3720 files changed, 23542 insertions, 49841 deletions

diff --git a/GIDs b/GIDs
index 1d5da984eeaf..e126d9060a84 100644
--- a/GIDs
+++ b/GIDs
@@ -802,9 +802,9 @@ opensearch:*:855:
 # free: 858
 # free: 859
 plocate:*:860:
-# free: 861
-# free: 862
-# free: 863
+rekor:*:861:
+timestamp-authority:*:862:
+trillian:*:863:
 mediamtx:*:864:
 z2m:*:865:
 vglusers:*:866:
diff --git a/MOVED b/MOVED
index 4979ccced87d..87dffc8892b3 100644
--- a/MOVED
+++ b/MOVED
@@ -3753,7 +3753,6 @@ x11-toolkits/py-qt6-chart|x11-toolkits/py-qt6-charts|2024-12-08|Renamed to be co
 devel/sfml251|devel/sfml|2024-12-09|Removed pinned port because the last user is gone
 devel/ocaml-seq|lang/ocaml|2024-12-10|Has expired: Seq is provided by lang/ocaml
 textproc/mdocml|textproc/mandoc|2024-12-17|Upstream reanamed
-www/shellinabox|sysutils/ttyd|2024-12-24|Has expired: Abandonware and outdated, last release in 2016. Use sysutils/ttyd instead
 audio/spiralsynth|audio/spiralsynthmodular|2024-12-24|Has expired: SpiralSynth isn't being supported any more, use audio/spiralsynthmodular
 textproc/apache-solr8|textproc/apache-solr|2024-12-24|Has expired: Deprecated upstream 2024-10-25, upgrade to version 9 in textproc/apache-solr instead
 editors/ghostwriter@qt5|editors/ghostwriter|2024-12-29|Flavors removed, now supports only qt6
@@ -4338,3 +4337,62 @@ graphics/linux-rl9-sdl_ttf|misc/linux-rl9-sdl12-extralibs|2025-05-03|Merged into
 graphics/linux-rl9-sdl_gfx|misc/linux-rl9-sdl12-extralibs|2025-05-03|Merged into misc/linux-rl9-sdl12-extralibs
 audio/linux-c7-sdl_mixer|misc/linux-c7-sdl12-extralibs|2025-05-03|Merged into misc/linux-c7-sdl12-extralibs
 audio/linux-rl9-sdl_sound|misc/linux-rl9-sdl12-extralibs|2025-05-03|Merged into misc/linux-rl9-sdl12-extralibs
+graphics/acidwarp-sdl||2025-05-04|Has expired: Unmaintained by upstream as last release was in 2022
+games/xjewel||2025-05-04|Has expired: Unmaintained as last release was in 1994
+textproc/mysqlviz||2025-05-04|Has expired: Repo deleted upstream
+textproc/sdif||2025-05-04|Has expired: Deprecated upstream, repo archived Nov 21, 2018
+textproc/xp||2025-05-04|Has expired: Obsolete, never versions of Java already include XML parser(s)
+textproc/turboxsl||2025-05-04|Has expired: Obsolete, supports only legacy versions of XML and XSLT
+textproc/docbook2odf||2025-05-04|Has expired: Upstream is gone and unmaintained in tree for years
+textproc/sxml||2025-05-04|Has expired: No consumers in tree and no active development upstream for over a decade
+textproc/java2html||2025-05-04|Has expired: Upstream is gone and last update 20 years ago
+textproc/word2x||2025-05-04|Has expired: Obsolete converter than only supports ancient versions of Word documents
+textproc/unoconv||2025-05-04|Has expired: Deprecated upstream in 2021
+textproc/syck||2025-05-04|Has expired: Unfetchable, no response from upstream in a year
+textproc/soothsayer||2025-05-04|Has expired: Deprecated upstream, consider using deskutils/presage
+textproc/nux||2025-05-04|Has expired: Depends on deprecated port textproc/saxon-devel
+textproc/saxon-devel|textproc/saxon-he|2025-05-04|Has expired: Deprecated and unsupported upstream, consider using textproc/saxon-he
+textproc/saxon|textproc/saxon-he|2025-05-04|Has expired: Deprecated and unsupported upstream, consider using textproc/saxon-he
+textproc/p5-Search-Saryer||2025-05-04|Has expired: Depends on deprecated port textproc/sary
+textproc/sary||2025-05-04|Has expired: Last release in 2005 and unmaintained in tree for years
+textproc/mifluz||2025-05-04|Has expired: Obsolete, no activity upstream since 2014 and unmaintained in tree for years
+textproc/atom||2025-05-04|Has expired: Upstream is gone and utility is considered obsolete
+textproc/jaxup||2025-05-04|Has expired: Abandonware and obsolete, last release in 2003
+textproc/htdig||2025-05-04|Has expired: Abandonware, multiple unresolved bugs and no unicode support etc
+textproc/gmetadom||2025-05-04|Has expired: Abandonware, last release in 2007
+textproc/flip|converters/dos2unix|2025-05-04|Has expired: Unmaintained and dead upstream, consider using converters/dos2unix
+textproc/dom4j||2025-05-04|Has expired: Outdated and unsupported upstream
+textproc/domc||2025-05-04|Has expired: Obsolete, doesn't support HTML5, DOM Level 4 and DOM 2020-06
+textproc/ekhtml||2025-05-04|Has expired: Abandonware and obsolete, last release in 2002
+textproc/estraier||2025-05-04|Has expired: Obsolete and abandonware, last update in 2005
+textproc/confetti||2025-05-04|Has expired: Outdated and unmaintained in tree since 2018
+textproc/c2man||2025-05-04|Has expired: Not recommended for use in new projects
+textproc/bsddiff||2025-05-04|Has expired: Obsolete, newer version imported into base as 2017
+textproc/aft||2025-05-04|Has expired: Obscure markup language and unmaintained in tree for years
+textproc/resume-extensions||2025-05-04|Has expired: Depends on deprecated port textproc/resume
+textproc/resume||2025-05-04|Has expired: Obsolete XML and XSL based system that targets resumes and curriculae vitae
+textproc/add-css-links||2025-05-04|Has expired: Obsolete and unmaintained in tree for years
+textproc/print-n-times||2025-05-04|Has expired: Obsolete and unmaintained in tree for years
+textproc/cdif||2025-05-04|Has expired: Deprecated upstream, repo archived on Jun 25, 2018
+security/i2p||2025-05-04|Has expired: Outdated and unsupported upstream
+security/libuecc||2025-05-04|Has expired: Deprecated, only user was some never properly ported FreiFunk control plane software
+net-p2p/p5-Net-BitTorrent-PeerPacket||2025-05-04|Has expired: Deprecated, no active development in more than a decade so any "new" functionality is missing and interoperability with recent software is very limited if not completely broken
+net-p2p/p5-Net-BitTorrent||2025-05-04|Has expired: Deprecated, no active development in more than a decade so any "new" functionality is missing and interoperability with recent software is very limited if not completely broken
+net-p2p/p5-Net-BitTorrent-File||2025-05-04|Has expired: Deprecated, no active development in more than a decade so any "new" functionality is missing and interoperability with recent software is very limited if not completely broken
+net-p2p/libswift||2025-05-04|Has expired: Upstream archived repo on Feb 19, 2024 and no active development in several years
+net-p2p/phex|net-p2p/gtk-gnutella|2025-05-04|Has expired: Abandonware, last update upstream in 2009. Consider using net-p2p/gtk-gnutella
+net-p2p/shx||2025-05-04|Has expired: Obsolete protocol that has been superseded by many others
+net/openbgpd||2025-05-04|Has expired: Unsupported upstream, consider using net/openbgpd8
+japanese/namazu|japanese/namazu2|2025-05-04|Has expired: Obsolete and superseded by namazu2, last release in 2000
+games/stuntrally||2025-05-04|Has expired: Broken for months and outdated
+editors/ssed||2025-05-04|Has expired: Legacy "fork" that's based on legacy GNU sed 4.1 and last release in 2005
+devel/rubygem-webby||2025-05-04|Has expired: Deprecated upstream in 2011
+devel/ccdoc||2025-05-04|Has expired: Obsolete utility
+www/moodle43||2025-05-04|Has expired: EOLed upstream
+net/libtnl||2025-05-04|Has expired: Unmaintained upstream and no consumers in the ports tree
+www/moodle41||2025-05-04|Has expired: Outdated version
+www/publicfile||2025-05-04|Has expired: Unmaintained for years upstream and in tree, consider using www/darkhttpd , www/miniserve and/or ftp/tnftpd , ftp/unftp
+science/gtamsanalyzer||2025-05-05|Has expired: Upstream unmaintained as last release was in 2004
+www/dot-http||2025-05-05|Remove broken, unmaintained upstream port
+security/linux-rl9-libxcrypt|emulators/linux_base-rl9|2025-05-06|Integrated into linux_base-rl9
+graphics/quat-gui||2025-05-06|Has expired: Last upstream release was in 2003
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index abea43bc9db1..e713b7c3def0 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -55,7 +55,7 @@ _GST1_SOVERSION=	0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERS
 _GST1_CATEGORIES=	audio comms devel ftp graphics multimedia net security \
 			sysutils textproc www x11 x11-toolkits
 _GST1_PLUGINS_audio= 	a52dec alsa amrnb amrwbdec bs2b cdparanoia chromaprint faac \
-			faad flac flite gme gsm jack ladspa lame lv2 modplug \
+			faad fdkaac flac flite gme gsm jack ladspa lame lv2 modplug \
 			mpg123 ogg openmpt opus pulse shout2 sidplay \
 			sndfile sndio soundtouch speex taglib twolame vorbis \
 			wavpack webrtcdsp
@@ -145,6 +145,9 @@ gst-faac_IMPL=		bad
 gst-faad_PORT=		audio/gstreamer${_GST_VER}-plugins-faad
 gst-faad_IMPL=		bad
 
+gst-fdkaac_PORT=	audio/gstreamer${_GST_VER}-plugins-fdkaac
+gst-fdkaac_IMPL=	bad
+
 gst-flac_PORT=		audio/gstreamer${_GST_VER}-plugins-flac
 gst-flac_IMPL=		good
 
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 1515088d88bb..bf62f887899a 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -136,7 +136,6 @@ _linux_rl9_libva=			linux-rl9-libva>0:multimedia/linux-rl9-libva
 _linux_rl9_libvdpau=			linux-rl9-libvdpau>0:multimedia/linux-rl9-libvdpau
 _linux_${linux_ARGS}_libvorbis=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
 _linux_rl9_libvpx=			linux-rl9-libvpx>0:multimedia/linux-rl9-libvpx
-_linux_${linux_ARGS}_libxcrypt=		linux-${linux_ARGS}-libxcrypt>0:security/linux-${linux_ARGS}-libxcrypt
 _linux_${linux_ARGS}_libxkbcommon=	linux-${linux_ARGS}-libxkbcommon>0:x11/linux-${linux_ARGS}-libxkbcommon
 _linux_${linux_ARGS}_libxml2=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
 _linux_${linux_ARGS}_libxslt=		linux-${linux_ARGS}-libxslt>0:textproc/linux-${linux_ARGS}-libxslt
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index ef2f8f92b796..d2b787504316 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -857,6 +857,7 @@ PY_SETUPTOOLS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV
 .  if ${PYTHON_REL} < 31100
 PY_EXCEPTIONGROUP=	${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.1:devel/py-exceptiongroup@${PY_FLAVOR}
 PY_TOMLI=	${PYTHON_PKGNAMEPREFIX}tomli>=2.0.2<3:textproc/py-tomli@${PY_FLAVOR}
+PY_TYPING_EXTENSIONS=	${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 .  endif
 
 .  if ${PYTHON_REL} >= 30000
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 775bcd1783bc..177b350b2a93 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -131,7 +131,7 @@ _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .  endif
 # Possible values: 13, 14, 15, 16, 17
-PGSQL_DEFAULT?=		16
+PGSQL_DEFAULT?=		17
 # Possible values: 8.1, 8.2, 8.3, 8.4
 PHP_DEFAULT?=		8.3
 # Possible values: rust, legacy
diff --git a/Tools/scripts/rmport b/Tools/scripts/rmport
index 930dd60753fd..c2ea4c26037e 100755
--- a/Tools/scripts/rmport
+++ b/Tools/scripts/rmport
@@ -203,11 +203,10 @@ check_dep()
 get_PRs()
 {
 	catport=${1}
-	synopsis=${2}
 
-	log "${catport}: getting PRs having ${synopsis} in the synopsis"
+	log "${catport}: getting PRs having ${catport} in the synopsis"
 
-	url="https://bugs.freebsd.org/bugzilla/buglist.cgi?quicksearch=${synopsis}"
+	url="https://bugs.freebsd.org/bugzilla/buglist.cgi?quicksearch=${catport}"
 
 	raw="$(fetch -q -T 20 -o - "${url}")"
 
@@ -225,12 +224,11 @@ get_PRs()
 check_PRs()
 {
 	catport=${1}
-	synopsis=${2}
 
-	PRs="$(get_PRs ${catport} "${synopsis}")" || exit
+	PRs="$(get_PRs ${catport})" || exit
 
 	if [ -n "${PRs}" ] ; then
-		log "${catport}: PRs found, related to ${synopsis}:"
+		log "${catport}: related PRs found:"
 		printf "%s\n" "${PRs}" >&2
 
 		echo "you can skip ${catport} and continue with the rest or remove it anyway" >&2
@@ -389,7 +387,7 @@ if [ ${1} = "-p" ] ; then
 	if [ ${#} -ne 2 ] ; then
 		usage
 	fi
-	get_PRs "dummy" ${2}
+	get_PRs ${2}
 	exit
 fi
 
@@ -439,7 +437,7 @@ for catport in $* ; do
 		continue
 	fi
 
-	if ! check_PRs ${catport} ${port} ; then
+	if ! check_PRs ${catport} ; then
 		continue
 	fi
 
diff --git a/UIDs b/UIDs
index af13787b0237..a04c7188973f 100644
--- a/UIDs
+++ b/UIDs
@@ -808,9 +808,9 @@ opensearch:*:855:855::0:0:opensearch user:/nonexistent:/usr/sbin/nologin
 # free: 858
 # free: 859
 # free: 860
-# free: 861
-# free: 862
-# free: 863
+rekor:*:861:861::0:0:rekor user:/nonexistent:/usr/sbin/nologin
+timestamp-authority:*:862:862::0:0:Timestamp Authority:/nonexistent:/usr/sbin/nologin
+trillian:*:863:863::0:0:trillian user:/nonexistent:/usr/sbin/nologin
 mediamtx:*:864:864::0:0:mediamtx:/nonexistent:/usr/sbin/nologin
 z2m:*:865:865::0:0:zigbee2mqtt:/usr/local/z2m:/usr/sbin/nologin
 # free: 866
diff --git a/UPDATING b/UPDATING
index 3c4865293c07..617d0f1646a9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,59 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20250506:
+  AFFECTS: users of databases/postgresql* and other software using PostgreSQL to run
+  AUTHOR: kbowling@FreeBSD.org
+
+  The default version of PostgreSQL has been switched from 16 to 17.
+  The upgrade procedure can use up twice the space the databases
+  currently needs. If you have a big amount of stored data take a
+  closer look at the manpage of pg_upgrade for avoidance and/or
+  speedup of the upgrade.
+
+  The upgrade instructions consider a basic usage and do not match
+  complex scenarios like replication, sharding, or similar.
+
+  Upgrade instructions:
+
+  First stop your PostgreSQL, create PostgreSQL-binaries and backup your data.
+  If you have another Version of PostgreSQL installed, for example 16, your
+  files are named according to this.
+
+  # service postgresql stop
+  # pkg create postgresql16-server postgresql16-contrib
+  # mkdir /tmp/pg-upgrade
+  # tar xf postgresql16-server-16.8.pkg -C /tmp/pg-upgrade
+  # tar xf postgresql16-contrib-16.8.pkg -C /tmp/pg-upgrade
+  # pkg delete -f databases/postgresql16-server databases/postgresql16-contrib databases/postgresql16-client
+
+  Now update PostgreSQL:
+
+    pkg user:
+    # pkg install databases/postgresql17-server databases/postgresql17-contrib
+    # pkg upgrade
+
+    Portmaster users:
+    # portmaster databases/postgresql17-server databases/postgresql17-contrib
+    # portmaster -a
+
+    Portupgrade users:
+    # portinstall databases/postgresql17-server databases/postgresql17-contrib
+    # portupgrade -a
+
+  After installing the new PostgreSQL version you need to convert
+  all your databases to new version:
+
+  # su -l postgres -c "/usr/local/bin/initdb --encoding=utf-8 --lc-collate=C -D /var/db/postgres/data17 -U postgres"
+  # su -l postgres -c "pg_upgrade -b /tmp/pg-upgrade/usr/local/bin/ -d /var/db/postgres/data16/ -B /usr/local/bin/ -D /var/db/postgres/data17/ -U postgres "
+
+  Now the migration is finished. You can start PostgreSQL again with:
+
+  # service postgresql start
+
+  ATTENTION:
+  1) If you use non-default initdb options, you have to adjust the initdb-command accordingly
+
 20250503:
   AFFECTS: users of sysutils/bastille
   AUTHOR: jdhurtado@orbiware.com
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index 92d3f8536cb5..59ce90358caf 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	speech-dispatcher
-DISTVERSION=	0.12.0
+DISTVERSION=	0.12.1
 CATEGORIES?=	accessibility audio
 MASTER_SITES=	https://github.com/brailcom/speechd/releases/download/${PORTVERSION}/
 
diff --git a/accessibility/speech-dispatcher/distinfo b/accessibility/speech-dispatcher/distinfo
index 00707fe953a2..0edffa6a56b5 100644
--- a/accessibility/speech-dispatcher/distinfo
+++ b/accessibility/speech-dispatcher/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740452962
-SHA256 (speech-dispatcher-0.12.0.tar.gz) = e1dd0bfa24b8338545e165451330adf51c4c0dca862b1b67e76fba5142dbbb74
-SIZE (speech-dispatcher-0.12.0.tar.gz) = 7481967
+TIMESTAMP = 1746673357
+SHA256 (speech-dispatcher-0.12.1.tar.gz) = b14a5238d287d2dcce4dd42bbd66ca65fa228e7e683708267f7b34036f7ba4b4
+SIZE (speech-dispatcher-0.12.1.tar.gz) = 7483246
diff --git a/accessibility/speech-dispatcher/pkg-plist b/accessibility/speech-dispatcher/pkg-plist
index a61727d97565..53d805a3615f 100644
--- a/accessibility/speech-dispatcher/pkg-plist
+++ b/accessibility/speech-dispatcher/pkg-plist
@@ -85,7 +85,7 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/base/font-variants.dic
 %%DATADIR%%/locale/base/orca-chars.dic
 %%DATADIR%%/locale/base/orca.dic
-%%DATADIR%%/locale/base/symbols-fallback.dic
+%%DATADIR%%/locale/base/symbols.dic
 %%DATADIR%%/locale/be/emojis.dic
 %%DATADIR%%/locale/be/orca-chars.dic
 %%DATADIR%%/locale/be/orca.dic
diff --git a/archivers/par2cmdline-turbo/Makefile b/archivers/par2cmdline-turbo/Makefile
index 14231c9f9a2e..779281fcc58f 100644
--- a/archivers/par2cmdline-turbo/Makefile
+++ b/archivers/par2cmdline-turbo/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	par2cmdline-turbo
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers
 
diff --git a/archivers/par2cmdline-turbo/distinfo b/archivers/par2cmdline-turbo/distinfo
index 033cf2fb9f97..e03a0cc64af0 100644
--- a/archivers/par2cmdline-turbo/distinfo
+++ b/archivers/par2cmdline-turbo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734382983
-SHA256 (animetosho-par2cmdline-turbo-v1.2.0_GH0.tar.gz) = 5d3911d1defaf2aa9d17f8b37325fa3152edce5814c5110647b2e5197706bfa4
-SIZE (animetosho-par2cmdline-turbo-v1.2.0_GH0.tar.gz) = 3952265
+TIMESTAMP = 1746386432
+SHA256 (animetosho-par2cmdline-turbo-v1.3.0_GH0.tar.gz) = ec7106f88f45e834607d74fb373dae22583f08eafef4850ae98c7c70ce788f72
+SIZE (animetosho-par2cmdline-turbo-v1.3.0_GH0.tar.gz) = 3951714
diff --git a/archivers/py-rcssmin/Makefile b/archivers/py-rcssmin/Makefile
index c066a02d3a5f..0761e1c78273 100644
--- a/archivers/py-rcssmin/Makefile
+++ b/archivers/py-rcssmin/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rcssmin
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/archivers/py-rcssmin/distinfo b/archivers/py-rcssmin/distinfo
index 59a769774120..f97a47b1a18d 100644
--- a/archivers/py-rcssmin/distinfo
+++ b/archivers/py-rcssmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734389350
-SHA256 (rcssmin-1.2.0.tar.gz) = f436872412cfa6f04fff990c6322246b13aa389f60323b963583ed6102d7c84c
-SIZE (rcssmin-1.2.0.tar.gz) = 583287
+TIMESTAMP = 1746419979
+SHA256 (rcssmin-1.2.1.tar.gz) = b35c0c89cdac8fc356c2b0985f3e534e85cc18d1971d902d1eac7fe6b4ff566c
+SIZE (rcssmin-1.2.1.tar.gz) = 584848
diff --git a/archivers/py-rjsmin/Makefile b/archivers/py-rjsmin/Makefile
index f936323a3554..c3ddcac18fec 100644
--- a/archivers/py-rjsmin/Makefile
+++ b/archivers/py-rjsmin/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rjsmin
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.2.4
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/archivers/py-rjsmin/distinfo b/archivers/py-rjsmin/distinfo
index 4872de0b4947..94df6e0a23e9 100644
--- a/archivers/py-rjsmin/distinfo
+++ b/archivers/py-rjsmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734389344
-SHA256 (rjsmin-1.2.3.tar.gz) = 1388b52493a4c04fbc970a2d757c301fa05a3c37640314c2ce9dfc8d8a730cc6
-SIZE (rjsmin-1.2.3.tar.gz) = 417812
+TIMESTAMP = 1746420001
+SHA256 (rjsmin-1.2.4.tar.gz) = ffcbe04e0dfac39cea8fbbcb41c38b2e07235ce2188bca15e998da1d348a7860
+SIZE (rjsmin-1.2.4.tar.gz) = 422289
diff --git a/astro/py-pymeeus/Makefile b/astro/py-pymeeus/Makefile
index 1bf300f9a08c..cac601daabe5 100644
--- a/astro/py-pymeeus/Makefile
+++ b/astro/py-pymeeus/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	pymeeus
-PORTVERSION=	0.5.12
+DISTVERSION=	0.5.12
 PORTREVISION=	1
 CATEGORIES=	astro science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyMeeus-${DISTVERSION}
 
-MAINTAINER=	bofh@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python implementation of Jean Meeus astronomical routines
 WWW=		https://github.com/architest/pymeeus
 
diff --git a/audio/Makefile b/audio/Makefile
index fe62fe7168c0..619fa0de3b37 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -233,6 +233,7 @@
     SUBDIR += gstreamer1-plugins-chromaprint
     SUBDIR += gstreamer1-plugins-faac
     SUBDIR += gstreamer1-plugins-faad
+    SUBDIR += gstreamer1-plugins-fdkaac
     SUBDIR += gstreamer1-plugins-flac
     SUBDIR += gstreamer1-plugins-flite
     SUBDIR += gstreamer1-plugins-gme
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 0729459f1a48..1c41d4e44fdf 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	aqualung
 DISTVERSION=	1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 
 MAINTAINER=	portmaster@BSDforge.com
diff --git a/audio/caps-plugins/Makefile b/audio/caps-plugins/Makefile
index 01094e2ff1c9..cad0c20b49c6 100644
--- a/audio/caps-plugins/Makefile
+++ b/audio/caps-plugins/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://quitte.de/dsp/
 DISTNAME=	caps_${PORTVERSION}
 
-MAINTAINER=	bofh@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The C* LADSPA Audio Plugin Suite
 WWW=		http://quitte.de/dsp/caps.html
 
diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile
index c7d53f491345..08affe46e6f1 100644
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@@ -1,26 +1,28 @@
 PORTNAME=	freealut
-PORTVERSION=	1.1.0
-PORTREVISION=	4
+DISTVERSION=	1.1.0.20240801
+PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	DEBIAN_POOL
-DISTNAME=	freealut_${PORTVERSION}.orig
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	The OpenAL Utility Toolkit
-WWW=		http://connect.creativelabs.com/openal/default.aspx
+WWW=		https://github.com/vancegroup/freealut
 
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		gmake libtool openal:al pathfix pkgconfig
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+DEPRECATED=	No longer actively developed, consider migrating to another library
+
+USES=		cmake localbase:ldflags openal pathfix
 USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	vancegroup
+GH_TAGNAME=	8abb420
+
 LDFLAGS_i386=	-Wl,-znotext
-INSTALL_TARGET=	install-strip
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/@CFLAGS@/& -lopenal -lpthread/g' \
-		${WRKSRC}/examples/Makefile.in \
-		${WRKSRC}/test_suite/Makefile.in
+CMAKE_OFF=	BUILD_EXAMPLES \
+		BUILD_OPTIMIZATION \
+		BUILD_TESTS
 
 .include <bsd.port.mk>
diff --git a/audio/freealut/distinfo b/audio/freealut/distinfo
index ccfb86d8ca90..94dd993d2ec7 100644
--- a/audio/freealut/distinfo
+++ b/audio/freealut/distinfo
@@ -1,2 +1,3 @@
-SHA256 (freealut_1.1.0.orig.tar.gz) = 60d1ea8779471bb851b89b49ce44eecb78e46265be1a6e9320a28b100c8df44f
-SIZE (freealut_1.1.0.orig.tar.gz) = 461830
+TIMESTAMP = 1743902077
+SHA256 (vancegroup-freealut-1.1.0.20240801-8abb420_GH0.tar.gz) = 229f33367404c61fb6341398c5a7e74dbecea886b4acc3d59d42a09c669b83fe
+SIZE (vancegroup-freealut-1.1.0.20240801-8abb420_GH0.tar.gz) = 147898
diff --git a/audio/freealut/files/patch-src_alutInit.c b/audio/freealut/files/patch-src_alutInit.c
deleted file mode 100644
index d111d24abf29..000000000000
--- a/audio/freealut/files/patch-src_alutInit.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/alutInit.c.orig	2006-05-08 09:28:07 UTC
-+++ src/alutInit.c
-@@ -147,11 +147,7 @@ alutExit (void)
-       return AL_FALSE;
-     }
- 
--  if (!alcCloseDevice (device))
--    {
--      _alutSetError (ALUT_ERROR_CLOSE_DEVICE);
--      return AL_FALSE;
--    }
-+  alcCloseDevice (device);
- 
-   initialisationState = Unintialized;
-   return AL_TRUE;
diff --git a/audio/freealut/files/patch-src_alutInternal.h b/audio/freealut/files/patch-src_alutInternal.h
deleted file mode 100644
index afa799efeb7b..000000000000
--- a/audio/freealut/files/patch-src_alutInternal.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/alutInternal.h.orig	2006-05-08 09:28:07 UTC
-+++ src/alutInternal.h
-@@ -13,23 +13,8 @@
- 
- #if HAVE_STDINT_H
- #include <stdint.h>
--#elif _MSC_VER < 1300
--typedef char int8_t;
--typedef unsigned char uint8_t;
--typedef short int16_t;
--typedef unsigned short uint16_t;
--typedef int int32_t;
--typedef unsigned int uint32_t;
--#elif HAVE_BASETSD_H
--#include <basetsd.h>
--typedef INT8 int8_t;
--typedef UINT8 uint8_t;
--typedef INT16 int16_t;
--typedef UINT16 uint16_t;
--typedef INT32 int32_t;
--typedef UINT32 uint32_t;
- #else
--#error Do not know sized types on this platform
-+#include <inttypes.h>
- #endif
- 
- typedef int16_t Int16BigEndian;
diff --git a/audio/freealut/files/patch-src_alutLoader.c b/audio/freealut/files/patch-src_alutLoader.c
deleted file mode 100644
index 79aacab3d449..000000000000
--- a/audio/freealut/files/patch-src_alutLoader.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/alutLoader.c.orig	2006-05-08 09:28:07 UTC
-+++ src/alutLoader.c
-@@ -474,7 +474,7 @@ alutLoadWAVMemory (ALbyte *buffer, ALenu
- 
-   /* ToDo: Can we do something less insane than passing 0x7FFFFFFF? */
-   stream = _alutInputStreamConstructFromMemory (buffer, 0x7FFFFFFF);
--  _alutLoadMemoryFromInputStream (stream, format, size, &freq);
-+  *data = _alutLoadMemoryFromInputStream (stream, format, size, &freq);
-   if (*data == NULL)
-     {
-       return;
diff --git a/audio/freealut/files/patch-src_alutUtil.c b/audio/freealut/files/patch-src_alutUtil.c
deleted file mode 100644
index 26b4edd94037..000000000000
--- a/audio/freealut/files/patch-src_alutUtil.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/alutUtil.c.orig	2006-05-08 09:28:07 UTC
-+++ src/alutUtil.c
-@@ -2,6 +2,7 @@
- 
- #if HAVE_NANOSLEEP && HAVE_TIME_H
- #include <time.h>
-+#include <sys/time.h>
- #include <errno.h>
- #elif HAVE_USLEEP && HAVE_UNISTD_H
- #include <unistd.h>
diff --git a/audio/freealut/pkg-plist b/audio/freealut/pkg-plist
index f1ab0b8bc9ee..4323ec26d99e 100644
--- a/audio/freealut/pkg-plist
+++ b/audio/freealut/pkg-plist
@@ -1,7 +1,6 @@
 bin/freealut-config
 include/AL/alut.h
 libdata/pkgconfig/freealut.pc
-lib/libalut.a
 lib/libalut.so
 lib/libalut.so.0
 lib/libalut.so.0.1.0
diff --git a/audio/gstreamer1-plugins-fdkaac/Makefile b/audio/gstreamer1-plugins-fdkaac/Makefile
new file mode 100644
index 000000000000..32e0ed584779
--- /dev/null
+++ b/audio/gstreamer1-plugins-fdkaac/Makefile
@@ -0,0 +1,15 @@
+PORTREVISION=	0
+CATEGORIES=	audio
+
+COMMENT=	GStreamer FDK-AAC codec plugin
+
+LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
+
+MASTERDIR=	${.CURDIR:H:H}/multimedia/gstreamer1-plugins
+
+PLIST=		${.CURDIR}/pkg-plist
+
+DIST=		bad
+GST_PLUGIN=	fdkaac
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-fdkaac/pkg-plist b/audio/gstreamer1-plugins-fdkaac/pkg-plist
new file mode 100644
index 000000000000..ab86d9b94448
--- /dev/null
+++ b/audio/gstreamer1-plugins-fdkaac/pkg-plist
@@ -0,0 +1 @@
+lib/gstreamer-%%VERSION%%/libgstfdkaac.so
diff --git a/audio/ladish/Makefile b/audio/ladish/Makefile
index d0e80ea041ce..ffe0ae1427c8 100644
--- a/audio/ladish/Makefile
+++ b/audio/ladish/Makefile
@@ -21,6 +21,7 @@ USES=		tar:bz2 localbase:ldflags pkgconfig python shebangfix waf
 USE_PERL5=	configure
 
 SHEBANG_FILES=	ladish_control
+TESTING_UNSAFE=	No function 'test' defined in ${WRKSRC}/wscript
 
 OPTIONS_DEFINE=		GUI
 OPTIONS_DEFAULT=	GUI
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index b1d16a4b7a77..9a86a2079d72 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libmikmod
-DISTVERSION=	3.3.12
+DISTVERSION=	3.3.13
 CATEGORIES=	audio
 MASTER_SITES=	SF/mikmod/${PORTNAME}/${DISTVERSION}/
 
@@ -9,7 +9,7 @@ WWW=		https://mikmod.sourceforge.net/
 
 LICENSE=	LGPL21
 
-USES=		cmake cpe pathfix pkgconfig
+USES=		cmake cpe pathfix
 CPE_VENDOR=	raphael_assenat
 USE_LDCONFIG=	yes
 
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index 26f856619d57..1293b17e106b 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743285650
-SHA256 (libmikmod-3.3.12.tar.gz) = adef6214863516a4a5b44ebf2c71ef84ecdfeb3444973dacbac70911c9bc67e9
-SIZE (libmikmod-3.3.12.tar.gz) = 1305911
+TIMESTAMP = 1745161813
+SHA256 (libmikmod-3.3.13.tar.gz) = 9fc1799f7ea6a95c7c5882de98be85fc7d20ba0a4a6fcacae11c8c6b382bb207
+SIZE (libmikmod-3.3.13.tar.gz) = 1306302
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index 3c18d2e130f1..cdfdd3bd9c2b 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mac
-PORTVERSION=	10.96
+PORTVERSION=	11.10
 CATEGORIES=	audio
 MASTER_SITES=	https://www.monkeysaudio.com/files/
 DISTNAME=	${PORTNAME:tu}_${PORTVERSION:S|.||}_SDK
diff --git a/audio/mac/distinfo b/audio/mac/distinfo
index 1b1f10e024cb..1f0737423b76 100644
--- a/audio/mac/distinfo
+++ b/audio/mac/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739444601
-SHA256 (MAC_1096_SDK.zip) = 73b25a517079bb015e2066b65854a7de0d8468f050b9b96025b7a3cb038f4dba
-SIZE (MAC_1096_SDK.zip) = 1675244
+TIMESTAMP = 1746655971
+SHA256 (MAC_1110_SDK.zip) = fe6f481e15eb03e0d4e0f8144a4fd1aff4398c77c419ff36aec99e807b38a54c
+SIZE (MAC_1110_SDK.zip) = 1695304
diff --git a/audio/mac/files/patch-CMakeLists.txt b/audio/mac/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..405846035bfc
--- /dev/null
+++ b/audio/mac/files/patch-CMakeLists.txt
@@ -0,0 +1,31 @@
+Version 11.00 added multi-threading support, but we need to link to -lpthread
+to resolve symbols.
+
+--- CMakeLists.txt.orig	2025-04-25 04:13:46 UTC
++++ CMakeLists.txt
+@@ -6,6 +6,8 @@ option(BUILD_UTIL "Build the mac command line tool" ON
+ option(BUILD_SHARED "Build libMAC as a shared library" ON)
+ option(BUILD_UTIL "Build the mac command line tool" ON)
+ 
++find_package(Threads)
++
+ #
+ # Determine interface version
+ #
+@@ -229,6 +231,7 @@ if(BUILD_SHARED)
+ if(BUILD_SHARED)
+     add_library(MAC SHARED $<TARGET_OBJECTS:shared> $<TARGET_OBJECTS:objects>)
+     set_target_properties(MAC PROPERTIES VERSION ${MAC_SOVERSION} SOVERSION ${MAC_SOVERSION})
++    target_link_libraries(MAC Threads::Threads)
+ 
+     if(WIN32)
+         if(${ARCHITECTURE} STREQUAL x86)
+@@ -315,7 +318,7 @@ if(BUILD_UTIL)
+        Source/Console/Console.cpp)
+ 
+     add_executable(macutil ${MAC_UTIL_HEADER_FILES} ${MAC_UTIL_SOURCE_FILES} $<TARGET_OBJECTS:shared>)
+-    target_link_libraries(macutil MAC)
++    target_link_libraries(macutil MAC Threads::Threads)
+ 
+     target_include_directories(macutil PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/Source/MACLib
diff --git a/audio/mac/files/patch-Source_Console_Console.cpp b/audio/mac/files/patch-Source_Console_Console.cpp
index 21d541b6a5b8..72ce55e11dc4 100644
--- a/audio/mac/files/patch-Source_Console_Console.cpp
+++ b/audio/mac/files/patch-Source_Console_Console.cpp
@@ -1,36 +1,40 @@
 Unixify built-in help.
 
---- Source/Console/Console.cpp.orig	2025-02-12 09:59:48 UTC
+--- Source/Console/Console.cpp.orig	2025-05-07 22:12:54 UTC
 +++ Source/Console/Console.cpp
-@@ -68,7 +68,7 @@ static void DisplayProperUsage(FILE * pFile)
+@@ -136,7 +136,7 @@ static void DisplayProperUsage(FILE * pFile)
  **************************************************************************************************/
  static void DisplayProperUsage(FILE * pFile)
  {
 -    fwprintf(pFile, L"Proper Usage: [EXE] [Input File] [Output File] [Mode]\n\n");
 +    fwprintf(pFile, L"Proper Usage: [mac] [Input File] [Output File] [Mode]\n\n");
  
-     fwprintf(pFile, L"Modes: \n");
+     fwprintf(pFile, L"Modes:\n");
      fwprintf(pFile, L"    Compress (fast): '-c1000'\n");
-@@ -85,16 +85,16 @@ static void DisplayProperUsage(FILE * pFile)
-     fwprintf(pFile, L"    Convert to ID3v1 (needed by some players, etc.): '-L'\n\n");
+@@ -156,18 +156,18 @@ static void DisplayProperUsage(FILE * pFile)
+     fwprintf(pFile, L"    Set the number of threads when compressing or decompressing: -threads=#'\n\n");
  
      fwprintf(pFile, L"Examples:\n");
 -    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n");
+-    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -threads=16 -t \"Artist=Metallica|Album=Black|Name=One\"\n");
 -    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n");
 -    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" auto -c2000\n");
 -    fwprintf(pFile, L"    Transcode from pipe: ffmpeg.exe -i \"Metallica - One.flac\" -f wav - | mac.exe - \"Metallica - One.ape\" -c2000\n");
 -    fwprintf(pFile, L"    Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n");
 -    fwprintf(pFile, L"    Decompress: mac.exe \"Metallica - One.ape\" auto -d\n");
+-    fwprintf(pFile, L"    Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d -threads=16\n");
 -    fwprintf(pFile, L"    Verify: mac.exe \"Metallica - One.ape\" -v\n");
 -    fwprintf(pFile, L"    Full Verify: mac.exe \"Metallica - One.ape\" -V\n");
 -    fwprintf(pFile, L"    Tag: mac.exe \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n");
 -    fwprintf(pFile, L"    Remove tag: mac.exe \"Metallica - One.ape\" -r\n");
 +    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n");
++    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -threads=16 -t \"Artist=Metallica|Album=Black|Name=One\"\n");
 +    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n");
 +    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" auto -c2000\n");
 +    fwprintf(pFile, L"    Transcode from pipe: ffmpeg -i \"Metallica - One.flac\" -f wav - | mac - \"Metallica - One.ape\" -c2000\n");
 +    fwprintf(pFile, L"    Decompress: mac \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n");
 +    fwprintf(pFile, L"    Decompress: mac \"Metallica - One.ape\" auto -d\n");
++    fwprintf(pFile, L"    Decompress: mac \"Metallica - One.ape\" \"Metallica - One.wav\" -d -threads=16\n");
 +    fwprintf(pFile, L"    Verify: mac \"Metallica - One.ape\" -v\n");
 +    fwprintf(pFile, L"    Full Verify: mac \"Metallica - One.ape\" -V\n");
 +    fwprintf(pFile, L"    Tag: mac \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n");
diff --git a/audio/mac/pkg-plist b/audio/mac/pkg-plist
index c31834c74702..3107453423b6 100644
--- a/audio/mac/pkg-plist
+++ b/audio/mac/pkg-plist
@@ -11,4 +11,4 @@ include/MAC/Version.h
 include/MAC/Warnings.h
 include/MAC/WindowsEnvironment.h
 lib/libMAC.so
-lib/libMAC.so.12
+lib/libMAC.so.13
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index e7c391370add..8e2abd0b579b 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -4,6 +4,9 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/mp3check/
 EXTRACT_SUFX=	# empty
 
+DEPRECATED=	Depends on expired audio/id3tool
+EXPIRATION_DATE=2025-06-04
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for checking and fixing MP3 archive inconsistencies
 WWW=		https://www.icculus.org/mp3check/
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 39b2a3887458..139e334edd0d 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	${GH_PROJECT:tl}
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.5.1
+PORTREVISION=	1
 CATEGORIES=	audio
 
 PATCH_SITES=	https://github.com/musescore/MuseScore/commit/
@@ -33,7 +34,6 @@ USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_PROJECT=	MuseScore
-GH_TAGNAME=	v4.5
 
 # Each release gets a subdir containing the distfiles for that release,
 # so hope that scanning the parent dir finds new ones.
@@ -62,7 +62,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/libdata
 	# workaround for https://github.com/musescore/MuseScore/issues/26104
 	@${INSTALL_DATA} ${FILESDIR}/mscore.desktop ${STAGEDIR}${PREFIX}/share/applications/
-	@${REINPLACE_CMD} -e "\
+	@${REINPLACE_CMD} -i '' -e "\
 		s|^Version=.*|Version=${PORTVERSION}|; \
 		s|^Name=.*|Name=MuseScore|; \
 		"  ${STAGEDIR}${PREFIX}/share/applications/mscore.desktop
diff --git a/audio/musescore/distinfo b/audio/musescore/distinfo
index 772f4fb39788..12e1c4fdc86c 100644
--- a/audio/musescore/distinfo
+++ b/audio/musescore/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1743123988
-SHA256 (musescore-MuseScore-v4.5.1-v4.5_GH0.tar.gz) = 13807e7970bb7506d1e06ce32798b020609409c96f4f0b9ff3b41ced596e74fd
-SIZE (musescore-MuseScore-v4.5.1-v4.5_GH0.tar.gz) = 144425720
+TIMESTAMP = 1746432494
+SHA256 (musescore-MuseScore-v4.5.1_GH0.tar.gz) = 5ec033770599ee42ebc00e1a8c680b78de7ac871a0fa6484a68544653171b9ae
+SIZE (musescore-MuseScore-v4.5.1_GH0.tar.gz) = 144481700
 SHA256 (05056ed19520060c3912a09a3adfa0927057f956.patch) = 8f8b1d947562ccb78875c00f50ece2ba32cb2ff38ef9da6350fc1eae4eac734a
 SIZE (05056ed19520060c3912a09a3adfa0927057f956.patch) = 3471
diff --git a/audio/musescore/pkg-plist b/audio/musescore/pkg-plist
index d59461f0ca3e..4f4de2782f39 100644
--- a/audio/musescore/pkg-plist
+++ b/audio/musescore/pkg-plist
@@ -11,6 +11,8 @@ share/icons/hicolor/512x512/mimetypes/application-x-musescore+xml.png
 share/icons/hicolor/512x512/mimetypes/application-x-musescore.png
 share/icons/hicolor/64x64/apps/mscore.png
 share/icons/hicolor/96x96/apps/mscore.png
+share/icons/hicolor/scalable/mimetypes/application-x-musescore+xml.svg
+share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg
 %%DATADIR%%/autobotscripts/TC1.1_CreateSimpleScore.js
 %%DATADIR%%/autobotscripts/TC1.2_CreateSimpleScoreWithRandomInstruments.js
 %%DATADIR%%/autobotscripts/TC2_CreateSimpleScoreByTemplate.js
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index e16f774e3639..fa4fd15e14b6 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	openal-soft
-PORTVERSION=	1.24.2
-PORTREVISION=	2
+PORTVERSION=	1.24.3
 CATEGORIES=	audio
 MASTER_SITES=	https://openal-soft.org/openal-releases/
 
-PATCH_SITES=	https://github.com/kcat/openal-soft/commit/
-PATCHFILES+=	9fdf662bcbd86cf26202f8718d6c5ca24655652e.patch:-p1 # Fix casts on 32-bit archs
-
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Software implementation of the OpenAL specification
 WWW=		https://openal-soft.org/
@@ -44,8 +40,8 @@ OPTIONS_DEFAULT_i386=	SIMD
 
 OPTIONS_SUB=		yes
 
-CONFIG_DESC=	Install configuration utility (needs Qt 5)
-UTILS_DESC=	Build and install utility programs
+CONFIG_DESC=		Install configuration utility (needs Qt 5)
+UTILS_DESC=		Build and install utility programs
 
 CONFIG_IMPLIES=		UTILS
 CONFIG_USES=		qt:5
@@ -55,7 +51,7 @@ CONFIG_CMAKE_BOOL_OFF=	ALSOFT_NO_CONFIG_UTIL
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_BOOL=	ALSOFT_BACKEND_JACK ALSOFT_REQUIRE_JACK
 
-OSS_CMAKE_BOOL=	ALSOFT_BACKEND_OSS ALSOFT_REQUIRE_OSS
+OSS_CMAKE_BOOL=		ALSOFT_BACKEND_OSS ALSOFT_REQUIRE_OSS
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_USES=		localbase:ldflags
@@ -67,9 +63,9 @@ PORTAUDIO_CMAKE_BOOL=	ALSOFT_BACKEND_PORTAUDIO ALSOFT_REQUIRE_PORTAUDIO
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ALSOFT_BACKEND_PULSEAUDIO ALSOFT_REQUIRE_PULSEAUDIO
 
-SDL_USES=	sdl
-SDL_USE=	SDL=sdl2
-SDL_CMAKE_BOOL=	ALSOFT_BACKEND_SDL2 ALSOFT_REQUIRE_SDL2
+SDL_USES=		sdl
+SDL_USE=		SDL=sdl2
+SDL_CMAKE_BOOL=		ALSOFT_BACKEND_SDL2 ALSOFT_REQUIRE_SDL2
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ALSOFT_BACKEND_SNDIO ALSOFT_REQUIRE_SNDIO
diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo
index 50ef810ffb29..4c70f2736a10 100644
--- a/audio/openal-soft/distinfo
+++ b/audio/openal-soft/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1738821586
-SHA256 (openal-soft-1.24.2.tar.bz2) = cd4c88c9b7311cb6785db71c0ed64f5430c9d5b3454e0158314b2ef25ace3e61
-SIZE (openal-soft-1.24.2.tar.bz2) = 1020760
-SHA256 (9fdf662bcbd86cf26202f8718d6c5ca24655652e.patch) = 17bfa74ce960c74e5b9fb131caf38f319d10dfde7ec3822358488ca7139bf581
-SIZE (9fdf662bcbd86cf26202f8718d6c5ca24655652e.patch) = 965
+TIMESTAMP = 1746663895
+SHA256 (openal-soft-1.24.3.tar.bz2) = cb5e6197a1c0da0edcf2a81024953cc8fa8545c3b9474e48c852af709d587892
+SIZE (openal-soft-1.24.3.tar.bz2) = 1025568
diff --git a/audio/pt2-clone/Makefile b/audio/pt2-clone/Makefile
index c542225a62ee..5cfafe2bb85d 100644
--- a/audio/pt2-clone/Makefile
+++ b/audio/pt2-clone/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pt2-clone
-PORTVERSION=	1.73
+PORTVERSION=	1.74
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/ehaupt:extras
diff --git a/audio/pt2-clone/distinfo b/audio/pt2-clone/distinfo
index eefac81326c0..fcc5ecfba765 100644
--- a/audio/pt2-clone/distinfo
+++ b/audio/pt2-clone/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745738146
+TIMESTAMP = 1746346857
 SHA256 (pt2-clone-extras-2.tar.gz) = ddbac01034022f27860d85f4627b07223f9fd8f02a4ddefdc36467f2e3cacd0b
 SIZE (pt2-clone-extras-2.tar.gz) = 742
-SHA256 (8bitbubsy-pt2-clone-v1.73_GH0.tar.gz) = a8c58e6bbe277a2366284197e860418059c1139b2ab1ca6db50e8a07ed11b5b6
-SIZE (8bitbubsy-pt2-clone-v1.73_GH0.tar.gz) = 9161174
+SHA256 (8bitbubsy-pt2-clone-v1.74_GH0.tar.gz) = fdb4f2a2155ae60fc3d19f1dd4f5e48da3713d07e5727be985c61de2952665a1
+SIZE (8bitbubsy-pt2-clone-v1.74_GH0.tar.gz) = 9161423
diff --git a/audio/schismtracker/Makefile b/audio/schismtracker/Makefile
index 933a1ebb6974..1b9f0b96568c 100644
--- a/audio/schismtracker/Makefile
+++ b/audio/schismtracker/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	schismtracker
-DISTVERSION=	20250313
+DISTVERSION=	20250415
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -11,15 +11,14 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 armv7 i386 powerpc powerpc64 powerpc64le
 
-LIB_DEPENDS=	libFLAC.so:audio/flac \
-		libutf8proc.so:textproc/utf8proc
+LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
 
-USES=		autoreconf compiler:c++11-lib desktop-file-utils localbase \
-		pkgconfig python sdl xorg
-USE_GITHUB=	yes
-USE_SDL=	sdl2
-USE_XORG=	x11 xext xv
-GNU_CONFIGURE=	yes
+USES=			autoreconf compiler:c++11-lib desktop-file-utils \
+			localbase pkgconfig python xorg
+USE_GITHUB=		yes
+USE_XORG=		x11 xext xv
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-sdl12
 
 PLIST_FILES=	bin/schismtracker \
 		share/applications/schism.desktop \
@@ -27,6 +26,18 @@ PLIST_FILES=	bin/schismtracker \
 		share/pixmaps/schism-icon-128.png \
 		share/pixmaps/schism-itf-icon-128.png
 
+OPTIONS_DEFINE=		FLAC SDL
+OPTIONS_DEFAULT=	FLAC SDL
+
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
+FLAC_CONFIGURE_ON=	--enable-flac-linking \
+			--with-flac
+
+SDL_USES=		sdl
+SDL_USE=		SDL=sdl2
+SDL_CONFIGURE_ON=	--enable-sdl2-linking \
+			--with-sdl2
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LAST_GIT_COMMIT%%|${DISTVERSION}|" \
 		${WRKSRC}/configure.ac
diff --git a/audio/schismtracker/distinfo b/audio/schismtracker/distinfo
index cbab2d148363..870b77ec1e70 100644
--- a/audio/schismtracker/distinfo
+++ b/audio/schismtracker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741948979
-SHA256 (schismtracker-schismtracker-20250313_GH0.tar.gz) = 0811a1133cb7a8c4c69713a15389b6601ec909b406b9e4d7e8ca2833887f0124
-SIZE (schismtracker-schismtracker-20250313_GH0.tar.gz) = 1245032
+TIMESTAMP = 1746459006
+SHA256 (schismtracker-schismtracker-20250415_GH0.tar.gz) = ba9b8e4381e9f3a3110ae7bb4e7794ac2399e88bb26a50c86a6f45beed57c5f3
+SIZE (schismtracker-schismtracker-20250415_GH0.tar.gz) = 1258277
diff --git a/audio/schismtracker/files/patch-configure.ac b/audio/schismtracker/files/patch-configure.ac
index ed1ee3f5fb39..120591c15c33 100644
--- a/audio/schismtracker/files/patch-configure.ac
+++ b/audio/schismtracker/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig	2024-12-26 07:15:43 UTC
+--- configure.ac.orig	2025-04-15 23:08:37 UTC
 +++ configure.ac
 @@ -23,9 +23,9 @@ m4_define([last_git_commit], patsubst(m4_esyscmd([git 
  
@@ -12,3 +12,22 @@
  
  AC_CONFIG_SRCDIR([schism/main.c])
  
+@@ -999,18 +999,6 @@ SCHISM_CHECK_COMPILE_FLAG([-Werror=return-type])
+ dnl Unlike a grand -Werror, this one could be rather important:
+ dnl functions returning random values are no good under any circumstances.
+ SCHISM_CHECK_COMPILE_FLAG([-Werror=return-type])
+-
+-dnl GCC by default does not error for mesopotamian pre-ANSI C constructs
+-dnl before GCC 14. Enforce C99 function and variable declarations.
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=implicit-int])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=old-style-declaration])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=old-style-definition])
+-
+-dnl Error for misc. undefined behavior.
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=write-strings])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=restrict])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=overlength-strings])
+ 
+ dnl disable this for now, clang's implementation is incorrect  --paper
+ dnl SCHISM_CHECK_COMPILE_FLAG([-Werror=cast-function-type])
diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile
index e864f6112527..7aef581a6f17 100644
--- a/audio/strawberry/Makefile
+++ b/audio/strawberry/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	strawberry
 DISTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/
 
@@ -10,7 +11,9 @@ WWW=		https://www.strawberrymusicplayer.org/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
+BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
+		rapidjson>0:devel/rapidjson \
+		sparsehash>0:devel/sparsehash
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libkdsingleapplication-qt6.so:devel/kdsingleapplication \
 		libtag.so:audio/taglib \
diff --git a/biology/fasda-utils/Makefile b/biology/fasda-utils/Makefile
index c9c607b9489d..854b7f13b7e0 100644
--- a/biology/fasda-utils/Makefile
+++ b/biology/fasda-utils/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fasda-utils
-DISTVERSION=	0.1.0-1
-DISTVERSIONSUFFIX=	-g761fb57
+DISTVERSION=	0.1.0-2
+DISTVERSIONSUFFIX=	-gf9217f0
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
diff --git a/biology/fasda-utils/distinfo b/biology/fasda-utils/distinfo
index 677b148e931d..8e6e59cedd0c 100644
--- a/biology/fasda-utils/distinfo
+++ b/biology/fasda-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743949209
-SHA256 (auerlab-fasda-utils-0.1.0-1-g761fb57_GH0.tar.gz) = a8c74c60b35446957cd9177908437e754e344431fea08f8600010d426c679c9c
-SIZE (auerlab-fasda-utils-0.1.0-1-g761fb57_GH0.tar.gz) = 4907
+TIMESTAMP = 1746452435
+SHA256 (auerlab-fasda-utils-0.1.0-2-gf9217f0_GH0.tar.gz) = 6dfa802e31e7f0f8a1721ac2f00b5a535999d8b78a54b550d5baea96476b5f9f
+SIZE (auerlab-fasda-utils-0.1.0-2-gf9217f0_GH0.tar.gz) = 4910
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 05b472488041..7f1a92dd87f0 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gmsh
 DISTVERSION=	4.13.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	http://gmsh.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/cad/gmsh/files/patch-contrib_HighOrderMeshOptimizer_HighOrderMeshElasticAnalogy.cpp b/cad/gmsh/files/patch-contrib_HighOrderMeshOptimizer_HighOrderMeshElasticAnalogy.cpp
new file mode 100644
index 000000000000..2ecac4e87b02
--- /dev/null
+++ b/cad/gmsh/files/patch-contrib_HighOrderMeshOptimizer_HighOrderMeshElasticAnalogy.cpp
@@ -0,0 +1,41 @@
+--- contrib/HighOrderMeshOptimizer/HighOrderMeshElasticAnalogy.cpp.orig	2024-03-29 22:06:53 UTC
++++ contrib/HighOrderMeshOptimizer/HighOrderMeshElasticAnalogy.cpp
+@@ -242,25 +242,25 @@ void highOrderTools::_computeMetricInfo(GFace *gf, MEl
+   for(int j = 0; j < nbNodes; j++) {
+     SPoint2 param;
+     reparamMeshVertexOnFace(e->getVertex(j), gf, param);
+-    Pair<SVector3, SVector3> der = gf->firstDer(param);
++    std::pair<SVector3, SVector3> der = gf->firstDer(param);
+     int XJ = j;
+     int YJ = j + nbNodes;
+     int ZJ = j + 2 * nbNodes;
+     int UJ = j;
+     int VJ = j + nbNodes;
+-    J(XJ, UJ) = der.first().x();
+-    J(YJ, UJ) = der.first().y();
+-    J(ZJ, UJ) = der.first().z();
+-    J(XJ, VJ) = der.second().x();
+-    J(YJ, VJ) = der.second().y();
+-    J(ZJ, VJ) = der.second().z();
++    J(XJ, UJ) = der.first.x();
++    J(YJ, UJ) = der.first.y();
++    J(ZJ, UJ) = der.first.z();
++    J(XJ, VJ) = der.second.x();
++    J(YJ, VJ) = der.second.y();
++    J(ZJ, VJ) = der.second.z();
+ 
+-    JT(UJ, XJ) = der.first().x();
+-    JT(UJ, YJ) = der.first().y();
+-    JT(UJ, ZJ) = der.first().z();
+-    JT(VJ, XJ) = der.second().x();
+-    JT(VJ, YJ) = der.second().y();
+-    JT(VJ, ZJ) = der.second().z();
++    JT(UJ, XJ) = der.first.x();
++    JT(UJ, YJ) = der.first.y();
++    JT(UJ, ZJ) = der.first.z();
++    JT(VJ, XJ) = der.second.x();
++    JT(VJ, YJ) = der.second.y();
++    JT(VJ, ZJ) = der.second.z();
+ 
+     SVector3 ss = getSSL(e->getVertex(j));
+     GPoint gp = gf->point(param);
diff --git a/cad/gmsh/files/patch-contrib_MeshOptimizer_VertexCoord.cpp b/cad/gmsh/files/patch-contrib_MeshOptimizer_VertexCoord.cpp
new file mode 100644
index 000000000000..4cb21e79ce54
--- /dev/null
+++ b/cad/gmsh/files/patch-contrib_MeshOptimizer_VertexCoord.cpp
@@ -0,0 +1,42 @@
+--- contrib/MeshOptimizer/VertexCoord.cpp.orig	2024-03-29 22:06:54 UTC
++++ contrib/MeshOptimizer/VertexCoord.cpp
+@@ -76,12 +76,12 @@ void VertexCoordParent::gXyz2gUvw(const SPoint3 &uvw, 
+     gUvw[0] = gXyz.x() * der.x() + gXyz.y() * der.y() + gXyz.z() * der.z();
+   }
+   else {
+-    Pair<SVector3, SVector3> der =
++    std::pair<SVector3, SVector3> der =
+       static_cast<GFace *>(ge)->firstDer(SPoint2(uvw[0], uvw[1]));
+-    gUvw[0] = gXyz.x() * der.first().x() + gXyz.y() * der.first().y() +
+-              gXyz.z() * der.first().z();
+-    gUvw[1] = gXyz.x() * der.second().x() + gXyz.y() * der.second().y() +
+-              gXyz.z() * der.second().z();
++    gUvw[0] = gXyz.x() * der.first.x() + gXyz.y() * der.first.y() +
++              gXyz.z() * der.first.z();
++    gUvw[1] = gXyz.x() * der.second.x() + gXyz.y() * der.second.y() +
++              gXyz.z() * der.second.z();
+   }
+ }
+ 
+@@ -101,15 +101,15 @@ void VertexCoordParent::gXyz2gUvw(const SPoint3 &uvw,
+     }
+   }
+   else {
+-    Pair<SVector3, SVector3> der =
++    std::pair<SVector3, SVector3> der =
+       static_cast<GFace *>(ge)->firstDer(SPoint2(uvw[0], uvw[1]));
+     auto itUvw = gUvw.begin();
+     for(auto itXyz = gXyz.begin(); itXyz != gXyz.end(); itXyz++) {
+-      (*itUvw)[0] = itXyz->x() * der.first().x() +
+-                    itXyz->y() * der.first().y() + itXyz->z() * der.first().z();
+-      (*itUvw)[1] = itXyz->x() * der.second().x() +
+-                    itXyz->y() * der.second().y() +
+-                    itXyz->z() * der.second().z();
++      (*itUvw)[0] = itXyz->x() * der.first.x() +
++                    itXyz->y() * der.first.y() + itXyz->z() * der.first.z();
++      (*itUvw)[1] = itXyz->x() * der.second.x() +
++                    itXyz->y() * der.second.y() +
++                    itXyz->z() * der.second.z();
+       itUvw++;
+     }
+   }
diff --git a/cad/gmsh/files/patch-contrib_domhex_BackgroundMesh2D.cpp b/cad/gmsh/files/patch-contrib_domhex_BackgroundMesh2D.cpp
new file mode 100644
index 000000000000..2863634a8f85
--- /dev/null
+++ b/cad/gmsh/files/patch-contrib_domhex_BackgroundMesh2D.cpp
@@ -0,0 +1,110 @@
+--- contrib/domhex/BackgroundMesh2D.cpp.orig	2024-03-29 22:06:54 UTC
++++ contrib/domhex/BackgroundMesh2D.cpp
+@@ -490,9 +490,9 @@ void frameFieldBackgroundMesh2D::computeCrossField(
+         v[1] = (*it)->lines[i]->getVertex(1);
+         SPoint2 p1, p2;
+         reparamMeshEdgeOnFace(v[0], v[1], face, p1, p2);
+-        Pair<SVector3, SVector3> der = face->firstDer((p1 + p2) * .5);
+-        SVector3 t1 = der.first();
+-        SVector3 t2 = der.second();
++        std::pair<SVector3, SVector3> der = face->firstDer((p1 + p2) * .5);
++        SVector3 t1 = der.first;
++        SVector3 t2 = der.second;
+         SVector3 n = crossprod(t1, t2);
+         n.normalize();
+         SVector3 d1(v[1]->x() - v[0]->x(), v[1]->y() - v[0]->y(),
+@@ -534,21 +534,21 @@ void frameFieldBackgroundMesh2D::eval_crossfield(doubl
+                                                  STensor3 &cf)
+ {
+   double quadAngle = angle(u, v);
+-  Pair<SVector3, SVector3> dirs =
++  std::pair<SVector3, SVector3> dirs =
+     compute_crossfield_directions(u, v, quadAngle);
+-  SVector3 n = crossprod(dirs.first(), dirs.second());
++  SVector3 n = crossprod(dirs.first, dirs.second);
+ 
+   for(int i = 0; i < 3; i++) {
+-    cf(i, 0) = dirs.first()[i];
+-    cf(i, 1) = dirs.second()[i];
++    cf(i, 0) = dirs.first[i];
++    cf(i, 1) = dirs.second[i];
+     cf(i, 2) = n[i];
+   }
+ 
+   //  SVector3 t1,t2,n;
+   //  GFace *face = dynamic_cast<GFace*>(gf);
+-  //  Pair<SVector3, SVector3> der = face->firstDer(SPoint2(u,v));
+-  //  SVector3 s1 = der.first();
+-  //  SVector3 s2 = der.second();
++  //  std::pair<SVector3, SVector3> der = face->firstDer(SPoint2(u,v));
++  //  SVector3 s1 = der.first;
++  //  SVector3 s2 = der.second;
+   //  n = crossprod(s1,s2);
+   //  n.normalize();
+   //  s1.normalize();
+@@ -642,12 +642,12 @@ void frameFieldBackgroundMesh2D::exportCrossField(cons
+     double angle_current = angle(v);
+     GPoint p = get_GPoint_from_MVertex(v);
+     for(int i = 0; i < 2; i++) {
+-      Pair<SVector3, SVector3> dirs = compute_crossfield_directions(
++      std::pair<SVector3, SVector3> dirs = compute_crossfield_directions(
+         v->x(), v->y(), angle_current + deltas[i]);
+       fprintf(f, "VP(%g,%g,%g) {%g,%g,%g};\n", p.x(), p.y(), p.z(),
+-              dirs.first()[0], dirs.first()[1], dirs.first()[2]);
++              dirs.first[0], dirs.first[1], dirs.first[2]);
+       fprintf(f, "VP(%g,%g,%g) {%g,%g,%g};\n", p.x(), p.y(), p.z(),
+-              dirs.second()[0], dirs.second()[1], dirs.second()[2]);
++              dirs.second[0], dirs.second[1], dirs.second[2]);
+     }
+   }
+   fprintf(f, "};\n");
+@@ -656,7 +656,7 @@ void frameFieldBackgroundMesh2D::exportCrossField(cons
+ 
+ // returns the cross field as a pair of othogonal vectors (NOT in parametric
+ // coordinates, but real 3D coordinates)
+-Pair<SVector3, SVector3>
++std::pair<SVector3, SVector3>
+ frameFieldBackgroundMesh2D::compute_crossfield_directions(double u, double v,
+                                                           double angle_current)
+ {
+@@ -664,12 +664,12 @@ frameFieldBackgroundMesh2D::compute_crossfield_directi
+   GFace *face = dynamic_cast<GFace *>(gf);
+   if(!face) {
+     Msg::Error("Entity is not a face in background mesh");
+-    return Pair<SVector3, SVector3>(SVector3(), SVector3());
++    return std::pair<SVector3, SVector3>(SVector3(), SVector3());
+   }
+ 
+-  Pair<SVector3, SVector3> der = face->firstDer(SPoint2(u, v));
+-  SVector3 s1 = der.first();
+-  SVector3 s2 = der.second();
++  std::pair<SVector3, SVector3> der = face->firstDer(SPoint2(u, v));
++  SVector3 s1 = der.first;
++  SVector3 s2 = der.second;
+   SVector3 n = crossprod(s1, s2);
+   n.normalize();
+ 
+@@ -687,8 +687,8 @@ frameFieldBackgroundMesh2D::compute_crossfield_directi
+   SVector3 t2 = crossprod(n, t1);
+   t2.normalize();
+ 
+-  return Pair<SVector3, SVector3>(SVector3(t1[0], t1[1], t1[2]),
+-                                  SVector3(t2[0], t2[1], t2[2]));
++  return std::pair<SVector3, SVector3>(SVector3(t1[0], t1[1], t1[2]),
++                                       SVector3(t2[0], t2[1], t2[2]));
+ }
+ 
+ bool frameFieldBackgroundMesh2D::compute_RK_infos(double u, double v, double x,
+@@ -711,9 +711,9 @@ bool frameFieldBackgroundMesh2D::compute_RK_infos(doub
+     return false;
+   }
+ 
+-  Pair<SVector3, SVector3> der = face->firstDer(SPoint2(u, v));
+-  SVector3 s1 = der.first();
+-  SVector3 s2 = der.second();
++  std::pair<SVector3, SVector3> der = face->firstDer(SPoint2(u, v));
++  SVector3 s1 = der.first;
++  SVector3 s2 = der.second;
+   SVector3 n = crossprod(s1, s2);
+   n.normalize();
+   SVector3 basis_u = s1;
diff --git a/cad/gmsh/files/patch-contrib_domhex_BackgroundMesh2D.h b/cad/gmsh/files/patch-contrib_domhex_BackgroundMesh2D.h
new file mode 100644
index 000000000000..9e6ad3a20153
--- /dev/null
+++ b/cad/gmsh/files/patch-contrib_domhex_BackgroundMesh2D.h
@@ -0,0 +1,23 @@
+--- contrib/domhex/BackgroundMesh2D.h.orig	2024-03-29 22:06:54 UTC
++++ contrib/domhex/BackgroundMesh2D.h
+@@ -9,9 +9,7 @@
+ #include <string>
+ #include <map>
+ #include <vector>
+-#include "Pair.h"
+ #include "STensor3.h"
+-
+ #include "BGMBase.h"
+ 
+ class MTriangle;
+@@ -133,8 +131,8 @@ class frameFieldBackgroundMesh2D : public backgroundMe
+   void eval_crossfield(MVertex *vert, STensor3 &cf);
+ 
+   void exportCrossField(const std::string &filename);
+-  Pair<SVector3, SVector3> compute_crossfield_directions(double u, double v,
+-                                                         double angle_current);
++  std::pair<SVector3, SVector3> compute_crossfield_directions(double u, double v,
++                                                              double angle_current);
+   bool compute_RK_infos(double u, double v, double x, double y, double z,
+                         RK_form &infos);
+ 
diff --git a/cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp b/cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp
new file mode 100644
index 000000000000..2985db17481f
--- /dev/null
+++ b/cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp
@@ -0,0 +1,48 @@
+--- contrib/domhex/surfaceFiller.cpp.orig	2024-03-29 22:06:54 UTC
++++ contrib/domhex/surfaceFiller.cpp
+@@ -85,10 +85,10 @@ bool compute4neighbors(
+   metricField = SMetric3(1. / (L * L));
+ 
+   // get the unit normal at that point
+-  Pair<SVector3, SVector3> der =
++  std::pair<SVector3, SVector3> der =
+     gf->firstDer(SPoint2(midpoint[0], midpoint[1]));
+-  SVector3 s1 = der.first();
+-  SVector3 s2 = der.second();
++  SVector3 s1 = der.first;
++  SVector3 s2 = der.second;
+   SVector3 n = crossprod(s1, s2);
+   n.normalize();
+   t1 -= n*dot(t1,n);
+@@ -259,10 +259,10 @@ bool compute4neighbors(
+ //     //                 0
+ 
+ //     // get the unit normal at that point
+-//     Pair<SVector3, SVector3> der =
++//     std::pair<SVector3, SVector3> der =
+ //       gf->firstDer(SPoint2(midpoint[0], midpoint[1]));
+-//     SVector3 s1 = der.first();
+-//     SVector3 s2 = der.second();
++//     SVector3 s1 = der.first;
++//     SVector3 s2 = der.second;
+ //     SVector3 n = crossprod(s1, s2);
+ //     n.normalize();
+ 
+@@ -490,7 +490,7 @@ void packingOfParallelograms(GFace *gf, std::vector<MV
+     double du[4] = {0,0,0,0}, dv[4]= {0,0,0,0};
+ 
+     //    printf("cop %d\n",(*it)->getNum());
+-    
++
+     for (int i=0;i<2;i++){
+       if (gf->periodic(i)){
+ 	reparamMeshVertexOnFace(*it, gf, midpoint);
+@@ -513,7 +513,7 @@ void packingOfParallelograms(GFace *gf, std::vector<MV
+     }
+ 
+     if (NP == 0)NP=1;
+-    
++
+     for (int i=0;i<NP;i++){
+       bool singular = !compute4neighbors(gf, *it, midpoint, newp, metricField, cross_field, du[i],dv[i],globalMult );
+       //      printf("there %d %g %g\n",singular,du[i],dv[i]);
diff --git a/cad/gmsh/files/patch-src_common_gmsh.cpp b/cad/gmsh/files/patch-src_common_gmsh.cpp
new file mode 100644
index 000000000000..df550b32000f
--- /dev/null
+++ b/cad/gmsh/files/patch-src_common_gmsh.cpp
@@ -0,0 +1,32 @@
+--- src/common/gmsh.cpp.orig	2024-05-05 07:36:23 UTC
++++ src/common/gmsh.cpp
+@@ -443,7 +443,7 @@ GMSH_API void gmsh::model::getEntitiesForPhysicalName(
+   GModel::current()->getEntitiesForPhysicalName(name, entities);
+   if(entities.size() != 0) {
+     for(auto ge : entities) {
+-      dimTags.push_back(std::pair<int, int >(ge->dim(), ge->tag()));
++      dimTags.push_back(std::make_pair(ge->dim(), ge->tag()));
+     }
+   }
+   else {
+@@ -847,13 +847,13 @@ gmsh::model::getDerivative(const int dim, const int ta
+     GFace *gf = static_cast<GFace *>(entity);
+     for(std::size_t i = 0; i < parametricCoord.size(); i += 2) {
+       SPoint2 param(parametricCoord[i], parametricCoord[i + 1]);
+-      Pair<SVector3, SVector3> d = gf->firstDer(param);
+-      deriv.push_back(d.left().x());
+-      deriv.push_back(d.left().y());
+-      deriv.push_back(d.left().z());
+-      deriv.push_back(d.right().x());
+-      deriv.push_back(d.right().y());
+-      deriv.push_back(d.right().z());
++      std::pair<SVector3, SVector3> d = gf->firstDer(param);
++      deriv.push_back(d.first.x());
++      deriv.push_back(d.first.y());
++      deriv.push_back(d.first.z());
++      deriv.push_back(d.second.x());
++      deriv.push_back(d.second.y());
++      deriv.push_back(d.second.z());
+     }
+   }
+ }
diff --git a/cad/gmsh/files/patch-src_geo_GFace.cpp b/cad/gmsh/files/patch-src_geo_GFace.cpp
new file mode 100644
index 000000000000..241d63352f0e
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_GFace.cpp
@@ -0,0 +1,121 @@
+--- src/geo/GFace.cpp.orig	2024-03-29 22:07:00 UTC
++++ src/geo/GFace.cpp
+@@ -880,10 +880,10 @@ double GFace::curvatureDiv(const SPoint2 &param) const
+ 
+   const double eps = 1.e-5;
+ 
+-  Pair<SVector3, SVector3> der = firstDer(param);
++  std::pair<SVector3, SVector3> der = firstDer(param);
+ 
+-  SVector3 du = der.first();
+-  SVector3 dv = der.second();
++  SVector3 du = der.first;
++  SVector3 dv = der.second;
+   SVector3 nml = crossprod(du, dv);
+ 
+   double detJ = norm(nml);
+@@ -937,19 +937,19 @@ double GFace::curvatures(const SPoint2 &param, SVector
+                          SVector3 &dirMin, double &curvMax,
+                          double &curvMin) const
+ {
+-  Pair<SVector3, SVector3> D1 = firstDer(param);
++  std::pair<SVector3, SVector3> D1 = firstDer(param);
+ 
+   if(geomType() == Plane || geomType() == BoundaryLayerSurface) {
+-    dirMax = D1.first();
+-    dirMin = D1.second();
++    dirMax = D1.first;
++    dirMin = D1.second;
+     curvMax = 0.;
+     curvMin = 0.;
+     return 0.;
+   }
+ 
+   if(geomType() == Sphere) {
+-    dirMax = D1.first();
+-    dirMin = D1.second();
++    dirMax = D1.first;
++    dirMin = D1.second;
+     curvMax = curvatureDiv(param);
+     curvMin = curvMax;
+     return curvMax;
+@@ -961,8 +961,8 @@ double GFace::curvatures(const SPoint2 &param, SVector
+   // curvatures and main directions
+   curvMax = fabs(eigVal[1]);
+   curvMin = fabs(eigVal[0]);
+-  dirMax = eigVec[1] * D1.first() + eigVec[3] * D1.second();
+-  dirMin = eigVec[0] * D1.first() + eigVec[2] * D1.second();
++  dirMax = eigVec[1] * D1.first + eigVec[3] * D1.second;
++  dirMin = eigVec[0] * D1.first + eigVec[2] * D1.second;
+ 
+   return curvMax;
+ }
+@@ -979,9 +979,9 @@ void GFace::getMetricEigenVectors(const SPoint2 &param
+                                   double eigVec[4]) const
+ {
+   // first derivatives
+-  Pair<SVector3, SVector3> D1 = firstDer(param);
+-  SVector3 du = D1.first();
+-  SVector3 dv = D1.second();
++  std::pair<SVector3, SVector3> D1 = firstDer(param);
++  SVector3 du = D1.first;
++  SVector3 dv = D1.second;
+   SVector3 nor = crossprod(du, dv);
+   nor.normalize();
+ 
+@@ -1088,13 +1088,13 @@ void GFace::XYZtoUV(double X, double Y, double Z, doub
+ 
+       while(err > tol && iter < MaxIter) {
+         P = point(U, V);
+-        Pair<SVector3, SVector3> der = firstDer(SPoint2(U, V));
+-        mat[0][0] = der.left().x();
+-        mat[0][1] = der.left().y();
+-        mat[0][2] = der.left().z();
+-        mat[1][0] = der.right().x();
+-        mat[1][1] = der.right().y();
+-        mat[1][2] = der.right().z();
++        std::pair<SVector3, SVector3> der = firstDer(SPoint2(U, V));
++        mat[0][0] = der.first.x();
++        mat[0][1] = der.first.y();
++        mat[0][2] = der.first.z();
++        mat[1][0] = der.second.x();
++        mat[1][1] = der.second.y();
++        mat[1][2] = der.second.z();
+         mat[2][0] = 0.;
+         mat[2][1] = 0.;
+         mat[2][2] = 0.;
+@@ -1193,15 +1193,15 @@ void bfgs_callback(const alglib::real_1d_array &x, dou
+   // printf("func : %f\n", func);
+ 
+   // Value of the gradient
+-  Pair<SVector3, SVector3> der = gf->firstDer(SPoint2(x[0], x[1]));
+-  grad[0] = -(p.x() - pnt.x()) * der.left().x() -
+-            (p.y() - pnt.y()) * der.left().y() -
+-            (p.z() - pnt.z()) * der.left().z();
+-  grad[1] = -(p.x() - pnt.x()) * der.right().x() -
+-            (p.y() - pnt.y()) * der.right().y() -
+-            (p.z() - pnt.z()) * der.right().z();
++  std::pair<SVector3, SVector3> der = gf->firstDer(SPoint2(x[0], x[1]));
++  grad[0] = -(p.x() - pnt.x()) * der.first.x() -
++            (p.y() - pnt.y()) * der.first.y() -
++            (p.z() - pnt.z()) * der.first.z();
++  grad[1] = -(p.x() - pnt.x()) * der.second.x() -
++            (p.y() - pnt.y()) * der.second.y() -
++            (p.z() - pnt.z()) * der.second.z();
+   // printf("func %22.15E Gradients %22.15E %22.15E der %g %g %g\n", func,
+-  //         grad[0], grad[1],der.left().x(),der.left().y(),der.left().z());
++  //         grad[0], grad[1],der.first.x(),der.first.y(),der.first.z());
+ }
+ #endif
+ 
+@@ -1296,8 +1296,8 @@ SVector3 GFace::normal(const SPoint2 &param) const
+ {
+   if(geomType() == BoundaryLayerSurface) return SVector3();
+ 
+-  Pair<SVector3, SVector3> der = firstDer(param);
+-  SVector3 n = crossprod(der.first(), der.second());
++  std::pair<SVector3, SVector3> der = firstDer(param);
++  SVector3 n = crossprod(der.first, der.second);
+   n.normalize();
+   return n;
+ }
diff --git a/cad/gmsh/files/patch-src_geo_GFace.h b/cad/gmsh/files/patch-src_geo_GFace.h
new file mode 100644
index 000000000000..6155c2ff1b67
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_GFace.h
@@ -0,0 +1,26 @@
+--- src/geo/GFace.h.orig	2024-03-29 22:07:00 UTC
++++ src/geo/GFace.h
+@@ -10,13 +10,13 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <utility>
+ #include "GmshDefines.h"
+ #include "GEntity.h"
+ #include "GPoint.h"
+ #include "GEdgeLoop.h"
+ #include "SPoint2.h"
+ #include "SVector3.h"
+-#include "Pair.h"
+ #include "Numeric.h"
+ #include "boundaryLayersData.h"
+ 
+@@ -201,7 +201,7 @@ class GFace : public GEntity { (public)
+   virtual SVector3 normal(const SPoint2 &param) const;
+ 
+   // return the first derivate of the face at the parameter location
+-  virtual Pair<SVector3, SVector3> firstDer(const SPoint2 &param) const = 0;
++  virtual std::pair<SVector3, SVector3> firstDer(const SPoint2 &param) const = 0;
+ 
+   // compute the second derivates of the face at the parameter location
+   virtual void secondDer(const SPoint2 &param, SVector3 &dudu, SVector3 &dvdv,
diff --git a/cad/gmsh/files/patch-src_geo_GeomMeshMatcher.cpp b/cad/gmsh/files/patch-src_geo_GeomMeshMatcher.cpp
new file mode 100644
index 000000000000..a78293d1f542
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_GeomMeshMatcher.cpp
@@ -0,0 +1,274 @@
+--- src/geo/GeomMeshMatcher.cpp.orig	2024-03-29 22:07:00 UTC
++++ src/geo/GeomMeshMatcher.cpp
+@@ -12,7 +12,6 @@
+ #include <list>
+ #include <vector>
+ #include "GeomMeshMatcher.h"
+-#include "Pair.h"
+ #include "discreteVertex.h"
+ #include "GmshMessage.h"
+ #include "SOrientedBoundingBox.h"
+@@ -61,22 +60,22 @@ void getIntersection(std::vector<T> &res, std::vector<
+   }
+ }
+ 
+-template <class T> T findMatching(std::vector<Pair<T, T> > &matching, T &entity)
++template <class T> T findMatching(std::vector<std::pair<T, T> > &matching, T &entity)
+ {
+   for(auto pair = matching.begin(); pair != matching.end(); pair++) {
+-    if((*pair).left() == entity) return ((*pair).right());
++    if((*pair).first == entity) return ((*pair).second);
+   }
+   return (0);
+ }
+ 
+ // Matching vertices
+ 
+-std::vector<Pair<GVertex *, GVertex *> > *
++std::vector<std::pair<GVertex *, GVertex *> > *
+ GeomMeshMatcher::matchVertices(GModel *m1, GModel *m2, bool &ok)
+ {
+   // Vector that will be returned.
+-  std::vector<Pair<GVertex *, GVertex *> > *coresp_v =
+-    new std::vector<Pair<GVertex *, GVertex *> >;
++  std::vector<std::pair<GVertex *, GVertex *> > *coresp_v =
++    new std::vector<std::pair<GVertex *, GVertex *> >;
+   int num_matched_vertices = 0;
+   int num_total_vertices = m2->getNumVertices();
+ 
+@@ -107,7 +106,7 @@ GeomMeshMatcher::matchVertices(GModel *m1, GModel *m2,
+ 
+     if(choice && best_score != DBL_MAX) {
+       choice->physicals = v1->physicals;
+-      coresp_v->push_back(Pair<GVertex *, GVertex *>(v1, choice));
++      coresp_v->push_back(std::make_pair(v1, choice));
+       num_matched_vertices++;
+     }
+   }
+@@ -120,17 +119,17 @@ GeomMeshMatcher::matchVertices(GModel *m1, GModel *m2,
+ 
+ // Matching edges
+ 
+-std::vector<Pair<GEdge *, GEdge *> > *
++std::vector<std::pair<GEdge *, GEdge *> > *
+ GeomMeshMatcher::matchEdges(GModel *m1, GModel *m2,
+-                            std::vector<Pair<GVertex *, GVertex *> > *coresp_v,
++                            std::vector<std::pair<GVertex *, GVertex *> > *coresp_v,
+                             bool &ok)
+ {
+   int num_matched_edges = 0;
+   int num_total_edges = m2->getNumEdges();
+ 
+   // Vector that will be returned.
+-  std::vector<Pair<GEdge *, GEdge *> > *coresp_e =
+-    new std::vector<Pair<GEdge *, GEdge *> >;
++  std::vector<std::pair<GEdge *, GEdge *> > *coresp_e =
++    new std::vector<std::pair<GEdge *, GEdge *> >;
+ 
+   std::vector<GEdge *> closed_curves;
+ 
+@@ -195,7 +194,7 @@ GeomMeshMatcher::matchEdges(GModel *m1, GModel *m2,
+         }
+       }
+     }
+-    coresp_e->push_back(Pair<GEdge *, GEdge *>(e1, choice));
++    coresp_e->push_back(std::make_pair(e1, choice));
+ 
+     // copy topological information
+     if(choice) {
+@@ -213,16 +212,16 @@ GeomMeshMatcher::matchEdges(GModel *m1, GModel *m2,
+ 
+ // Matching faces
+ 
+-std::vector<Pair<GFace *, GFace *> > *
++std::vector<std::pair<GFace *, GFace *> > *
+ GeomMeshMatcher::matchFaces(GModel *m1, GModel *m2,
+-                            std::vector<Pair<GEdge *, GEdge *> > *coresp_e,
++                            std::vector<std::pair<GEdge *, GEdge *> > *coresp_e,
+                             bool &ok)
+ {
+   int num_matched_faces = 0;
+   int num_total_faces = m2->getNumFaces();
+ 
+-  std::vector<Pair<GFace *, GFace *> > *coresp_f =
+-    new std::vector<Pair<GFace *, GFace *> >;
++  std::vector<std::pair<GFace *, GFace *> > *coresp_f =
++    new std::vector<std::pair<GFace *, GFace *> >;
+ 
+   for(auto fit = m1->firstFace(); fit != m1->lastFace(); fit++) {
+     GFace *f1 = (GFace *)*fit;
+@@ -276,7 +275,7 @@ GeomMeshMatcher::matchFaces(GModel *m1, GModel *m2,
+ 
+     if(choice) {
+       Msg::Debug("Surfaces %i and %i match", f1->tag(), choice->tag());
+-      coresp_f->push_back(Pair<GFace *, GFace *>(f1, choice));
++      coresp_f->push_back(std::make_pair(f1, choice));
+       // copy topological information
+       choice->setTag(f1->tag());
+       f1->physicals = choice->physicals;
+@@ -292,17 +291,17 @@ GeomMeshMatcher::matchFaces(GModel *m1, GModel *m2,
+ 
+ // Matching regions
+ 
+-std::vector<Pair<GRegion *, GRegion *> > *
++std::vector<std::pair<GRegion *, GRegion *> > *
+ GeomMeshMatcher::matchRegions(GModel *m1, GModel *m2,
+-                              std::vector<Pair<GFace *, GFace *> > *coresp_f,
++                              std::vector<std::pair<GFace *, GFace *> > *coresp_f,
+                               bool &ok)
+ 
+ {
+   int num_matched_regions = 0;
+   int num_total_regions = 0;
+ 
+-  std::vector<Pair<GRegion *, GRegion *> > *coresp_r =
+-    new std::vector<Pair<GRegion *, GRegion *> >;
++  std::vector<std::pair<GRegion *, GRegion *> > *coresp_r =
++    new std::vector<std::pair<GRegion *, GRegion *> >;
+ 
+   std::vector<GEntity *> m1_entities;
+   m1->getEntities(m1_entities, 3);
+@@ -344,8 +343,7 @@ GeomMeshMatcher::matchRegions(GModel *m1, GModel *m2,
+     }
+ 
+     if(common_regions.size() == 1) {
+-      coresp_r->push_back(
+-        Pair<GRegion *, GRegion *>((GRegion *)*entity1, common_regions[0]));
++      coresp_r->push_back(std::make_pair((GRegion *)*entity1, common_regions[0]));
+       common_regions[0]->setTag(((GRegion *)*entity1)->tag());
+       (*entity1)->physicals = common_regions[0]->physicals;
+       num_matched_regions++;
+@@ -377,8 +375,7 @@ GeomMeshMatcher::matchRegions(GModel *m1, GModel *m2,
+           choice = (*candidate);
+         }
+       }
+-      coresp_r->push_back(
+-        Pair<GRegion *, GRegion *>((GRegion *)*entity1, choice));
++      coresp_r->push_back(std::make_pair((GRegion *)*entity1, choice));
+       if(choice) {
+         choice->setTag(((GRegion *)*entity1)->tag());
+         (*entity1)->physicals = choice->physicals;
+@@ -594,13 +591,13 @@ template <class GEType>
+ }
+ 
+ template <class GEType>
+-static void copy_periodicity(std::vector<Pair<GEType *, GEType *> > &eCor,
++static void copy_periodicity(std::vector<std::pair<GEType *, GEType *> > &eCor,
+                              std::map<MVertex *, MVertex *> &mesh_to_geom)
+ {
+   typename std::multimap<GEType *, GEType *> eMap; // (eCor.begin(),eCor.end());
+   auto eIter = eCor.begin();
+   for(; eIter != eCor.end(); ++eIter) {
+-    eMap.insert(std::make_pair(eIter->second(), eIter->first()));
++    eMap.insert(std::make_pair(eIter->second, eIter->first));
+   }
+ 
+   auto srcIter = eMap.begin();
+@@ -651,12 +648,12 @@ template <class GEType>
+ }
+ 
+ template <class GEType>
+-static bool apply_periodicity(std::vector<Pair<GEType *, GEType *> > &eCor)
++static bool apply_periodicity(std::vector<std::pair<GEType *, GEType *> > &eCor)
+ {
+   typename std::multimap<GEType *, GEType *> eMap; // (eCor.begin(),eCor.end());
+   auto eIter = eCor.begin();
+   for(; eIter != eCor.end(); ++eIter) {
+-    eMap.insert(std::make_pair(eIter->second(), eIter->first()));
++    eMap.insert(std::make_pair(eIter->second, eIter->first));
+   }
+ 
+   auto srcIter = eMap.begin();
+@@ -787,57 +784,57 @@ void copy_vertices(GModel *geom, GModel *mesh,
+ 
+ void copy_vertices(GModel *geom, GModel *mesh,
+                    std::map<MVertex *, MVertex *> &_mesh_to_geom,
+-                   std::vector<Pair<GVertex *, GVertex *> > *coresp_v,
+-                   std::vector<Pair<GEdge *, GEdge *> > *coresp_e,
+-                   std::vector<Pair<GFace *, GFace *> > *coresp_f,
+-                   std::vector<Pair<GRegion *, GRegion *> > *coresp_r)
++                   std::vector<std::pair<GVertex *, GVertex *> > *coresp_v,
++                   std::vector<std::pair<GEdge *, GEdge *> > *coresp_e,
++                   std::vector<std::pair<GFace *, GFace *> > *coresp_f,
++                   std::vector<std::pair<GRegion *, GRegion *> > *coresp_r)
+ {
+   // copy all elements
+   for(std::size_t i = 0; i < coresp_v->size(); ++i)
+-    copy_vertices((*coresp_v)[i].first(), (*coresp_v)[i].second(),
++    copy_vertices((*coresp_v)[i].first, (*coresp_v)[i].second,
+                   _mesh_to_geom);
+   for(std::size_t i = 0; i < coresp_e->size(); ++i)
+-    copy_vertices((*coresp_e)[i].first(), (*coresp_e)[i].second(),
++    copy_vertices((*coresp_e)[i].first, (*coresp_e)[i].second,
+                   _mesh_to_geom);
+   for(std::size_t i = 0; i < coresp_f->size(); ++i)
+-    copy_vertices((*coresp_f)[i].first(), (*coresp_f)[i].second(),
++    copy_vertices((*coresp_f)[i].first, (*coresp_f)[i].second,
+                   _mesh_to_geom);
+   for(std::size_t i = 0; i < coresp_r->size(); ++i)
+-    copy_vertices((*coresp_r)[i].first(), (*coresp_r)[i].second(),
++    copy_vertices((*coresp_r)[i].first, (*coresp_r)[i].second,
+                   _mesh_to_geom);
+ }
+ void copy_elements(GModel *geom, GModel *mesh,
+                    std::map<MVertex *, MVertex *> &_mesh_to_geom,
+-                   std::vector<Pair<GVertex *, GVertex *> > *coresp_v,
+-                   std::vector<Pair<GEdge *, GEdge *> > *coresp_e,
+-                   std::vector<Pair<GFace *, GFace *> > *coresp_f,
+-                   std::vector<Pair<GRegion *, GRegion *> > *coresp_r)
++                   std::vector<std::pair<GVertex *, GVertex *> > *coresp_v,
++                   std::vector<std::pair<GEdge *, GEdge *> > *coresp_e,
++                   std::vector<std::pair<GFace *, GFace *> > *coresp_f,
++                   std::vector<std::pair<GRegion *, GRegion *> > *coresp_r)
+ {
+   // copy all elements
+ 
+   for(std::size_t i = 0; i < coresp_v->size(); ++i) {
+-    GVertex *dest = (*coresp_v)[i].first();
+-    GVertex *orig = (*coresp_v)[i].second();
++    GVertex *dest = (*coresp_v)[i].first;
++    GVertex *orig = (*coresp_v)[i].second;
+     copy_elements<MPoint>(dest->points, orig->points, _mesh_to_geom);
+   }
+ 
+   for(std::size_t i = 0; i < coresp_e->size(); ++i) {
+-    GEdge *dest = (*coresp_e)[i].first();
+-    GEdge *orig = (*coresp_e)[i].second();
++    GEdge *dest = (*coresp_e)[i].first;
++    GEdge *orig = (*coresp_e)[i].second;
+     copy_elements<MLine>(dest->lines, orig->lines, _mesh_to_geom);
+   }
+ 
+   for(std::size_t i = 0; i < coresp_f->size(); ++i) {
+-    GFace *dest = (*coresp_f)[i].first();
+-    GFace *orig = (*coresp_f)[i].second();
++    GFace *dest = (*coresp_f)[i].first;
++    GFace *orig = (*coresp_f)[i].second;
+     copy_elements<MTriangle>(dest->triangles, orig->triangles, _mesh_to_geom);
+     copy_elements<MQuadrangle>(dest->quadrangles, orig->quadrangles,
+                                _mesh_to_geom);
+   }
+ 
+   for(std::size_t i = 0; i < coresp_r->size(); ++i) {
+-    GRegion *dest = (*coresp_r)[i].first();
+-    GRegion *orig = (*coresp_r)[i].second();
++    GRegion *dest = (*coresp_r)[i].first;
++    GRegion *orig = (*coresp_r)[i].second;
+     copy_elements<MTetrahedron>(dest->tetrahedra, orig->tetrahedra,
+                                 _mesh_to_geom);
+     copy_elements<MHexahedron>(dest->hexahedra, orig->hexahedra, _mesh_to_geom);
+@@ -857,10 +854,10 @@ int GeomMeshMatcher::match(GModel *geom, GModel *mesh)
+ 
+   bool ok = true;
+ 
+-  std::vector<Pair<GVertex *, GVertex *> > *coresp_v(nullptr);
+-  std::vector<Pair<GEdge *, GEdge *> > *coresp_e(nullptr);
+-  std::vector<Pair<GFace *, GFace *> > *coresp_f(nullptr);
+-  std::vector<Pair<GRegion *, GRegion *> > *coresp_r(nullptr);
++  std::vector<std::pair<GVertex *, GVertex *> > *coresp_v(nullptr);
++  std::vector<std::pair<GEdge *, GEdge *> > *coresp_e(nullptr);
++  std::vector<std::pair<GFace *, GFace *> > *coresp_f(nullptr);
++  std::vector<std::pair<GRegion *, GRegion *> > *coresp_r(nullptr);
+ 
+   coresp_v = matchVertices(geom, mesh, ok);
+   if(ok) {
diff --git a/cad/gmsh/files/patch-src_geo_GeomMeshMatcher.h b/cad/gmsh/files/patch-src_geo_GeomMeshMatcher.h
new file mode 100644
index 000000000000..a22748865e45
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_GeomMeshMatcher.h
@@ -0,0 +1,32 @@
+--- src/geo/GeomMeshMatcher.h.orig	2024-03-29 22:07:00 UTC
++++ src/geo/GeomMeshMatcher.h
+@@ -16,21 +16,20 @@
+ #include "GEdge.h"
+ #include "GFace.h"
+ #include "GRegion.h"
+-#include "Pair.h"
+ 
+ class GeomMeshMatcher {
+ private:
+-  std::vector<Pair<GVertex *, GVertex *> > *matchVertices(GModel *m1,
+-                                                          GModel *m2, bool &ok);
+-  std::vector<Pair<GEdge *, GEdge *> > *
++  std::vector<std::pair<GVertex *, GVertex *> > *
++  matchVertices(GModel *m1, GModel *m2, bool &ok);
++  std::vector<std::pair<GEdge *, GEdge *> > *
+   matchEdges(GModel *m1, GModel *m2,
+-             std::vector<Pair<GVertex *, GVertex *> > *coresp_v, bool &ok);
+-  std::vector<Pair<GFace *, GFace *> > *
++             std::vector<std::pair<GVertex *, GVertex *> > *coresp_v, bool &ok);
++  std::vector<std::pair<GFace *, GFace *> > *
+   matchFaces(GModel *m1, GModel *m2,
+-             std::vector<Pair<GEdge *, GEdge *> > *coresp_e, bool &ok);
+-  std::vector<Pair<GRegion *, GRegion *> > *
++             std::vector<std::pair<GEdge *, GEdge *> > *coresp_e, bool &ok);
++  std::vector<std::pair<GRegion *, GRegion *> > *
+   matchRegions(GModel *m1, GModel *m2,
+-               std::vector<Pair<GFace *, GFace *> > *coresp_f, bool &ok);
++               std::vector<std::pair<GFace *, GFace *> > *coresp_f, bool &ok);
+   static GeomMeshMatcher *_gmm_instance;
+   GeomMeshMatcher() {}
+   ~GeomMeshMatcher() {}
diff --git a/cad/gmsh/files/patch-src_geo_OCCFace.cpp b/cad/gmsh/files/patch-src_geo_OCCFace.cpp
new file mode 100644
index 000000000000..4d34954ee598
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_OCCFace.cpp
@@ -0,0 +1,19 @@
+--- src/geo/OCCFace.cpp.orig	2024-03-29 22:07:01 UTC
++++ src/geo/OCCFace.cpp
+@@ -249,13 +249,13 @@ SVector3 OCCFace::normal(const SPoint2 &param) const
+   return n;
+ }
+ 
+-Pair<SVector3, SVector3> OCCFace::firstDer(const SPoint2 &param) const
++std::pair<SVector3, SVector3> OCCFace::firstDer(const SPoint2 &param) const
+ {
+   gp_Pnt pnt;
+   gp_Vec du, dv;
+   _occface->D1(param.x(), param.y(), pnt, du, dv);
+-  return Pair<SVector3, SVector3>(SVector3(du.X(), du.Y(), du.Z()),
+-                                  SVector3(dv.X(), dv.Y(), dv.Z()));
++  return std::make_pair(SVector3(du.X(), du.Y(), du.Z()),
++                        SVector3(dv.X(), dv.Y(), dv.Z()));
+ }
+ 
+ void OCCFace::secondDer(const SPoint2 &param, SVector3 &dudu, SVector3 &dvdv,
diff --git a/cad/gmsh/files/patch-src_geo_OCCFace.h b/cad/gmsh/files/patch-src_geo_OCCFace.h
new file mode 100644
index 000000000000..bf34b80f4372
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_OCCFace.h
@@ -0,0 +1,11 @@
+--- src/geo/OCCFace.h.orig	2024-03-29 22:07:01 UTC
++++ src/geo/OCCFace.h
+@@ -42,7 +42,7 @@ class OCCFace : public GFace { (public)
+   virtual bool containsPoint(const SPoint3 &pt) const;
+   virtual bool containsParam(const SPoint2 &pt);
+   virtual SVector3 normal(const SPoint2 &param) const;
+-  virtual Pair<SVector3, SVector3> firstDer(const SPoint2 &param) const;
++  virtual std::pair<SVector3, SVector3> firstDer(const SPoint2 &param) const;
+   virtual void secondDer(const SPoint2 &, SVector3 &, SVector3 &,
+                          SVector3 &) const;
+   virtual GEntity::GeomType geomType() const;
diff --git a/cad/gmsh/files/patch-src_geo_Pair.h b/cad/gmsh/files/patch-src_geo_Pair.h
new file mode 100644
index 000000000000..d99d6a3bcd43
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_Pair.h
@@ -0,0 +1,29 @@
+--- src/geo/Pair.h.orig	2024-03-29 22:07:01 UTC
++++ src/geo/Pair.h
+@@ -1,26 +0,0 @@
+-// Gmsh - Copyright (C) 1997-2024 C. Geuzaine, J.-F. Remacle
+-//
+-// See the LICENSE.txt file in the Gmsh root directory for license information.
+-// Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
+-
+-#ifndef PAIR_H
+-#define PAIR_H
+-
+-// A pair of values, the types of which can be different
+-template <class L, class R> class Pair {
+-private:
+-  L Left;
+-  R Right;
+-
+-public:
+-  Pair() {}
+-  Pair(const L &left, const R &right) : Left(left), Right(right) {}
+-  L left() const { return Left; }
+-  void left(const L &left) { Left = left; }
+-  R right() const { return Right; }
+-  void right(const R &right) { Right = right; }
+-  L first() const { return Left; }
+-  R second() const { return Right; }
+-};
+-
+-#endif
diff --git a/cad/gmsh/files/patch-src_geo_discreteFace.cpp b/cad/gmsh/files/patch-src_geo_discreteFace.cpp
new file mode 100644
index 000000000000..52bbff44c5fe
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_discreteFace.cpp
@@ -0,0 +1,33 @@
+--- src/geo/discreteFace.cpp.orig	2024-04-18 14:52:42 UTC
++++ src/geo/discreteFace.cpp
+@@ -363,16 +363,16 @@ double discreteFace::curvatures(const SPoint2 &param, 
+   return false;
+ }
+ 
+-Pair<SVector3, SVector3> discreteFace::firstDer(const SPoint2 &param) const
++std::pair<SVector3, SVector3> discreteFace::firstDer(const SPoint2 &param) const
+ {
+-  if(_param.empty()) return Pair<SVector3, SVector3>(SVector3(), SVector3());
++  if(_param.empty()) return std::make_pair(SVector3(), SVector3());
+ 
+   MElement *e = _param.oct->find(param.x(), param.y(), 0.0, -1, true);
+   if(!e) {
+     Msg::Info("Triangle not found for first derivative at uv=(%g,%g) on "
+               "discrete surface %d",
+               param.x(), param.y(), tag());
+-    return Pair<SVector3, SVector3>(SVector3(1, 0, 0), SVector3(0, 1, 0));
++    return std::make_pair(SVector3(1, 0, 0), SVector3(0, 1, 0));
+   }
+ 
+   int position = (int)((MTriangle *)e - &_param.t2d[0]);
+@@ -403,8 +403,8 @@ Pair<SVector3, SVector3> discreteFace::firstDer(const 
+     }
+   }
+ 
+-  return Pair<SVector3, SVector3>(SVector3(dxdu[0][0], dxdu[1][0], dxdu[2][0]),
+-                                  SVector3(dxdu[0][1], dxdu[1][1], dxdu[2][1]));
++  return std::make_pair(SVector3(dxdu[0][0], dxdu[1][0], dxdu[2][0]),
++                        SVector3(dxdu[0][1], dxdu[1][1], dxdu[2][1]));
+ }
+ 
+ void discreteFace::secondDer(const SPoint2 &param, SVector3 &dudu,
diff --git a/cad/gmsh/files/patch-src_geo_discreteFace.h b/cad/gmsh/files/patch-src_geo_discreteFace.h
new file mode 100644
index 000000000000..dcbc173e68d0
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_discreteFace.h
@@ -0,0 +1,11 @@
+--- src/geo/discreteFace.h.orig	2024-04-18 14:52:42 UTC
++++ src/geo/discreteFace.h
+@@ -60,7 +60,7 @@ class discreteFace : public GFace { (public)
+   double curvatures(const SPoint2 &param, SVector3 &dirMax, SVector3 &dirMin,
+                     double &curvMax, double &curvMin) const;
+   GEntity::GeomType geomType() const { return DiscreteSurface; }
+-  virtual Pair<SVector3, SVector3> firstDer(const SPoint2 &param) const;
++  virtual std::pair<SVector3, SVector3> firstDer(const SPoint2 &param) const;
+   virtual void secondDer(const SPoint2 &param, SVector3 &dudu, SVector3 &dvdv,
+                          SVector3 &dudv) const;
+   int createGeometry();
diff --git a/cad/gmsh/files/patch-src_geo_gmshFace.cpp b/cad/gmsh/files/patch-src_geo_gmshFace.cpp
new file mode 100644
index 000000000000..ecdfdd1ec5b4
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_gmshFace.cpp
@@ -0,0 +1,27 @@
+--- src/geo/gmshFace.cpp.orig	2024-03-29 22:07:01 UTC
++++ src/geo/gmshFace.cpp
+@@ -215,19 +215,19 @@ SVector3 gmshFace::normal(const SPoint2 &param) const
+   }
+ }
+ 
+-Pair<SVector3, SVector3> gmshFace::firstDer(const SPoint2 &param) const
++std::pair<SVector3, SVector3> gmshFace::firstDer(const SPoint2 &param) const
+ {
+   if(_s->Typ == MSH_SURF_PLAN && !_s->geometry) {
+     double x, y, z, VX[3], VY[3];
+     getMeanPlaneData(VX, VY, x, y, z);
+-    return Pair<SVector3, SVector3>(SVector3(VX[0], VX[1], VX[2]),
+-                                    SVector3(VY[0], VY[1], VY[2]));
++    return std::make_pair(SVector3(VX[0], VX[1], VX[2]),
++                          SVector3(VY[0], VY[1], VY[2]));
+   }
+   else {
+     Vertex vu = InterpolateSurface(_s, param[0], param[1], 1, 1);
+     Vertex vv = InterpolateSurface(_s, param[0], param[1], 1, 2);
+-    return Pair<SVector3, SVector3>(SVector3(vu.Pos.X, vu.Pos.Y, vu.Pos.Z),
+-                                    SVector3(vv.Pos.X, vv.Pos.Y, vv.Pos.Z));
++    return std::make_pair(SVector3(vu.Pos.X, vu.Pos.Y, vu.Pos.Z),
++                          SVector3(vv.Pos.X, vv.Pos.Y, vv.Pos.Z));
+   }
+ }
+ 
diff --git a/cad/gmsh/files/patch-src_geo_gmshFace.h b/cad/gmsh/files/patch-src_geo_gmshFace.h
new file mode 100644
index 000000000000..edb65b025f83
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_gmshFace.h
@@ -0,0 +1,11 @@
+--- src/geo/gmshFace.h.orig	2024-03-29 22:07:01 UTC
++++ src/geo/gmshFace.h
+@@ -26,7 +26,7 @@ class gmshFace : public GFace { (public)
+   virtual bool containsPoint(const SPoint3 &pt) const;
+   virtual double getMetricEigenvalue(const SPoint2 &);
+   virtual SVector3 normal(const SPoint2 &param) const;
+-  virtual Pair<SVector3, SVector3> firstDer(const SPoint2 &param) const;
++  virtual std::pair<SVector3, SVector3> firstDer(const SPoint2 &param) const;
+   virtual void secondDer(const SPoint2 &, SVector3 &, SVector3 &,
+                          SVector3 &) const;
+   virtual GEntity::GeomType geomType() const;
diff --git a/cad/gmsh/files/patch-src_geo_gmshSurface.cpp b/cad/gmsh/files/patch-src_geo_gmshSurface.cpp
new file mode 100644
index 000000000000..7f744d3ebfda
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_gmshSurface.cpp
@@ -0,0 +1,15 @@
+--- src/geo/gmshSurface.cpp.orig	2024-03-29 22:07:01 UTC
++++ src/geo/gmshSurface.cpp
+@@ -23,10 +23,10 @@ SVector3 gmshSurface::normal(const SPoint2 &param) con
+   return SVector3();
+ }
+ 
+-Pair<SVector3, SVector3> gmshSurface::firstDer(const SPoint2 &param)
++std::pair<SVector3, SVector3> gmshSurface::firstDer(const SPoint2 &param)
+ {
+   Msg::Error("First derivative not implemented for this type of surface");
+-  return Pair<SVector3, SVector3>();
++  return std::pair<SVector3, SVector3>();
+ }
+ 
+ double gmshSurface::getMetricEigenvalue(const SPoint2 &)
diff --git a/cad/gmsh/files/patch-src_geo_gmshSurface.h b/cad/gmsh/files/patch-src_geo_gmshSurface.h
new file mode 100644
index 000000000000..42b306deb3aa
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_gmshSurface.h
@@ -0,0 +1,19 @@
+--- src/geo/gmshSurface.h.orig	2024-03-29 22:07:01 UTC
++++ src/geo/gmshSurface.h
+@@ -9,7 +9,6 @@
+ #include <cmath>
+ #include <cstdio>
+ #include <map>
+-#include "Pair.h"
+ #include "Range.h"
+ #include "SPoint2.h"
+ #include "SPoint3.h"
+@@ -61,7 +60,7 @@ class gmshSurface { (public)
+   // Return the normal to the face at the given parameter location.
+   virtual SVector3 normal(const SPoint2 &param) const;
+   // Return the first derivate of the face at the parameter location.
+-  virtual Pair<SVector3, SVector3> firstDer(const SPoint2 &param);
++  virtual std::pair<SVector3, SVector3> firstDer(const SPoint2 &param);
+   virtual double getMetricEigenvalue(const SPoint2 &);
+ };
+ 
diff --git a/cad/gmsh/files/patch-src_geo_xyFace.h b/cad/gmsh/files/patch-src_geo_xyFace.h
new file mode 100644
index 000000000000..f3e92019390e
--- /dev/null
+++ b/cad/gmsh/files/patch-src_geo_xyFace.h
@@ -0,0 +1,16 @@
+--- src/geo/xyFace.h.orig	2024-03-29 22:07:01 UTC
++++ src/geo/xyFace.h
+@@ -33,11 +33,11 @@ class xyFace : public GFace { (public)
+     SVector3 n(0, 0, 1);
+     return n;
+   }
+-  virtual Pair<SVector3, SVector3> firstDer(const SPoint2 &param) const
++  virtual std::pair<SVector3, SVector3> firstDer(const SPoint2 &param) const
+   {
+     SVector3 t1(1, 0, 0);
+     SVector3 t2(0, 1, 0);
+-    return Pair<SVector3, SVector3>(t1, t2);
++    return std::make_pair(t1, t2);
+   }
+   virtual void secondDer(const SPoint2 &, SVector3 &a, SVector3 &b,
+                          SVector3 &c) const
diff --git a/cad/gmsh/files/patch-src_mesh_BackgroundMesh.cpp b/cad/gmsh/files/patch-src_mesh_BackgroundMesh.cpp
new file mode 100644
index 000000000000..91240206fb74
--- /dev/null
+++ b/cad/gmsh/files/patch-src_mesh_BackgroundMesh.cpp
@@ -0,0 +1,26 @@
+--- src/mesh/BackgroundMesh.cpp.orig	2024-03-29 22:07:01 UTC
++++ src/mesh/BackgroundMesh.cpp
+@@ -304,8 +304,8 @@ void backgroundMesh::propagateCrossFieldByDistance(GFa
+         SPoint2 p1, p2;
+         reparamMeshEdgeOnFace(v[0], v[1], _gf, p1, p2);
+         /* a correct way of computing angles  */
+-        Pair<SVector3, SVector3> der = _gf->firstDer((p1 + p2) * .5);
+-        SVector3 t1 = der.first();
++        std::pair<SVector3, SVector3> der = _gf->firstDer((p1 + p2) * .5);
++        SVector3 t1 = der.first;
+         SVector3 t2(v[1]->x() - v[0]->x(), v[1]->y() - v[0]->y(),
+                     v[1]->z() - v[0]->z());
+         t1.normalize();
+@@ -459,9 +459,9 @@ void backgroundMesh::propagateCrossField(GFace *_gf,
+         v[1] = (*it)->lines[i]->getVertex(1);
+         SPoint2 p1, p2;
+         reparamMeshEdgeOnFace(v[0], v[1], _gf, p1, p2);
+-        Pair<SVector3, SVector3> der = _gf->firstDer((p1 + p2) * .5);
+-        SVector3 t1 = der.first();
+-        SVector3 t2 = der.second();
++        std::pair<SVector3, SVector3> der = _gf->firstDer((p1 + p2) * .5);
++        SVector3 t1 = der.first;
++        SVector3 t2 = der.second;
+         SVector3 n = crossprod(t1, t2);
+         n.normalize();
+         SVector3 d1(v[1]->x() - v[0]->x(), v[1]->y() - v[0]->y(),
diff --git a/cad/gmsh/files/patch-src_mesh_meshGFace.cpp b/cad/gmsh/files/patch-src_mesh_meshGFace.cpp
new file mode 100644
index 000000000000..fa08a01b01d7
--- /dev/null
+++ b/cad/gmsh/files/patch-src_mesh_meshGFace.cpp
@@ -0,0 +1,22 @@
+--- src/mesh/meshGFace.cpp.orig	2024-03-29 22:07:01 UTC
++++ src/mesh/meshGFace.cpp
+@@ -1269,7 +1269,7 @@ static bool improved_translate(GFace *gf, MVertex *ver
+   SVector3 s1, s2;
+   SVector3 normal;
+   SVector3 basis_u, basis_v;
+-  Pair<SVector3, SVector3> derivatives;
++  std::pair<SVector3, SVector3> derivatives;
+ 
+   reparamMeshVertexOnFace(vertex, gf, point);
+   x = point.x();
+@@ -1278,8 +1278,8 @@ static bool improved_translate(GFace *gf, MVertex *ver
+   angle = backgroundMesh::current()->getAngle(x, y, 0.0);
+   derivatives = gf->firstDer(point);
+ 
+-  s1 = derivatives.first();
+-  s2 = derivatives.second();
++  s1 = derivatives.first;
++  s2 = derivatives.second;
+   normal = crossprod(s1, s2);
+ 
+   basis_u = s1;
diff --git a/cad/gmsh/files/patch-src_mesh_meshGFaceBamg.cpp b/cad/gmsh/files/patch-src_mesh_meshGFaceBamg.cpp
new file mode 100644
index 000000000000..ed95da9fb724
--- /dev/null
+++ b/cad/gmsh/files/patch-src_mesh_meshGFaceBamg.cpp
@@ -0,0 +1,24 @@
+--- src/mesh/meshGFaceBamg.cpp.orig	2024-03-29 22:07:01 UTC
++++ src/mesh/meshGFaceBamg.cpp
+@@ -49,14 +49,14 @@ static void computeMeshMetricsForBamg(GFace *gf, int n
+     SMetric3 m = BGM_MeshMetric(gf, u, v, gp.x(), gp.y(), gp.z());
+ 
+     // compute the derivatives of the parametrization
+-    Pair<SVector3, SVector3> der = gf->firstDer(SPoint2(u, v));
++    std::pair<SVector3, SVector3> der = gf->firstDer(SPoint2(u, v));
+ 
+-    J(0, 0) = JT(0, 0) = der.first().x();
+-    J(0, 1) = JT(1, 0) = der.first().y();
+-    J(0, 2) = JT(2, 0) = der.first().z();
+-    J(1, 0) = JT(0, 1) = der.second().x();
+-    J(1, 1) = JT(1, 1) = der.second().y();
+-    J(1, 2) = JT(2, 1) = der.second().z();
++    J(0, 0) = JT(0, 0) = der.first.x();
++    J(0, 1) = JT(1, 0) = der.first.y();
++    J(0, 2) = JT(2, 0) = der.first.z();
++    J(1, 0) = JT(0, 1) = der.second.x();
++    J(1, 1) = JT(1, 1) = der.second.y();
++    J(1, 2) = JT(2, 1) = der.second.z();
+ 
+     m.getMat(M);
+     J.mult(M, W);
diff --git a/cad/gmsh/files/patch-src_mesh_meshGFaceDelaunayInsertion.cpp b/cad/gmsh/files/patch-src_mesh_meshGFaceDelaunayInsertion.cpp
new file mode 100644
index 000000000000..2b1e1644b5cd
--- /dev/null
+++ b/cad/gmsh/files/patch-src_mesh_meshGFaceDelaunayInsertion.cpp
@@ -0,0 +1,18 @@
+--- src/mesh/meshGFaceDelaunayInsertion.cpp.orig	2024-03-29 22:07:01 UTC
++++ src/mesh/meshGFaceDelaunayInsertion.cpp
+@@ -331,11 +331,11 @@ void buildMetric(GFace *gf, double *uv, double *metric
+ 
+ void buildMetric(GFace *gf, double *uv, double *metric)
+ {
+-  Pair<SVector3, SVector3> der = gf->firstDer(SPoint2(uv[0], uv[1]));
++  std::pair<SVector3, SVector3> der = gf->firstDer(SPoint2(uv[0], uv[1]));
+ 
+-  metric[0] = dot(der.first(), der.first());
+-  metric[1] = dot(der.second(), der.first());
+-  metric[2] = dot(der.second(), der.second());
++  metric[0] = dot(der.first, der.first);
++  metric[1] = dot(der.second, der.first);
++  metric[2] = dot(der.second, der.second);
+ }
+ 
+ static double computeTolerance(const double radius)
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 017354cd2b45..c8b9f2656e10 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gtkwave
-DISTVERSION=	3.3.122
+DISTVERSION=	3.3.123
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	${PORTNAME}-gtk3-${DISTVERSION}
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index dcc3737a27fe..8eae517cf4ef 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745319864
-SHA256 (gtkwave-gtk3-3.3.122.tar.gz) = 6201b5f93dcaeafa92fc0ec4ad4baeaf60acf16fc8f019bbf061cf4ebf27938a
-SIZE (gtkwave-gtk3-3.3.122.tar.gz) = 3357469
+TIMESTAMP = 1746572263
+SHA256 (gtkwave-gtk3-3.3.123.tar.gz) = c2209d6c38e2bfe9747538bc3820d3525e88bd66c4ce092d04d2417e666bd797
+SIZE (gtkwave-gtk3-3.3.123.tar.gz) = 3358653
diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index 673d954b41b9..04397aa5cb2f 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	horizon-eda
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index fbbe882437ed..f62c72c80f2c 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 #PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 477800351d36..574588bca56c 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kicad
 DISTVERSION=	9.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	cad
 
diff --git a/cad/openscad-devel/Makefile.git_rev b/cad/openscad-devel/Makefile.git_rev
index 8ca9148ebdf9..fe7f5afe3ead 100644
--- a/cad/openscad-devel/Makefile.git_rev
+++ b/cad/openscad-devel/Makefile.git_rev
@@ -1,5 +1,5 @@
-GIT_SRC_HASH=  716690492a551b6458697c9c0c77dfadbd190f4d
-GIT_SRC_DATE=  2025.04.13
+GIT_SRC_HASH=  d1351d6282abfd239cdd0c657f755d8c4a123ff8
+GIT_SRC_DATE=  2025.05.04
 GIT_MCAD_HASH= 1ea402208c3127ffb443931e9bb1681c191dacca
 GIT_CLIPPER2_HASH= 6901921c4be75126d1de60bfd24bd86a61319fd0
 GIT_OPENCSG_HASH= 313018fbf997f484f66cb4a320bbd2abf79a4fc1
diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo
index 341869d6834c..32f98f736806 100644
--- a/cad/openscad-devel/distinfo
+++ b/cad/openscad-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1744627943
-SHA256 (openscad-openscad-2025.04.13-716690492a551b6458697c9c0c77dfadbd190f4d_GH0.tar.gz) = 4a5f41b5d04c4f5df056f9fcc49d5edeff9783f6b2cace21e81917da3cba7963
-SIZE (openscad-openscad-2025.04.13-716690492a551b6458697c9c0c77dfadbd190f4d_GH0.tar.gz) = 26369584
+TIMESTAMP = 1746447998
+SHA256 (openscad-openscad-2025.05.04-d1351d6282abfd239cdd0c657f755d8c4a123ff8_GH0.tar.gz) = d610c85143ab2437ca3ae9d68ea0857303eeca147b10ccf74fe1dfe04eb9f8a7
+SIZE (openscad-openscad-2025.05.04-d1351d6282abfd239cdd0c657f755d8c4a123ff8_GH0.tar.gz) = 24478575
 SHA256 (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1811a777b83ffa9cb5c2f3c1b2f41b48bd72b6f044812d7ba2c2bacf5e1b8e2c
 SIZE (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1133506
 SHA256 (elalish-manifold-7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9_GH0.tar.gz) = 5418524300e37c2edb0de81a2393cd768f631a5de02f68936bc5c42988271813
diff --git a/cad/py-gmsh/Makefile b/cad/py-gmsh/Makefile
index 958adaa4b313..1e85a9f45ff2 100644
--- a/cad/py-gmsh/Makefile
+++ b/cad/py-gmsh/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gmsh
 DISTVERSION=	4.13.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad python
 MASTER_SITES=	https://gmsh.info/src/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,6 +32,8 @@ USE_GL=		gl glu
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	${PYTHON_SITELIBDIR}
 
+PATCHDIR=	${PORTSDIR}/cad/gmsh/files
+
 CMAKE_ON=	ENABLE_WRAP_PYTHON ENABLE_PRIVATE_API ENABLE_OCC
 CMAKE_ARGS=	-DOCC_INC=${LOCALBASE}/include/OpenCASCADE
 
diff --git a/cad/veryl/Makefile b/cad/veryl/Makefile
index 2332fe60c39c..da6bd4bd1f13 100644
--- a/cad/veryl/Makefile
+++ b/cad/veryl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	veryl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.15.0
+DISTVERSION=	0.16.0
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -41,7 +41,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		anstyle-parse-0.2.6 \
 		anstyle-query-1.1.2 \
 		anstyle-wincon-3.0.7 \
-		anyhow-1.0.97 \
+		anyhow-1.0.98 \
 		arc-swap-1.7.1 \
 		arrayref-0.3.9 \
 		arrayvec-0.7.6 \
@@ -49,17 +49,16 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		async-channel-2.3.1 \
 		async-trait-0.1.88 \
 		atoi-2.0.0 \
-		auto_impl-1.2.1 \
 		autocfg-1.4.0 \
 		backtrace-0.3.74 \
 		backtrace-ext-0.2.1 \
 		base64-0.21.7 \
-		base64-simd-0.7.0 \
+		base64-simd-0.8.0 \
 		bimap-0.6.3 \
 		bitflags-1.3.2 \
 		bitflags-2.9.0 \
 		bitvec-1.0.1 \
-		blake3-1.8.1 \
+		blake3-1.8.0 \
 		block-buffer-0.10.4 \
 		bstr-1.11.3 \
 		btoi-0.4.3 \
@@ -77,16 +76,16 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
 		ciborium-ll-0.2.2 \
-		clap-4.5.35 \
-		clap_builder-4.5.35 \
-		clap_complete-4.5.47 \
+		clap-4.5.37 \
+		clap_builder-4.5.37 \
+		clap_complete-4.5.48 \
 		clap_derive-4.5.32 \
 		clap_lex-0.7.4 \
 		clru-0.6.2 \
 		codespan-reporting-0.11.1 \
-		codspeed-2.10.0 \
-		codspeed-criterion-compat-2.10.0 \
-		codspeed-criterion-compat-walltime-2.10.0 \
+		codspeed-2.9.1 \
+		codspeed-criterion-compat-2.9.1 \
+		codspeed-criterion-compat-walltime-2.9.1 \
 		colorchoice-1.0.3 \
 		colored-2.2.0 \
 		compact_str-0.6.1 \
@@ -101,14 +100,14 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		crc32fast-1.4.2 \
 		criterion-plot-0.5.0 \
 		crossbeam-0.8.4 \
-		crossbeam-channel-0.5.14 \
+		crossbeam-channel-0.5.15 \
 		crossbeam-deque-0.8.6 \
 		crossbeam-epoch-0.9.18 \
 		crossbeam-queue-0.3.12 \
 		crossbeam-utils-0.8.21 \
 		crunchy-0.2.3 \
 		crypto-common-0.1.6 \
-		daggy-0.8.1 \
+		daggy-0.9.0 \
 		darling-0.20.11 \
 		darling_core-0.20.11 \
 		darling_macro-0.20.11 \
@@ -139,7 +138,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		enum-as-inner-0.6.1 \
 		env_filter-0.1.3 \
 		env_home-0.1.0 \
-		env_logger-0.11.8 \
+		env_logger-0.11.7 \
 		equator-0.4.2 \
 		equator-macro-0.4.2 \
 		equivalent-1.0.2 \
@@ -153,7 +152,8 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		findshlibs-0.10.2 \
 		fixedbitset-0.4.2 \
 		fixedbitset-0.5.7 \
-		flate2-1.1.1 \
+		flate2-1.1.0 \
+		fluent-uri-0.1.4 \
 		fnv-1.0.7 \
 		foldhash-0.1.5 \
 		form_urlencoded-1.2.1 \
@@ -298,7 +298,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		lock_api-0.4.12 \
 		log-0.4.27 \
 		lru-cache-0.1.2 \
-		lsp-types-0.94.1 \
+		lsp-types-0.97.0 \
 		mac-0.1.1 \
 		maplit-1.0.2 \
 		mark-flaky-tests-1.0.2 \
@@ -310,8 +310,8 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		memmap2-0.5.10 \
 		memmap2-0.9.5 \
 		merkle_hash-3.8.0 \
-		miette-7.5.0 \
-		miette-derive-7.5.0 \
+		miette-7.6.0 \
+		miette-derive-7.6.0 \
 		mime-0.3.17 \
 		mime_guess-2.0.5 \
 		minimal-lexical-0.2.1 \
@@ -345,7 +345,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		oorandom-11.1.5 \
 		opener-0.7.2 \
 		option-ext-0.2.0 \
-		outref-0.1.0 \
+		outref-0.5.2 \
 		owo-colors-4.2.0 \
 		parking-2.2.1 \
 		parking_lot-0.12.3 \
@@ -361,7 +361,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		pest_generator-2.8.0 \
 		pest_meta-2.8.0 \
 		petgraph-0.6.5 \
-		petgraph-0.7.1 \
+		petgraph-0.8.1 \
 		phf-0.11.3 \
 		phf_codegen-0.11.3 \
 		phf_generator-0.11.3 \
@@ -420,15 +420,13 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		ring-0.17.14 \
 		rle-decode-fast-1.0.3 \
 		ropey-1.6.1 \
-		rust-embed-8.6.0 \
-		rust-embed-impl-8.6.0 \
-		rust-embed-utils-8.6.0 \
+		rust-embed-8.7.0 \
+		rust-embed-impl-8.7.0 \
+		rust-embed-utils-8.7.0 \
 		rustc-demangle-0.1.24 \
-		rustc-hash-1.1.0 \
 		rustc-hash-2.1.1 \
-		rustc_version-0.2.3 \
 		rustix-0.38.44 \
-		rustix-1.0.5 \
+		rustix-1.0.3 \
 		rustls-0.21.12 \
 		rustls-pemfile-1.0.4 \
 		rustls-webpki-0.101.7 \
@@ -439,9 +437,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.2.0 \
 		sct-0.7.1 \
-		semver-0.9.0 \
 		semver-1.0.26 \
-		semver-parser-0.7.0 \
 		serde-1.0.219 \
 		serde_derive-1.0.219 \
 		serde_json-1.0.140 \
@@ -456,13 +452,12 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		shlex-1.3.0 \
 		signal-hook-0.3.17 \
 		signal-hook-registry-1.4.2 \
-		simd-abstraction-0.7.1 \
 		similar-2.7.0 \
 		siphasher-1.0.1 \
 		slab-0.4.9 \
-		smallvec-1.14.0 \
+		smallvec-1.15.0 \
 		socket2-0.5.9 \
-		sourcemap-9.1.2 \
+		sourcemap-9.2.0 \
 		spdx-0.10.8 \
 		stable_deref_trait-1.2.0 \
 		str_indices-0.4.4 \
@@ -479,6 +474,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		syn-1.0.109 \
 		syn-2.0.100 \
 		sync_wrapper-0.1.2 \
+		sync_wrapper-1.0.2 \
 		synstructure-0.13.1 \
 		syntree-0.18.0 \
 		syntree_layout-0.4.0 \
@@ -502,21 +498,21 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		tinytemplate-1.2.1 \
 		tinyvec-1.9.0 \
 		tinyvec_macros-0.1.1 \
-		tokio-1.44.1 \
+		tokio-1.44.2 \
 		tokio-macros-2.5.0 \
 		tokio-rustls-0.24.1 \
 		tokio-tungstenite-0.21.0 \
-		tokio-util-0.7.14 \
+		tokio-util-0.7.15 \
 		toml-0.5.11 \
-		toml-0.8.20 \
-		toml_datetime-0.6.8 \
+		toml-0.8.22 \
+		toml_datetime-0.6.9 \
 		toml_edit-0.19.15 \
-		toml_edit-0.22.24 \
+		toml_edit-0.22.26 \
+		toml_write-0.1.1 \
 		topological-sort-0.2.2 \
-		tower-0.4.13 \
+		tower-0.5.2 \
 		tower-layer-0.3.3 \
-		tower-lsp-0.20.0 \
-		tower-lsp-macros-0.9.0 \
+		tower-lsp-server-0.21.1 \
 		tower-service-0.3.3 \
 		tracing-0.1.41 \
 		tracing-attributes-0.1.28 \
@@ -545,6 +541,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		utf8parse-0.2.2 \
 		uuid-1.16.0 \
 		version_check-0.9.5 \
+		vsimd-0.8.0 \
 		wait-timeout-0.2.1 \
 		walkdir-2.5.0 \
 		want-0.3.1 \
@@ -602,7 +599,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		windows_x86_64_msvc-0.48.5 \
 		windows_x86_64_msvc-0.52.6 \
 		winnow-0.5.40 \
-		winnow-0.7.4 \
+		winnow-0.7.7 \
 		winreg-0.50.0 \
 		winsafe-0.0.19 \
 		wit-bindgen-rt-0.39.0 \
diff --git a/cad/veryl/distinfo b/cad/veryl/distinfo
index 8ab3889e5009..4457a69027c1 100644
--- a/cad/veryl/distinfo
+++ b/cad/veryl/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1743699837
+TIMESTAMP = 1746424836
 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
@@ -31,8 +31,8 @@ SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d6789
 SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
 SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e
 SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400
-SHA256 (rust/crates/anyhow-1.0.97.crate) = dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f
-SIZE (rust/crates/anyhow-1.0.97.crate) = 52221
+SHA256 (rust/crates/anyhow-1.0.98.crate) = e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487
+SIZE (rust/crates/anyhow-1.0.98.crate) = 53334
 SHA256 (rust/crates/arc-swap-1.7.1.crate) = 69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457
 SIZE (rust/crates/arc-swap-1.7.1.crate) = 68512
 SHA256 (rust/crates/arrayref-0.3.9.crate) = 76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb
@@ -47,8 +47,6 @@ SHA256 (rust/crates/async-trait-0.1.88.crate) = e539d3fca749fcee5236ab05e93a5286
 SIZE (rust/crates/async-trait-0.1.88.crate) = 32084
 SHA256 (rust/crates/atoi-2.0.0.crate) = f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528
 SIZE (rust/crates/atoi-2.0.0.crate) = 7785
-SHA256 (rust/crates/auto_impl-1.2.1.crate) = e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73
-SIZE (rust/crates/auto_impl-1.2.1.crate) = 32287
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
 SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
@@ -57,8 +55,8 @@ SHA256 (rust/crates/backtrace-ext-0.2.1.crate) = 537beee3be4a18fb023b570f80e3ae2
 SIZE (rust/crates/backtrace-ext-0.2.1.crate) = 11401
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
 SIZE (rust/crates/base64-0.21.7.crate) = 82576
-SHA256 (rust/crates/base64-simd-0.7.0.crate) = 781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5
-SIZE (rust/crates/base64-simd-0.7.0.crate) = 9966
+SHA256 (rust/crates/base64-simd-0.8.0.crate) = 339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195
+SIZE (rust/crates/base64-simd-0.8.0.crate) = 12531
 SHA256 (rust/crates/bimap-0.6.3.crate) = 230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7
 SIZE (rust/crates/bimap-0.6.3.crate) = 26660
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
@@ -67,8 +65,8 @@ SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5
 SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
 SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
 SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
-SHA256 (rust/crates/blake3-1.8.1.crate) = 389a099b34312839e16420d499a9cad9650541715937ffbdd40d36f49e77eeb3
-SIZE (rust/crates/blake3-1.8.1.crate) = 205653
+SHA256 (rust/crates/blake3-1.8.0.crate) = 34a796731680be7931955498a16a10b2270c7762963d5d570fdbfe02dcbf314f
+SIZE (rust/crates/blake3-1.8.0.crate) = 205397
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
 SHA256 (rust/crates/bstr-1.11.3.crate) = 531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0
@@ -103,12 +101,12 @@ SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce369
 SIZE (rust/crates/ciborium-io-0.2.2.crate) = 6697
 SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9
 SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695
-SHA256 (rust/crates/clap-4.5.35.crate) = d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944
-SIZE (rust/crates/clap-4.5.35.crate) = 56970
-SHA256 (rust/crates/clap_builder-4.5.35.crate) = 2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9
-SIZE (rust/crates/clap_builder-4.5.35.crate) = 168525
-SHA256 (rust/crates/clap_complete-4.5.47.crate) = c06f5378ea264ad4f82bbc826628b5aad714a75abf6ece087e923010eb937fb6
-SIZE (rust/crates/clap_complete-4.5.47.crate) = 48038
+SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071
+SIZE (rust/crates/clap-4.5.37.crate) = 56962
+SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2
+SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761
+SHA256 (rust/crates/clap_complete-4.5.48.crate) = be8c97f3a6f02b9e24cadc12aaba75201d18754b53ea0a9d99642f806ccdb4c9
+SIZE (rust/crates/clap_complete-4.5.48.crate) = 48036
 SHA256 (rust/crates/clap_derive-4.5.32.crate) = 09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7
 SIZE (rust/crates/clap_derive-4.5.32.crate) = 33441
 SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6
@@ -117,12 +115,12 @@ SHA256 (rust/crates/clru-0.6.2.crate) = cbd0f76e066e64fdc5631e3bb46381254deab9ef
 SIZE (rust/crates/clru-0.6.2.crate) = 16497
 SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
 SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
-SHA256 (rust/crates/codspeed-2.10.0.crate) = d228291b19e82cdef59c17e595c45d482e12c4ddcc9546d2f1cbd1ef28b72af5
-SIZE (rust/crates/codspeed-2.10.0.crate) = 8585
-SHA256 (rust/crates/codspeed-criterion-compat-2.10.0.crate) = 51b63a59eb8143056810ad59fde8e60b2e736e025d3963ae7f1a204730b247ca
-SIZE (rust/crates/codspeed-criterion-compat-2.10.0.crate) = 20932
-SHA256 (rust/crates/codspeed-criterion-compat-walltime-2.10.0.crate) = 89981ff863e8e6c71298bddfb515c29456c015d7c634ec1c435e31ec390cf44a
-SIZE (rust/crates/codspeed-criterion-compat-walltime-2.10.0.crate) = 122453
+SHA256 (rust/crates/codspeed-2.9.1.crate) = 60e744216bfa9add3b1f2505587cbbb837923232ed10963609f4a6e3cbd99c3e
+SIZE (rust/crates/codspeed-2.9.1.crate) = 8588
+SHA256 (rust/crates/codspeed-criterion-compat-2.9.1.crate) = d5926ca63222a35b9a2299adcaafecf596efe20a9a2048e4a81cb2fc3463b4a8
+SIZE (rust/crates/codspeed-criterion-compat-2.9.1.crate) = 20936
+SHA256 (rust/crates/codspeed-criterion-compat-walltime-2.9.1.crate) = dbae4da05076cbc673e242400ac8f4353bdb686e48020edc6e36a5c36ae0878e
+SIZE (rust/crates/codspeed-criterion-compat-walltime-2.9.1.crate) = 122453
 SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990
 SIZE (rust/crates/colorchoice-1.0.3.crate) = 7923
 SHA256 (rust/crates/colored-2.2.0.crate) = 117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c
@@ -151,8 +149,8 @@ SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c
 SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
 SHA256 (rust/crates/crossbeam-0.8.4.crate) = 1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8
 SIZE (rust/crates/crossbeam-0.8.4.crate) = 10500
-SHA256 (rust/crates/crossbeam-channel-0.5.14.crate) = 06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471
-SIZE (rust/crates/crossbeam-channel-0.5.14.crate) = 92728
+SHA256 (rust/crates/crossbeam-channel-0.5.15.crate) = 82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2
+SIZE (rust/crates/crossbeam-channel-0.5.15.crate) = 92716
 SHA256 (rust/crates/crossbeam-deque-0.8.6.crate) = 9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51
 SIZE (rust/crates/crossbeam-deque-0.8.6.crate) = 22471
 SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
@@ -165,8 +163,8 @@ SHA256 (rust/crates/crunchy-0.2.3.crate) = 43da5946c66ffcc7745f48db692ffbb10a83b
 SIZE (rust/crates/crunchy-0.2.3.crate) = 3775
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
-SHA256 (rust/crates/daggy-0.8.1.crate) = 70def8d72740e44d9f676d8dab2c933a236663d86dd24319b57a2bed4d694774
-SIZE (rust/crates/daggy-0.8.1.crate) = 26690
+SHA256 (rust/crates/daggy-0.9.0.crate) = 804169db156b21258a2545757336922d93dfa229892c75911a0ad141aa0ff241
+SIZE (rust/crates/daggy-0.9.0.crate) = 26883
 SHA256 (rust/crates/darling-0.20.11.crate) = fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee
 SIZE (rust/crates/darling-0.20.11.crate) = 37614
 SHA256 (rust/crates/darling_core-0.20.11.crate) = 0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e
@@ -227,8 +225,8 @@ SHA256 (rust/crates/env_filter-0.1.3.crate) = 186e05a59d4c50738528153b83b0b0194d
 SIZE (rust/crates/env_filter-0.1.3.crate) = 15191
 SHA256 (rust/crates/env_home-0.1.0.crate) = c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe
 SIZE (rust/crates/env_home-0.1.0.crate) = 9006
-SHA256 (rust/crates/env_logger-0.11.8.crate) = 13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f
-SIZE (rust/crates/env_logger-0.11.8.crate) = 32538
+SHA256 (rust/crates/env_logger-0.11.7.crate) = c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697
+SIZE (rust/crates/env_logger-0.11.7.crate) = 31842
 SHA256 (rust/crates/equator-0.4.2.crate) = 4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc
 SIZE (rust/crates/equator-0.4.2.crate) = 11159
 SHA256 (rust/crates/equator-macro-0.4.2.crate) = 44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3
@@ -255,8 +253,10 @@ SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736e
 SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
 SHA256 (rust/crates/fixedbitset-0.5.7.crate) = 1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99
 SIZE (rust/crates/fixedbitset-0.5.7.crate) = 26537
-SHA256 (rust/crates/flate2-1.1.1.crate) = 7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece
-SIZE (rust/crates/flate2-1.1.1.crate) = 77224
+SHA256 (rust/crates/flate2-1.1.0.crate) = 11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc
+SIZE (rust/crates/flate2-1.1.0.crate) = 110650
+SHA256 (rust/crates/fluent-uri-0.1.4.crate) = 17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d
+SIZE (rust/crates/fluent-uri-0.1.4.crate) = 33596
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/foldhash-0.1.5.crate) = d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2
@@ -545,8 +545,8 @@ SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb404
 SIZE (rust/crates/log-0.4.27.crate) = 48120
 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
 SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
-SHA256 (rust/crates/lsp-types-0.94.1.crate) = c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1
-SIZE (rust/crates/lsp-types-0.94.1.crate) = 66997
+SHA256 (rust/crates/lsp-types-0.97.0.crate) = 53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071
+SIZE (rust/crates/lsp-types-0.97.0.crate) = 70764
 SHA256 (rust/crates/mac-0.1.1.crate) = c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4
 SIZE (rust/crates/mac-0.1.1.crate) = 4838
 SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d
@@ -569,10 +569,10 @@ SHA256 (rust/crates/memmap2-0.9.5.crate) = fd3f7eed9d3848f8b98834af67102b720745c
 SIZE (rust/crates/memmap2-0.9.5.crate) = 33280
 SHA256 (rust/crates/merkle_hash-3.8.0.crate) = 025450e7f75788743d2f9465c120a0ad0b350367715e1230c0d21a9e4a8fdc9d
 SIZE (rust/crates/merkle_hash-3.8.0.crate) = 10176
-SHA256 (rust/crates/miette-7.5.0.crate) = 1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484
-SIZE (rust/crates/miette-7.5.0.crate) = 112114
-SHA256 (rust/crates/miette-derive-7.5.0.crate) = bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147
-SIZE (rust/crates/miette-derive-7.5.0.crate) = 17252
+SHA256 (rust/crates/miette-7.6.0.crate) = 5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7
+SIZE (rust/crates/miette-7.6.0.crate) = 114499
+SHA256 (rust/crates/miette-derive-7.6.0.crate) = db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b
+SIZE (rust/crates/miette-derive-7.6.0.crate) = 17249
 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
 SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/mime_guess-2.0.5.crate) = f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e
@@ -639,8 +639,8 @@ SHA256 (rust/crates/opener-0.7.2.crate) = d0812e5e4df08da354c851a3376fead46db31c
 SIZE (rust/crates/opener-0.7.2.crate) = 19229
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
 SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
-SHA256 (rust/crates/outref-0.1.0.crate) = 7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4
-SIZE (rust/crates/outref-0.1.0.crate) = 3067
+SHA256 (rust/crates/outref-0.5.2.crate) = 1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e
+SIZE (rust/crates/outref-0.5.2.crate) = 5621
 SHA256 (rust/crates/owo-colors-4.2.0.crate) = 1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564
 SIZE (rust/crates/owo-colors-4.2.0.crate) = 37789
 SHA256 (rust/crates/parking-2.2.1.crate) = f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba
@@ -671,8 +671,8 @@ SHA256 (rust/crates/pest_meta-2.8.0.crate) = 7f9f832470494906d1fca5329f8ab5791cc
 SIZE (rust/crates/pest_meta-2.8.0.crate) = 42931
 SHA256 (rust/crates/petgraph-0.6.5.crate) = b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db
 SIZE (rust/crates/petgraph-0.6.5.crate) = 710970
-SHA256 (rust/crates/petgraph-0.7.1.crate) = 3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772
-SIZE (rust/crates/petgraph-0.7.1.crate) = 736025
+SHA256 (rust/crates/petgraph-0.8.1.crate) = 7a98c6720655620a521dcc722d0ad66cd8afd5d86e34a89ef691c50b7b24de06
+SIZE (rust/crates/petgraph-0.8.1.crate) = 763960
 SHA256 (rust/crates/phf-0.11.3.crate) = 1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078
 SIZE (rust/crates/phf-0.11.3.crate) = 23231
 SHA256 (rust/crates/phf_codegen-0.11.3.crate) = aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a
@@ -789,24 +789,20 @@ SHA256 (rust/crates/rle-decode-fast-1.0.3.crate) = 3582f63211428f83597b51b2ddb88
 SIZE (rust/crates/rle-decode-fast-1.0.3.crate) = 62086
 SHA256 (rust/crates/ropey-1.6.1.crate) = 93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5
 SIZE (rust/crates/ropey-1.6.1.crate) = 119463
-SHA256 (rust/crates/rust-embed-8.6.0.crate) = 0b3aba5104622db5c9fc61098de54708feb732e7763d7faa2fa625899f00bf6f
-SIZE (rust/crates/rust-embed-8.6.0.crate) = 906979
-SHA256 (rust/crates/rust-embed-impl-8.6.0.crate) = 1f198c73be048d2c5aa8e12f7960ad08443e56fd39cc26336719fdb4ea0ebaae
-SIZE (rust/crates/rust-embed-impl-8.6.0.crate) = 10097
-SHA256 (rust/crates/rust-embed-utils-8.6.0.crate) = 5a2fcdc9f40c8dc2922842ca9add611ad19f332227fc651d015881ad1552bd9a
-SIZE (rust/crates/rust-embed-utils-8.6.0.crate) = 6115
+SHA256 (rust/crates/rust-embed-8.7.0.crate) = e5fbc0ee50fcb99af7cebb442e5df7b5b45e9460ffa3f8f549cd26b862bec49d
+SIZE (rust/crates/rust-embed-8.7.0.crate) = 907480
+SHA256 (rust/crates/rust-embed-impl-8.7.0.crate) = 6bf418c9a2e3f6663ca38b8a7134cc2c2167c9d69688860e8961e3faa731702e
+SIZE (rust/crates/rust-embed-impl-8.7.0.crate) = 10171
+SHA256 (rust/crates/rust-embed-utils-8.7.0.crate) = 08d55b95147fe01265d06b3955db798bdaed52e60e2211c41137701b3aba8e21
+SIZE (rust/crates/rust-embed-utils-8.7.0.crate) = 6123
 SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
-SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
-SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/rustc-hash-2.1.1.crate) = 357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d
 SIZE (rust/crates/rustc-hash-2.1.1.crate) = 14154
-SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
-SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210
 SHA256 (rust/crates/rustix-0.38.44.crate) = fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154
 SIZE (rust/crates/rustix-0.38.44.crate) = 379347
-SHA256 (rust/crates/rustix-1.0.5.crate) = d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf
-SIZE (rust/crates/rustix-1.0.5.crate) = 414160
+SHA256 (rust/crates/rustix-1.0.3.crate) = e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96
+SIZE (rust/crates/rustix-1.0.3.crate) = 413960
 SHA256 (rust/crates/rustls-0.21.12.crate) = 3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e
 SIZE (rust/crates/rustls-0.21.12.crate) = 285674
 SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
@@ -827,12 +823,8 @@ SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
 SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414
 SIZE (rust/crates/sct-0.7.1.crate) = 27501
-SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
-SIZE (rust/crates/semver-0.9.0.crate) = 17344
 SHA256 (rust/crates/semver-1.0.26.crate) = 56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0
 SIZE (rust/crates/semver-1.0.26.crate) = 31303
-SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
-SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268
 SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
 SIZE (rust/crates/serde-1.0.219.crate) = 78983
 SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
@@ -861,20 +853,18 @@ SHA256 (rust/crates/signal-hook-0.3.17.crate) = 8621587d4798caf8eb44879d42e56b9a
 SIZE (rust/crates/signal-hook-0.3.17.crate) = 50296
 SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
 SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
-SHA256 (rust/crates/simd-abstraction-0.7.1.crate) = 9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987
-SIZE (rust/crates/simd-abstraction-0.7.1.crate) = 9170
 SHA256 (rust/crates/similar-2.7.0.crate) = bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa
 SIZE (rust/crates/similar-2.7.0.crate) = 53928
 SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
 SIZE (rust/crates/siphasher-1.0.1.crate) = 10351
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
-SHA256 (rust/crates/smallvec-1.14.0.crate) = 7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd
-SIZE (rust/crates/smallvec-1.14.0.crate) = 35561
+SHA256 (rust/crates/smallvec-1.15.0.crate) = 8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9
+SIZE (rust/crates/smallvec-1.15.0.crate) = 38113
 SHA256 (rust/crates/socket2-0.5.9.crate) = 4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef
 SIZE (rust/crates/socket2-0.5.9.crate) = 57432
-SHA256 (rust/crates/sourcemap-9.1.2.crate) = 27c4ea7042fd1a155ad95335b5d505ab00d5124ea0332a06c8390d200bb1a76a
-SIZE (rust/crates/sourcemap-9.1.2.crate) = 45871
+SHA256 (rust/crates/sourcemap-9.2.0.crate) = dd430118acc9fdd838557649b9b43fd0a78e3834d84a283b466f8e84720d6101
+SIZE (rust/crates/sourcemap-9.2.0.crate) = 47673
 SHA256 (rust/crates/spdx-0.10.8.crate) = 58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193
 SIZE (rust/crates/spdx-0.10.8.crate) = 1036873
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
@@ -907,6 +897,8 @@ SHA256 (rust/crates/syn-2.0.100.crate) = b09a44accad81e1ba1cd74a32461ba89dee8909
 SIZE (rust/crates/syn-2.0.100.crate) = 297947
 SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
 SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
+SHA256 (rust/crates/sync_wrapper-1.0.2.crate) = 0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263
+SIZE (rust/crates/sync_wrapper-1.0.2.crate) = 6958
 SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
 SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
 SHA256 (rust/crates/syntree-0.18.0.crate) = 00c99c9cda412afe293a6b962af651b4594161ba88c1affe7ef66459ea040a06
@@ -953,36 +945,36 @@ SHA256 (rust/crates/tinyvec-1.9.0.crate) = 09b3661f17e86524eccd4371ab0429194e0d7
 SIZE (rust/crates/tinyvec-1.9.0.crate) = 54137
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.44.1.crate) = f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a
-SIZE (rust/crates/tokio-1.44.1.crate) = 830115
+SHA256 (rust/crates/tokio-1.44.2.crate) = e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48
+SIZE (rust/crates/tokio-1.44.2.crate) = 841618
 SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
 SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
 SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081
 SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049
 SHA256 (rust/crates/tokio-tungstenite-0.21.0.crate) = c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38
 SIZE (rust/crates/tokio-tungstenite-0.21.0.crate) = 28159
-SHA256 (rust/crates/tokio-util-0.7.14.crate) = 6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034
-SIZE (rust/crates/tokio-util-0.7.14.crate) = 118861
+SHA256 (rust/crates/tokio-util-0.7.15.crate) = 66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df
+SIZE (rust/crates/tokio-util-0.7.15.crate) = 124255
 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
 SIZE (rust/crates/toml-0.5.11.crate) = 54910
-SHA256 (rust/crates/toml-0.8.20.crate) = cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148
-SIZE (rust/crates/toml-0.8.20.crate) = 51095
-SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
-SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
+SHA256 (rust/crates/toml-0.8.22.crate) = 05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae
+SIZE (rust/crates/toml-0.8.22.crate) = 76224
+SHA256 (rust/crates/toml_datetime-0.6.9.crate) = 3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3
+SIZE (rust/crates/toml_datetime-0.6.9.crate) = 12622
 SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
 SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
-SHA256 (rust/crates/toml_edit-0.22.24.crate) = 17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474
-SIZE (rust/crates/toml_edit-0.22.24.crate) = 106399
+SHA256 (rust/crates/toml_edit-0.22.26.crate) = 310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e
+SIZE (rust/crates/toml_edit-0.22.26.crate) = 121714
+SHA256 (rust/crates/toml_write-0.1.1.crate) = bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076
+SIZE (rust/crates/toml_write-0.1.1.crate) = 17467
 SHA256 (rust/crates/topological-sort-0.2.2.crate) = ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d
 SIZE (rust/crates/topological-sort-0.2.2.crate) = 10566
-SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
-SIZE (rust/crates/tower-0.4.13.crate) = 106906
+SHA256 (rust/crates/tower-0.5.2.crate) = d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9
+SIZE (rust/crates/tower-0.5.2.crate) = 109417
 SHA256 (rust/crates/tower-layer-0.3.3.crate) = 121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e
 SIZE (rust/crates/tower-layer-0.3.3.crate) = 6180
-SHA256 (rust/crates/tower-lsp-0.20.0.crate) = d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508
-SIZE (rust/crates/tower-lsp-0.20.0.crate) = 61870
-SHA256 (rust/crates/tower-lsp-macros-0.9.0.crate) = 84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa
-SIZE (rust/crates/tower-lsp-macros-0.9.0.crate) = 2888
+SHA256 (rust/crates/tower-lsp-server-0.21.1.crate) = 5fade4c658b63d11b623ddfa80821901e943a2923a010ae4a038661de42bd377
+SIZE (rust/crates/tower-lsp-server-0.21.1.crate) = 70035
 SHA256 (rust/crates/tower-service-0.3.3.crate) = 8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3
 SIZE (rust/crates/tower-service-0.3.3.crate) = 6950
 SHA256 (rust/crates/tracing-0.1.41.crate) = 784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0
@@ -1039,6 +1031,8 @@ SHA256 (rust/crates/uuid-1.16.0.crate) = 458f7a779bf54acc9f347480ac654f68407d3aa
 SIZE (rust/crates/uuid-1.16.0.crate) = 58549
 SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
 SIZE (rust/crates/version_check-0.9.5.crate) = 15554
+SHA256 (rust/crates/vsimd-0.8.0.crate) = 5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64
+SIZE (rust/crates/vsimd-0.8.0.crate) = 21377
 SHA256 (rust/crates/wait-timeout-0.2.1.crate) = 09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11
 SIZE (rust/crates/wait-timeout-0.2.1.crate) = 11435
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
@@ -1153,8 +1147,8 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
 SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
 SIZE (rust/crates/winnow-0.5.40.crate) = 159316
-SHA256 (rust/crates/winnow-0.7.4.crate) = 0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36
-SIZE (rust/crates/winnow-0.7.4.crate) = 173588
+SHA256 (rust/crates/winnow-0.7.7.crate) = 6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5
+SIZE (rust/crates/winnow-0.7.7.crate) = 173993
 SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
 SIZE (rust/crates/winreg-0.50.0.crate) = 29703
 SHA256 (rust/crates/winsafe-0.0.19.crate) = d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904
@@ -1189,8 +1183,8 @@ SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19d
 SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
-SHA256 (dalance-veryl-v0.15.0_GH0.tar.gz) = b8de1e19fb26e3caba3d99bec95bf10ea166812fd2112c6df829a265075d076b
-SIZE (dalance-veryl-v0.15.0_GH0.tar.gz) = 4268014
+SHA256 (dalance-veryl-v0.16.0_GH0.tar.gz) = bb3370a9fa907330127f60b1b58c390b021a9803b1b0a1e3c9d1f82bef8b22d4
+SIZE (dalance-veryl-v0.16.0_GH0.tar.gz) = 4315490
 SHA256 (veryl-lang-veryl.vim-1b53c65_GH0.tar.gz) = 243d887bf9d437b74e46ef7a21281da557b1bca373a30a58cf5b7d546623ab2e
 SIZE (veryl-lang-veryl.vim-1b53c65_GH0.tar.gz) = 6403
 SHA256 (veryl-lang-doc-c54dceb_GH0.tar.gz) = fc8cd6c9a5452840567f40599200031477485d4440eec99a5f641a41e1f43f4b
diff --git a/converters/py-gotenberg-client/Makefile b/converters/py-gotenberg-client/Makefile
index 0ca846739737..d838a7341bc6 100644
--- a/converters/py-gotenberg-client/Makefile
+++ b/converters/py-gotenberg-client/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gotenberg-client
-PORTVERSION=	0.9.0
+PORTVERSION=	0.10.0
 CATEGORIES=	converters python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/converters/py-gotenberg-client/distinfo b/converters/py-gotenberg-client/distinfo
index 0411671e3642..5eac8da25a32 100644
--- a/converters/py-gotenberg-client/distinfo
+++ b/converters/py-gotenberg-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738063746
-SHA256 (gotenberg_client-0.9.0.tar.gz) = bd3c1ed42b74d470a7e192118276f3d91b558b90aa7c0035afbcac04f42179bb
-SIZE (gotenberg_client-0.9.0.tar.gz) = 419242
+TIMESTAMP = 1746349912
+SHA256 (gotenberg_client-0.10.0.tar.gz) = 27da0ba29eb313d747b8940558d43588bfb816458829e4cb5e2697bfe645732d
+SIZE (gotenberg_client-0.10.0.tar.gz) = 1209616
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index f9a167c0deb8..c85b8b9c0372 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	adodb
-PORTVERSION=	5.22.8
+PORTVERSION=	5.22.9
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases www
 PKGNAMESUFFIX=	5${PHP_PKGNAMESUFFIX}
diff --git a/databases/adodb5/distinfo b/databases/adodb5/distinfo
index 8bae5e228b70..23ee8d24bc4d 100644
--- a/databases/adodb5/distinfo
+++ b/databases/adodb5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742854664
-SHA256 (adodb-ADOdb-v5.22.8_GH0.tar.gz) = e31eafd4bfe99d10b43002dcc9d28c5a9d1cb509acfb22a33b6fd7db318842d7
-SIZE (adodb-ADOdb-v5.22.8_GH0.tar.gz) = 449725
+TIMESTAMP = 1746523687
+SHA256 (adodb-ADOdb-v5.22.9_GH0.tar.gz) = f77bd016da1daa42337547ffb9a6de5561776884d520f41c63301c8943dec9b3
+SIZE (adodb-ADOdb-v5.22.9_GH0.tar.gz) = 450133
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 8e5df5040127..ec301943f915 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freetds
-DISTVERSION=	1.4.491
+DISTVERSION=	1.4.504
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.freetds.org/files/current/
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 43f7faa94875..722a49e38528 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746175734
-SHA256 (freetds-dev.1.4.491.tar.bz2) = b3f0b4607983db0f61c0e1030bf4272686406be7c4cf85159815e2c4e9acbe4e
-SIZE (freetds-dev.1.4.491.tar.bz2) = 2450439
+TIMESTAMP = 1746447638
+SHA256 (freetds-dev.1.4.504.tar.bz2) = d6f28316d7d53b7e6d0d9e24b59685685923d72e3027bb5611127bda831532de
+SIZE (freetds-dev.1.4.504.tar.bz2) = 2450558
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index 810301f9a5a8..488c5d8fa73a 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	geoserver
-DISTVERSION=	2.26.0
+DISTVERSION=	2.26.2
 CATEGORIES=	databases geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
 PKGNAMESUFFIX=	-mysql-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
-MAINTAINER=	bofh@FreeBSD.org
+MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	MySQL DataStore implementation for GeoServer
 WWW=		http://geoserver.org/display/GEOSDOC/MySQL+DataStore
 
@@ -22,8 +22,8 @@ NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-32.0.jar \
-		${GSLIBDIR}/mysql-connector-java-8.0.28.jar
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-32.2.jar \
+		${GSLIBDIR}/mysql-connector-j-9.1.0.jar
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GSLIBDIR}
diff --git a/databases/geoserver-mysql-plugin/distinfo b/databases/geoserver-mysql-plugin/distinfo
index b750fc042bc0..e0d3744a51f1 100644
--- a/databases/geoserver-mysql-plugin/distinfo
+++ b/databases/geoserver-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727150781
-SHA256 (geoserver-2.26.0-mysql-plugin.zip) = ad3d19ad54c703b3e7d517c70d161e855692a4e8b592c70aa69bd03c70ccbdd6
-SIZE (geoserver-2.26.0-mysql-plugin.zip) = 2401169
+TIMESTAMP = 1746690215
+SHA256 (geoserver-2.26.2-mysql-plugin.zip) = 113e777f7771d00743c3e748334c81aa43982d0a17968e5d5fe3562727dc02bc
+SIZE (geoserver-2.26.2-mysql-plugin.zip) = 2492564
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index 5c93f69fba6a..42a259bd33c1 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	hsqldb
-PORTVERSION=	2.3.4
-PORTREVISION=	1
+PORTVERSION=	2.7.4
 CATEGORIES=	databases java
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_2_3
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_2_7
 
 MAINTAINER=	jim@ohlste.in
 COMMENT=	Embeddable SQL database written in Java
@@ -14,7 +13,8 @@ USES=		java:ant,run zip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/build
-ALL_TARGET=	hsqldb hsqljdbc
+ALL_TARGET=	hsqldb sqltool
+MAKE_ARGS+=	-Djdk8string=''
 
 OPTIONS_DEFINE=	DOCS
 
@@ -22,8 +22,6 @@ do-install:
 	${MKDIR}  ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/hsqldb.jar \
 		${STAGEDIR}${JAVAJARDIR}/hsqldb.jar
-	${INSTALL_DATA} ${WRKSRC}/lib/hsqljdbc.jar \
-		${STAGEDIR}${JAVAJARDIR}/hsqljdbc.jar
 	${INSTALL_DATA} ${WRKSRC}/lib/sqltool.jar \
 		${STAGEDIR}${JAVAJARDIR}/sqltool.jar
 
diff --git a/databases/hsqldb/distinfo b/databases/hsqldb/distinfo
index 59dc8f566e2f..38f3f416fbdc 100644
--- a/databases/hsqldb/distinfo
+++ b/databases/hsqldb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469742798
-SHA256 (hsqldb-2.3.4.zip) = c00547495ca8f1de29ccbdd41965ab130acbc616f32dcbe58b3aed16169c962e
-SIZE (hsqldb-2.3.4.zip) = 7847408
+TIMESTAMP = 1746329394
+SHA256 (hsqldb-2.7.4.zip) = 9388a1d151c3f91575fa4cabc7f922594aa6ecfd2012957ae853e82a3a5008d5
+SIZE (hsqldb-2.7.4.zip) = 11792951
diff --git a/databases/hsqldb/pkg-plist b/databases/hsqldb/pkg-plist
index 36fb37cdba72..512f3cbdf74a 100644
--- a/databases/hsqldb/pkg-plist
+++ b/databases/hsqldb/pkg-plist
@@ -1,156 +1,478 @@
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/allclasses-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/allclasses-noframe.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/allclasses-index.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/allclasses.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/allpackages-index.html
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/constant-values.html
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/deprecated-list.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/element-list
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/help-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/hsqldb.gif
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/hsqldbs.png
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/index-all.html
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/index.html
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/javadoc.css
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/Trigger.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/AuthBeanMultiplexer.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/AuthFunctionBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/HsqldbSlaveAuthBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/JaasAuthBean.UPCallbackHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/JaasAuthBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/LdapAuthBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/LdapAuthBeanTester.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use/AuthBeanMultiplexer.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use/AuthFunctionBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use/HsqldbSlaveAuthBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use/JaasAuthBean.UPCallbackHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use/JaasAuthBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use/LdapAuthBean.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use/LdapAuthBeanTester.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/auth/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/class-use/Trigger.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/SqlFile.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/SqlTool.SqlToolException.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/SqlTool.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/class-use/SqlFile.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/class-use/SqlTool.SqlToolException.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/class-use/SqlTool.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/cmdline/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCArray.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCArrayBasic.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCBlob.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCBlobClient.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCBlobFile.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCCallableStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCClob.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCClobClient.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCClobFile.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCColumnMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCCommonDataSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCConnection.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCConnectionEventListener.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCDataSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCDataSourceFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCDatabaseMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCDriver.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCNClob.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCParameterMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCPool.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCPreparedStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCResultSet.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCResultSetMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCRowId.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCSQLXML.SAX2XMLStreamWriter.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCSQLXML.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCSavepoint.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/JDBCUtil.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCArray.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCArrayBasic.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCBlob.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCBlobClient.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCBlobFile.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCCallableStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCClob.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCClobClient.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCClobFile.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCColumnMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCCommonDataSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCConnection.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCConnectionEventListener.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCDataSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCDataSourceFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCDatabaseMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCDriver.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCNClob.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCParameterMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCPool.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCPreparedStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCResultSet.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCResultSetMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCRowId.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCSQLXML.SAX2XMLStreamWriter.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCSQLXML.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCSavepoint.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use/JDBCUtil.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/jdbc/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/FrameworkLogger.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/RCData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/class-use/FrameworkLogger.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/class-use/RCData.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/DbBackup.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/DbBackupMain.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/class-use/DbBackup.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/class-use/DbBackupMain.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/SqlFileEmbedder.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/TriggerSample.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/class-use/SqlFileEmbedder.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/class-use/TriggerSample.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/sample/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/Server.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/ServerAcl.AclFormatException.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/ServerAcl.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/WebServer.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/class-use/Server.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/class-use/ServerAcl.AclFormatException.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/class-use/ServerAcl.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/class-use/WebServer.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/server/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/util/MainInvoker.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/util/class-use/MainInvoker.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/util/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/util/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/util/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/org/hsqldb/util/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/overview-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/overview-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery-ui.overrides.css
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/external/jquery/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jquery-3.6.1.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jquery-ui.min.css
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jquery-ui.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jszip-utils/dist/jszip-utils-ie.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jszip-utils/dist/jszip-utils-ie.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jszip-utils/dist/jszip-utils.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jszip-utils/dist/jszip-utils.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jszip/dist/jszip.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/jquery/jszip/dist/jszip.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/legal/ADDITIONAL_LICENSE_INFO
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/legal/ASSEMBLY_EXCEPTION
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/legal/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/legal/jquery.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/legal/jqueryUI.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/legal/jszip.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/legal/pako.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/member-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/member-search-index.zip
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/module-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/module-search-index.zip
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/module-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/AuthBeanMultiplexer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/AuthFunctionBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/AuthUtils.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/DenyException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/HsqldbSlaveAuthBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/JaasAuthBean.UPCallbackHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/JaasAuthBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/LdapAuthBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/LdapAuthBeanTester.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/AuthBeanMultiplexer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/AuthFunctionBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/AuthUtils.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/DenyException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/HsqldbSlaveAuthBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/JaasAuthBean.UPCallbackHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/JaasAuthBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/LdapAuthBean.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/class-use/LdapAuthBeanTester.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/auth/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCArray.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCArrayBasic.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCBlob.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCBlobClient.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCBlobFile.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCCallableStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCClob.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCClobClient.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCClobFile.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCColumnMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCCommonDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCConnectionEventListener.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCDataSourceFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCDatabaseMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCDriver.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCNClob.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCParameterMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCPool.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCPreparedStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCResultSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCResultSetMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCRowId.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCSQLXML.SAX2XMLStreamWriter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCSQLXML.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCSavepoint.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/JDBCUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCArray.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCArrayBasic.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCBlob.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCBlobClient.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCBlobFile.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCCallableStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCClob.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCClobClient.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCClobFile.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCColumnMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCCommonDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCConnectionEventListener.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCDataSourceFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCDatabaseMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCDriver.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCNClob.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCParameterMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCPool.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCPreparedStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCResultSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCResultSetMetaData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCRowId.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCSQLXML.SAX2XMLStreamWriter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCSQLXML.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCSavepoint.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/class-use/JDBCUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/JDBCPooledConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/JDBCPooledDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/JDBCXAConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/JDBCXAConnectionWrapper.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/JDBCXADataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/JDBCXAResource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/JDBCXID.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/class-use/JDBCPooledConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/class-use/JDBCPooledDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/class-use/JDBCXAConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/class-use/JDBCXAConnectionWrapper.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/class-use/JDBCXADataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/class-use/JDBCXAResource.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/class-use/JDBCXID.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/jdbc/pool/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/AppendableException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ArrayCounter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ArrayListIdentity.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ArraySort.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ArrayUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/AsciiInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/AsciiOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/BasicTextJdkLogFormatter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/CharArrayWriter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ClosableByteArrayOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ClosableCharArrayWriter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/Collection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/CountUpDownLatch.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/CountdownInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/DataOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/DoubleIntIndex.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/DoubleLongIndex.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/EventLogInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FileAccess.FileSync.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FileAccess.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FileAccessRes.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FileArchiver.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FileUtil.FileSync.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FileUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FilteredIterator.Filter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FilteredIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/FrameworkLogger.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlArrayHeap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlArrayList.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlByteArrayInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlByteArrayOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlConsoleHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlDeque.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlHeap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlTaskQueue.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/HsqlTimer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/InOutUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/InputStreamInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/InputStreamWrapper.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntIndex.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntKeyHashMapConcurrent.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntKeyIntValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntKeyLongValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntLookup.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/IntValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/Iterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/KMPSearchAlgorithm.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LineGroupReader.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LineReader.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/List.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LongDeque.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LongKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LongKeyIntValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LongKeyLongValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LongLookup.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/LongValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/Map.Entry.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/Map.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/MapEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/MultiValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/Notified.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ObjectComparator.DefaultComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ObjectComparator.IdentityComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ObjectComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/OrderedHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/OrderedHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/OrderedIntHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/OrderedIntKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/OrderedLongHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/OrderedLongKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/PrimitiveIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ReadWriteLockDummy.LockDummy.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ReadWriteLockDummy.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ReaderInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/RefCapablePropertyResourceBundle.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/RefCapableRBInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ScannerSearchAlgorithm.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/Set.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/SimpleLog.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/StopWatch.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/StringComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/StringConverter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/StringInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/StringUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ThreadFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/ValidatingResourceBundle.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/WrapperIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/AppendableException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ArrayCounter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ArrayListIdentity.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ArraySort.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ArrayUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/AsciiInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/AsciiOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/BasicTextJdkLogFormatter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/CharArrayWriter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ClosableByteArrayOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ClosableCharArrayWriter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/Collection.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/CountUpDownLatch.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/CountdownInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/DataOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/DoubleIntIndex.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/DoubleLongIndex.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/EventLogInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FileAccess.FileSync.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FileAccess.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FileAccessRes.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FileArchiver.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FileUtil.FileSync.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FileUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FilteredIterator.Filter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FilteredIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/FrameworkLogger.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlArrayHeap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlArrayList.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlByteArrayInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlByteArrayOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlConsoleHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlDeque.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlHeap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlTaskQueue.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/HsqlTimer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/InOutUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/InputStreamInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/InputStreamWrapper.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntIndex.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntKeyHashMapConcurrent.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntKeyIntValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntKeyLongValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntLookup.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/IntValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/Iterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/KMPSearchAlgorithm.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LineGroupReader.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LineReader.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/List.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LongDeque.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LongKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LongKeyIntValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LongKeyLongValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LongLookup.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/LongValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/Map.Entry.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/Map.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/MapEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/MultiValueHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/Notified.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ObjectComparator.DefaultComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ObjectComparator.IdentityComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ObjectComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/OrderedHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/OrderedHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/OrderedIntHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/OrderedIntKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/OrderedLongHashSet.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/OrderedLongKeyHashMap.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/PrimitiveIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ReadWriteLockDummy.LockDummy.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ReadWriteLockDummy.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ReaderInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/RefCapablePropertyResourceBundle.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/RefCapableRBInterface.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ScannerSearchAlgorithm.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/Set.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/SimpleLog.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/StopWatch.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/StringComparator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/StringConverter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/StringInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/StringUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ThreadFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/ValidatingResourceBundle.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/class-use/WrapperIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/DbBackup.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/DbBackupMain.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/PIFData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/PIFGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/RB.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarFileInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarFileOutputStream.Compression.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarFileOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarGeneratorMain.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarHeaderField.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarMalformatException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarReader.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/TarReaderMain.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/DbBackup.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/DbBackupMain.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/PIFData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/PIFGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/RB.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarFileInputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarFileOutputStream.Compression.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarFileOutputStream.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarGeneratorMain.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarHeaderField.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarMalformatException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarReader.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/class-use/TarReaderMain.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/lib/tar/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/HsqlServerFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/HsqlSocketFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/HsqlSocketFactorySecure.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/HsqlSocketRequestHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/OdbcUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/PgType.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/Server.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/ServerAcl.AclFormatException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/ServerAcl.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/ServerConfiguration.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/ServerConstants.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/ServerProperties.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/WebServer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/HsqlServerFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/HsqlSocketFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/HsqlSocketFactorySecure.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/HsqlSocketRequestHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/OdbcUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/PgType.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/Server.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/ServerAcl.AclFormatException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/ServerAcl.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/ServerConfiguration.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/ServerConstants.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/ServerProperties.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/class-use/WebServer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/server/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/trigger/Trigger.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/trigger/class-use/Trigger.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/trigger/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/trigger/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/trigger/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/CodeSwitcher.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/ConnectionSetting.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/DatabaseManager.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/DatabaseManagerSwing.DBMPrefs.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/DatabaseManagerSwing.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/MainInvoker.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/RCData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/TableSorter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/Transfer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/CodeSwitcher.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/ConnectionSetting.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/DatabaseManager.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/DatabaseManagerSwing.DBMPrefs.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/DatabaseManagerSwing.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/MainInvoker.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/RCData.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/TableSorter.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/class-use/Transfer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/org.hsqldb/org/hsqldb/util/package-use.html
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/package-list
-%%PORTDOCS%%%%DOCSDIR%%/apidocs/resources/inherit.gif
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/package-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/package-search-index.zip
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/resources/glass.png
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/resources/x.png
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/script.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/search.js
 %%PORTDOCS%%%%DOCSDIR%%/apidocs/serialized-form.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/type-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocs/type-search-index.zip
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/allclasses-index.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/allclasses.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/allpackages-index.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/constant-values.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/deprecated-list.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/element-list
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/help-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/hsqldbs.png
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/index.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/javadoc.css
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery-ui.overrides.css
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/external/jquery/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jquery-3.6.1.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jquery-ui.min.css
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jquery-ui.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jszip-utils/dist/jszip-utils-ie.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jszip-utils/dist/jszip-utils-ie.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jszip-utils/dist/jszip-utils.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jszip-utils/dist/jszip-utils.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jszip/dist/jszip.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/jquery/jszip/dist/jszip.min.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/legal/ADDITIONAL_LICENSE_INFO
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/legal/ASSEMBLY_EXCEPTION
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/legal/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/legal/jquery.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/legal/jqueryUI.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/legal/jszip.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/legal/pako.md
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/member-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/member-search-index.zip
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/module-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/module-search-index.zip
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/module-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/SqlFile.BadSpecial.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/SqlFile.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/SqlTool.SqlToolException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/SqlTool.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/SqlToolError.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/SqlToolSprayer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/SqltoolRB.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/class-use/SqlFile.BadSpecial.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/class-use/SqlFile.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/class-use/SqlTool.SqlToolException.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/class-use/SqlTool.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/class-use/SqlToolError.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/class-use/SqlToolSprayer.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/class-use/SqltoolRB.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/org.hsqldb.sqltool/org/hsqldb/cmdline/package-use.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/overview-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/package-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/package-search-index.zip
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/resources/glass.png
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/resources/x.png
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/script.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/search.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/serialized-form.html
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/type-search-index.js
+%%PORTDOCS%%%%DOCSDIR%%/apidocssqltool/type-search-index.zip
 %%PORTDOCS%%%%DOCSDIR%%/branding-frag.xhtml
 %%PORTDOCS%%%%DOCSDIR%%/changelist_2_0.txt
 %%PORTDOCS%%%%DOCSDIR%%/docbook.css
@@ -162,8 +484,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/guide/compatibility-chapt.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/dataaccess-chapt.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/databaseobjects-chapt.html
+%%PORTDOCS%%%%DOCSDIR%%/guide/dbfiles-app.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/dbproperties-chapt.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/deployment-chapt.html
+%%PORTDOCS%%%%DOCSDIR%%/guide/dsndef.png
+%%PORTDOCS%%%%DOCSDIR%%/guide/dsnoptions1.png
+%%PORTDOCS%%%%DOCSDIR%%/guide/dsnoptions2.png
 %%PORTDOCS%%%%DOCSDIR%%/guide/dummy.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/eclipse-gradle-cfg.png
 %%PORTDOCS%%%%DOCSDIR%%/guide/eclipse-gradle-invoke.png
@@ -175,6 +501,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/guide/listeners-chapt.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/lists-app.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/management-chapt.html
+%%PORTDOCS%%%%DOCSDIR%%/guide/odbc-chapt.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/openoffice-app.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/running-chapt.html
 %%PORTDOCS%%%%DOCSDIR%%/guide/sessions-chapt.html
@@ -263,6 +590,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/up.svg
 %%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/warning.svg
 %%PORTDOCS%%%%DOCSDIR%%/images/db/draft.png
+%%PORTDOCS%%%%DOCSDIR%%/images/db/draft.svg
 %%PORTDOCS%%%%DOCSDIR%%/images/db/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/db/home.png
 %%PORTDOCS%%%%DOCSDIR%%/images/db/home.svg
@@ -313,30 +641,38 @@
 %%PORTDOCS%%%%DOCSDIR%%/util-guide/transfer-tool-chapt.html
 %%PORTDOCS%%%%DOCSDIR%%/util-guide/util-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/util-guide/util-guide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/StartupParameters.plist
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/acl.txt
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/csv-sample.sql
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/dsv-sample.sql
-%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/hsqldb.cfg
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/hsqldb.conf
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/hsqldb.init
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/hsqldb.service
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/html-report.sql
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/j-sample.sql
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/jaas.cfg
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/ldap-exerciser.properties
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/load_binding_lu.sql
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/nullempty.sql
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/pl.sql
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/plsql.sql
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sample.c
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sample.dsv
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sample.php
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sample.pl
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sample.py
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sample.sql
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sampledata.sql
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/server.properties
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/sample/sqltool.rc
-%%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/Tokens.java
-%%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/Trigger.java
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/sample/SqlFileEmbedder.java
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/sample/Testdb.java
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/sample/TriggerSample.java
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/server/Servlet.java
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/server/WebServer.java
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/test/TestBase.java
+%%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/trigger/Trigger.java
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/testrun/sqltool/sqljrt.sql
 %%PORTDOCS%%%%DOCSDIR%%/verbatim/testrun/sqltool/sqlpsm.sql
 %%JAVAJARDIR%%/hsqldb.jar
-%%JAVAJARDIR%%/hsqljdbc.jar
 %%JAVAJARDIR%%/sqltool.jar
diff --git a/databases/kyotocabinet/Makefile b/databases/kyotocabinet/Makefile
index 55089b058f8b..540f015c6af0 100644
--- a/databases/kyotocabinet/Makefile
+++ b/databases/kyotocabinet/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kyotocabinet
 PORTVERSION=	1.2.80
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://dbmx.net/kyotocabinet/pkg/ \
 		LOCAL/sunpoet
@@ -27,6 +28,12 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lstdc++ ||g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile ${WRKSRC}/lab/kcdict/Makefile
+	@${REINPLACE_CMD} -e 's|-g0 -O2||g' \
+	    ${PATCH_WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-march=native||g' \
+	    ${PATCH_WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-m64 ||g' \
+	    ${PATCH_WRKSRC}/configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libkyotocabinet.so
diff --git a/databases/pspg/Makefile b/databases/pspg/Makefile
index d90b31385dec..f6c59b857b35 100644
--- a/databases/pspg/Makefile
+++ b/databases/pspg/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pspg
-DISTVERSION=	5.8.5
+DISTVERSION=	5.8.7
 CATEGORIES=	databases
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/databases/pspg/distinfo b/databases/pspg/distinfo
index c4b78e8d1363..ec19a9394bed 100644
--- a/databases/pspg/distinfo
+++ b/databases/pspg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746175853
-SHA256 (okbob-pspg-5.8.5_GH0.tar.gz) = c3ea7ed13bea1742b3619bce2e9bfd076e600c4db6b3d9bdb4e7469027766812
-SIZE (okbob-pspg-5.8.5_GH0.tar.gz) = 2445232
+TIMESTAMP = 1746604086
+SHA256 (okbob-pspg-5.8.7_GH0.tar.gz) = cbbd13898f321aab645569e32808dc3aa4c9529ea008b321f21e7a0d8360fcc9
+SIZE (okbob-pspg-5.8.7_GH0.tar.gz) = 2445765
diff --git a/databases/redis_exporter/Makefile b/databases/redis_exporter/Makefile
index f58a2beebf42..9618cc17be25 100644
--- a/databases/redis_exporter/Makefile
+++ b/databases/redis_exporter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	redis_exporter
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.70.0
+DISTVERSION=	1.71.0
 CATEGORIES=	databases
 
 MAINTAINER=	arcade@b1t.name
diff --git a/databases/redis_exporter/distinfo b/databases/redis_exporter/distinfo
index 2f2d15a903b8..1873e831155f 100644
--- a/databases/redis_exporter/distinfo
+++ b/databases/redis_exporter/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745917108
-SHA256 (go/databases_redis_exporter/redis_exporter-v1.70.0/v1.70.0.mod) = 2fc5b11ca3220a102223c9ffdfc8aaaedbc06cf1987befad0d88aa1bec4db29b
-SIZE (go/databases_redis_exporter/redis_exporter-v1.70.0/v1.70.0.mod) = 673
-SHA256 (go/databases_redis_exporter/redis_exporter-v1.70.0/v1.70.0.zip) = 21885d88ef713c5b523020330f119406946b3db98da78329b6cb12da7b6b37ea
-SIZE (go/databases_redis_exporter/redis_exporter-v1.70.0/v1.70.0.zip) = 126222
+TIMESTAMP = 1746623624
+SHA256 (go/databases_redis_exporter/redis_exporter-v1.71.0/v1.71.0.mod) = 7cb10da1caae2ca24030533b3d8ade6689fa156daee0dd1c004682d15ccac789
+SIZE (go/databases_redis_exporter/redis_exporter-v1.71.0/v1.71.0.mod) = 695
+SHA256 (go/databases_redis_exporter/redis_exporter-v1.71.0/v1.71.0.zip) = ae002f1ac6a05dd1846eb21e30a0d7286cac7d83c97d1ccc8952713f3274589a
+SIZE (go/databases_redis_exporter/redis_exporter-v1.71.0/v1.71.0.zip) = 127590
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index a4e49038bfd5..a9005234557a 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	squirrel-sql
-PORTVERSION=	4.7.1
+DISTVERSION=	4.8.0
 CATEGORIES=	databases java
-MASTER_SITES=	SF/${PORTNAME}/1-stable/${PORTVERSION}-plainzip
-DISTNAME=	squirrelsql-${PORTVERSION}-optional
+MASTER_SITES=	SF/${PORTNAME}/1-stable/${DISTVERSION}-plainzip
+DISTNAME=	squirrelsql-${DISTVERSION}-optional
 
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	Universal SQL Client
diff --git a/databases/squirrel-sql/distinfo b/databases/squirrel-sql/distinfo
index 26c4d61c453f..8f1aeae33675 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711051942
-SHA256 (squirrelsql-4.7.1-optional.zip) = efaf42e08fa9a8a8ab032bea13106d660ae1b9327ed97c7810ceff12a285a4d2
-SIZE (squirrelsql-4.7.1-optional.zip) = 54312644
+TIMESTAMP = 1746596022
+SHA256 (squirrelsql-4.8.0-optional.zip) = b707867f3b8b207c6317c8ce2a05d62c46f010a5f11d57398d99f5a1885bbde0
+SIZE (squirrelsql-4.8.0-optional.zip) = 54506667
diff --git a/databases/squirrel-sql/pkg-plist b/databases/squirrel-sql/pkg-plist
index db5cd871d5dc..2aa24d85f43d 100644
--- a/databases/squirrel-sql/pkg-plist
+++ b/databases/squirrel-sql/pkg-plist
@@ -95,7 +95,7 @@ bin/squirrel-sql
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-discovery.jar
 %%DATADIR%%/lib/commons-httpclient.jar
-%%DATADIR%%/lib/commons-lang3-3.12.0.jar
+%%DATADIR%%/lib/commons-lang3-3.14.0.jar
 %%DATADIR%%/lib/commons-logging-1.2.jar
 %%DATADIR%%/lib/dom4j-2.1.3.jar
 %%DATADIR%%/lib/jackson-annotations-2.6.3.jar
@@ -309,7 +309,7 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/laf/doc/tinylaf-license.txt
 %%DATADIR%%/plugins/laf/doc/tonic-licence.txt
 %%DATADIR%%/plugins/laf/lafs/JTattoo-1.6.10.jar
-%%DATADIR%%/plugins/laf/lafs/flatlaf-3.2.5.jar
+%%DATADIR%%/plugins/laf/lafs/flatlaf-3.4.1.jar
 %%DATADIR%%/plugins/laf/lafs/ilf-gpl.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-common-1.8.1.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-looks-2.5.3.jar
diff --git a/databases/xrootd/Makefile b/databases/xrootd/Makefile
index 517e1bad926e..d0e4124e86d7 100644
--- a/databases/xrootd/Makefile
+++ b/databases/xrootd/Makefile
@@ -19,6 +19,8 @@ BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtinyxml.so:textproc/tinyxml \
 		libuuid.so:misc/e2fsprogs-libuuid
+TEST_DEPENDS=	cppunit>0:devel/cppunit \
+		googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++14-lang cpe gnome localbase:ldflags pkgconfig readline shebangfix ssl
 SHEBANG_GLOB=	*.sh
@@ -36,6 +38,8 @@ CMAKE_TESTING_ON=	ENABLE_TESTS
 CXXFLAGS+=	-Ddirent64=dirent
 LDFLAGS+=	-lexecinfo
 
+TESTING_UNSAFE=	some tests hang on accept()
+
 OPTIONS_DEFINE=		KERBEROS5
 OPTIONS_GROUP=		PLUGINS
 OPTIONS_GROUP_PLUGINS=	MACAROONS XRDCLHTTP
diff --git a/deskutils/py-paperless-ngx/Makefile b/deskutils/py-paperless-ngx/Makefile
index 81cfedddab09..f8f9f1d7e468 100644
--- a/deskutils/py-paperless-ngx/Makefile
+++ b/deskutils/py-paperless-ngx/Makefile
@@ -1,8 +1,6 @@
 PORTNAME=	paperless-ngx
-PORTVERSION=	2.11.6
-PORTREVISION=	1
+PORTVERSION=	2.15.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/:webui \
 		GH:gh
@@ -16,53 +14,55 @@ WWW=		https://docs.paperless-ngx.com
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bleach>=6.1.0:www/py-bleach@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.6:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}bleach>=6.2.0:www/py-bleach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}concurrent-log-handler>=0.9.19:sysutils/py-concurrent-log-handler@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateparser>=1.1.4:devel/py-dateparser@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}channels-redis>=4.2.0:www/py-channels-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-allauth>=0.59.0:www/py-django-allauth@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-auditlog>=2.3.0:www/py-django-auditlog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-celery-results>=2.5.1:www/py-django-celery-results@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-compression-middleware>=0.5.0:www/py-django-compression-middleware@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-cors-headers>=4.3.1:www/py-django-cors-headers@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-extensions>=3.2.3:www/py-django-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-filter>=23.5:www/py-django-filter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-multiselectfield>=0.1.12:www/py-django-multiselectfield@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-soft-delete>=1.0.15:www/py-django-soft-delete@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}djangorestframework-guardian>=0.3.0:www/py-djangorestframework-guardian@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}drf-writable-nested>=0.7.0:www/py-drf-writable-nested@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}filelock>=3.13.1:sysutils/py-filelock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateparser>=1.2.1:devel/py-dateparser@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-channels-redis>=4.2.1:www/py-dj51-channels-redis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-allauth>=65.7.0_1:www/py-dj51-django-allauth@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-auditlog>=3.0.0:www/py-dj51-django-auditlog@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-celery-results>=2.6.0:www/py-dj51-django-celery-results@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-compression-middleware>=0.5.0:www/py-dj51-django-compression-middleware@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-cors-headers>=4.7.0:www/py-dj51-django-cors-headers@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-extensions>=3.2.3:www/py-dj51-django-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-filter>=25.1:www/py-dj51-django-filter@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-multiselectfield>=0.1.13:www/py-dj51-django-multiselectfield@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-soft-delete>=1.0.16:www/py-dj51-django-soft-delete@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-djangorestframework-guardian>=0.3.0:www/py-dj51-djangorestframework-guardian@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-drf-spectacular>=0.28.0:www/py-dj51-drf-spectacular@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-drf-writable-nested>=0.7.2:www/py-dj51-drf-writable-nested@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}filelock>=3.17.0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flower>=2.0.1:www/py-flower@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gotenberg-client>=0.5.0:converters/py-gotenberg-client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gunicorn>=21.2.0:www/py-gunicorn@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gotenberg-client>=0.10.0:converters/py-gotenberg-client@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}granian>=2.2.5:www/py-granian@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h2>=4.1.0:www/py-h2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}hiredis>=2.0.0:databases/py-hiredis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}httptools>=0.6.1:www/py-httptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}imap-tools>=1.5.0:mail/py-imap-tools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}inotifyrecursive>=0.3.5_1:devel/py-inotifyrecursive@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hiredis>=3.0.0:databases/py-hiredis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httptools>=0.6.4:www/py-httptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httpx-oauth>=0.10.1:www/py-httpx-oauth@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}imap-tools>=1.10.0:mail/py-imap-tools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}inotifyrecursive>=0.3.5_2:devel/py-inotifyrecursive@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}langdetect>=1.0.9:textproc/py-langdetect@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mysqlclient>=2.2.1:databases/py-mysqlclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mysqlclient>=2.2.7:databases/py-mysqlclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.8.1:textproc/py-nltk@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ocrmypdf>=15.4.4:textproc/py-ocrmypdf@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pathvalidate>=3.2.0:devel/py-pathvalidate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ocrmypdf>=16.10.0:textproc/py-ocrmypdf@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pathvalidate>=3.2.3:devel/py-pathvalidate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdf2image>=1.17.0:graphics/py-pdf2image@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pdftotext>=2.2.2:textproc/py-pdftotext@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.9:databases/py-psycopg2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-dotenv>=1.0.0:www/py-python-dotenv@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pdftotext>=3.0.0:textproc/py-pdftotext@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.10:databases/py-psycopg2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dotenv>=1.1.0:www/py-python-dotenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.5.1:security/py-python-gnupg@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-ipware>=2.0.1:net/py-python-ipware@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-ipware>=2.0.3:net/py-python-ipware@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-magic>=0.4.27:devel/py-python-magic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzbar>=0.1.9:graphics/py-pyzbar@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}rapidfuzz>=3.6.1:devel/py-rapidfuzz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}rapidfuzz>=3.13.0:devel/py-rapidfuzz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.4.0:science/py-scikit-learn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.3.2:devel/py-setproctitle@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.3.3:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tika-client>=0.5.0:textproc/py-tika-client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}uvicorn>=0.25.0:www/py-uvicorn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}uvloop>=0.17.0:devel/py-uvloop@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}watchdog>=4.0.0:devel/py-watchdog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}watchfiles>=0.21.0:devel/py-watchfiles@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}websockets>=12.0:devel/py-websockets@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tika-client>=0.7.0:textproc/py-tika-client@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}uvloop>=0.21.0:devel/py-uvloop@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}watchdog>=6.0.0:devel/py-watchdog@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}watchfiles>=0.24.0:devel/py-watchfiles@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}websockets>=15.0.1:devel/py-websockets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whitenoise>=6.2.0:www/py-whitenoise@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whoosh>=2.7.4:textproc/py-whoosh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0.1:devel/py-pyyaml@${PY_FLAVOR}
@@ -131,9 +131,6 @@ do-build:
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-x ".*/tests/" \
 		-f ${WRKSRC}/src
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		-d ${PYTHONPREFIX_SITELIBDIR} \
-		-f ${WRKSRC}/gunicorn.conf.py
 	@${RM} -r ${PAPERLESS_STATICDIR}
 	@${SETENV} \
 		PAPERLESS_STATICDIR=${PAPERLESS_STATICDIR} \
@@ -145,8 +142,6 @@ do-install:
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/src && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} gunicorn.conf.py \
-		${STAGEDIR}${PYTHON_SITELIBDIR}/paperless
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.orig' -delete
 	@cd ${WRKDIR} && ${INSTALL_SCRIPT} paperless ${STAGEDIR}${PREFIX}/bin
 	@${SED} -e 's|%%WWWDIR%%|${WWWDIR}|g;' \
diff --git a/deskutils/py-paperless-ngx/distinfo b/deskutils/py-paperless-ngx/distinfo
index c5534161743b..346cca0f3972 100644
--- a/deskutils/py-paperless-ngx/distinfo
+++ b/deskutils/py-paperless-ngx/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1732099623
-SHA256 (paperless-ngx-v2.11.6.tar.xz) = 50b57e95d5e5d84f676f361f15d972866f4d3ad98d2aed81a433b31ee4e3e7ca
-SIZE (paperless-ngx-v2.11.6.tar.xz) = 63969744
-SHA256 (paperless-ngx-paperless-ngx-v2.11.6_GH0.tar.gz) = a12c30f8630f79d1e548f2e4f419cc443b7b99b396e1dff907c36a39e88e867a
-SIZE (paperless-ngx-paperless-ngx-v2.11.6_GH0.tar.gz) = 48771241
+TIMESTAMP = 1746350043
+SHA256 (paperless-ngx-v2.15.3.tar.xz) = 20cd5961b1f91bde5cb6743ae8eb7f8fd98d66ba67d49d5ab030d87c998ac2d1
+SIZE (paperless-ngx-v2.15.3.tar.xz) = 78329260
+SHA256 (paperless-ngx-paperless-ngx-v2.15.3_GH0.tar.gz) = 0c471d082ee03e94bf2b139bfadb98e758f94d17850e56966ef1793b1f1b7ee0
+SIZE (paperless-ngx-paperless-ngx-v2.15.3_GH0.tar.gz) = 49573227
diff --git a/deskutils/py-paperless-ngx/files/paperless-webui.in b/deskutils/py-paperless-ngx/files/paperless-webui.in
index 5dc08ee981c6..490fe3200364 100755
--- a/deskutils/py-paperless-ngx/files/paperless-webui.in
+++ b/deskutils/py-paperless-ngx/files/paperless-webui.in
@@ -77,9 +77,8 @@ command_args="-cS -u ${paperless_webui_daemon_user} \
 	-s ${paperless_webui_log_priority} \
 	-T ${paperless_webui_log_tag} \
 	-R ${paperless_webui_restart_delay} \
-	%%PREFIX%%/bin/gunicorn \
-	-c %%PYTHONPREFIX_SITELIBDIR%%/paperless/gunicorn.conf.py \
-	paperless.asgi:application"
+	%%PREFIX%%/bin/granian --interface asginl \
+	--ws --loop uvloop paperless.asgi:application"
 
 paperless_webui_prestart()
 {
diff --git a/deskutils/py-paperless-ngx/files/patch-gunicorn.conf.py b/deskutils/py-paperless-ngx/files/patch-gunicorn.conf.py
deleted file mode 100644
index e9cf70f82259..000000000000
--- a/deskutils/py-paperless-ngx/files/patch-gunicorn.conf.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- gunicorn.conf.py.orig	2024-02-18 20:13:15 UTC
-+++ gunicorn.conf.py
-@@ -11,7 +11,7 @@ timeout = 120
- preload_app = True
- 
- # https://docs.gunicorn.org/en/stable/faq.html#blocking-os-fchmod
--worker_tmp_dir = "/dev/shm"
-+worker_tmp_dir = "/tmp"
- 
- 
- def pre_fork(server, worker):
diff --git a/deskutils/py-paperless-ngx/files/patch-src_documents_management_commands_document__consumer.py b/deskutils/py-paperless-ngx/files/patch-src_documents_management_commands_document__consumer.py
index 6d42eced1f3c..7ce264a9831f 100644
--- a/deskutils/py-paperless-ngx/files/patch-src_documents_management_commands_document__consumer.py
+++ b/deskutils/py-paperless-ngx/files/patch-src_documents_management_commands_document__consumer.py
@@ -1,4 +1,4 @@
---- src/documents/management/commands/document_consumer.py.orig	2024-03-18 03:45:09 UTC
+--- src/documents/management/commands/document_consumer.py.orig	2025-04-19 22:34:42 UTC
 +++ src/documents/management/commands/document_consumer.py
 @@ -292,7 +292,7 @@ class Command(BaseCommand):
              logger.debug(f"Configuring timeout to {timeout_ms}ms")
@@ -7,5 +7,5 @@
 -        inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO | flags.MODIFY
 +        inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO | flags.MODIFY | flags.CREATE
          if recursive:
-             descriptor = inotify.add_watch_recursive(directory, inotify_flags)
+             inotify.add_watch_recursive(directory, inotify_flags)
          else:
diff --git a/deskutils/py-paperless-ngx/files/patch-src_paperless__mail_parsers.py b/deskutils/py-paperless-ngx/files/patch-src_paperless__mail_parsers.py
new file mode 100644
index 000000000000..d10bc4241194
--- /dev/null
+++ b/deskutils/py-paperless-ngx/files/patch-src_paperless__mail_parsers.py
@@ -0,0 +1,43 @@
+--- src/paperless_mail/parsers.py.orig	2025-04-19 22:34:42 UTC
++++ src/paperless_mail/parsers.py
+@@ -8,8 +8,8 @@ from django.conf import settings
+ from django.utils.timezone import is_naive
+ from django.utils.timezone import make_aware
+ from gotenberg_client import GotenbergClient
+-from gotenberg_client.options import MarginType
+-from gotenberg_client.options import MarginUnitType
++from gotenberg_client.options import Measurement
++from gotenberg_client.options import MeasurementUnitType
+ from gotenberg_client.options import PageMarginsType
+ from gotenberg_client.options import PageSize
+ from gotenberg_client.options import PdfAFormat
+@@ -370,10 +370,10 @@ class MailDocumentParser(DocumentParser):
+                     .resource(css_file)
+                     .margins(
+                         PageMarginsType(
+-                            top=MarginType(0.1, MarginUnitType.Inches),
+-                            bottom=MarginType(0.1, MarginUnitType.Inches),
+-                            left=MarginType(0.1, MarginUnitType.Inches),
+-                            right=MarginType(0.1, MarginUnitType.Inches),
++                            top=Measurement(0.1, MeasurementUnitType.Inches),
++                            bottom=Measurement(0.1, MeasurementUnitType.Inches),
++                            left=Measurement(0.1, MeasurementUnitType.Inches),
++                            right=Measurement(0.1, MeasurementUnitType.Inches),
+                         ),
+                     )
+                     .size(PageSize(height=11.7, width=8.27))
+@@ -452,10 +452,10 @@ class MailDocumentParser(DocumentParser):
+             # Set page size, margins
+             route.margins(
+                 PageMarginsType(
+-                    top=MarginType(0.1, MarginUnitType.Inches),
+-                    bottom=MarginType(0.1, MarginUnitType.Inches),
+-                    left=MarginType(0.1, MarginUnitType.Inches),
+-                    right=MarginType(0.1, MarginUnitType.Inches),
++                    top=Measurement(0.1, MeasurementUnitType.Inches),
++                    bottom=Measurement(0.1, MeasurementUnitType.Inches),
++                    left=Measurement(0.1, MeasurementUnitType.Inches),
++                    right=Measurement(0.1, MeasurementUnitType.Inches),
+                 ),
+             ).size(
+                 PageSize(height=11.7, width=8.27),
diff --git a/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py b/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py
index cb5180ea81a2..0631a458caf6 100644
--- a/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py
+++ b/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py
@@ -1,6 +1,6 @@
---- src/paperless/settings.py.orig	2024-03-18 03:45:09 UTC
+--- src/paperless/settings.py.orig	2025-04-19 22:34:42 UTC
 +++ src/paperless/settings.py
-@@ -24,8 +24,6 @@ if configuration_path and os.path.exists(configuration
+@@ -21,8 +21,6 @@ if configuration_path and os.path.exists(configuration
      load_dotenv(configuration_path)
  elif os.path.exists("../paperless.conf"):
      load_dotenv("../paperless.conf")
@@ -9,16 +9,16 @@
  elif os.path.exists("/usr/local/etc/paperless.conf"):
      load_dotenv("/usr/local/etc/paperless.conf")
  
-@@ -254,7 +252,7 @@ THUMBNAIL_DIR = MEDIA_ROOT / "documents" / "thumbnails
+@@ -267,7 +265,7 @@ THUMBNAIL_DIR = MEDIA_ROOT / "documents" / "thumbnails
  
  DATA_DIR = __get_path("PAPERLESS_DATA_DIR", BASE_DIR.parent / "data")
  
 -NLTK_DIR = __get_path("PAPERLESS_NLTK_DIR", "/usr/share/nltk_data")
 +NLTK_DIR = __get_path("PAPERLESS_NLTK_DIR", "/usr/local/share/nltk_data")
  
- TRASH_DIR = os.getenv("PAPERLESS_TRASH_DIR")
- 
-@@ -1031,7 +1029,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean(
+ # Check deprecated setting first
+ EMPTY_TRASH_DIR = os.getenv(
+@@ -1106,7 +1104,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean(
  
  THUMBNAIL_FONT_NAME = os.getenv(
      "PAPERLESS_THUMBNAIL_FONT_NAME",
diff --git a/deskutils/py-paperless-ngx/files/pkg-message.in b/deskutils/py-paperless-ngx/files/pkg-message.in
index d76964202b9a..2abb73ca7ab0 100644
--- a/deskutils/py-paperless-ngx/files/pkg-message.in
+++ b/deskutils/py-paperless-ngx/files/pkg-message.in
@@ -14,6 +14,12 @@ the sample configuration installed by the package:
 
 Then merge in changes as required by editing
 %%PREFIX%%/etc/paperless.conf.
+
+Database migrations are run automatically on service start, but
+it's recommended to run them explicitly, especially on major upgrades:
+
+    service paperless-migrate onestart
+
 EOM
 }
 { type: upgrade
diff --git a/deskutils/py-paperless-ngx/pkg-plist b/deskutils/py-paperless-ngx/pkg-plist
index 324c3449420d..2f355fc45641 100644
--- a/deskutils/py-paperless-ngx/pkg-plist
+++ b/deskutils/py-paperless-ngx/pkg-plist
@@ -41,6 +41,8 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/index%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/loggers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/loggers%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/mail%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/mail%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/matching%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/matching%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/models%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -51,6 +53,8 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/permissions%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/sanity_checker%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/sanity_checker%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/schema%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/schema%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/serialisers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/serialisers%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/__pycache__/settings%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -81,12 +85,15 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/filters.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/index.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/loggers.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/mail.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/__init__.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__init__.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/convert_mariadb_uuid%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/convert_mariadb_uuid%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/decrypt_documents%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/decrypt_documents%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/document_archiver%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -117,6 +124,9 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/manage_superuser%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/mixins%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/mixins%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/prune_audit_logs%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/__pycache__/prune_audit_logs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/convert_mariadb_uuid.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/decrypt_documents.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/document_archiver.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/document_consumer.py
@@ -132,6 +142,7 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/loaddata_stdin.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/manage_superuser.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/mixins.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/management/commands/prune_audit_logs.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/matching.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/0001_initial.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/0002_auto_20151226_1316.py
@@ -216,6 +227,19 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1050_customfield_extra_data_and_more.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1051_alter_correspondent_owner_alter_document_owner_and_more.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1052_document_transaction_id.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1053_document_page_count.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1054_customfieldinstance_value_monetary_amount_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1055_alter_storagepath_path.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1056_customfieldinstance_deleted_at_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1057_paperlesstask_owner.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1058_workflowtrigger_schedule_date_custom_field_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1059_workflowactionemail_workflowactionwebhook_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1060_alter_customfieldinstance_value_select.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1061_workflowactionwebhook_as_json.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1062_alter_savedviewfilterrule_rule_type.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1063_paperlesstask_type_alter_paperlesstask_task_name_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1064_delete_log.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1065_workflowaction_assign_custom_fields_values.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__init__.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.pyc
@@ -383,6 +407,32 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1051_alter_correspondent_owner_alter_document_owner_and_more%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1052_document_transaction_id%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1052_document_transaction_id%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1053_document_page_count%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1053_document_page_count%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1054_customfieldinstance_value_monetary_amount_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1054_customfieldinstance_value_monetary_amount_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1055_alter_storagepath_path%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1055_alter_storagepath_path%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1056_customfieldinstance_deleted_at_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1056_customfieldinstance_deleted_at_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1057_paperlesstask_owner%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1057_paperlesstask_owner%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1058_workflowtrigger_schedule_date_custom_field_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1058_workflowtrigger_schedule_date_custom_field_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1059_workflowactionemail_workflowactionwebhook_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1059_workflowactionemail_workflowactionwebhook_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1060_alter_customfieldinstance_value_select%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1060_alter_customfieldinstance_value_select%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1061_workflowactionwebhook_as_json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1061_workflowactionwebhook_as_json%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1062_alter_savedviewfilterrule_rule_type%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1062_alter_savedviewfilterrule_rule_type%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1063_paperlesstask_type_alter_paperlesstask_task_name_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1063_paperlesstask_type_alter_paperlesstask_task_name_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1064_delete_log%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1064_delete_log%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1065_workflowaction_assign_custom_fields_values%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1065_workflowaction_assign_custom_fields_values%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/documents/models.py
@@ -399,6 +449,7 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/plugins/helpers.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/resources/document.webp
 %%PYTHON_SITELIBDIR%%/paperless/documents/sanity_checker.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/schema.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/serialisers.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/settings.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/signals/__init__.py
@@ -410,6 +461,7 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/static/base.css
 %%PYTHON_SITELIBDIR%%/paperless/documents/static/bootstrap.min.css
 %%PYTHON_SITELIBDIR%%/paperless/documents/tasks.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/account_inactive.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/email/base_message.txt
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/login.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/password_reset.html
@@ -418,12 +470,25 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/password_reset_from_key_done.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/signup.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/index.html
+%%PYTHON_SITELIBDIR%%/paperless/documents/templates/mfa/authenticate.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/paperless-ngx/base.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/paperless-ngx/snippets/svg_leaf.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/paperless-ngx/snippets/svg_logo.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/socialaccount/authentication_error.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/socialaccount/login.html
 %%PYTHON_SITELIBDIR%%/paperless/documents/templates/socialaccount/signup.html
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__init__.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/filepath%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/filepath%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/workflows%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/__pycache__/workflows%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/filepath.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/utils.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/templating/workflows.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/conftest.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/data/v1.17.4.model.pickle
@@ -465,6 +530,8 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/documents/thumbnails/0000004.webp.gpg
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/double-sided-even.pdf
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/double-sided-odd.pdf
+%%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/eml_with_umlaut.eml
+%%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/invalid_pdf.pdf
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/password-is-test.pdf
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/simple-noalpha.png
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/samples/simple.jpg
@@ -480,10 +547,12 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_bulk_edit.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_custom_fields.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_documents.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_filter_by_custom_fields.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_objects.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_permissions.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_profile.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_remote_version.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_schema.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_search.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_status.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_tasks.py
@@ -512,10 +581,13 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_matchables.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_archive_files.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_consumption_templates.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_custom_field_selects.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_customfields.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_document_pages_count.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_encrypted_webp_conversion.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_mime_type.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_remove_null_characters.py
+%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_storage_path_template.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_tag_colors.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_webp_conversion.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_migration_workflows.py
@@ -530,7 +602,6 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/documents/utils.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/validators.py
 %%PYTHON_SITELIBDIR%%/paperless/documents/views.py
-%%PYTHON_SITELIBDIR%%/paperless/gunicorn.conf.py
 %%PYTHON_SITELIBDIR%%/paperless/locale/af_ZA/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/ar_AR/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/be_BY/LC_MESSAGES/django.po
@@ -543,6 +614,7 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/locale/en_GB/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/en_US/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/es_ES/LC_MESSAGES/django.po
+%%PYTHON_SITELIBDIR%%/paperless/locale/et_EE/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/fi_FI/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/fr_FR/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/he_IL/LC_MESSAGES/django.po
@@ -555,6 +627,7 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/locale/ko_KR/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/la_LA/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/lb_LU/LC_MESSAGES/django.po
+%%PYTHON_SITELIBDIR%%/paperless/locale/lt_LT/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/lv_LV/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/ms_MY/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/paperless/locale/nb_NO/LC_MESSAGES/django.po
@@ -582,6 +655,8 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/adapter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/adapter%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/admin%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/admin%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/apps%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/apps%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/asgi%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -616,11 +691,10 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/version%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/views%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/views%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/workers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/workers%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/wsgi%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/__pycache__/wsgi%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless/adapter.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless/admin.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless/apps.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless/asgi.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless/auth.py
@@ -661,7 +735,6 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless/urls.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless/version.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless/views.py
-%%PYTHON_SITELIBDIR%%/paperless/paperless/workers.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless/wsgi.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__init__.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -674,8 +747,12 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/mail%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/models%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/models%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/oauth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/oauth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/parsers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/parsers%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/preprocessor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/preprocessor%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/serialisers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/serialisers%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/__pycache__/signals%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -724,6 +801,10 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/0023_remove_mailrule_filter_attachment_filename_and_more.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/0024_alter_mailrule_name_and_more.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/0025_alter_mailaccount_owner_alter_mailrule_owner_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/0026_mailrule_enabled.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/0027_mailaccount_expiration_mailaccount_account_type_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/0028_alter_mailaccount_password_and_more.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/0029_mailrule_pdf_layout.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__init__.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.pyc
@@ -781,10 +862,20 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0024_alter_mailrule_name_and_more%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0025_alter_mailaccount_owner_alter_mailrule_owner_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0025_alter_mailaccount_owner_alter_mailrule_owner_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0026_mailrule_enabled%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0026_mailrule_enabled%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0027_mailaccount_expiration_mailaccount_account_type_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0027_mailaccount_expiration_mailaccount_account_type_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0028_alter_mailaccount_password_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0028_alter_mailaccount_password_and_more%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0029_mailrule_pdf_layout%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/0029_mailrule_pdf_layout%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/models.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/oauth.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/parsers.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/preprocessor.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/serialisers.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/signals.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tasks.py
@@ -813,8 +904,10 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tests/test_api.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tests/test_live_mail.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tests/test_mail.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tests/test_mail_oauth.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tests/test_parsers.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tests/test_parsers_live.py
+%%PYTHON_SITELIBDIR%%/paperless/paperless_mail/tests/test_preprocessor.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_mail/views.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_tesseract/__init__.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_tesseract/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -894,7 +987,6 @@ bin/paperless
 %%PYTHON_SITELIBDIR%%/paperless/paperless_tika/tests/samples/sample.odt
 %%PYTHON_SITELIBDIR%%/paperless/paperless_tika/tests/test_live_tika.py
 %%PYTHON_SITELIBDIR%%/paperless/paperless_tika/tests/test_tika_parser.py
-%%PYTHON_SITELIBDIR%%/paperless/setup.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sshd_config
@@ -950,6 +1042,9 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/admin/css/rtl.css
 %%WWWDIR%%/static/admin/css/rtl.css.br
 %%WWWDIR%%/static/admin/css/rtl.css.gz
+%%WWWDIR%%/static/admin/css/unusable_password_field.css
+%%WWWDIR%%/static/admin/css/unusable_password_field.css.br
+%%WWWDIR%%/static/admin/css/unusable_password_field.css.gz
 %%WWWDIR%%/static/admin/css/vendor/select2/LICENSE-SELECT2.md
 %%WWWDIR%%/static/admin/css/vendor/select2/LICENSE-SELECT2.md.br
 %%WWWDIR%%/static/admin/css/vendor/select2/LICENSE-SELECT2.md.gz
@@ -995,6 +1090,9 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/admin/img/icon-deletelink.svg
 %%WWWDIR%%/static/admin/img/icon-deletelink.svg.br
 %%WWWDIR%%/static/admin/img/icon-deletelink.svg.gz
+%%WWWDIR%%/static/admin/img/icon-hidelink.svg
+%%WWWDIR%%/static/admin/img/icon-hidelink.svg.br
+%%WWWDIR%%/static/admin/img/icon-hidelink.svg.gz
 %%WWWDIR%%/static/admin/img/icon-no.svg
 %%WWWDIR%%/static/admin/img/icon-no.svg.br
 %%WWWDIR%%/static/admin/img/icon-no.svg.gz
@@ -1055,9 +1153,6 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/admin/js/change_form.js
 %%WWWDIR%%/static/admin/js/change_form.js.br
 %%WWWDIR%%/static/admin/js/change_form.js.gz
-%%WWWDIR%%/static/admin/js/collapse.js
-%%WWWDIR%%/static/admin/js/collapse.js.br
-%%WWWDIR%%/static/admin/js/collapse.js.gz
 %%WWWDIR%%/static/admin/js/core.js
 %%WWWDIR%%/static/admin/js/core.js.br
 %%WWWDIR%%/static/admin/js/core.js.gz
@@ -1085,6 +1180,9 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/admin/js/theme.js
 %%WWWDIR%%/static/admin/js/theme.js.br
 %%WWWDIR%%/static/admin/js/theme.js.gz
+%%WWWDIR%%/static/admin/js/unusable_password_field.js
+%%WWWDIR%%/static/admin/js/unusable_password_field.js.br
+%%WWWDIR%%/static/admin/js/unusable_password_field.js.gz
 %%WWWDIR%%/static/admin/js/urlify.js
 %%WWWDIR%%/static/admin/js/urlify.js.br
 %%WWWDIR%%/static/admin/js/urlify.js.gz
@@ -1311,17 +1409,51 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/django_extensions/js/jquery.bgiframe.js
 %%WWWDIR%%/static/django_extensions/js/jquery.bgiframe.js.br
 %%WWWDIR%%/static/django_extensions/js/jquery.bgiframe.js.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.LICENSE.txt
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.LICENSE.txt.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.LICENSE.txt.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.map
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.map.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/redoc/bundles/redoc.standalone.js.map.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/favicon-32x32.png
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/oauth2-redirect.html
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/oauth2-redirect.html.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/oauth2-redirect.html.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.LICENSE.txt
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.LICENSE.txt.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.LICENSE.txt.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.map
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.map.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-bundle.js.map.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-standalone-preset.js
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-standalone-preset.js.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-standalone-preset.js.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-standalone-preset.js.map
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-standalone-preset.js.map.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui-standalone-preset.js.map.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui.css
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui.css.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui.css.gz
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui.css.map
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui.css.map.br
+%%WWWDIR%%/static/drf_spectacular_sidecar/swagger-ui-dist/swagger-ui.css.map.gz
 %%WWWDIR%%/static/frontend/af-ZA/3rdpartylicenses.txt
 %%WWWDIR%%/static/frontend/af-ZA/3rdpartylicenses.txt.br
 %%WWWDIR%%/static/frontend/af-ZA/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/af-ZA/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/af-ZA/assets/document.png
-%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/af-ZA/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/af-ZA/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/af-ZA/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/af-ZA/assets/logo-dark-notext.svg.gz
@@ -1363,12 +1495,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/ar-AR/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/ar-AR/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/ar-AR/assets/document.png
-%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/ar-AR/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/ar-AR/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/ar-AR/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/ar-AR/assets/logo-dark-notext.svg.gz
@@ -1410,12 +1542,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/be-BY/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/be-BY/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/be-BY/assets/document.png
-%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/be-BY/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/be-BY/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/be-BY/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/be-BY/assets/logo-dark-notext.svg.gz
@@ -1457,12 +1589,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/bg-BG/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/bg-BG/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/bg-BG/assets/document.png
-%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/bg-BG/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/bg-BG/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/bg-BG/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/bg-BG/assets/logo-dark-notext.svg.gz
@@ -1504,12 +1636,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/ca-ES/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/ca-ES/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/ca-ES/assets/document.png
-%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/ca-ES/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/ca-ES/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/ca-ES/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/ca-ES/assets/logo-dark-notext.svg.gz
@@ -1551,12 +1683,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/cs-CZ/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/cs-CZ/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/cs-CZ/assets/document.png
-%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/cs-CZ/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/cs-CZ/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/cs-CZ/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/cs-CZ/assets/logo-dark-notext.svg.gz
@@ -1598,12 +1730,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/da-DK/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/da-DK/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/da-DK/assets/document.png
-%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/da-DK/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/da-DK/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/da-DK/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/da-DK/assets/logo-dark-notext.svg.gz
@@ -1645,12 +1777,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/de-DE/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/de-DE/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/de-DE/assets/document.png
-%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/de-DE/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/de-DE/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/de-DE/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/de-DE/assets/logo-dark-notext.svg.gz
@@ -1692,12 +1824,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/el-GR/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/el-GR/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/el-GR/assets/document.png
-%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/el-GR/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/el-GR/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/el-GR/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/el-GR/assets/logo-dark-notext.svg.gz
@@ -1739,12 +1871,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/en-GB/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/en-GB/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/en-GB/assets/document.png
-%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/en-GB/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/en-GB/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/en-GB/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/en-GB/assets/logo-dark-notext.svg.gz
@@ -1786,12 +1918,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/en-US/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/en-US/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/en-US/assets/document.png
-%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/en-US/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/en-US/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/en-US/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/en-US/assets/logo-dark-notext.svg.gz
@@ -1833,12 +1965,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/es-ES/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/es-ES/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/es-ES/assets/document.png
-%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/es-ES/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/es-ES/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/es-ES/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/es-ES/assets/logo-dark-notext.svg.gz
@@ -1880,12 +2012,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/fi-FI/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/fi-FI/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/fi-FI/assets/document.png
-%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/fi-FI/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/fi-FI/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/fi-FI/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/fi-FI/assets/logo-dark-notext.svg.gz
@@ -1927,12 +2059,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/fr-FR/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/fr-FR/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/fr-FR/assets/document.png
-%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/fr-FR/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/fr-FR/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/fr-FR/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/fr-FR/assets/logo-dark-notext.svg.gz
@@ -1974,12 +2106,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/hu-HU/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/hu-HU/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/hu-HU/assets/document.png
-%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/hu-HU/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/hu-HU/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/hu-HU/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/hu-HU/assets/logo-dark-notext.svg.gz
@@ -2021,12 +2153,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/it-IT/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/it-IT/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/it-IT/assets/document.png
-%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/it-IT/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/it-IT/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/it-IT/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/it-IT/assets/logo-dark-notext.svg.gz
@@ -2068,12 +2200,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/ja-JP/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/ja-JP/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/ja-JP/assets/document.png
-%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/ja-JP/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/ja-JP/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/ja-JP/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/ja-JP/assets/logo-dark-notext.svg.gz
@@ -2110,17 +2242,64 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/ja-JP/styles.css
 %%WWWDIR%%/static/frontend/ja-JP/styles.css.br
 %%WWWDIR%%/static/frontend/ja-JP/styles.css.gz
+%%WWWDIR%%/static/frontend/ko-KR/3rdpartylicenses.txt
+%%WWWDIR%%/static/frontend/ko-KR/3rdpartylicenses.txt.br
+%%WWWDIR%%/static/frontend/ko-KR/3rdpartylicenses.txt.gz
+%%WWWDIR%%/static/frontend/ko-KR/apple-touch-icon.png
+%%WWWDIR%%/static/frontend/ko-KR/assets/document.png
+%%WWWDIR%%/static/frontend/ko-KR/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/ko-KR/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/ko-KR/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/ko-KR/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/ko-KR/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/ko-KR/assets/js/pdf.worker.min.mjs.gz
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-dark-notext.svg
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-dark-notext.svg.br
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-dark-notext.svg.gz
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-dark.svg
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-dark.svg.br
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-dark.svg.gz
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-notext.svg
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-notext.svg.br
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-notext.svg.gz
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-white-notext.svg
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-white-notext.svg.br
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo-white-notext.svg.gz
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo.svg
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo.svg.br
+%%WWWDIR%%/static/frontend/ko-KR/assets/logo.svg.gz
+%%WWWDIR%%/static/frontend/ko-KR/favicon.ico
+%%WWWDIR%%/static/frontend/ko-KR/favicon.ico.br
+%%WWWDIR%%/static/frontend/ko-KR/favicon.ico.gz
+%%WWWDIR%%/static/frontend/ko-KR/index.html
+%%WWWDIR%%/static/frontend/ko-KR/index.html.br
+%%WWWDIR%%/static/frontend/ko-KR/index.html.gz
+%%WWWDIR%%/static/frontend/ko-KR/main.js
+%%WWWDIR%%/static/frontend/ko-KR/main.js.br
+%%WWWDIR%%/static/frontend/ko-KR/main.js.gz
+%%WWWDIR%%/static/frontend/ko-KR/manifest.webmanifest
+%%WWWDIR%%/static/frontend/ko-KR/manifest.webmanifest.br
+%%WWWDIR%%/static/frontend/ko-KR/manifest.webmanifest.gz
+%%WWWDIR%%/static/frontend/ko-KR/polyfills.js
+%%WWWDIR%%/static/frontend/ko-KR/polyfills.js.br
+%%WWWDIR%%/static/frontend/ko-KR/polyfills.js.gz
+%%WWWDIR%%/static/frontend/ko-KR/runtime.js
+%%WWWDIR%%/static/frontend/ko-KR/runtime.js.br
+%%WWWDIR%%/static/frontend/ko-KR/runtime.js.gz
+%%WWWDIR%%/static/frontend/ko-KR/styles.css
+%%WWWDIR%%/static/frontend/ko-KR/styles.css.br
+%%WWWDIR%%/static/frontend/ko-KR/styles.css.gz
 %%WWWDIR%%/static/frontend/lb-LU/3rdpartylicenses.txt
 %%WWWDIR%%/static/frontend/lb-LU/3rdpartylicenses.txt.br
 %%WWWDIR%%/static/frontend/lb-LU/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/lb-LU/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/lb-LU/assets/document.png
-%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/lb-LU/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/lb-LU/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/lb-LU/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/lb-LU/assets/logo-dark-notext.svg.gz
@@ -2162,12 +2341,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/nl-NL/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/nl-NL/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/nl-NL/assets/document.png
-%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/nl-NL/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/nl-NL/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/nl-NL/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/nl-NL/assets/logo-dark-notext.svg.gz
@@ -2209,12 +2388,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/no-NO/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/no-NO/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/no-NO/assets/document.png
-%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/no-NO/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/no-NO/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/no-NO/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/no-NO/assets/logo-dark-notext.svg.gz
@@ -2256,12 +2435,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/pl-PL/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/pl-PL/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/pl-PL/assets/document.png
-%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/pl-PL/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/pl-PL/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/pl-PL/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/pl-PL/assets/logo-dark-notext.svg.gz
@@ -2303,12 +2482,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/pt-BR/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/pt-BR/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/pt-BR/assets/document.png
-%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/pt-BR/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/pt-BR/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/pt-BR/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/pt-BR/assets/logo-dark-notext.svg.gz
@@ -2350,12 +2529,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/pt-PT/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/pt-PT/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/pt-PT/assets/document.png
-%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/pt-PT/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/pt-PT/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/pt-PT/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/pt-PT/assets/logo-dark-notext.svg.gz
@@ -2397,12 +2576,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/ro-RO/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/ro-RO/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/ro-RO/assets/document.png
-%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/ro-RO/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/ro-RO/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/ro-RO/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/ro-RO/assets/logo-dark-notext.svg.gz
@@ -2444,12 +2623,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/ru-RU/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/ru-RU/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/ru-RU/assets/document.png
-%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/ru-RU/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/ru-RU/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/ru-RU/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/ru-RU/assets/logo-dark-notext.svg.gz
@@ -2491,12 +2670,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/sk-SK/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/sk-SK/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/sk-SK/assets/document.png
-%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/sk-SK/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/sk-SK/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/sk-SK/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/sk-SK/assets/logo-dark-notext.svg.gz
@@ -2538,12 +2717,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/sl-SI/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/sl-SI/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/sl-SI/assets/document.png
-%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/sl-SI/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/sl-SI/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/sl-SI/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/sl-SI/assets/logo-dark-notext.svg.gz
@@ -2585,12 +2764,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/sr-CS/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/sr-CS/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/sr-CS/assets/document.png
-%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/sr-CS/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/sr-CS/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/sr-CS/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/sr-CS/assets/logo-dark-notext.svg.gz
@@ -2632,12 +2811,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/sv-SE/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/sv-SE/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/sv-SE/assets/document.png
-%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/sv-SE/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/sv-SE/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/sv-SE/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/sv-SE/assets/logo-dark-notext.svg.gz
@@ -2679,12 +2858,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/tr-TR/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/tr-TR/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/tr-TR/assets/document.png
-%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/tr-TR/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/tr-TR/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/tr-TR/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/tr-TR/assets/logo-dark-notext.svg.gz
@@ -2726,12 +2905,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/uk-UA/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/uk-UA/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/uk-UA/assets/document.png
-%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/uk-UA/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/uk-UA/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/uk-UA/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/uk-UA/assets/logo-dark-notext.svg.gz
@@ -2773,12 +2952,12 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/zh-CN/3rdpartylicenses.txt.gz
 %%WWWDIR%%/static/frontend/zh-CN/apple-touch-icon.png
 %%WWWDIR%%/static/frontend/zh-CN/assets/document.png
-%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.min.js
-%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.min.js.br
-%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.min.js.gz
-%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.worker.min.js
-%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.worker.min.js.br
-%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.worker.min.js.gz
+%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/zh-CN/assets/js/pdf.worker.min.mjs.gz
 %%WWWDIR%%/static/frontend/zh-CN/assets/logo-dark-notext.svg
 %%WWWDIR%%/static/frontend/zh-CN/assets/logo-dark-notext.svg.br
 %%WWWDIR%%/static/frontend/zh-CN/assets/logo-dark-notext.svg.gz
@@ -2815,12 +2994,65 @@ share/man/man7/paperless-ngx.7.gz
 %%WWWDIR%%/static/frontend/zh-CN/styles.css
 %%WWWDIR%%/static/frontend/zh-CN/styles.css.br
 %%WWWDIR%%/static/frontend/zh-CN/styles.css.gz
+%%WWWDIR%%/static/frontend/zh-TW/3rdpartylicenses.txt
+%%WWWDIR%%/static/frontend/zh-TW/3rdpartylicenses.txt.br
+%%WWWDIR%%/static/frontend/zh-TW/3rdpartylicenses.txt.gz
+%%WWWDIR%%/static/frontend/zh-TW/apple-touch-icon.png
+%%WWWDIR%%/static/frontend/zh-TW/assets/document.png
+%%WWWDIR%%/static/frontend/zh-TW/assets/js/pdf.min.mjs
+%%WWWDIR%%/static/frontend/zh-TW/assets/js/pdf.min.mjs.br
+%%WWWDIR%%/static/frontend/zh-TW/assets/js/pdf.min.mjs.gz
+%%WWWDIR%%/static/frontend/zh-TW/assets/js/pdf.worker.min.mjs
+%%WWWDIR%%/static/frontend/zh-TW/assets/js/pdf.worker.min.mjs.br
+%%WWWDIR%%/static/frontend/zh-TW/assets/js/pdf.worker.min.mjs.gz
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-dark-notext.svg
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-dark-notext.svg.br
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-dark-notext.svg.gz
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-dark.svg
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-dark.svg.br
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-dark.svg.gz
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-notext.svg
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-notext.svg.br
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-notext.svg.gz
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-white-notext.svg
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-white-notext.svg.br
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo-white-notext.svg.gz
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo.svg
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo.svg.br
+%%WWWDIR%%/static/frontend/zh-TW/assets/logo.svg.gz
+%%WWWDIR%%/static/frontend/zh-TW/favicon.ico
+%%WWWDIR%%/static/frontend/zh-TW/favicon.ico.br
+%%WWWDIR%%/static/frontend/zh-TW/favicon.ico.gz
+%%WWWDIR%%/static/frontend/zh-TW/index.html
+%%WWWDIR%%/static/frontend/zh-TW/index.html.br
+%%WWWDIR%%/static/frontend/zh-TW/index.html.gz
+%%WWWDIR%%/static/frontend/zh-TW/main.js
+%%WWWDIR%%/static/frontend/zh-TW/main.js.br
+%%WWWDIR%%/static/frontend/zh-TW/main.js.gz
+%%WWWDIR%%/static/frontend/zh-TW/manifest.webmanifest
+%%WWWDIR%%/static/frontend/zh-TW/manifest.webmanifest.br
+%%WWWDIR%%/static/frontend/zh-TW/manifest.webmanifest.gz
+%%WWWDIR%%/static/frontend/zh-TW/polyfills.js
+%%WWWDIR%%/static/frontend/zh-TW/polyfills.js.br
+%%WWWDIR%%/static/frontend/zh-TW/polyfills.js.gz
+%%WWWDIR%%/static/frontend/zh-TW/runtime.js
+%%WWWDIR%%/static/frontend/zh-TW/runtime.js.br
+%%WWWDIR%%/static/frontend/zh-TW/runtime.js.gz
+%%WWWDIR%%/static/frontend/zh-TW/styles.css
+%%WWWDIR%%/static/frontend/zh-TW/styles.css.br
+%%WWWDIR%%/static/frontend/zh-TW/styles.css.gz
 %%WWWDIR%%/static/guardian/img/icon-no.svg
 %%WWWDIR%%/static/guardian/img/icon-no.svg.br
 %%WWWDIR%%/static/guardian/img/icon-no.svg.gz
 %%WWWDIR%%/static/guardian/img/icon-yes.svg
 %%WWWDIR%%/static/guardian/img/icon-yes.svg.br
 %%WWWDIR%%/static/guardian/img/icon-yes.svg.gz
+%%WWWDIR%%/static/mfa/js/webauthn-json.js
+%%WWWDIR%%/static/mfa/js/webauthn-json.js.br
+%%WWWDIR%%/static/mfa/js/webauthn-json.js.gz
+%%WWWDIR%%/static/mfa/js/webauthn.js
+%%WWWDIR%%/static/mfa/js/webauthn.js.br
+%%WWWDIR%%/static/mfa/js/webauthn.js.gz
 %%WWWDIR%%/static/paperless/img/favicon.ico
 %%WWWDIR%%/static/paperless/img/favicon.ico.br
 %%WWWDIR%%/static/paperless/img/favicon.ico.gz
diff --git a/deskutils/skim/Makefile b/deskutils/skim/Makefile
index abd1b70839bc..92001f07bb5b 100644
--- a/deskutils/skim/Makefile
+++ b/deskutils/skim/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	skim
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.2
+DISTVERSION=	0.17.2
 CATEGORIES=	deskutils
 PKGNAMESUFFIX=	-fuzzy-finder
 
@@ -23,22 +23,21 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		anstyle-1.0.10 \
 		anstyle-parse-0.2.6 \
 		anstyle-query-1.1.2 \
-		anstyle-wincon-3.0.6 \
+		anstyle-wincon-3.0.7 \
 		arrayvec-0.7.6 \
 		autocfg-1.4.0 \
 		beef-0.5.2 \
 		bitflags-1.3.2 \
-		bitflags-2.6.0 \
-		bstr-1.11.0 \
-		bumpalo-3.16.0 \
-		byteorder-1.5.0 \
-		cc-1.2.1 \
+		bitflags-2.9.0 \
+		bstr-1.12.0 \
+		bumpalo-3.17.0 \
+		cc-1.2.21 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.2.1 \
-		chrono-0.4.40 \
+		chrono-0.4.41 \
 		clap-4.5.37 \
 		clap_builder-4.5.37 \
-		clap_complete-4.5.47 \
+		clap_complete-4.5.48 \
 		clap_complete_fig-4.5.2 \
 		clap_complete_nushell-4.5.5 \
 		clap_derive-4.5.32 \
@@ -48,60 +47,62 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		core-foundation-sys-0.8.7 \
 		crossbeam-0.8.4 \
 		crossbeam-channel-0.5.15 \
-		crossbeam-deque-0.8.5 \
+		crossbeam-deque-0.8.6 \
 		crossbeam-epoch-0.9.18 \
-		crossbeam-queue-0.3.11 \
-		crossbeam-utils-0.8.20 \
-		darling-0.20.10 \
-		darling_core-0.20.10 \
-		darling_macro-0.20.10 \
+		crossbeam-queue-0.3.12 \
+		crossbeam-utils-0.8.21 \
+		darling-0.20.11 \
+		darling_core-0.20.11 \
+		darling_macro-0.20.11 \
 		defer-drop-1.3.0 \
-		deranged-0.4.1 \
+		deranged-0.4.0 \
 		derive_builder-0.20.2 \
 		derive_builder_core-0.20.2 \
 		derive_builder_macro-0.20.2 \
 		dirs-next-2.0.0 \
 		dirs-sys-next-0.1.2 \
-		either-1.13.0 \
-		env_filter-0.1.2 \
+		either-1.15.0 \
+		env_filter-0.1.3 \
 		env_home-0.1.0 \
-		env_logger-0.11.6 \
-		equivalent-1.0.1 \
-		errno-0.3.10 \
-		fastrand-2.2.0 \
+		env_logger-0.11.8 \
+		equivalent-1.0.2 \
+		errno-0.3.11 \
+		fastrand-2.3.0 \
 		fnv-1.0.7 \
 		fuzzy-matcher-0.3.7 \
-		getrandom-0.2.15 \
-		getrandom-0.3.0 \
-		hashbrown-0.15.2 \
+		getrandom-0.2.16 \
+		getrandom-0.3.2 \
+		hashbrown-0.15.3 \
 		heck-0.5.0 \
-		humantime-2.1.0 \
-		iana-time-zone-0.1.61 \
+		iana-time-zone-0.1.63 \
 		iana-time-zone-haiku-0.1.2 \
 		ident_case-1.0.1 \
-		indexmap-2.8.0 \
+		indexmap-2.9.0 \
 		is_terminal_polyfill-1.70.1 \
-		js-sys-0.3.72 \
+		jiff-0.2.12 \
+		jiff-static-0.2.12 \
+		js-sys-0.3.77 \
 		lazy_static-1.5.0 \
-		libc-0.2.170 \
+		libc-0.2.172 \
 		libredox-0.1.3 \
-		linux-raw-sys-0.4.14 \
-		linux-raw-sys-0.9.2 \
+		linux-raw-sys-0.9.4 \
 		log-0.4.27 \
 		memchr-2.7.4 \
-		nix-0.24.3 \
 		nix-0.29.0 \
 		num-conv-0.1.0 \
 		num-traits-0.2.19 \
-		once_cell-1.20.2 \
+		once_cell-1.21.3 \
+		portable-atomic-1.11.0 \
+		portable-atomic-util-0.2.4 \
 		powerfmt-0.2.0 \
-		ppv-lite86-0.2.20 \
-		proc-macro2-1.0.92 \
+		ppv-lite86-0.2.21 \
+		proc-macro2-1.0.95 \
 		pulldown-cmark-0.13.0 \
-		quote-1.0.37 \
-		rand-0.9.0 \
+		quote-1.0.40 \
+		r-efi-5.2.0 \
+		rand-0.9.1 \
 		rand_chacha-0.9.0 \
-		rand_core-0.9.0 \
+		rand_core-0.9.3 \
 		rayon-1.10.0 \
 		rayon-core-1.12.1 \
 		redox_users-0.4.6 \
@@ -109,15 +110,14 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		regex-automata-0.4.9 \
 		regex-syntax-0.8.5 \
 		roff-0.2.2 \
-		rustix-0.38.41 \
-		rustix-1.0.2 \
-		rustversion-1.0.18 \
-		serde-1.0.215 \
-		serde_derive-1.0.215 \
+		rustix-1.0.7 \
+		rustversion-1.0.20 \
+		serde-1.0.219 \
+		serde_derive-1.0.219 \
 		shell-quote-0.7.2 \
 		shlex-1.3.0 \
 		strsim-0.11.1 \
-		syn-2.0.89 \
+		syn-2.0.101 \
 		tempfile-3.19.1 \
 		term-0.7.0 \
 		thiserror-1.0.69 \
@@ -126,27 +126,28 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		time-0.3.41 \
 		time-core-0.1.4 \
 		timer-0.2.0 \
-		tuikit-0.5.0 \
 		unicase-2.8.1 \
-		unicode-ident-1.0.14 \
-		unicode-width-0.1.14 \
+		unicode-ident-1.0.18 \
 		unicode-width-0.2.0 \
 		utf8parse-0.2.2 \
 		vte-0.15.0 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasi-0.13.3+wasi-0.2.2 \
-		wasm-bindgen-0.2.95 \
-		wasm-bindgen-backend-0.2.95 \
-		wasm-bindgen-macro-0.2.95 \
-		wasm-bindgen-macro-support-0.2.95 \
-		wasm-bindgen-shared-0.2.95 \
-		which-7.0.2 \
+		wasi-0.14.2+wasi-0.2.4 \
+		wasm-bindgen-0.2.100 \
+		wasm-bindgen-backend-0.2.100 \
+		wasm-bindgen-macro-0.2.100 \
+		wasm-bindgen-macro-support-0.2.100 \
+		wasm-bindgen-shared-0.2.100 \
+		which-7.0.3 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-core-0.52.0 \
-		windows-link-0.1.0 \
-		windows-sys-0.52.0 \
+		windows-core-0.61.0 \
+		windows-implement-0.60.0 \
+		windows-interface-0.59.1 \
+		windows-link-0.1.1 \
+		windows-result-0.3.2 \
+		windows-strings-0.4.0 \
 		windows-sys-0.59.0 \
 		windows-targets-0.52.6 \
 		windows_aarch64_gnullvm-0.52.6 \
@@ -158,11 +159,9 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_msvc-0.52.6 \
 		winsafe-0.0.19 \
-		wit-bindgen-rt-0.33.0 \
-		zerocopy-0.7.35 \
-		zerocopy-0.8.14 \
-		zerocopy-derive-0.7.35 \
-		zerocopy-derive-0.8.14
+		wit-bindgen-rt-0.39.0 \
+		zerocopy-0.8.25 \
+		zerocopy-derive-0.8.25
 
 PLIST_FILES=	bin/sk
 
diff --git a/deskutils/skim/distinfo b/deskutils/skim/distinfo
index 26eb50fb3070..a819e1d17860 100644
--- a/deskutils/skim/distinfo
+++ b/deskutils/skim/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745828984
+TIMESTAMP = 1746424817
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
 SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
@@ -13,8 +13,8 @@ SHA256 (rust/crates/anstyle-parse-0.2.6.crate) = 3b2d16507662817a6a20a9ea92df665
 SIZE (rust/crates/anstyle-parse-0.2.6.crate) = 22343
 SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c
 SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
-SHA256 (rust/crates/anstyle-wincon-3.0.6.crate) = 2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125
-SIZE (rust/crates/anstyle-wincon-3.0.6.crate) = 12271
+SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e
+SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400
 SHA256 (rust/crates/arrayvec-0.7.6.crate) = 7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50
 SIZE (rust/crates/arrayvec-0.7.6.crate) = 31237
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
@@ -23,28 +23,26 @@ SHA256 (rust/crates/beef-0.5.2.crate) = 3a8241f3ebb85c056b509d4327ad0358fbbba6ff
 SIZE (rust/crates/beef-0.5.2.crate) = 15275
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de
-SIZE (rust/crates/bitflags-2.6.0.crate) = 45357
-SHA256 (rust/crates/bstr-1.11.0.crate) = 1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22
-SIZE (rust/crates/bstr-1.11.0.crate) = 380721
-SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
-SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
-SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
-SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
-SHA256 (rust/crates/cc-1.2.1.crate) = fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47
-SIZE (rust/crates/cc-1.2.1.crate) = 92731
+SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd
+SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
+SHA256 (rust/crates/bstr-1.12.0.crate) = 234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4
+SIZE (rust/crates/bstr-1.12.0.crate) = 351557
+SHA256 (rust/crates/bumpalo-3.17.0.crate) = 1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf
+SIZE (rust/crates/bumpalo-3.17.0.crate) = 91975
+SHA256 (rust/crates/cc-1.2.21.crate) = 8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0
+SIZE (rust/crates/cc-1.2.21.crate) = 106117
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
 SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
-SHA256 (rust/crates/chrono-0.4.40.crate) = 1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c
-SIZE (rust/crates/chrono-0.4.40.crate) = 229824
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
 SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071
 SIZE (rust/crates/clap-4.5.37.crate) = 56962
 SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2
 SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761
-SHA256 (rust/crates/clap_complete-4.5.47.crate) = c06f5378ea264ad4f82bbc826628b5aad714a75abf6ece087e923010eb937fb6
-SIZE (rust/crates/clap_complete-4.5.47.crate) = 48038
+SHA256 (rust/crates/clap_complete-4.5.48.crate) = be8c97f3a6f02b9e24cadc12aaba75201d18754b53ea0a9d99642f806ccdb4c9
+SIZE (rust/crates/clap_complete-4.5.48.crate) = 48036
 SHA256 (rust/crates/clap_complete_fig-4.5.2.crate) = d494102c8ff3951810c72baf96910b980fb065ca5d3101243e6a8dc19747c86b
 SIZE (rust/crates/clap_complete_fig-4.5.2.crate) = 11376
 SHA256 (rust/crates/clap_complete_nushell-4.5.5.crate) = c6a8b1593457dfc2fe539002b795710d022dc62a65bf15023f039f9760c7b18a
@@ -63,24 +61,24 @@ SHA256 (rust/crates/crossbeam-0.8.4.crate) = 1137cd7e7fc0fb5d3c5a8678be38ec56e81
 SIZE (rust/crates/crossbeam-0.8.4.crate) = 10500
 SHA256 (rust/crates/crossbeam-channel-0.5.15.crate) = 82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2
 SIZE (rust/crates/crossbeam-channel-0.5.15.crate) = 92716
-SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
-SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726
+SHA256 (rust/crates/crossbeam-deque-0.8.6.crate) = 9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51
+SIZE (rust/crates/crossbeam-deque-0.8.6.crate) = 22471
 SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
 SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875
-SHA256 (rust/crates/crossbeam-queue-0.3.11.crate) = df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35
-SIZE (rust/crates/crossbeam-queue-0.3.11.crate) = 15581
-SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
-SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
-SHA256 (rust/crates/darling-0.20.10.crate) = 6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989
-SIZE (rust/crates/darling-0.20.10.crate) = 32031
-SHA256 (rust/crates/darling_core-0.20.10.crate) = 95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5
-SIZE (rust/crates/darling_core-0.20.10.crate) = 65015
-SHA256 (rust/crates/darling_macro-0.20.10.crate) = d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806
-SIZE (rust/crates/darling_macro-0.20.10.crate) = 1874
+SHA256 (rust/crates/crossbeam-queue-0.3.12.crate) = 0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115
+SIZE (rust/crates/crossbeam-queue-0.3.12.crate) = 16270
+SHA256 (rust/crates/crossbeam-utils-0.8.21.crate) = d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28
+SIZE (rust/crates/crossbeam-utils-0.8.21.crate) = 42691
+SHA256 (rust/crates/darling-0.20.11.crate) = fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee
+SIZE (rust/crates/darling-0.20.11.crate) = 37614
+SHA256 (rust/crates/darling_core-0.20.11.crate) = 0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e
+SIZE (rust/crates/darling_core-0.20.11.crate) = 68006
+SHA256 (rust/crates/darling_macro-0.20.11.crate) = fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead
+SIZE (rust/crates/darling_macro-0.20.11.crate) = 2532
 SHA256 (rust/crates/defer-drop-1.3.0.crate) = f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57
 SIZE (rust/crates/defer-drop-1.3.0.crate) = 11087
-SHA256 (rust/crates/deranged-0.4.1.crate) = 28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058
-SIZE (rust/crates/deranged-0.4.1.crate) = 23541
+SHA256 (rust/crates/deranged-0.4.0.crate) = 9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e
+SIZE (rust/crates/deranged-0.4.0.crate) = 23235
 SHA256 (rust/crates/derive_builder-0.20.2.crate) = 507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947
 SIZE (rust/crates/derive_builder-0.20.2.crate) = 36661
 SHA256 (rust/crates/derive_builder_core-0.20.2.crate) = 2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8
@@ -91,86 +89,90 @@ SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690
 SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
 SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
 SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
-SHA256 (rust/crates/either-1.13.0.crate) = 60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0
-SIZE (rust/crates/either-1.13.0.crate) = 19169
-SHA256 (rust/crates/env_filter-0.1.2.crate) = 4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab
-SIZE (rust/crates/env_filter-0.1.2.crate) = 13327
+SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719
+SIZE (rust/crates/either-1.15.0.crate) = 20114
+SHA256 (rust/crates/env_filter-0.1.3.crate) = 186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0
+SIZE (rust/crates/env_filter-0.1.3.crate) = 15191
 SHA256 (rust/crates/env_home-0.1.0.crate) = c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe
 SIZE (rust/crates/env_home-0.1.0.crate) = 9006
-SHA256 (rust/crates/env_logger-0.11.6.crate) = dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0
-SIZE (rust/crates/env_logger-0.11.6.crate) = 31105
-SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
-SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.10.crate) = 33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d
-SIZE (rust/crates/errno-0.3.10.crate) = 11824
-SHA256 (rust/crates/fastrand-2.2.0.crate) = 486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4
-SIZE (rust/crates/fastrand-2.2.0.crate) = 15031
+SHA256 (rust/crates/env_logger-0.11.8.crate) = 13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f
+SIZE (rust/crates/env_logger-0.11.8.crate) = 32538
+SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
+SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
+SHA256 (rust/crates/errno-0.3.11.crate) = 976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e
+SIZE (rust/crates/errno-0.3.11.crate) = 12048
+SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be
+SIZE (rust/crates/fastrand-2.3.0.crate) = 15076
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/fuzzy-matcher-0.3.7.crate) = 54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94
 SIZE (rust/crates/fuzzy-matcher-0.3.7.crate) = 18047
-SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
-SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
-SHA256 (rust/crates/getrandom-0.3.0.crate) = 71393ecc86efbf00e4ca13953979ba8b94cfe549a4b74cc26d8b62f4d8feac2b
-SIZE (rust/crates/getrandom-0.3.0.crate) = 45123
-SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
-SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
+SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592
+SIZE (rust/crates/getrandom-0.2.16.crate) = 40163
+SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0
+SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
+SHA256 (rust/crates/hashbrown-0.15.3.crate) = 84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3
+SIZE (rust/crates/hashbrown-0.15.3.crate) = 140413
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
-SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
-SIZE (rust/crates/humantime-2.1.0.crate) = 16749
-SHA256 (rust/crates/iana-time-zone-0.1.61.crate) = 235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220
-SIZE (rust/crates/iana-time-zone-0.1.61.crate) = 27685
+SHA256 (rust/crates/iana-time-zone-0.1.63.crate) = b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8
+SIZE (rust/crates/iana-time-zone-0.1.63.crate) = 32919
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
 SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
 SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
-SHA256 (rust/crates/indexmap-2.8.0.crate) = 3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058
-SIZE (rust/crates/indexmap-2.8.0.crate) = 89670
+SHA256 (rust/crates/indexmap-2.9.0.crate) = cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e
+SIZE (rust/crates/indexmap-2.9.0.crate) = 91214
 SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
 SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
-SHA256 (rust/crates/js-sys-0.3.72.crate) = 6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9
-SIZE (rust/crates/js-sys-0.3.72.crate) = 54096
+SHA256 (rust/crates/jiff-0.2.12.crate) = d07d8d955d798e7a4d6f9c58cd1f1916e790b42b092758a9ef6e16fef9f1b3fd
+SIZE (rust/crates/jiff-0.2.12.crate) = 706826
+SHA256 (rust/crates/jiff-static-0.2.12.crate) = f244cfe006d98d26f859c7abd1318d85327e1882dc9cef80f62daeeb0adcf300
+SIZE (rust/crates/jiff-static-0.2.12.crate) = 76130
+SHA256 (rust/crates/js-sys-0.3.77.crate) = 1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f
+SIZE (rust/crates/js-sys-0.3.77.crate) = 55538
 SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
-SHA256 (rust/crates/libc-0.2.170.crate) = 875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828
-SIZE (rust/crates/libc-0.2.170.crate) = 760076
+SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa
+SIZE (rust/crates/libc-0.2.172.crate) = 791646
 SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
 SIZE (rust/crates/libredox-0.1.3.crate) = 6068
-SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
-SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
-SHA256 (rust/crates/linux-raw-sys-0.9.2.crate) = 6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9
-SIZE (rust/crates/linux-raw-sys-0.9.2.crate) = 2297426
+SHA256 (rust/crates/linux-raw-sys-0.9.4.crate) = cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12
+SIZE (rust/crates/linux-raw-sys-0.9.4.crate) = 2311088
 SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
 SIZE (rust/crates/log-0.4.27.crate) = 48120
 SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
 SIZE (rust/crates/memchr-2.7.4.crate) = 96670
-SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069
-SIZE (rust/crates/nix-0.24.3.crate) = 266843
 SHA256 (rust/crates/nix-0.29.0.crate) = 71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46
 SIZE (rust/crates/nix-0.29.0.crate) = 318248
 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
 SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
 SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
 SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
-SHA256 (rust/crates/once_cell-1.20.2.crate) = 1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775
-SIZE (rust/crates/once_cell-1.20.2.crate) = 33394
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
+SHA256 (rust/crates/portable-atomic-1.11.0.crate) = 350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e
+SIZE (rust/crates/portable-atomic-1.11.0.crate) = 181258
+SHA256 (rust/crates/portable-atomic-util-0.2.4.crate) = d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507
+SIZE (rust/crates/portable-atomic-util-0.2.4.crate) = 47043
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
-SHA256 (rust/crates/ppv-lite86-0.2.20.crate) = 77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04
-SIZE (rust/crates/ppv-lite86-0.2.20.crate) = 22478
-SHA256 (rust/crates/proc-macro2-1.0.92.crate) = 37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0
-SIZE (rust/crates/proc-macro2-1.0.92.crate) = 52353
+SHA256 (rust/crates/ppv-lite86-0.2.21.crate) = 85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9
+SIZE (rust/crates/ppv-lite86-0.2.21.crate) = 22522
+SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
+SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
 SHA256 (rust/crates/pulldown-cmark-0.13.0.crate) = 1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0
 SIZE (rust/crates/pulldown-cmark-0.13.0.crate) = 154023
-SHA256 (rust/crates/quote-1.0.37.crate) = b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af
-SIZE (rust/crates/quote-1.0.37.crate) = 28558
-SHA256 (rust/crates/rand-0.9.0.crate) = 3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94
-SIZE (rust/crates/rand-0.9.0.crate) = 97798
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
+SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
+SIZE (rust/crates/r-efi-5.2.0.crate) = 64764
+SHA256 (rust/crates/rand-0.9.1.crate) = 9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97
+SIZE (rust/crates/rand-0.9.1.crate) = 97986
 SHA256 (rust/crates/rand_chacha-0.9.0.crate) = d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb
 SIZE (rust/crates/rand_chacha-0.9.0.crate) = 18258
-SHA256 (rust/crates/rand_core-0.9.0.crate) = b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff
-SIZE (rust/crates/rand_core-0.9.0.crate) = 23441
+SHA256 (rust/crates/rand_core-0.9.3.crate) = 99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38
+SIZE (rust/crates/rand_core-0.9.3.crate) = 24543
 SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa
 SIZE (rust/crates/rayon-1.10.0.crate) = 180155
 SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
@@ -185,24 +187,22 @@ SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303af
 SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
 SHA256 (rust/crates/roff-0.2.2.crate) = 88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3
 SIZE (rust/crates/roff-0.2.2.crate) = 11648
-SHA256 (rust/crates/rustix-0.38.41.crate) = d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6
-SIZE (rust/crates/rustix-0.38.41.crate) = 378463
-SHA256 (rust/crates/rustix-1.0.2.crate) = f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825
-SIZE (rust/crates/rustix-1.0.2.crate) = 411835
-SHA256 (rust/crates/rustversion-1.0.18.crate) = 0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248
-SIZE (rust/crates/rustversion-1.0.18.crate) = 17794
-SHA256 (rust/crates/serde-1.0.215.crate) = 6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f
-SIZE (rust/crates/serde-1.0.215.crate) = 78527
-SHA256 (rust/crates/serde_derive-1.0.215.crate) = ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0
-SIZE (rust/crates/serde_derive-1.0.215.crate) = 57092
+SHA256 (rust/crates/rustix-1.0.7.crate) = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+SIZE (rust/crates/rustix-1.0.7.crate) = 414500
+SHA256 (rust/crates/rustversion-1.0.20.crate) = eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2
+SIZE (rust/crates/rustversion-1.0.20.crate) = 20666
+SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
+SIZE (rust/crates/serde-1.0.219.crate) = 78983
+SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
+SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798
 SHA256 (rust/crates/shell-quote-0.7.2.crate) = fb502615975ae2365825521fa1529ca7648fd03ce0b0746604e0683856ecd7e4
 SIZE (rust/crates/shell-quote-0.7.2.crate) = 16738
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
 SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
 SIZE (rust/crates/strsim-0.11.1.crate) = 14266
-SHA256 (rust/crates/syn-2.0.89.crate) = 44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e
-SIZE (rust/crates/syn-2.0.89.crate) = 289852
+SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf
+SIZE (rust/crates/syn-2.0.101.crate) = 299250
 SHA256 (rust/crates/tempfile-3.19.1.crate) = 7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf
 SIZE (rust/crates/tempfile-3.19.1.crate) = 39634
 SHA256 (rust/crates/term-0.7.0.crate) = c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f
@@ -219,14 +219,10 @@ SHA256 (rust/crates/time-core-0.1.4.crate) = c9e9a38711f559d9e3ce1cdb06dd7c5b8ea
 SIZE (rust/crates/time-core-0.1.4.crate) = 8422
 SHA256 (rust/crates/timer-0.2.0.crate) = 31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b
 SIZE (rust/crates/timer-0.2.0.crate) = 12190
-SHA256 (rust/crates/tuikit-0.5.0.crate) = 5e19c6ab038babee3d50c8c12ff8b910bdb2196f62278776422f50390d8e53d8
-SIZE (rust/crates/tuikit-0.5.0.crate) = 46855
 SHA256 (rust/crates/unicase-2.8.1.crate) = 75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539
 SIZE (rust/crates/unicase-2.8.1.crate) = 24088
-SHA256 (rust/crates/unicode-ident-1.0.14.crate) = adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83
-SIZE (rust/crates/unicode-ident-1.0.14.crate) = 47547
-SHA256 (rust/crates/unicode-width-0.1.14.crate) = 7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af
-SIZE (rust/crates/unicode-width-0.1.14.crate) = 271615
+SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
+SIZE (rust/crates/unicode-ident-1.0.18.crate) = 47743
 SHA256 (rust/crates/unicode-width-0.2.0.crate) = 1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd
 SIZE (rust/crates/unicode-width-0.2.0.crate) = 271509
 SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
@@ -235,32 +231,38 @@ SHA256 (rust/crates/vte-0.15.0.crate) = a5924018406ce0063cd67f8e008104968b74b563
 SIZE (rust/crates/vte-0.15.0.crate) = 57487
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasi-0.13.3+wasi-0.2.2.crate) = 26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2
-SIZE (rust/crates/wasi-0.13.3+wasi-0.2.2.crate) = 136754
-SHA256 (rust/crates/wasm-bindgen-0.2.95.crate) = 128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e
-SIZE (rust/crates/wasm-bindgen-0.2.95.crate) = 43894
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.95.crate) = cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358
-SIZE (rust/crates/wasm-bindgen-backend-0.2.95.crate) = 30487
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.95.crate) = e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56
-SIZE (rust/crates/wasm-bindgen-macro-0.2.95.crate) = 6938
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.95.crate) = 26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.95.crate) = 21331
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.95.crate) = 65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d
-SIZE (rust/crates/wasm-bindgen-shared-0.2.95.crate) = 7649
-SHA256 (rust/crates/which-7.0.2.crate) = 2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283
-SIZE (rust/crates/which-7.0.2.crate) = 21099
+SHA256 (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3
+SIZE (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 140921
+SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
+SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
+SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
+SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
+SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
+SHA256 (rust/crates/which-7.0.3.crate) = 24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762
+SIZE (rust/crates/which-7.0.3.crate) = 18872
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
-SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
-SHA256 (rust/crates/windows-link-0.1.0.crate) = 6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3
-SIZE (rust/crates/windows-link-0.1.0.crate) = 6153
-SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
-SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-core-0.61.0.crate) = 4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980
+SIZE (rust/crates/windows-core-0.61.0.crate) = 36707
+SHA256 (rust/crates/windows-implement-0.60.0.crate) = a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836
+SIZE (rust/crates/windows-implement-0.60.0.crate) = 15073
+SHA256 (rust/crates/windows-interface-0.59.1.crate) = bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8
+SIZE (rust/crates/windows-interface-0.59.1.crate) = 11735
+SHA256 (rust/crates/windows-link-0.1.1.crate) = 76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38
+SIZE (rust/crates/windows-link-0.1.1.crate) = 6154
+SHA256 (rust/crates/windows-result-0.3.2.crate) = c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252
+SIZE (rust/crates/windows-result-0.3.2.crate) = 13399
+SHA256 (rust/crates/windows-strings-0.4.0.crate) = 7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97
+SIZE (rust/crates/windows-strings-0.4.0.crate) = 13939
 SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
 SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323
 SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
@@ -283,15 +285,11 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
 SHA256 (rust/crates/winsafe-0.0.19.crate) = d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904
 SIZE (rust/crates/winsafe-0.0.19.crate) = 492820
-SHA256 (rust/crates/wit-bindgen-rt-0.33.0.crate) = 3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c
-SIZE (rust/crates/wit-bindgen-rt-0.33.0.crate) = 3357
-SHA256 (rust/crates/zerocopy-0.7.35.crate) = 1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0
-SIZE (rust/crates/zerocopy-0.7.35.crate) = 152645
-SHA256 (rust/crates/zerocopy-0.8.14.crate) = a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468
-SIZE (rust/crates/zerocopy-0.8.14.crate) = 229188
-SHA256 (rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e
-SIZE (rust/crates/zerocopy-derive-0.7.35.crate) = 37829
-SHA256 (rust/crates/zerocopy-derive-0.8.14.crate) = d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1
-SIZE (rust/crates/zerocopy-derive-0.8.14.crate) = 80308
-SHA256 (lotabout-skim-v0.16.2_GH0.tar.gz) = b503a11606ecd740bff570a204b6e23a1ec3e0cd6ea0221b43872837b8bc9d86
-SIZE (lotabout-skim-v0.16.2_GH0.tar.gz) = 140028
+SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
+SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241
+SHA256 (rust/crates/zerocopy-0.8.25.crate) = a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb
+SIZE (rust/crates/zerocopy-0.8.25.crate) = 252714
+SHA256 (rust/crates/zerocopy-derive-0.8.25.crate) = 28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef
+SIZE (rust/crates/zerocopy-derive-0.8.25.crate) = 87671
+SHA256 (lotabout-skim-v0.17.2_GH0.tar.gz) = afdef2f53dcc0f51cc5a4b28c3a21b02cf82436970535a01d3fffaa6499b23a2
+SIZE (lotabout-skim-v0.17.2_GH0.tar.gz) = 188503
diff --git a/deskutils/subsurface/Makefile b/deskutils/subsurface/Makefile
index b57db44c0203..1f9ca9b68092 100644
--- a/deskutils/subsurface/Makefile
+++ b/deskutils/subsurface/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	subsurface
 DISTVERSIONPREFIX=v
 DISTVERSION=	5.0.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils
 
 MAINTAINER=	romain@FreeBSD.org
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
index 6e9887fad491..02bec6534bcf 100644
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zim
-DISTVERSION=	0.76.1
+DISTVERSION=	0.76.3
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://www.zim-wiki.org/downloads/
 
diff --git a/deskutils/zim/distinfo b/deskutils/zim/distinfo
index 955a3039f07a..d545369bea6c 100644
--- a/deskutils/zim/distinfo
+++ b/deskutils/zim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738483842
-SHA256 (zim-0.76.1.tar.gz) = 6a8edd625750a208f1b9b009077bec4d28d38333988e4a047a2d6a594bf91055
-SIZE (zim-0.76.1.tar.gz) = 2671879
+TIMESTAMP = 1746701185
+SHA256 (zim-0.76.3.tar.gz) = 4adf09eb3f077138fe55bf26f13e6c4d993616fe424a799d1ba6be098ce4eb05
+SIZE (zim-0.76.3.tar.gz) = 2709910
diff --git a/devel/Makefile b/devel/Makefile
index cbe4b252ff60..8095a26700f4 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -200,6 +200,7 @@
     SUBDIR += apache-rat
     SUBDIR += aphpbreakdown
     SUBDIR += aphpunit
+    SUBDIR += api-linter
     SUBDIR += api-sanity-autotest
     SUBDIR += apitrace
     SUBDIR += app-builder
@@ -393,7 +394,6 @@
     SUBDIR += ccache-static
     SUBDIR += ccache4
     SUBDIR += cccc
-    SUBDIR += ccdoc
     SUBDIR += ccls
     SUBDIR += cctz
     SUBDIR += cdecl
@@ -690,6 +690,8 @@
     SUBDIR += etcd32
     SUBDIR += etcd33
     SUBDIR += etcd34
+    SUBDIR += etcd35
+    SUBDIR += etcd36
     SUBDIR += etl
     SUBDIR += evcxr-jupyter
     SUBDIR += evdev-proto
@@ -726,6 +728,7 @@
     SUBDIR += folly
     SUBDIR += forge
     SUBDIR += forge-devel
+    SUBDIR += fortran-stdlib
     SUBDIR += fortran-utils
     SUBDIR += fortytwo-encore
     SUBDIR += fossil
@@ -954,6 +957,7 @@
     SUBDIR += grcov
     SUBDIR += grex
     SUBDIR += grpc
+    SUBDIR += grpc-gateway
     SUBDIR += gsettings-desktop-schemas
     SUBDIR += gsl-lite
     SUBDIR += gsoap
@@ -4335,9 +4339,11 @@
     SUBDIR += projectcenter
     SUBDIR += protobuf
     SUBDIR += protobuf-c
+    SUBDIR += protobuf-go
     SUBDIR += protobuf-java
     SUBDIR += protobuf25
     SUBDIR += protobuf3
+    SUBDIR += protoc-gen-go-grpc
     SUBDIR += prototool
     SUBDIR += protozero
     SUBDIR += pructl
@@ -5236,6 +5242,7 @@
     SUBDIR += py-memory-allocator
     SUBDIR += py-memory-profiler
     SUBDIR += py-mergedeep
+    SUBDIR += py-merossiot
     SUBDIR += py-methodtools
     SUBDIR += py-microversion-parse
     SUBDIR += py-milc
@@ -8059,7 +8066,6 @@
     SUBDIR += rubygem-web-console3-rails5
     SUBDIR += rubygem-web-console3-rails50
     SUBDIR += rubygem-web-console3-rails52
-    SUBDIR += rubygem-webby
     SUBDIR += rubygem-webfinger
     SUBDIR += rubygem-webpacker-rails60
     SUBDIR += rubygem-webpacker-rails61
diff --git a/devel/R-cran-R.cache/Makefile b/devel/R-cran-R.cache/Makefile
index e07c3e650125..2fd39fe58c7e 100644
--- a/devel/R-cran-R.cache/Makefile
+++ b/devel/R-cran-R.cache/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	R.cache
-DISTVERSION=	0.16.0
+DISTVERSION=	0.17.0
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -10,10 +10,10 @@ WWW=		https://cran.r-project.org/package=R.cache
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-digest>0:security/R-cran-digest \
+RUN_DEPENDS=	R-cran-digest>=0.6.13:security/R-cran-digest \
 		R-cran-R.methodsS3>=1.8.1:devel/R-cran-R.methodsS3 \
-		R-cran-R.oo>0:devel/R-cran-R.oo \
-		R-cran-R.utils>0:devel/R-cran-R.utils
+		R-cran-R.oo>=1.24.0:devel/R-cran-R.oo \
+		R-cran-R.utils>=2.10.10:devel/R-cran-R.utils
 
 USES=		cran:auto-plist
 
diff --git a/devel/R-cran-R.cache/distinfo b/devel/R-cran-R.cache/distinfo
index 10fbf7d3afd4..de6e496027e2 100644
--- a/devel/R-cran-R.cache/distinfo
+++ b/devel/R-cran-R.cache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739707567
-SHA256 (R.cache_0.16.0.tar.gz) = 7853409161571a790e0383f64f99e4eae43201a0ed7146d2baf157741a509291
-SIZE (R.cache_0.16.0.tar.gz) = 35287
+TIMESTAMP = 1746294270
+SHA256 (R.cache_0.17.0.tar.gz) = e265953212edd15be12cdfcc4fa8829cc0dcf3b06ab3e0aa1758108544822d21
+SIZE (R.cache_0.17.0.tar.gz) = 35744
diff --git a/devel/R-cran-R.oo/Makefile b/devel/R-cran-R.oo/Makefile
index b14e749752d3..fa4cf6ad2b43 100644
--- a/devel/R-cran-R.oo/Makefile
+++ b/devel/R-cran-R.oo/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	R.oo
-DISTVERSION=	1.27.0
+DISTVERSION=	1.27.1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Methods and classes for object-oriented programming
-WWW=		https://cran.r-project.org/web/packages/R.oo/
+WWW=		https://cran.r-project.org/package=R.oo
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
diff --git a/devel/R-cran-R.oo/distinfo b/devel/R-cran-R.oo/distinfo
index 7ebc46f04271..5541bb672516 100644
--- a/devel/R-cran-R.oo/distinfo
+++ b/devel/R-cran-R.oo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730645577
-SHA256 (R.oo_1.27.0.tar.gz) = d11281506d672729bbfcfeb1b1414a6f5c7b6027a6c9e0b6b1da50ef461d67f9
-SIZE (R.oo_1.27.0.tar.gz) = 384222
+TIMESTAMP = 1746365521
+SHA256 (R.oo_1.27.1.tar.gz) = 5faf599cc1f027d8b80e1270aa6a43e29dccd6fee8287953f13e7ab3d94270f5
+SIZE (R.oo_1.27.1.tar.gz) = 384264
diff --git a/devel/R-cran-gert/Makefile b/devel/R-cran-gert/Makefile
index 346d5481795e..ce7e9a840b4d 100644
--- a/devel/R-cran-gert/Makefile
+++ b/devel/R-cran-gert/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gert
 DISTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/devel/R-cran-git2r/Makefile b/devel/R-cran-git2r/Makefile
index 282a85ec3ff3..9b87c198ddd6 100644
--- a/devel/R-cran-git2r/Makefile
+++ b/devel/R-cran-git2r/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	git2r
 DISTVERSION=	0.33.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile
index 9f705811de95..2b44b7552c4a 100644
--- a/devel/apache-commons-daemon/Makefile
+++ b/devel/apache-commons-daemon/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	commons-daemon
-PORTVERSION=	1.4.0
+DISTVERSION=	1.4.1
 CATEGORIES=	devel java
 MASTER_SITES=	https://archive.apache.org/dist/commons/daemon/source/:src \
 		https://archive.apache.org/dist/commons/daemon/binaries/:bin
 PKGNAMEPREFIX=	apache-
-DISTFILES=	${PORTNAME}-${PORTVERSION}-native-src${EXTRACT_SUFX}:src \
-		${PORTNAME}-${PORTVERSION}-bin${EXTRACT_SUFX}:bin
+DISTFILES=	${PORTNAME}-${DISTVERSION}-native-src${EXTRACT_SUFX}:src \
+		${PORTNAME}-${DISTVERSION}-bin${EXTRACT_SUFX}:bin
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Wrapper code to start/stop a Java application as a daemon
@@ -16,23 +16,26 @@ LICENSE=	APACHE20
 USES=		java
 JAVA_OS=	native
 
-OPTIONS_DEFINE=	DOCS
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-java=${JAVA_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-native-src/unix
 WRKBIN=		${WRKDIR}/${DISTNAME}
 
-PLIST_FILES=	bin/jsvc %%JAVAJARDIR%%/${PORTNAME}.jar
+PLIST_FILES=	bin/jsvc ${JAVAJARDIR}/${PORTNAME}.jar
 
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jsvc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKBIN}/${DISTNAME}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKBIN} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKBIN}/${PORTNAME}-${DISTVERSION}-javadoc.jar \
+			${STAGEDIR}${DOCSDIR}/${PORTNAME}-javadoc.jar
 
 .include <bsd.port.mk>
diff --git a/devel/apache-commons-daemon/distinfo b/devel/apache-commons-daemon/distinfo
index dd544290c57d..775d71ef789f 100644
--- a/devel/apache-commons-daemon/distinfo
+++ b/devel/apache-commons-daemon/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1717668909
-SHA256 (commons-daemon-1.4.0-native-src.tar.gz) = e05fab8f752457a70b2aadaf7f1702f14a162200809ade6cb6f9a52add3c310d
-SIZE (commons-daemon-1.4.0-native-src.tar.gz) = 214459
-SHA256 (commons-daemon-1.4.0-bin.tar.gz) = 0a7b1dd79c91103b64a0d15102c2290029c286771536075d4c9d4212f84a9f8f
-SIZE (commons-daemon-1.4.0-bin.tar.gz) = 244710
+TIMESTAMP = 1746148831
+SHA256 (commons-daemon-1.4.1-native-src.tar.gz) = d672cbc125d448551e34b112b45655468694112e4566a87f63d602b58145e774
+SIZE (commons-daemon-1.4.1-native-src.tar.gz) = 215448
+SHA256 (commons-daemon-1.4.1-bin.tar.gz) = a5f2ab67776e0f3e702939f7f9233ec9edd434dd76f555823ce788ec94ae62db
+SIZE (commons-daemon-1.4.1-bin.tar.gz) = 4314313
diff --git a/devel/apache-commons-daemon/files/patch-configure b/devel/apache-commons-daemon/files/patch-configure
deleted file mode 100644
index 240a0979310e..000000000000
--- a/devel/apache-commons-daemon/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2018-06-29 12:40:33 UTC
-+++ configure
-@@ -3504,7 +3504,7 @@ then
- $as_echo "jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6; }
-   INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
- else
--  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
-+  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
- fi
- 
- if test "$GCC" = "yes"
diff --git a/devel/apache-commons-daemon/files/patch-native_arguments.c b/devel/apache-commons-daemon/files/patch-native_arguments.c
index a60ca3b03803..ea9a407ecbdc 100644
--- a/devel/apache-commons-daemon/files/patch-native_arguments.c
+++ b/devel/apache-commons-daemon/files/patch-native_arguments.c
@@ -1,4 +1,4 @@
---- native/arguments.c.orig	2019-09-04 15:44:04 UTC
+--- native/arguments.c.orig	2025-01-06 00:00:00 UTC
 +++ native/arguments.c
 @@ -157,7 +157,7 @@ static arg_data *parse(int argc, char *argv[])
      args->help = false;                /* Don't display help */
@@ -20,3 +20,14 @@
          }
          else if (!strcmp(argv[x], "-restarts")) {
              temp = optional(argc, argv, x++);
+@@ -424,6 +420,10 @@ static arg_data *parse(int argc, char *argv[])
+         }
+         /* Java 11 specific options */
+         else if (!strncmp(argv[x], "--enable-preview", 16)) {
++            args->opts[args->onum++] = strdup(argv[x]);
++        }
++        /* Java 21 specific options */
++        else if (!strncmp(argv[x], "--enable-native-access=", 23)) {
+             args->opts[args->onum++] = strdup(argv[x]);
+         }
+         else if (*argv[x] == '-') {
diff --git a/devel/apache-commons-daemon/files/patch-native_help.c b/devel/apache-commons-daemon/files/patch-native_help.c
new file mode 100644
index 000000000000..84af961ceafa
--- /dev/null
+++ b/devel/apache-commons-daemon/files/patch-native_help.c
@@ -0,0 +1,11 @@
+--- native/help.c.orig	2025-01-06 00:00:00 UTC
++++ native/help.c
+@@ -123,6 +123,8 @@ void help(home_data *data)
+     printf("        Refer java help for possible values.\n");
+     printf("    --enable-preview\n");
+     printf("        Java 11 --enable-preview option. Passed as it is to JVM\n");
++    printf("    --enable-native-access=<module name>\n");
++    printf("        Java 21 --enable-native-access option. Passed as it is to JVM\n");
+     printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n");
+     printf("Copyright (c) 1999-2025 Apache Software Foundation.\n");
+ 
diff --git a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
index c94778a6a1af..8b2486ff416f 100644
--- a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
+++ b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
@@ -1,6 +1,6 @@
---- native/jsvc-unix.c.orig	2017-11-15 11:51:22 UTC
+--- native/jsvc-unix.c.orig	2025-01-06 00:00:00 UTC
 +++ native/jsvc-unix.c
-@@ -717,18 +717,13 @@ static void remove_tmp_file(arg_data *ar
+@@ -731,18 +731,13 @@ static int wait_child(arg_data *args, int pid)
   */
  static int wait_child(arg_data *args, int pid)
  {
@@ -21,7 +21,7 @@
      while (count > 0) {
          sleep(1);
          /* check if the controler is still running */
-@@ -767,7 +762,6 @@ static int wait_child(arg_data *args, in
+@@ -781,7 +776,6 @@ static int wait_child(arg_data *args, int pid)
                  }
              }
          }
@@ -29,7 +29,7 @@
          count--;
      }
      /* It takes more than the wait time to start,
-@@ -901,11 +895,11 @@ static int child(arg_data *args, home_da
+@@ -915,11 +909,11 @@ static int child(arg_data *args, home_data *data, uid_
      create_tmp_file(args);
      while (!stopping) {
  #if defined(OSD_POSIX)
@@ -41,9 +41,9 @@
 -        sleep(60);
 +        sleep(1);
  #endif
-         if(doreopen) {
+         if (doreopen) {
              doreopen = false;
-@@ -924,7 +918,7 @@ static int child(arg_data *args, home_da
+@@ -938,7 +932,7 @@ static int child(arg_data *args, home_data *data, uid_
          return 6;
  
      if (doreload == true)
@@ -52,7 +52,7 @@
      else
          ret = 0;
  
-@@ -1341,10 +1335,10 @@ static int run_controller(arg_data *args
+@@ -1348,10 +1342,10 @@ static int run_controller(arg_data *args, home_data *d
              if (args->vers != true && args->chck != true && status != 122)
                  remove_pid_file(args, pid);
  
@@ -65,7 +65,7 @@
                      if (args->restarts == 0) {
                          log_debug("Service failure, restarts disabled");
                          return 1;
-@@ -1356,7 +1350,7 @@ static int run_controller(arg_data *args
+@@ -1363,7 +1357,7 @@ static int run_controller(arg_data *args, home_data *d
                      log_debug("Reloading service");
                      restarts++;
                      /* prevent looping */
diff --git a/devel/apache-commons-jxpath/Makefile b/devel/apache-commons-jxpath/Makefile
index cf5984d75e96..03159aec52ba 100644
--- a/devel/apache-commons-jxpath/Makefile
+++ b/devel/apache-commons-jxpath/Makefile
@@ -1,29 +1,33 @@
 PORTNAME=	commons-jxpath
-PORTVERSION=	1.3
+DISTVERSION=	1.4.0
 CATEGORIES=	devel www java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	apache-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
+DISTNAME=	${PORTNAME}-${DISTVERSION}-bin
 
-LICENSE=	APACHE20
-
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	atanubiswas484@gmail.com
 COMMENT=	Utilities for manipulating Java Beans using the XPath syntax
 WWW=		https://commons.apache.org/proper/commons-jxpath/
 
+LICENSE=	APACHE20
+
 USES=		java
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}.jar \
+	${INSTALL_DATA} \
+		${WRKDIR}/${PORTNAME}-${DISTVERSION}/${PORTNAME}-${DISTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-	(cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/apidocs && \
+
+do-install-DOCS-on:
+	(cd ${WRKDIR}/${PORTNAME}-${DISTVERSION}/apidocs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/apache-commons-jxpath/distinfo b/devel/apache-commons-jxpath/distinfo
index 2ffe54588e4a..7d874e1a3393 100644
--- a/devel/apache-commons-jxpath/distinfo
+++ b/devel/apache-commons-jxpath/distinfo
@@ -1,2 +1,3 @@
-SHA256 (commons-jxpath-1.3-bin.tar.gz) = 3eaebe66f81b9dd58f523e763329a443ac56bba95c0b2ab9a3861179d8944973
-SIZE (commons-jxpath-1.3-bin.tar.gz) = 3062527
+TIMESTAMP = 1746044731
+SHA256 (commons-jxpath-1.4.0-bin.tar.gz) = 7238502e664ffa526c6ba2675d0e9d33ceb149e88a1f62639f18a2cd834c628d
+SIZE (commons-jxpath-1.4.0-bin.tar.gz) = 3374636
diff --git a/devel/aphpbreakdown/Makefile b/devel/aphpbreakdown/Makefile
index e770343b5672..97d689248d29 100644
--- a/devel/aphpbreakdown/Makefile
+++ b/devel/aphpbreakdown/Makefile
@@ -11,6 +11,10 @@ WWW=		https://gitlab.code-mesa.com/code-mesa/aphpbreakdown/
 
 LICENSE=	BSD2CLAUSE
 
+BROKEN=		Unfetchable
+DEPRECATED=	Upstream is gone and last release in 2018
+EXPIRATION_DATE=2025-05-31
+
 USES=		php:flavors
 USE_PHP=	tokenizer phar
 
diff --git a/devel/api-linter/Makefile b/devel/api-linter/Makefile
new file mode 100644
index 000000000000..2d1afa67368d
--- /dev/null
+++ b/devel/api-linter/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	api-linter
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.69.2
+CATEGORIES=	devel
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Google API Linter
+WWW=		https://github.com/googleapis/api-linter/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:1.22,modules
+
+GO_MODULE=	github.com/googleapis/api-linter
+GO_TARGET=	./cmd/${PORTNAME}
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/devel/api-linter/distinfo b/devel/api-linter/distinfo
new file mode 100644
index 000000000000..706f9c21ea82
--- /dev/null
+++ b/devel/api-linter/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746353929
+SHA256 (go/devel_api-linter/api-linter-v1.69.2/v1.69.2.mod) = 5d4f2dfb8a1f67627172aacdd2f2c7a82077e3a57adf87da5bd4cd4863a6b255
+SIZE (go/devel_api-linter/api-linter-v1.69.2/v1.69.2.mod) = 1087
+SHA256 (go/devel_api-linter/api-linter-v1.69.2/v1.69.2.zip) = 6facfe06d619b33d418e6a17e032c390915e8f1f68fd9ac89787b17df15fb201
+SIZE (go/devel_api-linter/api-linter-v1.69.2/v1.69.2.zip) = 1385749
diff --git a/devel/api-linter/pkg-descr b/devel/api-linter/pkg-descr
new file mode 100644
index 000000000000..d88b44abfad6
--- /dev/null
+++ b/devel/api-linter/pkg-descr
@@ -0,0 +1,3 @@
+The API linter provides real-time checks for compliance with many of
+Google's API standards, documented using API Improvement Proposals. It
+operates on API surfaces defined in protocol buffers.
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 24cc137c508f..13e4afe96186 100644
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@@ -30,6 +30,8 @@ USE_LDCONFIG=	yes
 MESON_ARGS=	-Drpm=false \
 		-Dalpm=false
 
+TESTING_UNSAFE=	not ok /AppStream/app - As:ERROR:../libappstream-glib/as-self-test.c:2134:as_test_app_func: assertion failed (as_app_get_update_contact (app) == "richard@hughsie.co.uk")
+
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
diff --git a/devel/artifactory/Makefile b/devel/artifactory/Makefile
index e9cf53f565ac..5b41d147b354 100644
--- a/devel/artifactory/Makefile
+++ b/devel/artifactory/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.AFFERO
 LICENSE_FILE_APACHE20=	${WRKSRC}/tomcat/LICENSE
 
 FORBIDDEN=	Ships a very vulnerable Tomcat 8.5.23
+DEPRECATED=	Outdated with known vulnerabilities and marked as forbidden in 2023
+EXPIRATION_DATE=2025-05-31
 
 RUN_DEPENDS=	bash:shells/bash
 
diff --git a/devel/awless/Makefile b/devel/awless/Makefile
index a8f470f63e0e..3a030c3dbb30 100644
--- a/devel/awless/Makefile
+++ b/devel/awless/Makefile
@@ -11,6 +11,9 @@ WWW=		https://github.com/wallix/awless
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Abandoned upstream
+EXPIRATION_DATE=2025-05-31
+
 USES=		go
 
 USE_GITHUB=	yes
diff --git a/devel/aws-c-s3/Makefile b/devel/aws-c-s3/Makefile
index 4e5e9e88b277..456116c4e17e 100644
--- a/devel/aws-c-s3/Makefile
+++ b/devel/aws-c-s3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	aws-c-s3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.16
+DISTVERSION=	0.7.17
 CATEGORIES=	devel
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/devel/aws-c-s3/distinfo b/devel/aws-c-s3/distinfo
index 2e730d07ada6..3c2011876fc7 100644
--- a/devel/aws-c-s3/distinfo
+++ b/devel/aws-c-s3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745947906
-SHA256 (awslabs-aws-c-s3-v0.7.16_GH0.tar.gz) = 04c7edffd0210f8b0fd20be843ad74a350cb2edb37b47f99131136ec24a20e59
-SIZE (awslabs-aws-c-s3-v0.7.16_GH0.tar.gz) = 363160
+TIMESTAMP = 1746648163
+SHA256 (awslabs-aws-c-s3-v0.7.17_GH0.tar.gz) = cad16b82f628ae05a2bf072de19cad12f69dddcf7817b55eb00037628011fa92
+SIZE (awslabs-aws-c-s3-v0.7.17_GH0.tar.gz) = 363821
diff --git a/devel/bit/Makefile b/devel/bit/Makefile
index 1a3f49c20fff..1b84a50645b4 100644
--- a/devel/bit/Makefile
+++ b/devel/bit/Makefile
@@ -11,6 +11,9 @@ WWW=		https://github.com/chriswalz/bit
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=     Upstream ceased development
+EXPIRATION_DATE=2025-06-21
+
 USES=		cpe go:modules
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
diff --git a/devel/cargo-c/Makefile b/devel/cargo-c/Makefile
index 5c1915feb5c0..b16ce9cc6d71 100644
--- a/devel/cargo-c/Makefile
+++ b/devel/cargo-c/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cargo-c
 DISTVERSION=	0.10.12
 DISTVERSIONSUFFIX=	+cargo-0.87.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 # XXX Teach USES=cargo to have proper default
diff --git a/devel/cargo-generate/Makefile b/devel/cargo-generate/Makefile
index 6c25fa3bfe63..40cf39f2fb39 100644
--- a/devel/cargo-generate/Makefile
+++ b/devel/cargo-generate/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cargo-generate
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.21.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/cargo-udeps/Makefile b/devel/cargo-udeps/Makefile
index bb813f43e0be..e9af62baf2a7 100644
--- a/devel/cargo-udeps/Makefile
+++ b/devel/cargo-udeps/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	cargo-udeps
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.55
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/ccdoc/Makefile b/devel/ccdoc/Makefile
deleted file mode 100644
index 931ebf36392f..000000000000
--- a/devel/ccdoc/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-PORTNAME=	ccdoc
-PORTVERSION=	0.8r41
-PORTREVISION=	1
-CATEGORIES=	devel textproc
-MASTER_SITES=	http://ccdoc.sourceforge.net/downloads/
-DISTNAME=	src
-DIST_SUBDIR=	ccdoc
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Extracting comments from C++ source and generating HTML
-WWW=		https://ccdoc.sourceforge.net/
-
-LICENSE=	MIT
-
-DEPRECATED=	Obsolete utility
-EXPIRATION_DATE=2025-04-30
-
-USES=		perl5
-
-WRKSRC=		${WRKDIR}/${PORTNAME}v${PORTVERSION:S/.//g}/src
-MAKEFILE=	mkopt_gcc.mk
-ALL_TARGET=	bld
-PLIST_FILES=	bin/ccdoc \
-		share/man/man1/ccdoc.1.gz
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS
-
-MAKE_JOBS_UNSAFE=	yes
-
-do-configure:
-	@${REINPLACE_CMD} -e "s:%%PERL%%:${PERL}:" \
-		-e "s:%%CXX%%:${CXX}:" \
-		-e "s:%%CXXFLAGS%%:${CXXFLAGS}:" \
-		-e "s:-pedantic::" \
-		${WRKSRC}/${MAKEFILE}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin_opt_gcc_/ccdoc.exe \
-		${STAGEDIR}${PREFIX}/bin/ccdoc
-	${INSTALL_MAN} ${WRKSRC}/../doc/htdocs/ccdoc.man \
-		${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
-
-do-install-DOCS-on:
-	cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
diff --git a/devel/ccdoc/distinfo b/devel/ccdoc/distinfo
deleted file mode 100644
index 620cc002ca1c..000000000000
--- a/devel/ccdoc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ccdoc/src.tar.gz) = 5a04f6d420a13457853f6501e4118057fb000b1f5ac3f58195d47729521258c0
-SIZE (ccdoc/src.tar.gz) = 1750511
diff --git a/devel/ccdoc/files/patch-log.cc b/devel/ccdoc/files/patch-log.cc
deleted file mode 100644
index 70deb9db170d..000000000000
--- a/devel/ccdoc/files/patch-log.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-log.cc:236:8: error: invalid operands to binary expression ('std::__1::ostream' (aka 'basic_ostream<char>') and 'std::__1::ostream')
-        (*os) << fct( *os );
-                ~~~~~ ^  ~~~~~~~~~~
-
-Never used
-
---- log.cc.orig	2018-08-26 04:28:55 UTC
-+++ log.cc
-@@ -225,20 +225,6 @@ ccdoc::log& ccdoc::log::operator << (const vector<stri
-   return *this;
- }
- // ================================================================
--// operator <<
--// ================================================================
--ccdoc::log& ccdoc::log::operator << (ostream& (fct)(ostream&) ) {
--  if(m_output_flag) {
--    vector<ostream*>::iterator i = m_os.begin();
--    for( ; i!=m_os.end(); ++i) {
--      ostream* os = *i;
--      if(os)
--	(*os) << fct( *os );
--    }
--  }
--  return *this;
--}
--// ================================================================
- // Warning
- // ================================================================
- ccdoc::log& ccdoc::log::warning() {
diff --git a/devel/ccdoc/files/patch-log.h b/devel/ccdoc/files/patch-log.h
deleted file mode 100644
index b99651b211a2..000000000000
--- a/devel/ccdoc/files/patch-log.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- log.h.orig	2018-08-26 04:31:27 UTC
-+++ log.h
-@@ -69,7 +69,6 @@ namespace ccdoc {
-     log& operator << (unsigned int);
-     log& operator << (long);
-     log& operator << (unsigned long);
--    log& operator << (ostream& (fct)(ostream&));
-     log& operator << (log& x) {return x;}
-     log& flush();
-     void insert(ostream*);
diff --git a/devel/ccdoc/files/patch-mkopt_gcc.mk b/devel/ccdoc/files/patch-mkopt_gcc.mk
deleted file mode 100644
index 481a3baaa4c5..000000000000
--- a/devel/ccdoc/files/patch-mkopt_gcc.mk
+++ /dev/null
@@ -1,27 +0,0 @@
---- mkopt_gcc.mk.orig	2004-10-06 16:35:47 UTC
-+++ mkopt_gcc.mk
-@@ -1,17 +1,17 @@
- # ================================================
- # GCC compiler, optimized mode, any platform.
- # ================================================
--PERL = perl
-+PERL = %%PERL%%
- PLATFORM = $(shell $(PERL) ../utils/platform.pl)
- CCDOC_CID = bin_opt_gcc_${PLATFORM}
- BIN_DIR = ../${CCDOC_CID}
- OBJ_EXT = o
--CXX = g++
--CXX_FLAGS = -c -pedantic -Wall -O -DCCDOC_OPT -DCCDOC_CID=\"${CCDOC_CID}\"
--CXX_OUT = -o 
-+CXX = %%CXX%%
-+CXX_FLAGS = -c -pedantic -Wall %%CXXFLAGS%% -DCCDOC_OPT -DCCDOC_CID=\"${CCDOC_CID}\"
-+CXX_OUT = -o
- LINK_TARG = ${BIN_DIR}/ccdoc.exe
--LINK = g++
--LINK_FLAGS = -g
--LINK_OUT = -o 
-+LINK = %%CXX%%
-+LINK_FLAGS = %%CXXFLAGS%%
-+LINK_OUT = -o
- 
- include mktargs.mk
diff --git a/devel/ccdoc/pkg-descr b/devel/ccdoc/pkg-descr
deleted file mode 100644
index 217ca2e98d71..000000000000
--- a/devel/ccdoc/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Ccdoc is a tool for extracting comments from C++ source code and presenting it
-in HTML format, very similar to Java's JavaDoc tool. The tagging used in ccdoc
-is very similar to that of Javadoc, with adaptations for the C++ specifics, of
-course. Ccdoc supports extracting comments from both header and implementation
-files.
-
-In contrast to most other C++ doc'ing applications, ccdoc analyses the code
-before it has been run through the pre-processor, so things such as macros can
-actually be included in the documentation.
-
-It's usage is not quite as straight forward as JavaDoc's, but considering the
-quality of the output, it is well worth the effort.
diff --git a/devel/cirrus-cli/Makefile b/devel/cirrus-cli/Makefile
index aa9d0f0e7549..777337769238 100644
--- a/devel/cirrus-cli/Makefile
+++ b/devel/cirrus-cli/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	cirrus-cli
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.129.1
-PORTREVISION=	4
+DISTVERSION=	0.130.2
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -11,7 +10,7 @@ WWW=		https://github.com/cirruslabs/cirrus-cli
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:1.22,modules
+USES=		go:1.24,modules
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/devel/cirrus-cli/distinfo b/devel/cirrus-cli/distinfo
index 9625af23794e..6a2355b8ee32 100644
--- a/devel/cirrus-cli/distinfo
+++ b/devel/cirrus-cli/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1728726420
-SHA256 (go/devel_cirrus-cli/cirrus-cli-v0.129.1/v0.129.1.mod) = 4c57cb388bf0476e369fbf2c9cf5cb4ad0485ab9c6d1dfc029c9f54c49acc0c2
-SIZE (go/devel_cirrus-cli/cirrus-cli-v0.129.1/v0.129.1.mod) = 10858
-SHA256 (go/devel_cirrus-cli/cirrus-cli-v0.129.1/v0.129.1.zip) = c172c722ecaad9f3bb9dd984db737533dc87ab2558843da240e0a36c03a8c0f7
-SIZE (go/devel_cirrus-cli/cirrus-cli-v0.129.1/v0.129.1.zip) = 1307842
+TIMESTAMP = 1746606409
+SHA256 (go/devel_cirrus-cli/cirrus-cli-v0.130.2/v0.130.2.mod) = 4c57cb388bf0476e369fbf2c9cf5cb4ad0485ab9c6d1dfc029c9f54c49acc0c2
+SIZE (go/devel_cirrus-cli/cirrus-cli-v0.130.2/v0.130.2.mod) = 10858
+SHA256 (go/devel_cirrus-cli/cirrus-cli-v0.130.2/v0.130.2.zip) = b83a880f370da734b8cb61567134d20beb358bf12d16a57f4cb3bc7078b7cff2
+SIZE (go/devel_cirrus-cli/cirrus-cli-v0.130.2/v0.130.2.zip) = 1307854
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index e5993dd0a3af..0c97fdb5b50f 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	clojure-cider
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.17.0
-PORTREVISION=	1
+DISTVERSION=	1.18.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/clojure-cider/distinfo b/devel/clojure-cider/distinfo
index 8ac71f26070a..ca9b99df6f51 100644
--- a/devel/clojure-cider/distinfo
+++ b/devel/clojure-cider/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739949657
-SHA256 (clojure-emacs-cider-v1.17.0_GH0.tar.gz) = 2177da997675f6df51b55ffeb84db8c85eea7bf6032f87969a0a81c9c062a4ea
-SIZE (clojure-emacs-cider-v1.17.0_GH0.tar.gz) = 7412971
+TIMESTAMP = 1746269707
+SHA256 (clojure-emacs-cider-v1.18.0_GH0.tar.gz) = 8096f54abc10e1a76a828ed1f8e311008773866524a9c69b6c81015a6f214afc
+SIZE (clojure-emacs-cider-v1.18.0_GH0.tar.gz) = 8838210
diff --git a/devel/cmunge/Makefile b/devel/cmunge/Makefile
index bfae1b23ecd2..a808e1eeb0d3 100644
--- a/devel/cmunge/Makefile
+++ b/devel/cmunge/Makefile
@@ -10,6 +10,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for encrypting and compacting C source code
 WWW=		http://www.vcpc.univie.ac.at/~jhm/cmunge/
 
+BROKEN=		Unfetchable
+DEPRECATED=	Upstream is gone
+EXPIRATION_DATE=2025-05-31
+
 WRKSRC=		${WRKDIR}/cmunger
 MAKE_ARGS=	CC="${CC} ${CFLAGS}"
 
diff --git a/devel/colormake/Makefile b/devel/colormake/Makefile
index 8fd0cc68125b..a29d65948dd6 100644
--- a/devel/colormake/Makefile
+++ b/devel/colormake/Makefile
@@ -8,6 +8,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wrapper to color gmake output
 WWW=		https://bre.klaki.net/programs/colormake/
 
+BROKEN=		Unfetchable
+DEPRECATED=	Abandoned upstream
+EXPIRATION_DATE=2025-05-31
+
 RUN_DEPENDS=	gmake:devel/gmake \
 		bash:shells/bash
 
diff --git a/devel/criterion/Makefile b/devel/criterion/Makefile
index 759e5a4f86f1..53fb6cd5f998 100644
--- a/devel/criterion/Makefile
+++ b/devel/criterion/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	criterion
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/csmith/Makefile b/devel/csmith/Makefile
index 909bb688819b..07c0d1a586a0 100644
--- a/devel/csmith/Makefile
+++ b/devel/csmith/Makefile
@@ -9,6 +9,10 @@ WWW=		https://embed.cs.utah.edu/csmith/
 
 LICENSE=	BSD2CLAUSE
 
+BROKEN=		Unfetchable
+DEPRECATED=	Unmaintained for years
+EXPIRATION_DATE=2024-06-30
+
 USES=		gmake libtool localbase perl5 shebangfix
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
diff --git a/devel/dura/Makefile b/devel/dura/Makefile
index 124be8cf4eb9..956f09ef1f07 100644
--- a/devel/dura/Makefile
+++ b/devel/dura/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dura
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/electron32/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/devel/electron32/files/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 000000000000..f07e3c5639d5
--- /dev/null
+++ b/devel/electron32/files/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2024-10-18 12:34:34 UTC
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args
+         # https://savannah.gnu.org/bugs/index.php?53028
+         gperf_output = re.sub(r'\bregister ', '', gperf_output)
+         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
++        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++        if re.search(
++                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
++                gperf_output):
++            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
++                                                '  [[fallthrough]];')
+         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+         # Replace {(int)(long)&(foo), bar} with
+         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/devel/electron33/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/devel/electron33/files/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 000000000000..49f75c47b3af
--- /dev/null
+++ b/devel/electron33/files/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-01-06 14:31:29 UTC
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args
+         # https://savannah.gnu.org/bugs/index.php?53028
+         gperf_output = re.sub(r'\bregister ', '', gperf_output)
+         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
++        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++        if re.search(
++                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
++                gperf_output):
++            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
++                                                '  [[fallthrough]];')
+         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+         # Replace {(int)(long)&(foo), bar} with
+         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/devel/electron34/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/devel/electron34/files/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 000000000000..253f9e7d747d
--- /dev/null
+++ b/devel/electron34/files/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-02-24 19:59:26 UTC
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args
+         # https://savannah.gnu.org/bugs/index.php?53028
+         gperf_output = re.sub(r'\bregister ', '', gperf_output)
+         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
++        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++        if re.search(
++                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
++                gperf_output):
++            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
++                                                '  [[fallthrough]];')
+         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+         # Replace {(int)(long)&(foo), bar} with
+         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/devel/electron35/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/devel/electron35/files/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 000000000000..07160cca56e6
--- /dev/null
+++ b/devel/electron35/files/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-04-14 21:12:04 UTC
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args
+         # https://savannah.gnu.org/bugs/index.php?53028
+         gperf_output = re.sub(r'\bregister ', '', gperf_output)
+         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
++        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++        if re.search(
++                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
++                gperf_output):
++            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
++                                                '  [[fallthrough]];')
+         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+         # Replace {(int)(long)&(foo), bar} with
+         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/devel/etcd35/Makefile b/devel/etcd35/Makefile
new file mode 100644
index 000000000000..7e47aae2ecd2
--- /dev/null
+++ b/devel/etcd35/Makefile
@@ -0,0 +1,68 @@
+PORTNAME=	etcd
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.5.21
+CATEGORIES=	devel
+MASTER_SITES=	https://raw.githubusercontent.com/etcd-io/${PORTNAME}/${DISTVERSIONFULL}/:gomod
+PKGNAMEPREFIX=	coreos-
+PKGNAMESUFFIX=	35
+DISTFILES=	go.mod:gomod \
+		api/go.mod:gomod \
+		pkg/go.mod:gomod \
+		client/pkg/go.mod:gomod \
+		client/v2/go.mod:gomod \
+		client/v3/go.mod:gomod \
+		etcdctl/go.mod:gomod \
+		etcdutl/go.mod:gomod \
+		raft/go.mod:gomod \
+		server/go.mod:gomod \
+		tests/go.mod:gomod
+
+MAINTAINER=	kiwi@FreeBSD.org
+COMMENT=	Highly-available key value store and service discovery
+WWW=		https://github.com/coreos/etcd
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cpe go:1.23,modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	etcd-io
+GO_MODULE=	go.etcd.io/etcd/v3
+GO_MOD_DIST=	github
+GO_TARGET=	./etcdctl ./etcdutl ./server
+
+CONFLICTS_INSTALL=	coreos-etcd[0-9][0-9]
+
+PLIST_FILES=	bin/etcd \
+		bin/etcdctl \
+		bin/etcdutl
+
+# This target is based on the post-extract target from Uses/go.mk
+post-extract:
+.for gt in ${GO_TARGET:T}
+	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
+	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
+	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
+	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
+.endfor
+
+# This target is based on the do-build target from Uses/go.mk.
+do-build:
+.for gt in ${GO_TARGET:T}
+	(cd ${GO_WRKSRC}/${gt}; \
+	for t in ${gt}; do \
+		out=$$(${BASENAME} $$(${ECHO_CMD} $${t} | \
+			${SED} -Ee 's/^[^:]*:([^:]+).*$$/\1/' -e 's/^\.$$/${PORTNAME}/')); \
+		pkg=$$(${ECHO_CMD} $${t} | \
+			${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
+		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
+		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
+			-o ${GO_WRKDIR_BIN}/$${out} \
+			.; \
+	done)
+.endfor
+
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/bin/server ${STAGEDIR}${PREFIX}/bin/etcd
+
+.include <bsd.port.mk>
diff --git a/devel/etcd35/distinfo b/devel/etcd35/distinfo
new file mode 100644
index 000000000000..5412d601db01
--- /dev/null
+++ b/devel/etcd35/distinfo
@@ -0,0 +1,25 @@
+TIMESTAMP = 1746210825
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/go.mod) = 49bb45ae5a3ba5c6bc24c92734bd3a4298b6cd9e4cc0bfac976c0bcdd2efcfa2
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/go.mod) = 4196
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/api/go.mod) = de19beffd2aeb61c6025339859195286befa8f2284ec915be82a5ff56f655e26
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/api/go.mod) = 1072
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/pkg/go.mod) = 70454afe2c7c63195470c8c970dea95bd9677e1e33bcb8426d4ea76bc0522928
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/pkg/go.mod) = 1173
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/client/pkg/go.mod) = f98d36cfad740f8cdc6842de31a9267b731b26846ab495b3fbe2cfd69f29aa03
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/client/pkg/go.mod) = 437
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/client/v2/go.mod) = 56b9256ae4b934d59e91cf7cbb7414422c1e6590919454afdad320d979caac10
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/client/v2/go.mod) = 763
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/client/v3/go.mod) = 49c2c838963786507c98634b200235f7632edee57e4de48672c8f63867003bb3
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/client/v3/go.mod) = 1818
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/etcdctl/go.mod) = 720d9323de6d81fe582271c2a6d1302ec554404790c44eca5275247ad52427b0
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/etcdctl/go.mod) = 3489
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/etcdutl/go.mod) = 4780489b45bd1ca9f7e293bdc2059c2ee2b3888d5fa9fa5019f3d2750117d187
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/etcdutl/go.mod) = 3152
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/raft/go.mod) = 851637a68394671dd0bdf027acae8f5bd6e72cc693c01f680542b9dee09cec4d
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/raft/go.mod) = 645
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/server/go.mod) = 5a1c635f8b7a125609c330f1c621e3a1f458ba2d9359a518fd87839cb33669a8
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/server/go.mod) = 3783
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/tests/go.mod) = db8c5104c032364d5e32e32d04360a0340292476d45946533ce3663f23e1e2da
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/tests/go.mod) = 3941
+SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/etcd-io-etcd-v3.5.21_GH0.tar.gz) = 76d7fcafe4fcc957fcd45671226b992c16e5f5e724935dea9df0190ac2b13481
+SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.21_GH0/etcd-io-etcd-v3.5.21_GH0.tar.gz) = 4132943
diff --git a/devel/etcd35/pkg-descr b/devel/etcd35/pkg-descr
new file mode 100644
index 000000000000..ea402f1fff4c
--- /dev/null
+++ b/devel/etcd35/pkg-descr
@@ -0,0 +1,11 @@
+A highly-available key value store for shared
+configuration and service discovery. etcd is
+inspired by zookeeper and doozer, with a focus on:
+
+* Simple: curl'able user facing API (HTTP+JSON)
+* Secure: optional SSL client cert authentication
+* Fast: benchmarked 1000s of writes/s per instance
+* Reliable: Properly distributed using Raft
+
+Etcd is written in Go and uses the raft consensus
+algorithm to manage a highly-available replicated log.
diff --git a/devel/etcd36/Makefile b/devel/etcd36/Makefile
new file mode 100644
index 000000000000..a7a443a2e893
--- /dev/null
+++ b/devel/etcd36/Makefile
@@ -0,0 +1,66 @@
+PORTNAME=	etcd
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.6.0-rc.4
+CATEGORIES=	devel
+MASTER_SITES=	https://raw.githubusercontent.com/etcd-io/${PORTNAME}/${DISTVERSIONFULL}/:gomod
+PKGNAMEPREFIX=	coreos-
+PKGNAMESUFFIX=	36
+DISTFILES=	go.mod:gomod \
+		api/go.mod:gomod \
+		pkg/go.mod:gomod \
+		client/pkg/go.mod:gomod \
+		client/v3/go.mod:gomod \
+		etcdctl/go.mod:gomod \
+		etcdutl/go.mod:gomod \
+		server/go.mod:gomod \
+		tests/go.mod:gomod
+
+MAINTAINER=	0mp@FreeBSD.org
+COMMENT=	Highly-available key value store and service discovery
+WWW=		https://etcd.io/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cpe go:1.23,modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	etcd-io
+GO_MODULE=	go.etcd.io/etcd/v3
+GO_MOD_DIST=	github
+GO_TARGET=	./etcdctl ./etcdutl ./server
+
+CONFLICTS_INSTALL=	coreos-etcd[0-9][0-9]
+
+PLIST_FILES=	bin/etcd \
+		bin/etcdctl \
+		bin/etcdutl
+
+# This target is based on the post-extract target from Uses/go.mk
+post-extract:
+.for gt in ${GO_TARGET:T}
+	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
+	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
+	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
+	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
+.endfor
+
+# This target is based on the do-build target from Uses/go.mk.
+do-build:
+.for gt in ${GO_TARGET:T}
+	(cd ${GO_WRKSRC}/${gt}; \
+	for t in ${gt}; do \
+		out=$$(${BASENAME} $$(${ECHO_CMD} $${t} | \
+			${SED} -Ee 's/^[^:]*:([^:]+).*$$/\1/' -e 's/^\.$$/${PORTNAME}/')); \
+		pkg=$$(${ECHO_CMD} $${t} | \
+			${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
+		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
+		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
+			-o ${GO_WRKDIR_BIN}/$${out} \
+			.; \
+	done)
+.endfor
+
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/bin/server ${STAGEDIR}${PREFIX}/bin/etcd
+
+.include <bsd.port.mk>
diff --git a/devel/etcd36/distinfo b/devel/etcd36/distinfo
new file mode 100644
index 000000000000..a047b821055f
--- /dev/null
+++ b/devel/etcd36/distinfo
@@ -0,0 +1,21 @@
+TIMESTAMP = 1746453492
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/go.mod) = dc9bf0b21ae0ab300e96e60bfcd3a2c73b5ebcfb36a6c717db0ffba789d753af
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/go.mod) = 4411
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/api/go.mod) = 55ef5a76dc335dc032b34457773e652b3ffde8d1586cdab9168c0f9fe78b2060
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/api/go.mod) = 1271
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/pkg/go.mod) = 3e492c667484b2b94cb0ad5132da101ddc24dfd97831ab55acfadf8136468ec4
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/pkg/go.mod) = 1463
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/pkg/go.mod) = e71fd432af21536333c9da0751d3cb9d9dde0925a5a6efa1d321d9123fb04183
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/pkg/go.mod) = 560
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/v3/go.mod) = 98130a7a95edc45eef055388dfdcd8fd41784f77ec8e10087f6c0ee272067040
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/v3/go.mod) = 2152
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdctl/go.mod) = 30624d3d842493d3cad7f1368db25f9d6bb204005c17028ab083367836b0cefd
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdctl/go.mod) = 2170
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdutl/go.mod) = b56fcff0f42f5e75f68d812338d7982e5059465350234e9042e3933a5b1eee20
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdutl/go.mod) = 4022
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/server/go.mod) = da9ea9e1d8b71a8a4adf43ed5ad7143a05c8871bc05c6c059fe0d3579aa0b25c
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/server/go.mod) = 3607
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/tests/go.mod) = ab486a67087d038c337b21064dacac69a504ffea4697aa3ebf8981b201521b34
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/tests/go.mod) = 4533
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcd-io-etcd-v3.6.0-rc.4_GH0.tar.gz) = fdeb4fce1d58214bd63341f2cd5230848eba4895e335e265eaf52ce7144b73ca
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcd-io-etcd-v3.6.0-rc.4_GH0.tar.gz) = 7370001
diff --git a/devel/etcd36/pkg-descr b/devel/etcd36/pkg-descr
new file mode 100644
index 000000000000..ea402f1fff4c
--- /dev/null
+++ b/devel/etcd36/pkg-descr
@@ -0,0 +1,11 @@
+A highly-available key value store for shared
+configuration and service discovery. etcd is
+inspired by zookeeper and doozer, with a focus on:
+
+* Simple: curl'able user facing API (HTTP+JSON)
+* Secure: optional SSL client cert authentication
+* Fast: benchmarked 1000s of writes/s per instance
+* Reliable: Properly distributed using Raft
+
+Etcd is written in Go and uses the raft consensus
+algorithm to manage a highly-available replicated log.
diff --git a/devel/eventxx/Makefile b/devel/eventxx/Makefile
index d0c43e09c7b9..404cf6e983a5 100644
--- a/devel/eventxx/Makefile
+++ b/devel/eventxx/Makefile
@@ -9,6 +9,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for libevent
 WWW=		http://www.llucax.com.ar/~luca/eventxx/
 
+DEPRECATED=	Upstream is gone, unmaintained for 10+ years in tree
+EXPIRATION_DATE=2025-05-31
+
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 NO_BUILD=	yes
diff --git a/devel/fatal/Makefile b/devel/fatal/Makefile
index 44d113a288ad..a97fc98d1067 100644
--- a/devel/fatal/Makefile
+++ b/devel/fatal/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fatal
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/fatal/distinfo b/devel/fatal/distinfo
index b0114fbc0c5b..54db462dd338 100644
--- a/devel/fatal/distinfo
+++ b/devel/fatal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891841
-SHA256 (facebook-fatal-v2025.04.28.00_GH0.tar.gz) = 083f4031c4b73d127868eef7012acbd2c863d5eb370aff78f92be65800cb311e
-SIZE (facebook-fatal-v2025.04.28.00_GH0.tar.gz) = 656397
+TIMESTAMP = 1746504543
+SHA256 (facebook-fatal-v2025.05.05.00_GH0.tar.gz) = 89108b8beac70a52e6f85f812335de19751c5f4494fb1c6b4543f37b936ccf8c
+SIZE (facebook-fatal-v2025.05.05.00_GH0.tar.gz) = 656319
diff --git a/devel/fbthrift/Makefile b/devel/fbthrift/Makefile
index 78284078211c..02adcba53f2e 100644
--- a/devel/fbthrift/Makefile
+++ b/devel/fbthrift/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fbthrift
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/fbthrift/distinfo b/devel/fbthrift/distinfo
index b121e6e4b7f2..125908dd9c67 100644
--- a/devel/fbthrift/distinfo
+++ b/devel/fbthrift/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891839
-SHA256 (facebook-fbthrift-v2025.04.28.00_GH0.tar.gz) = f88781be3be1417545e9c9772edc7f01ea7a2fcce860ea6a682c4d4650511d71
-SIZE (facebook-fbthrift-v2025.04.28.00_GH0.tar.gz) = 15063280
+TIMESTAMP = 1746504541
+SHA256 (facebook-fbthrift-v2025.05.05.00_GH0.tar.gz) = c14da09a5f4ed5fc345508e66ea84e6670b6383c92a421eb25d3f8e82ffa987c
+SIZE (facebook-fbthrift-v2025.05.05.00_GH0.tar.gz) = 15079795
diff --git a/devel/fbthrift/pkg-plist b/devel/fbthrift/pkg-plist
index 71f8f9a75be1..5cd99590fb31 100644
--- a/devel/fbthrift/pkg-plist
+++ b/devel/fbthrift/pkg-plist
@@ -280,7 +280,9 @@ include/thrift/lib/cpp2/debug_thrift_data_difference/pretty_print.h
 include/thrift/lib/cpp2/detail/EventHandlerRuntime.h
 include/thrift/lib/cpp2/detail/Isset.h
 include/thrift/lib/cpp2/detail/meta.h
+include/thrift/lib/cpp2/dynamic/SerializableRecord.h
 include/thrift/lib/cpp2/dynamic/TypeId.h
+include/thrift/lib/cpp2/dynamic/TypeSystem.h
 include/thrift/lib/cpp2/folly_dynamic/folly_dynamic.h
 include/thrift/lib/cpp2/folly_dynamic/internal/folly_dynamic-inl-post.h
 include/thrift/lib/cpp2/folly_dynamic/internal/folly_dynamic-inl-pre.h
@@ -351,7 +353,6 @@ include/thrift/lib/cpp2/op/detail/ContainerPatch.h
 include/thrift/lib/cpp2/op/detail/Copy.h
 include/thrift/lib/cpp2/op/detail/Create.h
 include/thrift/lib/cpp2/op/detail/Encode.h
-include/thrift/lib/cpp2/op/detail/Get.h
 include/thrift/lib/cpp2/op/detail/Hash.h
 include/thrift/lib/cpp2/op/detail/HashProtocol.h
 include/thrift/lib/cpp2/op/detail/Patch.h
@@ -363,7 +364,6 @@ include/thrift/lib/cpp2/op/detail/ValueOp.h
 include/thrift/lib/cpp2/op/detail/ValuePatch.h
 include/thrift/lib/cpp2/patch/DynamicPatch.h
 include/thrift/lib/cpp2/patch/detail/PatchBadge.h
-include/thrift/lib/cpp2/patch/detail/Scuba.h
 include/thrift/lib/cpp2/patch/detail/TaggedPatch.h
 include/thrift/lib/cpp2/protocol/BinaryProtocol-inl.h
 include/thrift/lib/cpp2/protocol/BinaryProtocol.h
@@ -730,7 +730,9 @@ include/thrift/lib/thrift/TypeToMaskAdapter.h
 include/thrift/lib/thrift/bundled_lib_thrift.h
 include/thrift/lib/thrift/detail/AnyPatch.h
 include/thrift/lib/thrift/detail/DynamicPatch.h
+include/thrift/lib/thrift/detail/SerializableRecordAdapter.h
 include/thrift/lib/thrift/detail/TypeIdAdapter.h
+include/thrift/lib/thrift/detail/TypeSystemAdapter.h
 include/thrift/lib/thrift/detail/id.h
 include/thrift/lib/thrift/detail/protocol.h
 include/thrift/lib/thrift/gen-cpp2/RocketUpgrade.h
diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index c72998583c0f..db0accfee417 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/folly/distinfo b/devel/folly/distinfo
index d55828eb6c82..e7d773fffd38 100644
--- a/devel/folly/distinfo
+++ b/devel/folly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891833
-SHA256 (facebook-folly-v2025.04.28.00_GH0.tar.gz) = 2198e153707459df9e931e07009aea9d6ef5fc8ee1a244c24761d326f3a21393
-SIZE (facebook-folly-v2025.04.28.00_GH0.tar.gz) = 4309458
+TIMESTAMP = 1746504535
+SHA256 (facebook-folly-v2025.05.05.00_GH0.tar.gz) = e302cc88fb9707045f2eaf89eb7e3c318ad8d9b7773b4bb3900785568c1214dc
+SIZE (facebook-folly-v2025.05.05.00_GH0.tar.gz) = 4310413
diff --git a/devel/fortran-stdlib/Makefile b/devel/fortran-stdlib/Makefile
new file mode 100644
index 000000000000..527cd9b09088
--- /dev/null
+++ b/devel/fortran-stdlib/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	fortran-stdlib
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.7.0
+CATEGORIES=	devel
+
+MAINTAINER=	rwn@mailo.com
+COMMENT=	Fortran Standard Library
+WWW=		https://stdlib.fortran-lang.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cmake fortran compiler:features
+
+BUILD_DEPENDS=	fypp:devel/py-fypp
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	fortran-lang
+GH_PROJECT=	stdlib
+
+CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	BUILD_TESTING
+
+.include <bsd.port.mk>
diff --git a/devel/fortran-stdlib/distinfo b/devel/fortran-stdlib/distinfo
new file mode 100644
index 000000000000..9c122aa48127
--- /dev/null
+++ b/devel/fortran-stdlib/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746516620
+SHA256 (fortran-lang-stdlib-v0.7.0_GH0.tar.gz) = 07615b1fd0d9c78f04ec5a26234d091cb7e359933ba2caee311dcd6f58d87af0
+SIZE (fortran-lang-stdlib-v0.7.0_GH0.tar.gz) = 3669255
diff --git a/devel/fortran-stdlib/files/patch-config-CMakeLists.txt b/devel/fortran-stdlib/files/patch-config-CMakeLists.txt
new file mode 100644
index 000000000000..ca524d5c609d
--- /dev/null
+++ b/devel/fortran-stdlib/files/patch-config-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- config/CMakeLists.txt.orig	2024-07-01 17:21:34 UTC
++++ config/CMakeLists.txt
+@@ -3,7 +3,7 @@ if(NOT DEFINED CMAKE_INSTALL_MODULEDIR)
+ if(NOT DEFINED CMAKE_INSTALL_MODULEDIR)
+   set(
+     CMAKE_INSTALL_MODULEDIR
+-    "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${CMAKE_Fortran_COMPILER_ID}-${CMAKE_Fortran_COMPILER_VERSION}"
++    "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${CMAKE_Fortran_COMPILER_ID}"
+     CACHE
+     STRING
+     "Directory in prefix to install generated module files"
diff --git a/devel/fortran-stdlib/pkg-descr b/devel/fortran-stdlib/pkg-descr
new file mode 100644
index 000000000000..6655bc76b4b0
--- /dev/null
+++ b/devel/fortran-stdlib/pkg-descr
@@ -0,0 +1,11 @@
+The Fortran Standard Library is a community driven de facto standard library for
+Fortran.
+
+The goal of the Fortran Standard Library is to achieve the following general
+scope:
+- Utilities (containers, strings, files, OS/environment integration, unit
+  testing & assertions, logging, ...)
+- Algorithms (searching and sorting, merging, ...)
+- Mathematics (linear algebra, sparse matrices, special functions, fast Fourier
+  transform, random numbers, statistics, ordinary differential equations,
+  numerical integration, optimization, ...)
diff --git a/devel/fortran-stdlib/pkg-plist b/devel/fortran-stdlib/pkg-plist
new file mode 100644
index 000000000000..ed65cce1e26e
--- /dev/null
+++ b/devel/fortran-stdlib/pkg-plist
@@ -0,0 +1,130 @@
+include/fortran_stdlib/GNU/stdlib_ansi.mod
+include/fortran_stdlib/GNU/stdlib_ansi.smod
+include/fortran_stdlib/GNU/stdlib_ansi@stdlib_ansi_operator.smod
+include/fortran_stdlib/GNU/stdlib_ansi@stdlib_ansi_to_string.smod
+include/fortran_stdlib/GNU/stdlib_array.mod
+include/fortran_stdlib/GNU/stdlib_ascii.mod
+include/fortran_stdlib/GNU/stdlib_bitsets.mod
+include/fortran_stdlib/GNU/stdlib_bitsets.smod
+include/fortran_stdlib/GNU/stdlib_bitsets@stdlib_bitsets_64.smod
+include/fortran_stdlib/GNU/stdlib_bitsets@stdlib_bitsets_large.smod
+include/fortran_stdlib/GNU/stdlib_codata.mod
+include/fortran_stdlib/GNU/stdlib_codata_type.mod
+include/fortran_stdlib/GNU/stdlib_constants.mod
+include/fortran_stdlib/GNU/stdlib_error.mod
+include/fortran_stdlib/GNU/stdlib_error.smod
+include/fortran_stdlib/GNU/stdlib_error@f08estop.smod
+include/fortran_stdlib/GNU/stdlib_hash_32bit.mod
+include/fortran_stdlib/GNU/stdlib_hash_32bit.smod
+include/fortran_stdlib/GNU/stdlib_hash_32bit@stdlib_hash_32bit_fnv.smod
+include/fortran_stdlib/GNU/stdlib_hash_32bit@stdlib_hash_32bit_nm.smod
+include/fortran_stdlib/GNU/stdlib_hash_32bit@stdlib_hash_32bit_water.smod
+include/fortran_stdlib/GNU/stdlib_hash_64bit.mod
+include/fortran_stdlib/GNU/stdlib_hash_64bit.smod
+include/fortran_stdlib/GNU/stdlib_hash_64bit@stdlib_hash_64bit_fnv.smod
+include/fortran_stdlib/GNU/stdlib_hash_64bit@stdlib_hash_64bit_pengy.smod
+include/fortran_stdlib/GNU/stdlib_hash_64bit@stdlib_hash_64bit_spookyv2.smod
+include/fortran_stdlib/GNU/stdlib_hashmap_wrappers.mod
+include/fortran_stdlib/GNU/stdlib_hashmap_wrappers.smod
+include/fortran_stdlib/GNU/stdlib_hashmaps.mod
+include/fortran_stdlib/GNU/stdlib_hashmaps.smod
+include/fortran_stdlib/GNU/stdlib_hashmaps@stdlib_hashmap_chaining.smod
+include/fortran_stdlib/GNU/stdlib_hashmaps@stdlib_hashmap_open.smod
+include/fortran_stdlib/GNU/stdlib_io.mod
+include/fortran_stdlib/GNU/stdlib_io.smod
+include/fortran_stdlib/GNU/stdlib_io_npy.mod
+include/fortran_stdlib/GNU/stdlib_io_npy.smod
+include/fortran_stdlib/GNU/stdlib_io_npy@stdlib_io_npy_load.smod
+include/fortran_stdlib/GNU/stdlib_io_npy@stdlib_io_npy_save.smod
+include/fortran_stdlib/GNU/stdlib_kinds.mod
+include/fortran_stdlib/GNU/stdlib_linalg.mod
+include/fortran_stdlib/GNU/stdlib_linalg.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_cross_product.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_determinant.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_diag.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_eigenvalues.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_kronecker.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_least_squares.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_outer_product.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_solve.smod
+include/fortran_stdlib/GNU/stdlib_linalg@stdlib_linalg_svd.smod
+include/fortran_stdlib/GNU/stdlib_linalg_blas.mod
+include/fortran_stdlib/GNU/stdlib_linalg_blas_aux.mod
+include/fortran_stdlib/GNU/stdlib_linalg_blas_c.mod
+include/fortran_stdlib/GNU/stdlib_linalg_blas_d.mod
+include/fortran_stdlib/GNU/stdlib_linalg_blas_q.mod
+include/fortran_stdlib/GNU/stdlib_linalg_blas_s.mod
+include/fortran_stdlib/GNU/stdlib_linalg_blas_w.mod
+include/fortran_stdlib/GNU/stdlib_linalg_blas_z.mod
+include/fortran_stdlib/GNU/stdlib_linalg_constants.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack_aux.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack_c.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack_d.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack_q.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack_s.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack_w.mod
+include/fortran_stdlib/GNU/stdlib_linalg_lapack_z.mod
+include/fortran_stdlib/GNU/stdlib_linalg_state.mod
+include/fortran_stdlib/GNU/stdlib_logger.mod
+include/fortran_stdlib/GNU/stdlib_math.mod
+include/fortran_stdlib/GNU/stdlib_math.smod
+include/fortran_stdlib/GNU/stdlib_math@stdlib_math_all_close.smod
+include/fortran_stdlib/GNU/stdlib_math@stdlib_math_arange.smod
+include/fortran_stdlib/GNU/stdlib_math@stdlib_math_diff.smod
+include/fortran_stdlib/GNU/stdlib_math@stdlib_math_is_close.smod
+include/fortran_stdlib/GNU/stdlib_math@stdlib_math_linspace.smod
+include/fortran_stdlib/GNU/stdlib_math@stdlib_math_logspace.smod
+include/fortran_stdlib/GNU/stdlib_math@stdlib_math_meshgrid.smod
+include/fortran_stdlib/GNU/stdlib_optval.mod
+include/fortran_stdlib/GNU/stdlib_quadrature.mod
+include/fortran_stdlib/GNU/stdlib_quadrature.smod
+include/fortran_stdlib/GNU/stdlib_quadrature@stdlib_quadrature_gauss.smod
+include/fortran_stdlib/GNU/stdlib_quadrature@stdlib_quadrature_simps.smod
+include/fortran_stdlib/GNU/stdlib_quadrature@stdlib_quadrature_trapz.smod
+include/fortran_stdlib/GNU/stdlib_random.mod
+include/fortran_stdlib/GNU/stdlib_random.smod
+include/fortran_stdlib/GNU/stdlib_selection.mod
+include/fortran_stdlib/GNU/stdlib_sorting.mod
+include/fortran_stdlib/GNU/stdlib_sorting.smod
+include/fortran_stdlib/GNU/stdlib_sorting@stdlib_sorting_ord_sort.smod
+include/fortran_stdlib/GNU/stdlib_sorting@stdlib_sorting_radix_sort.smod
+include/fortran_stdlib/GNU/stdlib_sorting@stdlib_sorting_sort.smod
+include/fortran_stdlib/GNU/stdlib_sorting@stdlib_sorting_sort_index.smod
+include/fortran_stdlib/GNU/stdlib_specialfunctions.mod
+include/fortran_stdlib/GNU/stdlib_specialfunctions.smod
+include/fortran_stdlib/GNU/stdlib_specialfunctions@stdlib_specialfunctions_legendre.smod
+include/fortran_stdlib/GNU/stdlib_specialfunctions_gamma.mod
+include/fortran_stdlib/GNU/stdlib_specialfunctions_gamma.smod
+include/fortran_stdlib/GNU/stdlib_stats.mod
+include/fortran_stdlib/GNU/stdlib_stats.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_corr.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_cov.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_mean.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_median.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_moment.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_moment_all.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_moment_mask.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_moment_scalar.smod
+include/fortran_stdlib/GNU/stdlib_stats@stdlib_stats_var.smod
+include/fortran_stdlib/GNU/stdlib_stats_distribution_exponential.mod
+include/fortran_stdlib/GNU/stdlib_stats_distribution_normal.mod
+include/fortran_stdlib/GNU/stdlib_stats_distribution_uniform.mod
+include/fortran_stdlib/GNU/stdlib_stats_distribution_uniform.smod
+include/fortran_stdlib/GNU/stdlib_str2num.mod
+include/fortran_stdlib/GNU/stdlib_string_type.mod
+include/fortran_stdlib/GNU/stdlib_string_type.smod
+include/fortran_stdlib/GNU/stdlib_string_type@stdlib_string_type_constructor.smod
+include/fortran_stdlib/GNU/stdlib_stringlist_type.mod
+include/fortran_stdlib/GNU/stdlib_stringlist_type.smod
+include/fortran_stdlib/GNU/stdlib_strings.mod
+include/fortran_stdlib/GNU/stdlib_strings.smod
+include/fortran_stdlib/GNU/stdlib_strings@stdlib_strings_to_string.smod
+include/fortran_stdlib/GNU/stdlib_system.mod
+include/fortran_stdlib/GNU/stdlib_version.mod
+lib/cmake/fortran_stdlib/fortran_stdlib-config-version.cmake
+lib/cmake/fortran_stdlib/fortran_stdlib-config.cmake
+lib/cmake/fortran_stdlib/fortran_stdlib-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/fortran_stdlib/fortran_stdlib-targets.cmake
+lib/libfortran_stdlib.so
+libdata/pkgconfig/fortran_stdlib.pc
diff --git a/devel/gbump/Makefile b/devel/gbump/Makefile
index 00b212f24392..3638569e7fb5 100644
--- a/devel/gbump/Makefile
+++ b/devel/gbump/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gbump
 PORTVERSION=	1.1.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
diff --git a/devel/geany-plugin-git-changebar/Makefile b/devel/geany-plugin-git-changebar/Makefile
index 836e837bac9c..1e2b8007b49b 100644
--- a/devel/geany-plugin-git-changebar/Makefile
+++ b/devel/geany-plugin-git-changebar/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	geany-plugin-git-changebar
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/devel/geany-plugin-workbench/Makefile b/devel/geany-plugin-workbench/Makefile
index 6f62df75ae6d..ef8f9fe93393 100644
--- a/devel/geany-plugin-workbench/Makefile
+++ b/devel/geany-plugin-workbench/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	geany-plugin-workbench
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile
index 47be8523ccf4..985a93df1009 100644
--- a/devel/git-codereview/Makefile
+++ b/devel/git-codereview/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	git-codereview
-DISTVERSION=	1.14.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+DISTVERSION=	1.15.0
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/devel/git-codereview/distinfo b/devel/git-codereview/distinfo
index 39927ab46aa6..1cdc1e7b8180 100644
--- a/devel/git-codereview/distinfo
+++ b/devel/git-codereview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741246381
-SHA256 (golang-review-v1.14.0_GH0.tar.gz) = f5f368c4a83dc965d83d41d54ed13a18e27e2323acb652f50550976e78721f5e
-SIZE (golang-review-v1.14.0_GH0.tar.gz) = 72250
+TIMESTAMP = 1746606284
+SHA256 (golang-review-v1.15.0_GH0.tar.gz) = 0a8d3ce0124e5bbf394607723a42942b9af91aaa7c03e0037c26bd462519a3b1
+SIZE (golang-review-v1.15.0_GH0.tar.gz) = 72301
diff --git a/devel/git-repo-manager/Makefile b/devel/git-repo-manager/Makefile
index 170bbfac0521..49f914c8d79f 100644
--- a/devel/git-repo-manager/Makefile
+++ b/devel/git-repo-manager/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-repo-manager
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.22
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/git-workspace/Makefile b/devel/git-workspace/Makefile
index 7b02ca17f28b..ef698bf89005 100644
--- a/devel/git-workspace/Makefile
+++ b/devel/git-workspace/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-workspace
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 9350f878a0d6..5d03999e8dd3 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitg
 PORTVERSION=	41
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
diff --git a/devel/gitu/Makefile b/devel/gitu/Makefile
index 4f6f77a375a8..60fe6b66da63 100644
--- a/devel/gitu/Makefile
+++ b/devel/gitu/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitu
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.30.3
+DISTVERSION=	0.31.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -88,7 +88,6 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		git-version-macro-0.3.9 \
 		git2-0.20.1 \
 		glob-0.3.1 \
-		globset-0.4.15 \
 		half-2.4.1 \
 		hashbrown-0.15.0 \
 		heck-0.5.0 \
@@ -109,7 +108,6 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		icu_provider_macros-1.5.0 \
 		idna-1.0.3 \
 		idna_adapter-1.2.0 \
-		ignore-0.4.23 \
 		indexmap-2.6.0 \
 		indoc-2.0.5 \
 		inotify-0.10.2 \
diff --git a/devel/gitu/distinfo b/devel/gitu/distinfo
index d94d8c7f04ff..7a721ca314b0 100644
--- a/devel/gitu/distinfo
+++ b/devel/gitu/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745309125
+TIMESTAMP = 1746508809
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
 SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
@@ -145,8 +145,6 @@ SHA256 (rust/crates/git2-0.20.1.crate) = 5220b8ba44c68a9a7f7a7659e864dd73692e417
 SIZE (rust/crates/git2-0.20.1.crate) = 223275
 SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
 SIZE (rust/crates/glob-0.3.1.crate) = 18880
-SHA256 (rust/crates/globset-0.4.15.crate) = 15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19
-SIZE (rust/crates/globset-0.4.15.crate) = 25177
 SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
 SIZE (rust/crates/half-2.4.1.crate) = 50892
 SHA256 (rust/crates/hashbrown-0.15.0.crate) = 1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb
@@ -187,8 +185,6 @@ SHA256 (rust/crates/idna-1.0.3.crate) = 686f825264d630750a544639377bae737628043f
 SIZE (rust/crates/idna-1.0.3.crate) = 142515
 SHA256 (rust/crates/idna_adapter-1.2.0.crate) = daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71
 SIZE (rust/crates/idna_adapter-1.2.0.crate) = 8206
-SHA256 (rust/crates/ignore-0.4.23.crate) = 6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b
-SIZE (rust/crates/ignore-0.4.23.crate) = 55901
 SHA256 (rust/crates/indexmap-2.6.0.crate) = 707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da
 SIZE (rust/crates/indexmap-2.6.0.crate) = 85204
 SHA256 (rust/crates/indoc-2.0.5.crate) = b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5
@@ -569,5 +565,5 @@ SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19d
 SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
-SHA256 (altsem-gitu-v0.30.3_GH0.tar.gz) = 946d734843c9e69bac29aeba65c4a900b106606beb6c4bbbd31c65971cb214de
-SIZE (altsem-gitu-v0.30.3_GH0.tar.gz) = 3937000
+SHA256 (altsem-gitu-v0.31.0_GH0.tar.gz) = a6eafe8fc5ce0dfec029d919bc970de330e6d5d8404d7f57ba89be27e7feec1c
+SIZE (altsem-gitu-v0.31.0_GH0.tar.gz) = 3937616
diff --git a/devel/gitui/Makefile b/devel/gitui/Makefile
index 4020cd1cf845..4d77e5891c50 100644
--- a/devel/gitui/Makefile
+++ b/devel/gitui/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitui
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.27.0	# After update, `make patch` and `make cargo-crates > Makefile.crates` to avoid fetching vendored openssl-src
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index 6b0a99e6ad7f..7faf00c606d5 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnome-builder
 PORTVERSION=	42.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
diff --git a/devel/golangci-lint/Makefile b/devel/golangci-lint/Makefile
index e2f66c06bb2b..8bfaa14ed7f0 100644
--- a/devel/golangci-lint/Makefile
+++ b/devel/golangci-lint/Makefile
@@ -1,23 +1,22 @@
 PORTNAME=	golangci-lint
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.62.2
-PORTREVISION=	3
+DISTVERSION=	2.1.5
 CATEGORIES=	devel
 
-MAINTAINER=	lcook@FreeBSD.org
+MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Linters Runner for Go
 WWW=		https://github.com/golangci/golangci-lint
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake go:1.22,modules
+USES=		gmake go:1.23,modules
 
 _BUILD_VERSION=	${DISTVERSION}
 _BUILD_COMMIT=	89476e7
 _BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
-GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}
+GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}/v2
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
diff --git a/devel/golangci-lint/distinfo b/devel/golangci-lint/distinfo
index 67bca6aae7e1..420853d8ef26 100644
--- a/devel/golangci-lint/distinfo
+++ b/devel/golangci-lint/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1734921304
-SHA256 (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.mod) = d5642925cd7324e7b63551dd7837cd21230aea4da54c83d9f906946533ea7c6c
-SIZE (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.mod) = 8564
-SHA256 (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.zip) = 87d2ed0a3ffc8b630dd049c5878ed3bd66317e095a085a48d701282971e1e76a
-SIZE (go/devel_golangci-lint/golangci-lint-v1.62.2/v1.62.2.zip) = 2288895
+TIMESTAMP = 1746295170
+SHA256 (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.mod) = d4436cfc877222ef95353ff40dbff34df18b39390c9597922753b8ea5d09f34f
+SIZE (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.mod) = 9323
+SHA256 (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.zip) = 4e69677eb96ebbd680b91b30e64f4707fb05a788469f920a42509458e0743388
+SIZE (go/devel_golangci-lint/golangci-lint-v2.1.5/v2.1.5.zip) = 2979567
diff --git a/devel/grpc-gateway/Makefile b/devel/grpc-gateway/Makefile
new file mode 100644
index 000000000000..28cf5ecee147
--- /dev/null
+++ b/devel/grpc-gateway/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	grpc-gateway
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.26.3
+CATEGORIES=	devel
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	gRPC to JSON proxy generator following the gRPC HTTP spec
+WWW=		https://github.com/grpc-ecosystem/grpc-gateway/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:1.23,modules
+
+GO_MODULE=	github.com/grpc-ecosystem/grpc-gateway/v2
+GO_TARGET=	./protoc-gen-grpc-gateway \
+			./protoc-gen-openapiv2
+
+PLIST_FILES=	bin/protoc-gen-grpc-gateway \
+			bin/protoc-gen-openapiv2
+
+.include <bsd.port.mk>
diff --git a/devel/grpc-gateway/distinfo b/devel/grpc-gateway/distinfo
new file mode 100644
index 000000000000..099646d3dcdc
--- /dev/null
+++ b/devel/grpc-gateway/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746353122
+SHA256 (go/devel_grpc-gateway/grpc-gateway-v2.26.3/v2.26.3.mod) = 2cddbad8d2382213d6072bc12793873dba8d6612bcc56da1c1582b601f3a87b6
+SIZE (go/devel_grpc-gateway/grpc-gateway-v2.26.3/v2.26.3.mod) = 680
+SHA256 (go/devel_grpc-gateway/grpc-gateway-v2.26.3/v2.26.3.zip) = c330a95ca20bf6c52af5474ebb58eb5c034925731e111a32c25e260f69075fb0
+SIZE (go/devel_grpc-gateway/grpc-gateway-v2.26.3/v2.26.3.zip) = 1142715
diff --git a/devel/grpc-gateway/pkg-descr b/devel/grpc-gateway/pkg-descr
new file mode 100644
index 000000000000..1aa2c860f558
--- /dev/null
+++ b/devel/grpc-gateway/pkg-descr
@@ -0,0 +1,5 @@
+The gRPC-Gateway is a plugin of the Google protocol buffers compiler
+protoc. It reads protobuf service definitions and generates a
+reverse-proxy server which translates a RESTful HTTP API into gRPC. This
+server is generated according to the google.api.http annotations in your
+service definitions.
diff --git a/devel/gsl-lite/Makefile b/devel/gsl-lite/Makefile
index 760dcb44e03b..ed7f110909bc 100644
--- a/devel/gsl-lite/Makefile
+++ b/devel/gsl-lite/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gsl-lite
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.42.0
+DISTVERSION=	0.43.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,9 +10,11 @@ WWW=		https://github.com/gsl-lite/gsl-lite
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake
+USES=		cmake:testing
 USE_GITHUB=	yes
 
+CMAKE_TESTING_ON=	GSL_LITE_OPT_BUILD_TESTS
+
 PLIST_FILES=	include/gsl-lite/gsl-lite.hpp \
 		include/gsl/gsl-lite.hpp \
 		lib/cmake/gsl-lite/gsl-lite-config-version.cmake \
@@ -21,4 +23,6 @@ PLIST_FILES=	include/gsl-lite/gsl-lite.hpp \
 
 NO_ARCH=	yes
 
+# tests as of 0.43.0: 100% tests passed, 0 tests failed out of 12
+
 .include <bsd.port.mk>
diff --git a/devel/gsl-lite/distinfo b/devel/gsl-lite/distinfo
index 26c404f4e07a..ac3d5846d7a2 100644
--- a/devel/gsl-lite/distinfo
+++ b/devel/gsl-lite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745802178
-SHA256 (gsl-lite-gsl-lite-v0.42.0_GH0.tar.gz) = 54a1b6f9db72eab5d8dcaf06b36d32d4f5da3471d91dac71aba19fe15291a773
-SIZE (gsl-lite-gsl-lite-v0.42.0_GH0.tar.gz) = 131013
+TIMESTAMP = 1746424869
+SHA256 (gsl-lite-gsl-lite-v0.43.0_GH0.tar.gz) = e48c3138648156d2b85905b1d280d661fad61524c5c0ca10d3857036ca3dd519
+SIZE (gsl-lite-gsl-lite-v0.43.0_GH0.tar.gz) = 134987
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index f82da9aaede9..0271ba4b4443 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	cabal-install
-PORTVERSION=	3.12.1.0
+PORTVERSION=	3.14.2.0
 DISTVERSIONPREFIX=	${PORTNAME}-v
-PORTREVISION=	2
 CATEGORIES=	devel haskell
 EXTRACT_ONLY=	${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX}
 
@@ -18,35 +17,38 @@ GH_ACCOUNT=	haskell
 GH_PROJECT=	cabal
 
 USE_CABAL=	alex-3.5.1.0 \
-		async-2.2.5_1 \
+		async-2.2.5_3 \
 		base16-bytestring-1.0.2.0_1 \
 		base64-bytestring-1.2.1.0_1 \
-		cryptohash-sha256-0.11.102.1_4 \
+		cryptohash-sha256-0.11.102.1_5 \
 		data-array-byte-0.1.0.1_1 \
-		directory-1.3.7.1 \
+		directory-1.3.9.0_1 \
 		echo-0.1.4 \
 		ed25519-0.0.5.0_8 \
 		edit-distance-0.2.2.1_1 \
-		hackage-security-0.6.2.6_1 \
-		hashable-1.4.6.0 \
-		hsc2hs-0.68.10_2 \
+		file-io-0.1.4 \
+		filepath-1.5.4.0 \
+		hackage-security-0.6.2.6_4 \
+		hashable-1.5.0.0_1 \
+		hsc2hs-0.68.10_3 \
 		HTTP-4000.4.1_4 \
 		lukko-0.1.2 \
-		network-3.2.0.0 \
+		network-3.2.6.0 \
 		network-uri-2.6.4.2_1 \
 		open-browser-0.2.1.0 \
-		os-string-2.0.3 \
-		process-1.6.17.0 \
+		os-string-2.0.7 \
+		process-1.6.25.0 \
 		random-1.2.1.2 \
 		regex-base-0.94.0.2_4 \
 		regex-posix-0.96.0.1_3 \
-		resolv-0.2.0.2_3 \
+		resolv-0.2.0.2_4 \
 		safe-exceptions-0.1.7.4_1 \
 		semaphore-compat-1.0.0_3 \
 		splitmix-0.1.0.5_1 \
-		tar-0.6.3.0 \
+		tar-0.6.3.0_1 \
 		th-compat-0.1.5_2 \
-		zlib-0.7.1.0
+		unix-2.8.6.0_1 \
+		zlib-0.7.1.0_2
 
 CABAL_EXECUTABLES=	cabal
 SKIP_CABAL_EXTRACT=	yes
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index 576fb883995b..79a69c398a58 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1719732118
+TIMESTAMP = 1746301163
 SHA256 (cabal/HTTP-4000.4.1/HTTP-4000.4.1.tar.gz) = df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453
 SIZE (cabal/HTTP-4000.4.1/HTTP-4000.4.1.tar.gz) = 74330
 SHA256 (cabal/HTTP-4000.4.1/revision/4.cabal) = b90ce97917703f6613ed5a8cfe1a51525b990244f5610509baa15c8499eadca3
@@ -7,8 +7,8 @@ SHA256 (cabal/alex-3.5.1.0/alex-3.5.1.0.tar.gz) = c92efe86f8eb959ee03be6c04ee57e
 SIZE (cabal/alex-3.5.1.0/alex-3.5.1.0.tar.gz) = 85982
 SHA256 (cabal/async-2.2.5/async-2.2.5.tar.gz) = 1818473ebab9212afad2ed76297aefde5fae8b5d4404daf36939aece6a8f16f7
 SIZE (cabal/async-2.2.5/async-2.2.5.tar.gz) = 15742
-SHA256 (cabal/async-2.2.5/revision/1.cabal) = 9d5d9e605f52958d099e13a8b8f30ee56cb137c9192996245e3c533adb682cf8
-SIZE (cabal/async-2.2.5/revision/1.cabal) = 3280
+SHA256 (cabal/async-2.2.5/revision/3.cabal) = b7648c6165729a973d95cb328f9fd874813a81c727707e8b2552b4f03399763b
+SIZE (cabal/async-2.2.5/revision/3.cabal) = 3366
 SHA256 (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784
 SIZE (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 7219
 SHA256 (cabal/base16-bytestring-1.0.2.0/revision/1.cabal) = a694e88f9ec9fc79f0b03f233d3fea592b68f70a34aac2ddb5bcaecb6562e2fd
@@ -19,14 +19,16 @@ SHA256 (cabal/base64-bytestring-1.2.1.0/revision/1.cabal) = 45305ccf8914c66d385b
 SIZE (cabal/base64-bytestring-1.2.1.0/revision/1.cabal) = 2502
 SHA256 (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6
 SIZE (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 15707
-SHA256 (cabal/cryptohash-sha256-0.11.102.1/revision/4.cabal) = 200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd
-SIZE (cabal/cryptohash-sha256-0.11.102.1/revision/4.cabal) = 5497
+SHA256 (cabal/cryptohash-sha256-0.11.102.1/revision/5.cabal) = acb64f2af52d81b0bb92c266f11d43def726a7a7b74a2c23d219e160b54edec7
+SIZE (cabal/cryptohash-sha256-0.11.102.1/revision/5.cabal) = 5489
 SHA256 (cabal/data-array-byte-0.1.0.1/data-array-byte-0.1.0.1.tar.gz) = 1bb6eca0b3e02d057fe7f4e14c81ef395216f421ab30fdaa1b18017c9c025600
 SIZE (cabal/data-array-byte-0.1.0.1/data-array-byte-0.1.0.1.tar.gz) = 6784
 SHA256 (cabal/data-array-byte-0.1.0.1/revision/1.cabal) = 2ef1bd3511e82ba56f7f23cd793dd2da84338a1e7c2cbea5b151417afe3baada
 SIZE (cabal/data-array-byte-0.1.0.1/revision/1.cabal) = 1989
-SHA256 (cabal/directory-1.3.7.1/directory-1.3.7.1.tar.gz) = dc2785d6548cec2e80700fab007d3e9467f65d3c58ab3efa21b34d9017cf0efd
-SIZE (cabal/directory-1.3.7.1/directory-1.3.7.1.tar.gz) = 83757
+SHA256 (cabal/directory-1.3.9.0/directory-1.3.9.0.tar.gz) = 20a24846117fc5f8751d974b7de07210a161989410467e9adca525381b8e64cc
+SIZE (cabal/directory-1.3.9.0/directory-1.3.9.0.tar.gz) = 98128
+SHA256 (cabal/directory-1.3.9.0/revision/1.cabal) = 2490137bb7738bd79392959458ef5f276219ea5ba8a9a56d3e0b06315c1bb917
+SIZE (cabal/directory-1.3.9.0/revision/1.cabal) = 3307
 SHA256 (cabal/echo-0.1.4/echo-0.1.4.tar.gz) = c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43
 SIZE (cabal/echo-0.1.4/echo-0.1.4.tar.gz) = 5501
 SHA256 (cabal/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz) = d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d
@@ -37,30 +39,36 @@ SHA256 (cabal/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz) = 3e8885ee2f56
 SIZE (cabal/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz) = 13228
 SHA256 (cabal/edit-distance-0.2.2.1/revision/1.cabal) = 4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee
 SIZE (cabal/edit-distance-0.2.2.1/revision/1.cabal) = 2351
+SHA256 (cabal/file-io-0.1.4/file-io-0.1.4.tar.gz) = e3d9113a015c57e3d8c2294550c41544f84a265291fed96cca697f91b6e86f52
+SIZE (cabal/file-io-0.1.4/file-io-0.1.4.tar.gz) = 10992
+SHA256 (cabal/filepath-1.5.4.0/filepath-1.5.4.0.tar.gz) = 54aa86c432f593273d7b9f607c5b5e0a1628c2674c6f4e3b5a54eb0c83db5caf
+SIZE (cabal/filepath-1.5.4.0/filepath-1.5.4.0.tar.gz) = 77260
 SHA256 (cabal/hackage-security-0.6.2.6/hackage-security-0.6.2.6.tar.gz) = 2e4261576b3e11b9f5175392947f56a638cc1a3584b8acbb962b809d7c69db69
 SIZE (cabal/hackage-security-0.6.2.6/hackage-security-0.6.2.6.tar.gz) = 84736
-SHA256 (cabal/hackage-security-0.6.2.6/revision/1.cabal) = 8ff70524314f9ad706f8e5051d7150ee44cb82170147879b245bdab279604b16
-SIZE (cabal/hackage-security-0.6.2.6/revision/1.cabal) = 9667
-SHA256 (cabal/hashable-1.4.6.0/hashable-1.4.6.0.tar.gz) = 34652a7a1d2fc9e3d764b150bd35bcd2220761c1d4c6b446b0cfac5ad5b778cb
-SIZE (cabal/hashable-1.4.6.0/hashable-1.4.6.0.tar.gz) = 89426
+SHA256 (cabal/hackage-security-0.6.2.6/revision/4.cabal) = a7311a70ce2cc820ee430c389f57f82a082f148230b37526c34eac72b7b3ff34
+SIZE (cabal/hackage-security-0.6.2.6/revision/4.cabal) = 9966
+SHA256 (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = e58b3a8e18da5f6cd7e937e5fd683e500bb1f8276b3768269759119ca0cddb6a
+SIZE (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = 89062
+SHA256 (cabal/hashable-1.5.0.0/revision/1.cabal) = 2f23146cbe0325029927b221647695a4c7d6e97548ff731110979e34361f58ef
+SIZE (cabal/hashable-1.5.0.0/revision/1.cabal) = 5914
 SHA256 (cabal/hsc2hs-0.68.10/hsc2hs-0.68.10.tar.gz) = 6f4e34d788fe2ca7091ee0a10307ee8a7c060a1ba890f2bffad16a7d4d5cef76
 SIZE (cabal/hsc2hs-0.68.10/hsc2hs-0.68.10.tar.gz) = 40517
-SHA256 (cabal/hsc2hs-0.68.10/revision/2.cabal) = 60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325
-SIZE (cabal/hsc2hs-0.68.10/revision/2.cabal) = 3032
+SHA256 (cabal/hsc2hs-0.68.10/revision/3.cabal) = 276325277350cd2c2c88916ed3ae5cd35b2b4f494ec594fbd9534081eb7fb759
+SIZE (cabal/hsc2hs-0.68.10/revision/3.cabal) = 3008
 SHA256 (cabal/lukko-0.1.2/lukko-0.1.2.tar.gz) = 72d86f8aa625b461f4397f737346f78a1700a7ffbff55cf6375c5e18916e986d
 SIZE (cabal/lukko-0.1.2/lukko-0.1.2.tar.gz) = 28448
-SHA256 (cabal/network-3.2.0.0/network-3.2.0.0.tar.gz) = c45696744dc437d93a56871a3dd869965b7b50eda3fe3c1a90a35e2fbb9cb9ca
-SIZE (cabal/network-3.2.0.0/network-3.2.0.0.tar.gz) = 142711
+SHA256 (cabal/network-3.2.6.0/network-3.2.6.0.tar.gz) = dbd8a10456908294eb5ab9c522bf2da75444d958429a643a821464213698523e
+SIZE (cabal/network-3.2.6.0/network-3.2.6.0.tar.gz) = 145574
 SHA256 (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228
 SIZE (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 31309
 SHA256 (cabal/network-uri-2.6.4.2/revision/1.cabal) = 6fffb57373962b5651a2db8b0af732098b3bf029a7ced76a9855615de2026588
 SIZE (cabal/network-uri-2.6.4.2/revision/1.cabal) = 3217
 SHA256 (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 0bed2e63800f738e78a4803ed22902accb50ac02068b96c17ce83a267244ca66
 SIZE (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 2629
-SHA256 (cabal/os-string-2.0.3/os-string-2.0.3.tar.gz) = f6b388b9f9002622901d3f71437b98f95f54fbf7fe10490d319cb801c2a061ea
-SIZE (cabal/os-string-2.0.3/os-string-2.0.3.tar.gz) = 43336
-SHA256 (cabal/process-1.6.17.0/process-1.6.17.0.tar.gz) = 4c5c454e0f5c864c79b9fabd850307b26d8ac4037e45a6a39ab87e20b583bf06
-SIZE (cabal/process-1.6.17.0/process-1.6.17.0.tar.gz) = 87688
+SHA256 (cabal/os-string-2.0.7/os-string-2.0.7.tar.gz) = 339c35fd3a290522f23de4e33528423cfd0b0a8f22946b0b9816a817b926cba0
+SIZE (cabal/os-string-2.0.7/os-string-2.0.7.tar.gz) = 44683
+SHA256 (cabal/process-1.6.25.0/process-1.6.25.0.tar.gz) = 496fe0566c3915b112e9772ac9c967dfeb8d5ca04895e54ae0160522bee76e65
+SIZE (cabal/process-1.6.25.0/process-1.6.25.0.tar.gz) = 100551
 SHA256 (cabal/random-1.2.1.2/random-1.2.1.2.tar.gz) = 790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4
 SIZE (cabal/random-1.2.1.2/random-1.2.1.2.tar.gz) = 47229
 SHA256 (cabal/regex-base-0.94.0.2/regex-base-0.94.0.2.tar.gz) = 7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1
@@ -73,8 +81,8 @@ SHA256 (cabal/regex-posix-0.96.0.1/revision/3.cabal) = 816d6acc560cb86672f347a7b
 SIZE (cabal/regex-posix-0.96.0.1/revision/3.cabal) = 2925
 SHA256 (cabal/resolv-0.2.0.2/resolv-0.2.0.2.tar.gz) = 880d283df9132a7375fa28670f71e86480a4f49972256dc2a204c648274ae74b
 SIZE (cabal/resolv-0.2.0.2/resolv-0.2.0.2.tar.gz) = 159658
-SHA256 (cabal/resolv-0.2.0.2/revision/3.cabal) = 4868265ab5760d2fdeb96625b138c8df25d41b9ee2651fa299ed019a69403045
-SIZE (cabal/resolv-0.2.0.2/revision/3.cabal) = 5006
+SHA256 (cabal/resolv-0.2.0.2/revision/4.cabal) = 3e196e1362e4d0ec9dfcd7f8d58b24fac91beafaa1c8ee34dc9dee489c362377
+SIZE (cabal/resolv-0.2.0.2/revision/4.cabal) = 4950
 SHA256 (cabal/safe-exceptions-0.1.7.4/safe-exceptions-0.1.7.4.tar.gz) = 3c51d8d50c9b60ff8bf94f942fd92e3bea9e62c5afa778dfc9f707b79da41ef6
 SIZE (cabal/safe-exceptions-0.1.7.4/safe-exceptions-0.1.7.4.tar.gz) = 15347
 SHA256 (cabal/safe-exceptions-0.1.7.4/revision/1.cabal) = 8bb7261bd54bd58acfcb154be6a161fb6d0d31a1852aadc8e927d2ad2d7651d1
@@ -89,11 +97,19 @@ SHA256 (cabal/splitmix-0.1.0.5/revision/1.cabal) = caa9b4a92abf1496c7f6a3c0f4e35
 SIZE (cabal/splitmix-0.1.0.5/revision/1.cabal) = 6596
 SHA256 (cabal/tar-0.6.3.0/tar-0.6.3.0.tar.gz) = 50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814
 SIZE (cabal/tar-0.6.3.0/tar-0.6.3.0.tar.gz) = 54502
+SHA256 (cabal/tar-0.6.3.0/revision/1.cabal) = e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a
+SIZE (cabal/tar-0.6.3.0/revision/1.cabal) = 4634
 SHA256 (cabal/th-compat-0.1.5/th-compat-0.1.5.tar.gz) = 81f55fafc7afad7763c09cb8b7b4165ca3765edcf70ffa42c7393043a1382a1e
 SIZE (cabal/th-compat-0.1.5/th-compat-0.1.5.tar.gz) = 14893
 SHA256 (cabal/th-compat-0.1.5/revision/2.cabal) = 129a59ba3ccfcd06192fd6da899e2711ae276a466915a047bd6727e4a0321d2e
 SIZE (cabal/th-compat-0.1.5/revision/2.cabal) = 3330
+SHA256 (cabal/unix-2.8.6.0/unix-2.8.6.0.tar.gz) = 8117599bb3e4aa1d4656710afbc85aef2a75483eddfac5338f8cc88fb505eea2
+SIZE (cabal/unix-2.8.6.0/unix-2.8.6.0.tar.gz) = 184419
+SHA256 (cabal/unix-2.8.6.0/revision/1.cabal) = 5b7f8afd7a879c3c8c3c636fd3c7543cdd5e0b514b7da90e76907ccd11434031
+SIZE (cabal/unix-2.8.6.0/revision/1.cabal) = 10177
 SHA256 (cabal/zlib-0.7.1.0/zlib-0.7.1.0.tar.gz) = 6edd38b6b81df8d274952aa85affa6968ae86b2231e1d429ce8bc9083e6a55bc
 SIZE (cabal/zlib-0.7.1.0/zlib-0.7.1.0.tar.gz) = 29318
-SHA256 (cabal/haskell-cabal-cabal-install-v3.12.1.0_GH0.tar.gz) = 84e883989cf44341dada05f866ec2b0256ac1f3bd111fcf80e7b6a7b77942af3
-SIZE (cabal/haskell-cabal-cabal-install-v3.12.1.0_GH0.tar.gz) = 2500419
+SHA256 (cabal/zlib-0.7.1.0/revision/2.cabal) = 85e64a75c0b490506a7edaa2d54950c668e66b65758bb08bb14cd31faf53a206
+SIZE (cabal/zlib-0.7.1.0/revision/2.cabal) = 5357
+SHA256 (cabal/haskell-cabal-cabal-install-v3.14.2.0_GH0.tar.gz) = c24784c3cfaea08f7a0cfcddba31672044dcab59f5c6bb58a82ddc7e4310badc
+SIZE (cabal/haskell-cabal-cabal-install-v3.14.2.0_GH0.tar.gz) = 3926030
diff --git a/devel/hs-cabal-install/files/patch-Cabal_src_Distribution_Simple_Configure.hs b/devel/hs-cabal-install/files/patch-Cabal_src_Distribution_Simple_Configure.hs
index 65a60d22f937..7154dac56321 100644
--- a/devel/hs-cabal-install/files/patch-Cabal_src_Distribution_Simple_Configure.hs
+++ b/devel/hs-cabal-install/files/patch-Cabal_src_Distribution_Simple_Configure.hs
@@ -1,6 +1,6 @@
---- Cabal/src/Distribution/Simple/Configure.hs.orig	2024-06-24 23:58:58 UTC
+--- Cabal/src/Distribution/Simple/Configure.hs.orig	2025-04-03 19:39:49 UTC
 +++ Cabal/src/Distribution/Simple/Configure.hs
-@@ -2631,6 +2631,7 @@ checkForeignLibSupported comp platform flib = go (comp
+@@ -2854,6 +2854,7 @@ checkForeignLibSupported comp platform flib = go (comp
      goGhcPlatform :: Platform -> Maybe String
      goGhcPlatform (Platform _ OSX) = goGhcOsx (foreignLibType flib)
      goGhcPlatform (Platform _ Linux) = goGhcLinux (foreignLibType flib)
diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.6.4.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.6.4.json
index 6ae12f8ca82c..b2095c5e004c 100644
--- a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.6.4.json
+++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.6.4.json
@@ -1,47 +1,34 @@
---- bootstrap/linux-9.6.4.json.orig	2024-06-24 23:58:58 UTC
+--- bootstrap/linux-9.6.4.json.orig	2025-04-03 19:39:49 UTC
 +++ bootstrap/linux-9.6.4.json
-@@ -14,7 +14,7 @@
+@@ -14,11 +14,11 @@
          },
          {
              "package": "base",
 -            "version": "4.18.2.0"
-+            "version": "4.18.2.1"
++            "version": "4.18.3.0"
          },
          {
              "package": "array",
+-            "version": "0.5.6.0"
++            "version": "0.5.8.0"
+         },
+         {
+             "package": "deepseq",
 @@ -26,7 +26,7 @@
          },
          {
              "package": "ghc-boot-th",
 -            "version": "9.6.4"
-+            "version": "9.6.6"
++            "version": "9.6.7"
          },
          {
              "package": "pretty",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "filepath",
--            "version": "1.4.200.1"
-+            "version": "1.4.300.1"
-         },
-         {
-             "package": "time",
-@@ -74,7 +74,7 @@
-         },
-         {
-             "package": "directory",
--            "version": "1.3.8.1"
-+            "version": "1.3.8.5"
+@@ -42,7 +42,7 @@
          },
          {
-             "package": "binary",
-@@ -90,7 +90,7 @@
+             "package": "bytestring",
+-            "version": "0.11.5.3"
++            "version": "0.11.5.4"
          },
          {
-             "package": "process",
--            "version": "1.6.17.0"
-+            "version": "1.6.19.0"
-         }
-     ],
-     "dependencies": [
+             "package": "transformers",
diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile
index 187eaf1d42d0..b3ba5e531c99 100644
--- a/devel/hs-haskell-language-server/Makefile
+++ b/devel/hs-haskell-language-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	haskell-language-server
 DISTVERSION=	2.10.0.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hyprlang/Makefile b/devel/hyprlang/Makefile
index 198e769bb1bc..eb4872cfe667 100644
--- a/devel/hyprlang/Makefile
+++ b/devel/hyprlang/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	hyprlang
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1
-PORTREVISION=	1
+DISTVERSION=	0.6.3
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/hyprlang/distinfo b/devel/hyprlang/distinfo
index 676478a37bce..e490a8ba0378 100644
--- a/devel/hyprlang/distinfo
+++ b/devel/hyprlang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744468525
-SHA256 (hyprwm-hyprlang-v0.6.1_GH0.tar.gz) = 8537bb112c633b3463850747d1fd29e1e1884df2cc4659c12736b941ba06e6bb
-SIZE (hyprwm-hyprlang-v0.6.1_GH0.tar.gz) = 59417
+TIMESTAMP = 1746655412
+SHA256 (hyprwm-hyprlang-v0.6.3_GH0.tar.gz) = f5effe017edc7a0036c20c7ecbea4edc2bfdacbc0f791b283bd21ec202384251
+SIZE (hyprwm-hyprlang-v0.6.3_GH0.tar.gz) = 60065
diff --git a/devel/hyprutils/Makefile b/devel/hyprutils/Makefile
index 116bc205ca90..c71a972728ce 100644
--- a/devel/hyprutils/Makefile
+++ b/devel/hyprutils/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hyprutils
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.0
+DISTVERSION=	0.7.1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/hyprutils/distinfo b/devel/hyprutils/distinfo
index e7591f7ae49b..51b4d935e95b 100644
--- a/devel/hyprutils/distinfo
+++ b/devel/hyprutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745975815
-SHA256 (hyprwm-hyprutils-v0.7.0_GH0.tar.gz) = 45d7b76ad477a01dd55807949bf245edb8d2597c50fdd2001a7ce1e0c59ef58f
-SIZE (hyprwm-hyprutils-v0.7.0_GH0.tar.gz) = 36392
+TIMESTAMP = 1746635225
+SHA256 (hyprwm-hyprutils-v0.7.1_GH0.tar.gz) = bcbf05252b392b8837eec9ba9855ff6ddab571f9795917c7139215ae4b2cf1bc
+SIZE (hyprwm-hyprutils-v0.7.1_GH0.tar.gz) = 36755
diff --git a/devel/hyprutils/pkg-plist b/devel/hyprutils/pkg-plist
index 12a0081f6554..8ec9b786a9f5 100644
--- a/devel/hyprutils/pkg-plist
+++ b/devel/hyprutils/pkg-plist
@@ -17,6 +17,7 @@ include/hyprutils/os/Process.hpp
 include/hyprutils/path/Path.hpp
 include/hyprutils/signal/Listener.hpp
 include/hyprutils/signal/Signal.hpp
+include/hyprutils/string/ConstVarList.hpp
 include/hyprutils/string/String.hpp
 include/hyprutils/string/VarList.hpp
 include/hyprutils/utils/ScopeGuard.hpp
diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makefile
index 70918401303e..4a33bb341320 100644
--- a/devel/ignition-common/Makefile
+++ b/devel/ignition-common/Makefile
@@ -35,6 +35,8 @@ WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 PLIST_SUB=	COMMON_IGN_VER=common${DISTVERSION:R:R}
 
+TESTING_UNSAFE=	6 tests failed out of 79
+
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
diff --git a/devel/indi/Makefile b/devel/indi/Makefile
index 099e32a4819d..c27a6131f96c 100644
--- a/devel/indi/Makefile
+++ b/devel/indi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	indi
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.2.1
+DISTVERSION=	2.1.3
 CATEGORIES=	devel astro
 
 MAINTAINER=	acm@FreeBSD.org
@@ -12,15 +12,15 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
-LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
-		libnova.so:astro/libnova \
+LIB_DEPENDS=	libXISF.so:graphics/libxisf \
+		libcfitsio.so:astro/cfitsio \
 		libcurl.so:ftp/curl \
-		libgsl.so:math/gsl \
+		libev.so:devel/libev \
 		libfftw3.so:math/fftw3 \
-		libtheora.so:multimedia/libtheora \
+		libgsl.so:math/gsl \
+		libnova.so:astro/libnova \
 		libogg.so:audio/libogg \
-		libev.so:devel/libev \
-		libXISF.so:graphics/libxisf
+		libtheora.so:multimedia/libtheora
 
 USES=		cmake jpeg iconv ninja pkgconfig
 USE_GITHUB=	yes
@@ -28,6 +28,6 @@ GH_ACCOUNT=	indilib
 
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	SOVERSION=${DISTVERSION:R}
+PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/indi/distinfo b/devel/indi/distinfo
index 08f5f7fee79c..4ba1df6f6504 100644
--- a/devel/indi/distinfo
+++ b/devel/indi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740300270
-SHA256 (indilib-indi-v2.1.2.1_GH0.tar.gz) = 2ef3151e984101575b51e9ec2dd9dafdbf5b656b5ca773279b6ca3bffae667ba
-SIZE (indilib-indi-v2.1.2.1_GH0.tar.gz) = 2941118
+TIMESTAMP = 1744745462
+SHA256 (indilib-indi-v2.1.3_GH0.tar.gz) = ccf1999abfe84469a04149142c1cf5383cb6e2ac5e63f7b05d7892fb717c168e
+SIZE (indilib-indi-v2.1.3_GH0.tar.gz) = 2958687
diff --git a/devel/indi/files/patch-indiserver_LocalDvrInfo.cpp b/devel/indi/files/patch-indiserver_LocalDvrInfo.cpp
new file mode 100644
index 000000000000..e074a5ab8f5b
--- /dev/null
+++ b/devel/indi/files/patch-indiserver_LocalDvrInfo.cpp
@@ -0,0 +1,10 @@
+--- indiserver/LocalDvrInfo.cpp.orig	2025-03-31 09:12:20 UTC
++++ indiserver/LocalDvrInfo.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include "Fifo.hpp"
+ #include <sys/socket.h>
++#include <sys/wait.h>
+ #include <fcntl.h>
+ #include <libgen.h>
+ #include <unistd.h>
diff --git a/devel/indi/files/patch-indiserver_RemoteDvrInfo.cpp b/devel/indi/files/patch-indiserver_RemoteDvrInfo.cpp
new file mode 100644
index 000000000000..9e0dec02afbd
--- /dev/null
+++ b/devel/indi/files/patch-indiserver_RemoteDvrInfo.cpp
@@ -0,0 +1,10 @@
+--- indiserver/RemoteDvrInfo.cpp.orig	2025-03-31 09:12:20 UTC
++++ indiserver/RemoteDvrInfo.cpp
+@@ -25,6 +25,7 @@
+ #include <cstdio>
+ #include <netinet/in.h>
+ #include <netdb.h>
++#include <sys/socket.h>
+ 
+ using namespace indiserver::constants;
+ 
diff --git a/devel/indi/files/patch-indiserver_TcpServer.cpp b/devel/indi/files/patch-indiserver_TcpServer.cpp
new file mode 100644
index 000000000000..006803bd5680
--- /dev/null
+++ b/devel/indi/files/patch-indiserver_TcpServer.cpp
@@ -0,0 +1,10 @@
+--- indiserver/TcpServer.cpp.orig	2025-03-31 09:12:20 UTC
++++ indiserver/TcpServer.cpp
+@@ -25,6 +25,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <fcntl.h>
++#include <sys/socket.h>
+ 
+ TcpServer::TcpServer(int port): port(port)
+ {
diff --git a/devel/indi/files/patch-indiserver_UnixServer.cpp b/devel/indi/files/patch-indiserver_UnixServer.cpp
new file mode 100644
index 000000000000..4e8dedb8a2ee
--- /dev/null
+++ b/devel/indi/files/patch-indiserver_UnixServer.cpp
@@ -0,0 +1,10 @@
+--- indiserver/UnixServer.cpp.orig	2025-03-31 09:12:20 UTC
++++ indiserver/UnixServer.cpp
+@@ -25,6 +25,7 @@
+ #include <sys/un.h>
+ #include <sys/socket.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #ifdef ENABLE_INDI_SHARED_MEMORY
+ 
+ std::string UnixServer::unixSocketPath = INDIUNIXSOCK;
diff --git a/devel/indi/pkg-plist b/devel/indi/pkg-plist
index a4aaf8ac8451..ab7fd40ecbff 100644
--- a/devel/indi/pkg-plist
+++ b/devel/indi/pkg-plist
@@ -1,7 +1,9 @@
 bin/indi_Excalibur
 bin/indi_aaf2_focus
+bin/indi_aagsolo_weather
 bin/indi_activefocuser_focus
 bin/indi_alluna_tcs2
+bin/indi_alpaca_dome
 bin/indi_alto
 bin/indi_arduinost4
 bin/indi_astrolink4
@@ -127,9 +129,11 @@ bin/indi_setprop
 bin/indi_siefs_focus
 bin/indi_simulator_ccd
 bin/indi_simulator_dome
+bin/indi_simulator_dustcover
 bin/indi_simulator_focus
 bin/indi_simulator_gps
 bin/indi_simulator_guide
+bin/indi_simulator_io
 bin/indi_simulator_lightpanel
 bin/indi_simulator_receiver
 bin/indi_simulator_rotator
@@ -172,6 +176,7 @@ bin/indi_wanderercover_v4_ec
 bin/indi_watchdog
 bin/indi_watcher_weather
 bin/indi_wavesharemodbus_relay
+bin/indi_weather_safety_alpaca
 bin/indi_weather_safety_proxy
 bin/indi_xagyl_wheel
 bin/indiserver
diff --git a/devel/interactive_rebase_tool/Makefile b/devel/interactive_rebase_tool/Makefile
index 8ae2c474a902..ec62d15c5e0a 100644
--- a/devel/interactive_rebase_tool/Makefile
+++ b/devel/interactive_rebase_tool/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	interactive_rebase_tool
 DISTVERSION=	2.4.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 
 MAINTAINER=	petteri.valkonen@iki.fi
diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile
index 87a43f6b319b..a514a8409069 100644
--- a/devel/jenkins-lts/Makefile
+++ b/devel/jenkins-lts/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	jenkins
-PORTVERSION=	2.492.3
+PORTVERSION=	2.504.1
 CATEGORIES=	devel java
 MASTER_SITES=	https://get.jenkins.io/war-stable/${PORTVERSION}/
 PKGNAMESUFFIX=	-lts
diff --git a/devel/jenkins-lts/distinfo b/devel/jenkins-lts/distinfo
index 75afeff64aca..b7d5df6b40cb 100644
--- a/devel/jenkins-lts/distinfo
+++ b/devel/jenkins-lts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744351486
-SHA256 (jenkins/2.492.3/jenkins.war) = 90ccf556133c36fdf7653ad710f00d248bf2895f9fbc26ccee0e2d3ba681b01f
-SIZE (jenkins/2.492.3/jenkins.war) = 96690342
+TIMESTAMP = 1746182958
+SHA256 (jenkins/2.504.1/jenkins.war) = 81026db18b0c4aad6b62cf408e4c42e5797661b41c517b37df606238e89b9df1
+SIZE (jenkins/2.504.1/jenkins.war) = 94294478
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index 2f72ac0b3829..a97b458d3238 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	jenkins
-PORTVERSION=	2.508
+PORTVERSION=	2.509
 CATEGORIES=	devel java
 MASTER_SITES=	https://get.jenkins.io/war/${PORTVERSION}/
 DISTNAME=	jenkins
diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo
index 71c66265b87f..69fe0c689cde 100644
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745947088
-SHA256 (jenkins/2.508/jenkins.war) = 5f56374bedef57a3dcfc58fdaea337ab342fd789939c8037a958d0f028e81606
-SIZE (jenkins/2.508/jenkins.war) = 86889345
+TIMESTAMP = 1746547929
+SHA256 (jenkins/2.509/jenkins.war) = 32c0cb0c9e030cb0472c80ed4e1e4eb252a10fbed59de8c987d6aaba6718b1b2
+SIZE (jenkins/2.509/jenkins.war) = 86878402
diff --git a/devel/kf5-ktexteditor/Makefile b/devel/kf5-ktexteditor/Makefile
index b5e784d83e64..ce4564ecf4e4 100644
--- a/devel/kf5-ktexteditor/Makefile
+++ b/devel/kf5-ktexteditor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ktexteditor
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kommit/Makefile b/devel/kommit/Makefile
index d49a0035af1f..6091ef40a0b9 100644
--- a/devel/kommit/Makefile
+++ b/devel/kommit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kommit
 DISTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/
 
diff --git a/devel/lazygit/Makefile b/devel/lazygit/Makefile
index ff17a6a44427..248937489604 100644
--- a/devel/lazygit/Makefile
+++ b/devel/lazygit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lazygit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.49.0
+DISTVERSION=	0.50.0
 CATEGORIES=	devel
 
 MAINTAINER=	meta@FreeBSD.org
diff --git a/devel/lazygit/distinfo b/devel/lazygit/distinfo
index 0a174f66cb00..6e1312a91305 100644
--- a/devel/lazygit/distinfo
+++ b/devel/lazygit/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1744778342
-SHA256 (go/devel_lazygit/lazygit-v0.49.0/v0.49.0.mod) = f4c9e56214617f41fcab426690f6fac4a8cdf65d3d4a4f1f009b596a2b63abe6
-SIZE (go/devel_lazygit/lazygit-v0.49.0/v0.49.0.mod) = 3871
-SHA256 (go/devel_lazygit/lazygit-v0.49.0/v0.49.0.zip) = 95a5323ab6c8382b97aa929a630e70dbe7a0ed43e5010c25c65162fd4f5fbaf3
-SIZE (go/devel_lazygit/lazygit-v0.49.0/v0.49.0.zip) = 1381634
+TIMESTAMP = 1746583522
+SHA256 (go/devel_lazygit/lazygit-v0.50.0/v0.50.0.mod) = 3decfa30920ead4fbd3654a3f4d1379f6afaecd3682c9be515c4c60b3a81648c
+SIZE (go/devel_lazygit/lazygit-v0.50.0/v0.50.0.mod) = 3871
+SHA256 (go/devel_lazygit/lazygit-v0.50.0/v0.50.0.zip) = 971afa5addf44fed6822ab426c54e19951d0afc71c3ffb460e60135395debf87
+SIZE (go/devel_lazygit/lazygit-v0.50.0/v0.50.0.zip) = 1412293
diff --git a/devel/libconfig/Makefile b/devel/libconfig/Makefile
index a5ae7ae75b59..361791a5d7a6 100644
--- a/devel/libconfig/Makefile
+++ b/devel/libconfig/Makefile
@@ -9,7 +9,7 @@ WWW=		https://www.hyperrealm.com/libconfig/libconfig.html
 
 LICENSE=	LGPL21
 
-USES=		autoreconf libtool pathfix
+USES=		libtool pathfix
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/devel/libsearpc/pkg-plist b/devel/libsearpc/pkg-plist
index 62a14dafcb06..172f9f785099 100644
--- a/devel/libsearpc/pkg-plist
+++ b/devel/libsearpc/pkg-plist
@@ -8,24 +8,31 @@ lib/libsearpc.a
 lib/libsearpc.so
 lib/libsearpc.so.1
 lib/libsearpc.so.1.0.2
-libdata/pkgconfig/libsearpc.pc
 %%PYTHON_SITELIBDIR%%/pysearpc/__init__.py
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/named_pipe.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/named_pipe.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/transport.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/transport.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/client%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/client%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/client%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/common%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/common%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/common%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/named_pipe%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/named_pipe%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/named_pipe%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/server%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/server%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/server%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/transport%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/transport%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/transport%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/pysearpc/client.py
 %%PYTHON_SITELIBDIR%%/pysearpc/common.py
 %%PYTHON_SITELIBDIR%%/pysearpc/errors.py
@@ -33,3 +40,4 @@ libdata/pkgconfig/libsearpc.pc
 %%PYTHON_SITELIBDIR%%/pysearpc/server.py
 %%PYTHON_SITELIBDIR%%/pysearpc/transport.py
 %%PYTHON_SITELIBDIR%%/pysearpc/utils.py
+libdata/pkgconfig/libsearpc.pc
diff --git a/devel/libstatgrab0/Makefile b/devel/libstatgrab0/Makefile
index 8f7642451a65..d372f58f3ea5 100644
--- a/devel/libstatgrab0/Makefile
+++ b/devel/libstatgrab0/Makefile
@@ -10,6 +10,9 @@ MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Provides a useful interface to system statistics
 WWW=		https://www.i-scream.org/libstatgrab/
 
+DEPRECATED=	Use devel/libstatgrab instead.
+EXPIRATION_DATE=2025-12-31
+
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig libtool
diff --git a/devel/linux-rl9-devtools/Makefile b/devel/linux-rl9-devtools/Makefile
index 35fa0304049e..3c025d29ac68 100644
--- a/devel/linux-rl9-devtools/Makefile
+++ b/devel/linux-rl9-devtools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	devtools
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -21,8 +21,8 @@ QA_ENV+=		USESLIBTOOL=no
 
 BUVERSION=	2.35.2-54.el9
 GCCVERSION=	11.5.0-5.el9_5
-GLIBCVERSION=	2.34-125.el9_5.3
-KERNELVERSION=	5.14.0-503.38.1.el9_5
+GLIBCVERSION=	2.34-125.el9_5.8
+KERNELVERSION=	5.14.0-503.40.1.el9_5
 MPFRVERSION=	4.1.0-7.el9
 LIBMPCVERSION=	1.2.1-4.el9
 
diff --git a/devel/linux-rl9-devtools/distinfo b/devel/linux-rl9-devtools/distinfo
index a1a423bab085..0daece7d972c 100644
--- a/devel/linux-rl9-devtools/distinfo
+++ b/devel/linux-rl9-devtools/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745213399
+TIMESTAMP = 1746515153
 SHA256 (rocky/b/binutils-2.35.2-54.el9.aarch64.rpm) = fa816c4f7479b68e0ac3fd6c26982d1c2832d70dfb4236085ff5b6bd4e2a1039
 SIZE (rocky/b/binutils-2.35.2-54.el9.aarch64.rpm) = 4983292
 SHA256 (rocky/b/binutils-2.35.2-54.el9.x86_64.rpm) = ddba97d5ad45c495cdd94188955569819dd6db2d6c927431987bad7f4c0df3b6
@@ -29,18 +29,18 @@ SHA256 (rocky/g/gcc-gfortran-11.5.0-5.el9_5.aarch64.rpm) = ce2da122db9439111eca6
 SIZE (rocky/g/gcc-gfortran-11.5.0-5.el9_5.aarch64.rpm) = 12831212
 SHA256 (rocky/g/gcc-gfortran-11.5.0-5.el9_5.x86_64.rpm) = 99dccf59e5f52df2b6386dce7d2d2b62048014c9decd05bb81f9a958b09c1d13
 SIZE (rocky/g/gcc-gfortran-11.5.0-5.el9_5.x86_64.rpm) = 13283781
-SHA256 (rocky/g/glibc-devel-2.34-125.el9_5.3.aarch64.rpm) = e0e6a2e7d9b57e85ac13544e5903a5fa7cb7a65d831d4a79e4045cf985ef1537
-SIZE (rocky/g/glibc-devel-2.34-125.el9_5.3.aarch64.rpm) = 444846
-SHA256 (rocky/g/glibc-devel-2.34-125.el9_5.3.i686.rpm) = 787546862f5c43bf723d6077d1081932c3218fa51a0dfe0b2016e75861269639
-SIZE (rocky/g/glibc-devel-2.34-125.el9_5.3.i686.rpm) = 25871
-SHA256 (rocky/g/glibc-devel-2.34-125.el9_5.3.x86_64.rpm) = 0365766ac33bc7dfad9979401ea71450614f87564ba221ae840c829e367edea0
-SIZE (rocky/g/glibc-devel-2.34-125.el9_5.3.x86_64.rpm) = 25425
-SHA256 (rocky/g/glibc-headers-2.34-125.el9_5.3.x86_64.rpm) = 27390403c4a1e41c9d3097de4492374dcbebad4cca402c924ebd35f4eb26978f
-SIZE (rocky/g/glibc-headers-2.34-125.el9_5.3.x86_64.rpm) = 439533
-SHA256 (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.aarch64.rpm) = a0c86d790416cb1ac4e4a283678e5f0ba47408d0cfeac5f85ed552a1b71aafa4
-SIZE (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.aarch64.rpm) = 3680029
-SHA256 (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.x86_64.rpm) = 02385266dd48fbeaaa11493ab231a778f77b24c3fc1aadacd57ace601f79f3c8
-SIZE (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.x86_64.rpm) = 3712245
+SHA256 (rocky/g/glibc-devel-2.34-125.el9_5.8.aarch64.rpm) = 020e899c6312b0f94d225972b2b018cd47e3c645454ac11902e63a99d985dc68
+SIZE (rocky/g/glibc-devel-2.34-125.el9_5.8.aarch64.rpm) = 445179
+SHA256 (rocky/g/glibc-devel-2.34-125.el9_5.8.i686.rpm) = 73fbf8beab0fea69803e6c706d7828eaa07ba4b99d4ff1f82cae594c55c5b882
+SIZE (rocky/g/glibc-devel-2.34-125.el9_5.8.i686.rpm) = 26092
+SHA256 (rocky/g/glibc-devel-2.34-125.el9_5.8.x86_64.rpm) = 71b669dae2d01ab784068454f2a7f196fc6a39c038f92aab025ce70909080a79
+SIZE (rocky/g/glibc-devel-2.34-125.el9_5.8.x86_64.rpm) = 25624
+SHA256 (rocky/g/glibc-headers-2.34-125.el9_5.8.x86_64.rpm) = 1581f170a3e272715013f4e3d93aec13f97a79c3f720731e02369f8c59c4b169
+SIZE (rocky/g/glibc-headers-2.34-125.el9_5.8.x86_64.rpm) = 439728
+SHA256 (rocky/k/kernel-headers-5.14.0-503.40.1.el9_5.aarch64.rpm) = d7b7126ba2bc1a76dcbcca857db03262910e300c6503ecaa626590a1fa9b8125
+SIZE (rocky/k/kernel-headers-5.14.0-503.40.1.el9_5.aarch64.rpm) = 3682361
+SHA256 (rocky/k/kernel-headers-5.14.0-503.40.1.el9_5.x86_64.rpm) = c1ce3fba00143e7f225b2200b18356da5e6361ea956c9d962d12eb20d25ea301
+SIZE (rocky/k/kernel-headers-5.14.0-503.40.1.el9_5.x86_64.rpm) = 3714589
 SHA256 (rocky/l/libatomic-11.5.0-5.el9_5.aarch64.rpm) = 22ec15677e92a91a1aa86c9083525083f4a53c75c159e5cce496a65172f47589
 SIZE (rocky/l/libatomic-11.5.0-5.el9_5.aarch64.rpm) = 28359
 SHA256 (rocky/l/libatomic-11.5.0-5.el9_5.i686.rpm) = 74f8d01153ae3052f968fc76e4d26d71e300d35335d4c5d9c7887676cf255b3c
@@ -67,10 +67,10 @@ SHA256 (rocky/l/libstdc++-devel-11.5.0-5.el9_5.x86_64.rpm) = a9df7e426503b79954e
 SIZE (rocky/l/libstdc++-devel-11.5.0-5.el9_5.x86_64.rpm) = 2329962
 SHA256 (rocky/b/binutils-2.35.2-54.el9.src.rpm) = c6eccfb1ac99c90691953dfd97f1aabce89cf4ca83e39137ab561a0733f7853d
 SIZE (rocky/b/binutils-2.35.2-54.el9.src.rpm) = 22350808
-SHA256 (rocky/g/glibc-2.34-125.el9_5.3.src.rpm) = 185db2c8d2aab7d58ac33a5b1fb85ec2f253fe20f95dcc36beb510b205a4e1a0
-SIZE (rocky/g/glibc-2.34-125.el9_5.3.src.rpm) = 18609420
-SHA256 (rocky/k/kernel-5.14.0-503.38.1.el9_5.src.rpm) = c3cf7f683ec75e8611e8562ed49497e6de87350a45f49e58924a870604c89f50
-SIZE (rocky/k/kernel-5.14.0-503.38.1.el9_5.src.rpm) = 146398845
+SHA256 (rocky/g/glibc-2.34-125.el9_5.8.src.rpm) = 2a0ea9e22af53f2c9f5f9819b000f970206e8b2242132ae6165f1ecd3eb3c2ea
+SIZE (rocky/g/glibc-2.34-125.el9_5.8.src.rpm) = 18631240
+SHA256 (rocky/k/kernel-5.14.0-503.40.1.el9_5.src.rpm) = dc3656bf0b43d1fcafc5a0a21859b17f57de36e18af4cf3b16320577306ddeb2
+SIZE (rocky/k/kernel-5.14.0-503.40.1.el9_5.src.rpm) = 146404769
 SHA256 (rocky/l/libmpc-1.2.1-4.el9.src.rpm) = e0e1edc062c4d5565ebedeba87e13a661caa74d43c885c656eb5b75cf1ed3bcc
 SIZE (rocky/l/libmpc-1.2.1-4.el9.src.rpm) = 844729
 SHA256 (rocky/g/gcc-11.5.0-5.el9_5.src.rpm) = 8656bacb48e097fec2c34a35460ff0338c021ac4b1b0cb3849e47f4256692095
diff --git a/devel/llvm20/Makefile b/devel/llvm20/Makefile
index 0ec870d13936..65c09bd81d80 100644
--- a/devel/llvm20/Makefile
+++ b/devel/llvm20/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	llvm
-DISTVERSION=	20.1.3
+DISTVERSION=	20.1.4
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/
diff --git a/devel/llvm20/distinfo b/devel/llvm20/distinfo
index 1282f29b04f5..04e50478a732 100644
--- a/devel/llvm20/distinfo
+++ b/devel/llvm20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744828886
-SHA256 (llvm-project-20.1.3.src.tar.xz) = b6183c41281ee3f23da7fda790c6d4f5877aed103d1e759763b1008bdd0e2c50
-SIZE (llvm-project-20.1.3.src.tar.xz) = 147212776
+TIMESTAMP = 1746463969
+SHA256 (llvm-project-20.1.4.src.tar.xz) = a95365b02536ed4aef29b325c205dd89c268cba41503ab2fc05f81418613ab63
+SIZE (llvm-project-20.1.4.src.tar.xz) = 147228104
diff --git a/devel/msitools/Makefile b/devel/msitools/Makefile
index 21c91effc762..8a0457ab721c 100644
--- a/devel/msitools/Makefile
+++ b/devel/msitools/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libgcab-1.0.so:archivers/gcab \
 		libgsf-1.so:devel/libgsf \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	bash:shells/bash
+TEST_DEPENDS=	gsed:textproc/gsed
 
 USES=		bison gnome meson perl5 pkgconfig shebangfix tar:xz vala:build
 USE_LDCONFIG=	yes
@@ -32,4 +33,7 @@ OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
+post-patch:
+	${REINPLACE_CMD} 's|sed|gsed|g' ${WRKSRC}/tests/wixl.bats
+
 .include <bsd.port.mk>
diff --git a/devel/notcurses/Makefile b/devel/notcurses/Makefile
index a791623a1e1b..b5917a34be16 100644
--- a/devel/notcurses/Makefile
+++ b/devel/notcurses/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	notcurses
 DISTVERSIONPREFIX=	v
-DISTVERSION=	${ABIVERSION}.0.8
-PORTREVISION=	4
+DISTVERSION=	${ABIVERSION}.0.16
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/:docs
 DISTFILES=	${PORTNAME}-doc-${DISTVERSION}.tar.gz:docs
diff --git a/devel/notcurses/distinfo b/devel/notcurses/distinfo
index 1aee4abfcf33..d5b1c7dff1f6 100644
--- a/devel/notcurses/distinfo
+++ b/devel/notcurses/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1649251493
-SHA256 (notcurses-doc-3.0.8.tar.gz) = 513fd088e607cda3ae4dce9cc3ede5127e69016c0099b511e9a1b674d1994643
-SIZE (notcurses-doc-3.0.8.tar.gz) = 150000
-SHA256 (dankamongmen-notcurses-v3.0.8_GH0.tar.gz) = 56c33ffe2a2bc4d0b6e3ac14bdf620cf41e3293789135f76825057d0166974fd
-SIZE (dankamongmen-notcurses-v3.0.8_GH0.tar.gz) = 10146073
+TIMESTAMP = 1746394513
+SHA256 (notcurses-doc-3.0.16.tar.gz) = 30e761ec0b93748d708da3567be5580cb0d43069e02a8db32efe23584e6f33da
+SIZE (notcurses-doc-3.0.16.tar.gz) = 155099
+SHA256 (dankamongmen-notcurses-v3.0.16_GH0.tar.gz) = e893c507eab2183b6c598a8071f2a695efa9e4de4b7f7819a457d4b579bacf05
+SIZE (dankamongmen-notcurses-v3.0.16_GH0.tar.gz) = 10160662
diff --git a/devel/p5-Cache-FastMmap/Makefile b/devel/p5-Cache-FastMmap/Makefile
index 16a6670a7d78..d55db8a3f081 100644
--- a/devel/p5-Cache-FastMmap/Makefile
+++ b/devel/p5-Cache-FastMmap/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Cache-FastMmap
-PORTVERSION=	1.57
+PORTVERSION=	1.58
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN CPAN/Cache
 MASTER_SITE_SUBDIR=	CPAN:ROBM
diff --git a/devel/p5-Cache-FastMmap/distinfo b/devel/p5-Cache-FastMmap/distinfo
index 0f38b4b877da..26e0288833b8 100644
--- a/devel/p5-Cache-FastMmap/distinfo
+++ b/devel/p5-Cache-FastMmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634127855
-SHA256 (Cache-FastMmap-1.57.tar.gz) = e04b3a28d989edb8fb96eafacdc2b87f9eccb84f047eb2e27cb26aa7d08cc7b8
-SIZE (Cache-FastMmap-1.57.tar.gz) = 57502
+TIMESTAMP = 1746662049
+SHA256 (Cache-FastMmap-1.58.tar.gz) = ea6553a8e08b87d2be033d542143ecfa9cbfbd50057a501688f1719752c46094
+SIZE (Cache-FastMmap-1.58.tar.gz) = 56883
diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile
index cc4547bd8d17..16a33f55cab5 100644
--- a/devel/p5-Devel-Cover/Makefile
+++ b/devel/p5-Devel-Cover/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Devel-Cover
-PORTVERSION=	1.46
+PORTVERSION=	1.47
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Devel-Cover/distinfo b/devel/p5-Devel-Cover/distinfo
index fd0d6e918d1e..d95b637aaac1 100644
--- a/devel/p5-Devel-Cover/distinfo
+++ b/devel/p5-Devel-Cover/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746230577
-SHA256 (Devel-Cover-1.46.tar.gz) = f2ce3de06bc1fb01950bc8181ff7e17ef9b02bc15304907525ade949d31beb78
-SIZE (Devel-Cover-1.46.tar.gz) = 230533
+TIMESTAMP = 1746662559
+SHA256 (Devel-Cover-1.47.tar.gz) = 323ad5db2e64ec665e0deef7f2e7472610ee8cf98dafbad4e241b0f52918ee41
+SIZE (Devel-Cover-1.47.tar.gz) = 230482
diff --git a/devel/p5-ExtUtils-Builder-Compiler/Makefile b/devel/p5-ExtUtils-Builder-Compiler/Makefile
index 575f0ec2fc20..7934957b0049 100644
--- a/devel/p5-ExtUtils-Builder-Compiler/Makefile
+++ b/devel/p5-ExtUtils-Builder-Compiler/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ExtUtils-Builder-Compiler
-DISTVERSION=	0.031
+DISTVERSION=	0.032
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-ExtUtils-Builder-Compiler/distinfo b/devel/p5-ExtUtils-Builder-Compiler/distinfo
index 533c0796f9e6..d72b1a9b5369 100644
--- a/devel/p5-ExtUtils-Builder-Compiler/distinfo
+++ b/devel/p5-ExtUtils-Builder-Compiler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746096868
-SHA256 (ExtUtils-Builder-Compiler-0.031.tar.gz) = a74048eef6457561bca076077483b33368c9df34a9ec87faf9bef1c74859fbca
-SIZE (ExtUtils-Builder-Compiler-0.031.tar.gz) = 27935
+TIMESTAMP = 1746443971
+SHA256 (ExtUtils-Builder-Compiler-0.032.tar.gz) = 8967f3508c20819b557d6b99c1f51fae2cecd9da24d1a2527c122d3c5437298b
+SIZE (ExtUtils-Builder-Compiler-0.032.tar.gz) = 28002
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index 7123c697d9c0..d9178e19c8ad 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Tree-DAG_Node
-PORTVERSION=	1.33
+PORTVERSION=	1.34
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Tree-DAG_Node/distinfo b/devel/p5-Tree-DAG_Node/distinfo
index 72f53354eee9..66f0693480ac 100644
--- a/devel/p5-Tree-DAG_Node/distinfo
+++ b/devel/p5-Tree-DAG_Node/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743583956
-SHA256 (Tree-DAG_Node-1.33.tgz) = 81661e08fe1d7e49fd390b79b5e132c644c99633cc7c6f1514b20e293da6aafe
-SIZE (Tree-DAG_Node-1.33.tgz) = 55263
+TIMESTAMP = 1746328800
+SHA256 (Tree-DAG_Node-1.34.tgz) = 26845b628872ec1af020ac2e839ae036c59c9e26aab887efb6c75a819c675cb1
+SIZE (Tree-DAG_Node-1.34.tgz) = 65945
diff --git a/devel/php-maxminddb/Makefile b/devel/php-maxminddb/Makefile
index d139ec2ec1b0..e5945f850132 100644
--- a/devel/php-maxminddb/Makefile
+++ b/devel/php-maxminddb/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX=	v
 CATEGORIES=	devel net
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
-MAINTAINER=	danger@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MaxMind DB Reader extension for PHP
 WWW=		https://github.com/maxmind/MaxMind-DB-Reader-php
 
diff --git a/devel/protobuf-go/Makefile b/devel/protobuf-go/Makefile
new file mode 100644
index 000000000000..2358824e07b3
--- /dev/null
+++ b/devel/protobuf-go/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	protobuf-go
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.36.6
+CATEGORIES=	devel
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Go support for Protocol Buffers
+WWW=		https://github.com/protocolbuffers/protobuf-go
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:1.22,modules
+
+GO_MODULE=	google.golang.org/protobuf
+GO_TARGET=	./cmd/protoc-gen-go
+
+CONFLICTS_INSTALL=	goprotobuf
+
+PLIST_FILES=	bin/protoc-gen-go
+
+.include <bsd.port.mk>
diff --git a/devel/protobuf-go/distinfo b/devel/protobuf-go/distinfo
new file mode 100644
index 000000000000..680559c687ca
--- /dev/null
+++ b/devel/protobuf-go/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746315257
+SHA256 (go/devel_protobuf-go/protobuf-go-v1.36.6/v1.36.6.mod) = e11082f89ab1be94e778e4bd2c53172f481135604dd9f2d60140e5514bc53623
+SIZE (go/devel_protobuf-go/protobuf-go-v1.36.6/v1.36.6.mod) = 201
+SHA256 (go/devel_protobuf-go/protobuf-go-v1.36.6/v1.36.6.zip) = 3294ac8ea5089b3c231351afaea4f012e8027a9beeb523bbf31dcb383cc0ab99
+SIZE (go/devel_protobuf-go/protobuf-go-v1.36.6/v1.36.6.zip) = 2239723
diff --git a/devel/protobuf-go/pkg-descr b/devel/protobuf-go/pkg-descr
new file mode 100644
index 000000000000..b584b6484c03
--- /dev/null
+++ b/devel/protobuf-go/pkg-descr
@@ -0,0 +1,7 @@
+This project hosts the Go implementation for protocol buffers, which is
+a language-neutral, platform-neutral, extensible mechanism for
+serializing structured data. The protocol buffer language is a language
+for specifying the schema for structured data. This schema is compiled
+into language specific bindings. This project provides both a tool to
+generate Go code for the protocol buffer language, and also the runtime
+implementation to handle serialization of messages in Go.
diff --git a/devel/protoc-gen-go-grpc/Makefile b/devel/protoc-gen-go-grpc/Makefile
new file mode 100644
index 000000000000..1a59ba7faccd
--- /dev/null
+++ b/devel/protoc-gen-go-grpc/Makefile
@@ -0,0 +1,34 @@
+PORTNAME=	protoc-gen-go-grpc
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.72.0
+CATEGORIES=	devel
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Go implementaion of gRPC
+WWW=		https://github.com/grpc/grpc-go/blob/master/go.mod
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:1.23
+USE_GITHUB=	yes
+GH_ACCOUNT=	grpc
+GH_PROJECT=	grpc-go
+GH_TUPLE=	\
+		golang:net:v0.34.0:golang_net/vendor/golang.org/x/net \
+		golang:sys:v0.29.0:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.21.0:golang_text/vendor/golang.org/x/text \
+		google:go-genproto:1a7da9e5054f:google_go_genproto/vendor/google.golang.org/genproto/googleapis/rpc \
+		grpc:grpc-go:v1.70.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		open-telemetry:opentelemetry-go:v1.34.0:open_telemetry_opentelemetry_go/vendor/go.opentelemetry.io/otel \
+		protocolbuffers:protobuf-go:v1.36.5:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf
+
+#GO_MODULE=	google.golang.org/grpc
+GO_TARGET=	./cmd/protoc-gen-go-grpc
+
+PLIST_FILES=	bin/protoc-gen-go-grpc
+
+#post-patch:
+#	@${CP} -R ${WRKDIR}/grpc-go-${DISTVERSION}/cmd ${WRKSRC}/
+
+.include <bsd.port.mk>
diff --git a/devel/protoc-gen-go-grpc/distinfo b/devel/protoc-gen-go-grpc/distinfo
new file mode 100644
index 000000000000..cfb4062fbf5c
--- /dev/null
+++ b/devel/protoc-gen-go-grpc/distinfo
@@ -0,0 +1,17 @@
+TIMESTAMP = 1746316897
+SHA256 (grpc-grpc-go-v1.72.0_GH0.tar.gz) = bfd9b72523f56391aa568b464775a1241f5f38fba8d7f5f1edc1f1d8cde3d2f4
+SIZE (grpc-grpc-go-v1.72.0_GH0.tar.gz) = 2410705
+SHA256 (golang-net-v0.34.0_GH0.tar.gz) = 3d5ec65e81b6f1d9530a3008f35722e9cf6d4905b20c19a7126f58aae515996c
+SIZE (golang-net-v0.34.0_GH0.tar.gz) = 1466242
+SHA256 (golang-sys-v0.29.0_GH0.tar.gz) = 7bac3e0a686a05d0e86ca110917b45f60553d6c146dba8a4cdafb911486428e7
+SIZE (golang-sys-v0.29.0_GH0.tar.gz) = 1519988
+SHA256 (golang-text-v0.21.0_GH0.tar.gz) = d64dbf40a8ae06c4805895e48553ecdadaed07089d8ed2168a0d61551d17ff22
+SIZE (golang-text-v0.21.0_GH0.tar.gz) = 8964782
+SHA256 (google-go-genproto-1a7da9e5054f_GH0.tar.gz) = 66a043c0c3bccff28bed10bdde9f18ebcb615fd10fe5ddc0e0fab3c71ad429ec
+SIZE (google-go-genproto-1a7da9e5054f_GH0.tar.gz) = 5891519
+SHA256 (grpc-grpc-go-v1.70.0_GH0.tar.gz) = 40719afc7a6fed9572cb4deeb902e7659095370dac87bb74c4273128deff38c3
+SIZE (grpc-grpc-go-v1.70.0_GH0.tar.gz) = 2299149
+SHA256 (open-telemetry-opentelemetry-go-v1.34.0_GH0.tar.gz) = 16d562e15e7cdbd7e6c49cd5ac3fa2770969d7873295dd0387ad842126815436
+SIZE (open-telemetry-opentelemetry-go-v1.34.0_GH0.tar.gz) = 1873245
+SHA256 (protocolbuffers-protobuf-go-v1.36.5_GH0.tar.gz) = a669a85f92c229768e51877c6ed9b2c7d33c31ab089345b616dd3da1d815534d
+SIZE (protocolbuffers-protobuf-go-v1.36.5_GH0.tar.gz) = 1958977
diff --git a/devel/protoc-gen-go-grpc/pkg-descr b/devel/protoc-gen-go-grpc/pkg-descr
new file mode 100644
index 000000000000..24f859f6d048
--- /dev/null
+++ b/devel/protoc-gen-go-grpc/pkg-descr
@@ -0,0 +1,2 @@
+This tool generates Go language bindings of services in protobuf
+definition files for gRPC.
diff --git a/devel/py-buildbot-pkg/Makefile b/devel/py-buildbot-pkg/Makefile
index f9e062199bef..938b9f25f450 100644
--- a/devel/py-buildbot-pkg/Makefile
+++ b/devel/py-buildbot-pkg/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	buildbot-pkg
-DISTVERSION=	3.11.9
-PORTREVISION=	1
+DISTVERSION=	4.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-buildbot-pkg/distinfo b/devel/py-buildbot-pkg/distinfo
index 17e88bdd75b2..4788b29f37f1 100644
--- a/devel/py-buildbot-pkg/distinfo
+++ b/devel/py-buildbot-pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1728971901
-SHA256 (buildbot_pkg-3.11.9.tar.gz) = 641b65fdcbf55e71e072da749b2375f4ffa459978e759cfc2b9f21d2bd8cf659
-SIZE (buildbot_pkg-3.11.9.tar.gz) = 5081
+TIMESTAMP = 1746273569
+SHA256 (buildbot_pkg-4.2.1.tar.gz) = 9687b343918c704f69264115d164b97bf9cce636cb0d49f380d7bafb1fa6f884
+SIZE (buildbot_pkg-4.2.1.tar.gz) = 5147
diff --git a/devel/py-dateparser/Makefile b/devel/py-dateparser/Makefile
index 00362b30cd4c..78ce0406c3c0 100644
--- a/devel/py-dateparser/Makefile
+++ b/devel/py-dateparser/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	dateparser
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-dateparser/distinfo b/devel/py-dateparser/distinfo
index bf1c0c4d7d08..cb3f8ecac71a 100644
--- a/devel/py-dateparser/distinfo
+++ b/devel/py-dateparser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730639100
-SHA256 (dateparser-1.2.0.tar.gz) = 7975b43a4222283e0ae15be7b4999d08c9a70e2d378ac87385b1ccf2cffbbb30
-SIZE (dateparser-1.2.0.tar.gz) = 307260
+TIMESTAMP = 1746349818
+SHA256 (dateparser-1.2.1.tar.gz) = 7e4919aeb48481dbfc01ac9683c8e20bfe95bb715a38c1e9f6af889f4f30ccc3
+SIZE (dateparser-1.2.1.tar.gz) = 309924
diff --git a/devel/py-dependency-groups/Makefile b/devel/py-dependency-groups/Makefile
index d26b71c3198d..8d70a2dcee01 100644
--- a/devel/py-dependency-groups/Makefile
+++ b/devel/py-dependency-groups/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dependency-groups
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.1
 CATEGORIES=	devel python
 #MASTER_SITES=	PYPI # no tarball
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -24,6 +24,6 @@ NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
-# tests as of 1.3.0: 31 passed in 6.85s
+# tests as of 1.3.1: 39 passed in 0.15s
 
 .include <bsd.port.mk>
diff --git a/devel/py-dependency-groups/distinfo b/devel/py-dependency-groups/distinfo
index ac793c4cc628..4dc9999f06a3 100644
--- a/devel/py-dependency-groups/distinfo
+++ b/devel/py-dependency-groups/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739171771
-SHA256 (pypa-dependency-groups-1.3.0_GH0.tar.gz) = d269c6a227ec810c92d72d401c71879696183590845232e31be03beb84461d21
-SIZE (pypa-dependency-groups-1.3.0_GH0.tar.gz) = 14999
+TIMESTAMP = 1746349109
+SHA256 (pypa-dependency-groups-1.3.1_GH0.tar.gz) = df31e804d078643229c43ee74bf0bd5911edf13ca1a1a24c87612a2c19b393be
+SIZE (pypa-dependency-groups-1.3.1_GH0.tar.gz) = 14045
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index f6b145f6629e..38ed4d67618c 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	icalendar
-PORTVERSION=	4.0.3
-PORTREVISION=	3
+PORTVERSION=	6.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,17 +11,21 @@ WWW=		https://github.com/collective/icalendar
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
 
-USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python shebangfix
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
+SHEBANG_FILES=	${WRKSRC}/src/icalendar/cli.py
+
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}/
diff --git a/devel/py-icalendar/distinfo b/devel/py-icalendar/distinfo
index 8f09fb88c93a..8adf8c9a7af9 100644
--- a/devel/py-icalendar/distinfo
+++ b/devel/py-icalendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545839169
-SHA256 (icalendar-4.0.3.tar.gz) = 07c2447a1d44cbb27c90b8c6a5c98e890cc1853c6223e2a52195cddec26c6356
-SIZE (icalendar-4.0.3.tar.gz) = 77899
+TIMESTAMP = 1746341882
+SHA256 (icalendar-6.1.1.tar.gz) = 2c44355a8f006de5ae73fa3f022a1cbe2a0de6b1607ce8879739eb887c4f3471
+SIZE (icalendar-6.1.1.tar.gz) = 145256
diff --git a/devel/py-icalendar/files/patch-src_icalendar_cli.py b/devel/py-icalendar/files/patch-src_icalendar_cli.py
deleted file mode 100644
index f3cb8f58edb0..000000000000
--- a/devel/py-icalendar/files/patch-src_icalendar_cli.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/icalendar/cli.py.orig	2018-06-20 12:52:55 UTC
-+++ src/icalendar/cli.py
-@@ -86,6 +86,7 @@ def main():
-     # This seems a bit of an overkill now, but we will probably add more
-     # functionality later, e.g., iCalendar to JSON / YAML and vice versa.
-     subparsers = parser.add_subparsers(dest='subcommand')
-+    subparsers.required = True
- 
-     subparser = subparsers.add_parser(
-         'view', description=view.__doc__.split('\n\n')[0])
diff --git a/devel/py-merossiot/Makefile b/devel/py-merossiot/Makefile
new file mode 100644
index 000000000000..2e9eae95c802
--- /dev/null
+++ b/devel/py-merossiot/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	merossiot
+PORTVERSION=	0.4.9.0
+CATEGORIES=	devel python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	MerossIot-${PORTVERSION}
+
+MAINTAINER=	mm@FreeBSD.org
+COMMENT=	Python library for accessing Meross IoT devices
+WWW=		https://github.com/albertogeniola/MerossIot
+
+LICENSE=	MIT
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paho-mqtt>=2.1.0:net/py-paho-mqtt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.19.2:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}aiohttp>=3.7.4:www/py-aiohttp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.20.0:security/py-pycryptodomex@${PY_FLAVOR}
+
+USES=		python
+USE_GITHUB=	yes
+GH_ACCOUNT=	albertogeniola
+GH_PROJECT=	MerossIot
+
+USE_PYTHON=	autoplist concurrent distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-merossiot/distinfo b/devel/py-merossiot/distinfo
new file mode 100644
index 000000000000..ce8de7ce0bad
--- /dev/null
+++ b/devel/py-merossiot/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746520167
+SHA256 (albertogeniola-MerossIot-0.4.9.0_GH0.tar.gz) = ba79d97c5f9d60b88165ad4c244051442de044bdaae9e61fbd25fd293cb25317
+SIZE (albertogeniola-MerossIot-0.4.9.0_GH0.tar.gz) = 7361775
diff --git a/devel/py-merossiot/files/patch-setup.py b/devel/py-merossiot/files/patch-setup.py
new file mode 100644
index 000000000000..1463484d9bcb
--- /dev/null
+++ b/devel/py-merossiot/files/patch-setup.py
@@ -0,0 +1,19 @@
+--- setup.py.orig	2025-05-06 08:53:00 UTC
++++ setup.py
+@@ -31,7 +31,6 @@ setup(
+     long_description_content_type='text/markdown',
+     keywords='meross smartplug smartbulb iot mqtt domotic switch MSL120 MSS110 MSS210 MSS310 MSS310h '
+              'MSS425e MSS530H MSG100 MSH300 MS100 MSS710 MSXH0',
+-    data_files=[('.', ['.version'])],
+     project_urls={
+         'Documentation': 'https://github.com/albertogeniola/MerossIot',
+         'Funding': 'https://donate.pypi.org',
+@@ -41,7 +40,7 @@ setup(
+     install_requires=[
+         'paho-mqtt>=2.1.0,<3.0.0',
+         'requests>=2.19.1,<3.0.0',
+-        'aiohttp[speedups]>=3.7.4.post0,<4.0.0',
++        'aiohttp>=3.7.4.post0,<4.0.0',
+         'pycryptodomex>=3.20.0'
+     ],
+     python_requires='>=3.8',
diff --git a/devel/py-merossiot/pkg-descr b/devel/py-merossiot/pkg-descr
new file mode 100644
index 000000000000..aba72d541b87
--- /dev/null
+++ b/devel/py-merossiot/pkg-descr
@@ -0,0 +1,3 @@
+Async Python library for controlling Meross devices
+
+https://albertogeniola.github.io/MerossIot/
diff --git a/devel/py-mypy_extensions/Makefile b/devel/py-mypy_extensions/Makefile
index a31626732f96..d778a48d73bb 100644
--- a/devel/py-mypy_extensions/Makefile
+++ b/devel/py-mypy_extensions/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mypy_extensions
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +11,10 @@ WWW=		http://www.mypy-lang.org
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.2<4:devel/py-flit-core@${PY_FLAVOR}
+
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
diff --git a/devel/py-mypy_extensions/distinfo b/devel/py-mypy_extensions/distinfo
index d1067fd18b00..c55193650751 100644
--- a/devel/py-mypy_extensions/distinfo
+++ b/devel/py-mypy_extensions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676714286
-SHA256 (mypy_extensions-1.0.0.tar.gz) = 75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782
-SIZE (mypy_extensions-1.0.0.tar.gz) = 4433
+TIMESTAMP = 1746579228
+SHA256 (mypy_extensions-1.1.0.tar.gz) = 52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558
+SIZE (mypy_extensions-1.1.0.tar.gz) = 6343
diff --git a/devel/py-structlog/Makefile b/devel/py-structlog/Makefile
index 148be50035cd..40aa095d2a40 100644
--- a/devel/py-structlog/Makefile
+++ b/devel/py-structlog/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	structlog
-PORTVERSION=	18.2.0
+PORTVERSION=	25.3.0
 PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
@@ -11,14 +11,22 @@ WWW=		https://www.structlog.org/
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
-LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.apache2
-LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.mit
+LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0:devel/py-hatch-vcs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 
-NO_ARCH=	yes
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31100
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1.0:devel/py-typing-extensions@${PY_FLAVOR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/py-structlog/distinfo b/devel/py-structlog/distinfo
index e6464ef9ee96..70e0a7386194 100644
--- a/devel/py-structlog/distinfo
+++ b/devel/py-structlog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563985335
-SHA256 (structlog-18.2.0.tar.gz) = e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4
-SIZE (structlog-18.2.0.tar.gz) = 316679
+TIMESTAMP = 1746395007
+SHA256 (structlog-25.3.0.tar.gz) = 8dab497e6f6ca962abad0c283c46744185e0c9ba900db52a423cb6db99f7abeb
+SIZE (structlog-25.3.0.tar.gz) = 1367514
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index 2ccabff14619..30a7cd696e76 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -19,6 +19,4 @@ USE_PYTHON=	allflavors autoplist concurrent pep517
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 NO_ARCH=	yes
 
-CONFLICTS_INSTALL=	py*-wheel044
-
 .include <bsd.port.mk>
diff --git a/devel/py-wheel044/Makefile b/devel/py-wheel044/Makefile
index 870d4b327e74..91f2a06f8b82 100644
--- a/devel/py-wheel044/Makefile
+++ b/devel/py-wheel044/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wheel
 PORTVERSION=	0.44.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,13 +17,23 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.8:devel/py-flit-core@${PY_FLA
 USES=		python
 USE_PYTHON=	allflavors autoplist concurrent pep517
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}wheel
 PORTSCOUT=	ignore:1
 
 # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268500
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 NO_ARCH=	yes
 
-CONFLICTS_INSTALL=	py*-wheel
+post-install:
+# move everything under setuptools vendor directory
+	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/setuptools/_vendor
+	@${MV} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.dist-info \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g} \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/setuptools/_vendor
+	@${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME:C|[-_]+|_|g}|${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/setuptools/_vendor/${PORTNAME:C|[-_]+|_|g}|g' \
+		-e 's|bin/|@comment bin/|' \
+		${_PYTHONPKGLIST}
+# add .pth so setuptools build knows we exist
+	@${ECHO_CMD} setuptools/_vendor > ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}${PKGNAMESUFFIX}.pth
+	@${ECHO_CMD} ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}${PKGNAMESUFFIX}.pth >> ${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/py-yamllint/Makefile b/devel/py-yamllint/Makefile
index 34e122864929..b159cda58c5c 100644
--- a/devel/py-yamllint/Makefile
+++ b/devel/py-yamllint/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	yamllint
-PORTVERSION=	1.37.0
+PORTVERSION=	1.37.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-yamllint/distinfo b/devel/py-yamllint/distinfo
index c6cbe909b14b..19a5a460e14c 100644
--- a/devel/py-yamllint/distinfo
+++ b/devel/py-yamllint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742752867
-SHA256 (yamllint-1.37.0.tar.gz) = ead81921d4d87216b2528b7a055664708f9fb8267beb0c427cb706ac6ab93580
-SIZE (yamllint-1.37.0.tar.gz) = 141202
+TIMESTAMP = 1746423699
+SHA256 (yamllint-1.37.1.tar.gz) = 81f7c0c5559becc8049470d86046b36e96113637bcbe4753ecef06977c00245d
+SIZE (yamllint-1.37.1.tar.gz) = 141613
diff --git a/devel/rgbds/Makefile b/devel/rgbds/Makefile
index be5abdd7f40a..ea91a5eaf67e 100644
--- a/devel/rgbds/Makefile
+++ b/devel/rgbds/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rgbds
-DISTVERSION=	0.9.1
+DISTVERSION=	0.9.2
 CATEGORIES=	devel games
 MASTER_SITES=	https://github.com/gbdev/rgbds/releases/download/v${DISTVERSION}/
 
diff --git a/devel/rgbds/distinfo b/devel/rgbds/distinfo
index 4acaa03bf0f1..ce6a3ea8d8ed 100644
--- a/devel/rgbds/distinfo
+++ b/devel/rgbds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738530315
-SHA256 (rgbds-0.9.1.tar.gz) = 55cfa65b62f31de08c4050c7a8b0d7aba8d344ab2165cbbf76210e196d4e1f16
-SIZE (rgbds-0.9.1.tar.gz) = 8093364
+TIMESTAMP = 1746373193
+SHA256 (rgbds-0.9.2.tar.gz) = 07143d2c1bb4a03cccd76b1990c843c307c2360702510bee9920dea8eea4a5b2
+SIZE (rgbds-0.9.2.tar.gz) = 8104081
diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile
index 1919b30e9cd5..546a0ad2c001 100644
--- a/devel/ruby-build/Makefile
+++ b/devel/ruby-build/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ruby-build
-PORTVERSION=	20250430
+PORTVERSION=	20250507
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel ruby
 
diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo
index 36e2fb201b51..b718802bd86b 100644
--- a/devel/ruby-build/distinfo
+++ b/devel/ruby-build/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746059031
-SHA256 (rbenv-ruby-build-v20250430_GH0.tar.gz) = 06e2a934f84102ed6aff430d73c76f2051c70d8aecd4d3b3dfb94f71e790f986
-SIZE (rbenv-ruby-build-v20250430_GH0.tar.gz) = 96521
+TIMESTAMP = 1746666968
+SHA256 (rbenv-ruby-build-v20250507_GH0.tar.gz) = 59992f934dccb48d2547969efd3075a5338617e02a5bff8c566ca1e51b6d349d
+SIZE (rbenv-ruby-build-v20250507_GH0.tar.gz) = 96694
diff --git a/devel/rubygem-webby/Makefile b/devel/rubygem-webby/Makefile
deleted file mode 100644
index 3def3ac8af8e..000000000000
--- a/devel/rubygem-webby/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-PORTNAME=	webby
-PORTVERSION=	0.9.4
-PORTREVISION=	2
-CATEGORIES=	devel rubygems
-MASTER_SITES=	RG
-
-MAINTAINER=	zi@FreeBSD.org
-COMMENT=	Small website management system
-WWW=		https://rubygems.org/gems/webby
-
-LICENSE=	MIT
-
-DEPRECATED=	Deprecated upstream in 2011
-EXPIRATION_DATE=2025-04-30
-
-RUN_DEPENDS=	rubygem-bones>=2.5.0:devel/rubygem-bones \
-		rubygem-directory_watcher>=1.1.2:devel/rubygem-directory_watcher \
-		rubygem-hpricot>=0.6.0:www/rubygem-hpricot \
-		rubygem-launchy>=0.3.2:devel/rubygem-launchy \
-		rubygem-logging>=0.9.7:devel/rubygem-logging \
-		rubygem-loquacious>=1.3.0:devel/rubygem-loquacious \
-		rubygem-rspec>=1.2.2:devel/rubygem-rspec
-
-NO_ARCH=	yes
-USES=		gem
-PLIST_FILES=	bin/webby bin/webby-gen
-
-.include <bsd.port.mk>
diff --git a/devel/rubygem-webby/distinfo b/devel/rubygem-webby/distinfo
deleted file mode 100644
index b323d4530a62..000000000000
--- a/devel/rubygem-webby/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/webby-0.9.4.gem) = 4955abc4ae94fd1c6242c5056183d574a8b90c1c3086de80f621417a9484b422
-SIZE (rubygem/webby-0.9.4.gem) = 344064
diff --git a/devel/rubygem-webby/pkg-descr b/devel/rubygem-webby/pkg-descr
deleted file mode 100644
index 9812e6952677..000000000000
--- a/devel/rubygem-webby/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Webby is a fantastic little website management system.
-It would be called a content management system if it
-were a bigger kid. But, it's just a runt with a
-special knack for transforming text.
-
-Webby works by combining the contents of a page with
-a layout to produce HTML. The layout contains
-everything common to all the pages HTML headers,
-navigation menu, footer, etc. and the page
-contains just the information for that page. You
-can use your favorite markup language to write
-your pages; Webby supports quite a few.
diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index b4595c017836..0aac799b4d13 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	sdl2
-DISTVERSION=	2.32.4
+DISTVERSION=	2.32.6
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libsdl-org/SDL/releases/download/release-${DISTVERSION}/ \
 		https://www.libsdl.org/release/
diff --git a/devel/sdl20/distinfo b/devel/sdl20/distinfo
index edc1a4cb62d5..97147148db62 100644
--- a/devel/sdl20/distinfo
+++ b/devel/sdl20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743442829
-SHA256 (SDL2-2.32.4.tar.gz) = f15b478253e1ff6dac62257ded225ff4e7d0c5230204ac3450f1144ee806f934
-SIZE (SDL2-2.32.4.tar.gz) = 7627336
+TIMESTAMP = 1746129373
+SHA256 (SDL2-2.32.6.tar.gz) = 6a7a40d6c2e00016791815e1a9f4042809210bdf10cc78d2c75b45c4f52f93ad
+SIZE (SDL2-2.32.6.tar.gz) = 7627447
diff --git a/devel/sdl3/Makefile b/devel/sdl3/Makefile
index fd389b07c030..ed458824cced 100644
--- a/devel/sdl3/Makefile
+++ b/devel/sdl3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sdl3
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	3.2.10
+DISTVERSION=	3.2.12
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/devel/sdl3/distinfo b/devel/sdl3/distinfo
index 15977f16db35..b5e687778099 100644
--- a/devel/sdl3/distinfo
+++ b/devel/sdl3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743509400
-SHA256 (libsdl-org-SDL-release-3.2.10_GH0.tar.gz) = 8a6ddc3e70de897f7921da275ac71e375de89dad802aa2932649d1fea9068478
-SIZE (libsdl-org-SDL-release-3.2.10_GH0.tar.gz) = 16108858
+TIMESTAMP = 1746129381
+SHA256 (libsdl-org-SDL-release-3.2.12_GH0.tar.gz) = e8202c117b5a4eaa48f27790d29aa7c4c0ab0421fe7bdfe95dc9c4f8eae1580b
+SIZE (libsdl-org-SDL-release-3.2.12_GH0.tar.gz) = 16117560
diff --git a/devel/sentry-cli/Makefile b/devel/sentry-cli/Makefile
index 27aa6f70166a..a560d42c8004 100644
--- a/devel/sentry-cli/Makefile
+++ b/devel/sentry-cli/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sentry-cli
 DISTVERSION=	2.31.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/spr/Makefile b/devel/spr/Makefile
index bd1906348433..a68b74ffe83c 100644
--- a/devel/spr/Makefile
+++ b/devel/spr/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	spr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.5-4
 DISTVERSIONSUFFIX=	-gd90b197
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index a91080868eea..05cc407cb06e 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	stack
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.1
+DISTVERSION=	3.5.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -22,9 +22,9 @@ USE_PERL5=	run
 
 USE_CABAL=	Glob-0.10.2_3 \
 		OneTuple-0.4.2_1 \
-		QuickCheck-2.15.0.1 \
+		QuickCheck-2.15.0.1_1 \
 		StateVar-1.2.2 \
-		aeson-2.2.3.0_2 \
+		aeson-2.2.3.0_3 \
 		aeson-warning-parser-0.1.1 \
 		annotated-wl-pprint-0.7.0_1 \
 		ansi-terminal-1.1.2 \
@@ -35,6 +35,7 @@ USE_CABAL=	Glob-0.10.2_3 \
 		asn1-types-0.3.4 \
 		assoc-1.1.1_1 \
 		async-2.2.5_3 \
+		atomic-counter-0.1.2.3 \
 		attoparsec-0.14.4_6 \
 		attoparsec-aeson-2.2.2.0 \
 		auto-update-0.2.6 \
@@ -42,8 +43,8 @@ USE_CABAL=	Glob-0.10.2_3 \
 		base16-bytestring-1.0.2.0_1 \
 		base64-bytestring-1.2.1.0_1 \
 		basement-0.0.16 \
-		bifunctors-5.6.2_1 \
-		bitvec-1.1.5.0_2 \
+		bifunctors-5.6.2_2 \
+		bitvec-1.1.5.0_3 \
 		blaze-builder-0.4.2.3 \
 		blaze-html-0.9.2.0_1 \
 		blaze-markup-0.8.3.0_2 \
@@ -51,59 +52,67 @@ USE_CABAL=	Glob-0.10.2_3 \
 		casa-client-0.0.2 \
 		casa-types-0.0.2 \
 		case-insensitive-1.2.1.0 \
-		cborg-0.2.10.0_1 \
+		cborg-0.2.10.0_2 \
 		cereal-0.5.8.3 \
 		character-ps-0.1 \
 		clock-0.8.4 \
 		cmdargs-0.10.22 \
 		colour-2.3.6 \
-		comonad-5.0.9 \
+		comonad-5.0.9_1 \
 		companion-0.1.0 \
-		conduit-1.3.6 \
+		conduit-1.3.6.1 \
 		conduit-combinators-1.3.0 \
-		conduit-extra-1.3.6 \
+		conduit-extra-1.3.7 \
 		contravariant-1.5.5 \
-		cookie-0.5.0 \
+		cookie-0.5.1 \
 		cryptohash-sha256-0.11.102.1_6 \
-		crypton-1.0.1 \
+		crypton-1.0.4 \
 		crypton-conduit-0.2.3 \
-		crypton-connection-0.4.3 \
+		crypton-connection-0.4.4 \
 		crypton-x509-1.7.7 \
-		crypton-x509-store-1.6.9 \
+		crypton-x509-store-1.6.10 \
 		crypton-x509-system-1.6.7 \
-		crypton-x509-validation-1.6.13 \
-		data-default-0.8.0.0 \
+		crypton-x509-validation-1.6.14 \
+		data-default-0.8.0.1 \
 		data-default-class-0.2.0.0 \
 		data-fix-0.3.4_1 \
 		digest-0.0.2.1 \
+		directory-ospath-streaming-0.2.2 \
 		distributive-0.6.2.1_1 \
 		dlist-1.0_2 \
 		easy-file-0.2.5 \
+		ech-config-0.0.1 \
 		echo-0.1.4 \
-		ed25519-0.0.5.0_8 \
+		ed25519-0.0.5.0_9 \
 		extra-1.8 \
 		fast-logger-3.2.5 \
 		file-embed-0.0.16.0 \
+		file-io-0.1.5 \
 		filelock-0.1.1.7 \
-		fsnotify-0.4.1.0_1 \
-		generic-deriving-1.14.6 \
+		fsnotify-0.4.2.0 \
+		generic-deriving-1.14.6_1 \
 		generically-0.1.1_4 \
 		githash-0.1.7.0 \
-		hackage-security-0.6.2.6_4 \
+		hackage-security-0.6.2.6_5 \
 		half-0.3.2 \
-		hashable-1.4.7.0 \
+		happy-2.1.5 \
+		happy-lib-2.1.5 \
+		hashable-1.5.0.0_1 \
+		haskell-src-exts-1.23.1 \
+		haskell-src-meta-0.8.15 \
 		hi-file-parser-0.1.7.0 \
 		hourglass-0.2.12_1 \
-		hpack-0.37.0 \
-		hsc2hs-0.68.10_3 \
-		http-api-data-0.6.1_1 \
-		http-client-0.7.18 \
-		http-client-tls-0.3.6.4 \
+		hpack-0.38.1 \
+		hpke-0.0.0 \
+		hsc2hs-0.68.10_4 \
+		http-api-data-0.6.2 \
+		http-client-0.7.19 \
+		http-client-tls-0.3.6.4_2 \
 		http-conduit-2.3.9.1 \
 		http-download-0.2.1.0 \
 		http-types-0.12.4 \
-		indexed-traversable-0.1.4 \
-		indexed-traversable-instances-0.1.2 \
+		indexed-traversable-0.1.4_1 \
+		indexed-traversable-instances-0.1.2_1 \
 		infer-license-0.2.0 \
 		integer-conversion-0.1.1_1 \
 		integer-logarithms-1.0.4 \
@@ -112,88 +121,97 @@ USE_CABAL=	Glob-0.10.2_3 \
 		libyaml-clib-0.2.5 \
 		lift-type-0.1.2.0 \
 		lifted-base-0.2.3.12 \
-		lukko-0.1.2 \
+		lukko-0.1.2_1 \
 		megaparsec-9.7.0 \
-		memory-0.18.0 \
-		microlens-0.4.13.1_1 \
-		microlens-mtl-0.2.0.3_1 \
-		microlens-th-0.4.3.16 \
+		memory-0.18.0_1 \
+		microlens-0.4.14.0 \
+		microlens-mtl-0.2.1.0 \
+		microlens-th-0.4.3.17 \
 		mime-types-0.1.2.0 \
 		monad-control-1.0.3.1 \
-		monad-logger-0.3.41 \
+		monad-logger-0.3.42 \
 		monad-loops-0.4.3 \
 		mono-traversable-1.0.21.0 \
 		mtl-compat-0.2.2 \
 		mustache-2.4.2 \
 		neat-interpolation-0.5.1.4 \
 		network-3.2.7.0 \
+		network-byte-order-0.1.7 \
 		network-uri-2.6.4.2_1 \
 		old-locale-1.0.0.7_2 \
 		old-time-1.1.0.4 \
-		open-browser-0.2.1.0 \
-		optparse-applicative-0.18.1.0 \
+		open-browser-0.4.0.0 \
+		optparse-applicative-0.18.1.0_1 \
 		optparse-simple-0.1.1.4 \
 		os-string-2.0.7 \
-		pantry-0.10.0_2 \
+		pantry-0.10.1 \
 		parser-combinators-1.3.0_1 \
-		path-0.9.6 \
+		path-0.9.6_1 \
 		path-io-1.8.2 \
 		path-pieces-0.2.1_1 \
 		pem-0.2.4 \
-		persistent-2.14.6.3 \
+		persistent-2.14.6.3_1 \
 		persistent-sqlite-2.13.3.0 \
 		persistent-template-2.12.0.0 \
 		prettyprinter-1.7.1 \
 		prettyprinter-ansi-terminal-1.1.3 \
-		primitive-0.9.0.0_2 \
+		primitive-0.9.1.0 \
 		project-template-0.2.1.0 \
-		random-1.2.1.3 \
+		random-1.3.1 \
 		resource-pool-0.4.0.0 \
 		resourcet-1.3.0 \
 		retry-0.9.3.1 \
 		rio-0.1.22.0 \
 		rio-orphans-0.1.2.0 \
 		rio-prettyprint-0.1.8.0 \
+		safe-0.3.21_1 \
 		safe-exceptions-0.1.7.4_1 \
 		scientific-0.3.8.0_2 \
-		semialign-1.3.1_1 \
-		semigroupoids-6.0.1_1 \
-		serialise-0.2.6.1_3 \
+		semialign-1.3.1_2 \
+		semigroupoids-6.0.1_2 \
+		serialise-0.2.6.1_4 \
 		silently-1.2.5.4 \
 		socks-0.6.1 \
 		split-0.2.5 \
 		splitmix-0.1.1 \
 		static-bytes-0.1.1 \
 		stm-chans-3.0.0.9 \
-		streaming-commons-0.2.2.6_1 \
+		streaming-commons-0.2.3.0 \
 		strict-0.5.1_1 \
+		string-interpolate-0.3.4.0_2 \
+		syb-0.7.2.4 \
 		tagged-0.8.9 \
-		tar-0.6.3.0_1 \
+		tar-0.6.4.0_1 \
 		tar-conduit-0.4.1 \
-		tasty-1.5.2 \
+		tasty-1.5.3_1 \
 		temporary-1.3 \
-		text-iso8601-0.1.1_1 \
+		text-conversions-0.3.1.1 \
+		text-iso8601-0.1.1_2 \
 		text-metrics-0.3.3 \
 		text-short-0.1.6_3 \
-		th-abstraction-0.7.1.0 \
+		th-abstraction-0.7.1.0_1 \
 		th-compat-0.1.6 \
+		th-expand-syns-0.4.12.0 \
 		th-lift-0.8.6 \
 		th-lift-instances-0.1.20 \
-		these-1.2.1_1 \
+		th-orphans-0.13.16 \
+		th-reify-many-0.1.10 \
+		these-1.2.1_2 \
 		time-compat-1.9.8 \
-		tls-2.1.5 \
+		tls-2.1.9 \
 		transformers-base-0.4.6 \
 		transformers-compat-0.7.2 \
-		typed-process-0.2.12.0 \
-		unix-compat-0.7.3 \
+		typed-process-0.2.13.0 \
+		unix-compat-0.7.4 \
 		unix-time-0.4.16 \
-		unliftio-0.2.25.0 \
+		unliftio-0.2.25.1 \
 		unliftio-core-0.2.1.0_4 \
 		unordered-containers-0.2.20_4 \
-		uuid-types-1.0.6_2 \
-		vault-0.3.1.5_9 \
-		vector-0.13.2.0 \
-		vector-algorithms-0.9.0.3 \
+		utf8-string-1.0.2 \
+		uuid-types-1.0.6_3 \
+		vault-0.3.1.5_10 \
+		vector-0.13.2.0_1 \
+		vector-algorithms-0.9.1.0 \
 		vector-stream-0.1.0.1_3 \
 		witherable-0.5_1 \
 		yaml-0.11.11.2_2 \
diff --git a/devel/stack/distinfo b/devel/stack/distinfo
index eb71014ca27f..0c7c4f81428e 100644
--- a/devel/stack/distinfo
+++ b/devel/stack/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1735923188
+TIMESTAMP = 1746356982
 SHA256 (cabal/Glob-0.10.2/Glob-0.10.2.tar.gz) = 6af672ac8427d35cbd42d64142dc288feab266f0be92dae3c696e8860d8173c0
 SIZE (cabal/Glob-0.10.2/Glob-0.10.2.tar.gz) = 30226
 SHA256 (cabal/Glob-0.10.2/revision/3.cabal) = dd2ddbecae8f84e8f4cacb5b856901a19c25ceaa11f2525d3ee88d034acb0081
@@ -9,12 +9,14 @@ SHA256 (cabal/OneTuple-0.4.2/revision/1.cabal) = dd7266f983da2970e5662168add810d
 SIZE (cabal/OneTuple-0.4.2/revision/1.cabal) = 2013
 SHA256 (cabal/QuickCheck-2.15.0.1/QuickCheck-2.15.0.1.tar.gz) = a3b2216ddbaf481dbc82414b6120f8b726d969db3f0b51f20a7a45425ef36e7f
 SIZE (cabal/QuickCheck-2.15.0.1/QuickCheck-2.15.0.1.tar.gz) = 81502
+SHA256 (cabal/QuickCheck-2.15.0.1/revision/1.cabal) = 0cfd337bb9e6fbf09255bd24bb498a156f1d9bcd465396ac8657b25034b9ee31
+SIZE (cabal/QuickCheck-2.15.0.1/revision/1.cabal) = 9046
 SHA256 (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5e4b39da395656a59827b0280508aafdc70335798b50e5d6fd52596026251825
 SIZE (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5048
 SHA256 (cabal/aeson-2.2.3.0/aeson-2.2.3.0.tar.gz) = daa25cf428256ad05d21f2bfa44077c1b14d6c784b7930a202ee901f11cc6baa
 SIZE (cabal/aeson-2.2.3.0/aeson-2.2.3.0.tar.gz) = 340855
-SHA256 (cabal/aeson-2.2.3.0/revision/2.cabal) = 011fa2d67d7a821aa5ec5c825adc919bb067d42dde8fac7c6e5db23239a58866
-SIZE (cabal/aeson-2.2.3.0/revision/2.cabal) = 6589
+SHA256 (cabal/aeson-2.2.3.0/revision/3.cabal) = 61e559f2bad61a98aac564f2a4fd892d21e9e1712e14e3db93326317aa944a9b
+SIZE (cabal/aeson-2.2.3.0/revision/3.cabal) = 6378
 SHA256 (cabal/aeson-warning-parser-0.1.1/aeson-warning-parser-0.1.1.tar.gz) = 2b7edfa0267e28e317358433fbf57e31aca2927efeef6ae625a90084f54487e4
 SIZE (cabal/aeson-warning-parser-0.1.1/aeson-warning-parser-0.1.1.tar.gz) = 4228
 SHA256 (cabal/annotated-wl-pprint-0.7.0/annotated-wl-pprint-0.7.0.tar.gz) = 0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18
@@ -43,6 +45,8 @@ SHA256 (cabal/async-2.2.5/async-2.2.5.tar.gz) = 1818473ebab9212afad2ed76297aefde
 SIZE (cabal/async-2.2.5/async-2.2.5.tar.gz) = 15742
 SHA256 (cabal/async-2.2.5/revision/3.cabal) = b7648c6165729a973d95cb328f9fd874813a81c727707e8b2552b4f03399763b
 SIZE (cabal/async-2.2.5/revision/3.cabal) = 3366
+SHA256 (cabal/atomic-counter-0.1.2.3/atomic-counter-0.1.2.3.tar.gz) = ce4b63391b3c0d426cbe32af89f483222602a5b43aa5379aa720bf6f45f4cf04
+SIZE (cabal/atomic-counter-0.1.2.3/atomic-counter-0.1.2.3.tar.gz) = 17379
 SHA256 (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c
 SIZE (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 160701
 SHA256 (cabal/attoparsec-0.14.4/revision/6.cabal) = 35129d0ab1741f000f1a7d2fc839544919ee6fbb8f2d6e7f0a629c41f91035f3
@@ -65,12 +69,12 @@ SHA256 (cabal/basement-0.0.16/basement-0.0.16.tar.gz) = 7fb77e249aef76ba5aed3059
 SIZE (cabal/basement-0.0.16/basement-0.0.16.tar.gz) = 134837
 SHA256 (cabal/bifunctors-5.6.2/bifunctors-5.6.2.tar.gz) = 1086a9285061eed0c2c5d3cb65aa223defd52fca6d0515bb69ddf2dbc3d9697a
 SIZE (cabal/bifunctors-5.6.2/bifunctors-5.6.2.tar.gz) = 38193
-SHA256 (cabal/bifunctors-5.6.2/revision/1.cabal) = ffd926ed71d6a046b7d5d92980d92269d7198e6b4768ffd33d120b44b88c2bbe
-SIZE (cabal/bifunctors-5.6.2/revision/1.cabal) = 3332
+SHA256 (cabal/bifunctors-5.6.2/revision/2.cabal) = 115a621c4eaaabb07834f9e4dd3371e21f39d034305062f4bd5cd72c2f8880d2
+SIZE (cabal/bifunctors-5.6.2/revision/2.cabal) = 3332
 SHA256 (cabal/bitvec-1.1.5.0/bitvec-1.1.5.0.tar.gz) = 83d27cee5be1d5342ddbf39999d0c8ea54cb433d0891eea5471fbfaa29f8dec5
 SIZE (cabal/bitvec-1.1.5.0/bitvec-1.1.5.0.tar.gz) = 40076
-SHA256 (cabal/bitvec-1.1.5.0/revision/2.cabal) = c04630f6b68f8deebfa6a07d468d3ff4582ab452b721797ef497642cf75e8b99
-SIZE (cabal/bitvec-1.1.5.0/revision/2.cabal) = 4921
+SHA256 (cabal/bitvec-1.1.5.0/revision/3.cabal) = 434be6dc60e22858a52869c58038c35353f1a778b9679ebc06a2165bcc7f88b3
+SIZE (cabal/bitvec-1.1.5.0/revision/3.cabal) = 4921
 SHA256 (cabal/blaze-builder-0.4.2.3/blaze-builder-0.4.2.3.tar.gz) = 66291874236b7342adab033e3cddae414a23a2865dfb44095dfc4e0b9d46703b
 SIZE (cabal/blaze-builder-0.4.2.3/blaze-builder-0.4.2.3.tar.gz) = 60777
 SHA256 (cabal/blaze-html-0.9.2.0/blaze-html-0.9.2.0.tar.gz) = 65542ef39f7644a3d76afcadeb976d3e334c6947516b7313fcb59165cea1608f
@@ -91,8 +95,8 @@ SHA256 (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 296dc1
 SIZE (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 53609
 SHA256 (cabal/cborg-0.2.10.0/cborg-0.2.10.0.tar.gz) = 17fe070c38fc498cab49bcb9d6215b7747d53bedf96502e9bcce9cad73b9c797
 SIZE (cabal/cborg-0.2.10.0/cborg-0.2.10.0.tar.gz) = 92122
-SHA256 (cabal/cborg-0.2.10.0/revision/1.cabal) = f7b2cbd8a73f511d5ddc249f27b1ee3c48c5b4522b763a0cb4e830fb05498874
-SIZE (cabal/cborg-0.2.10.0/revision/1.cabal) = 5378
+SHA256 (cabal/cborg-0.2.10.0/revision/2.cabal) = a52224590aca5c992a5ca0c6713439587076ad1f9c8e04ce2dca7ba2026e3654
+SIZE (cabal/cborg-0.2.10.0/revision/2.cabal) = 5406
 SHA256 (cabal/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz) = 99905220661b26e5bd91130bd9772554938608a5b1d717240a6eb331121e0f6a
 SIZE (cabal/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz) = 20166
 SHA256 (cabal/character-ps-0.1/character-ps-0.1.tar.gz) = 22de71fde38b236d3e9168a832b5e1e75d1fb4f4028667bdf747b3b4c8c1529c
@@ -105,38 +109,40 @@ SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee5
 SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675
 SHA256 (cabal/comonad-5.0.9/comonad-5.0.9.tar.gz) = 69fb0eb49a80055a9b76d31d0a5648777c4050ac8dbf56a9344b862ed878a789
 SIZE (cabal/comonad-5.0.9/comonad-5.0.9.tar.gz) = 14455
+SHA256 (cabal/comonad-5.0.9/revision/1.cabal) = 75aded79bf583c908e4e4687c0ae067f256e2507536b75f58ffba7748767c353
+SIZE (cabal/comonad-5.0.9/revision/1.cabal) = 3587
 SHA256 (cabal/companion-0.1.0/companion-0.1.0.tar.gz) = 0ac052e299b1e021951aed59d43c687e422d24c77b38515f346e434699dc14dd
 SIZE (cabal/companion-0.1.0/companion-0.1.0.tar.gz) = 3075
-SHA256 (cabal/conduit-1.3.6/conduit-1.3.6.tar.gz) = 33e69a48c742b20c57a854ca9ab9e6e217d5f37387aebbd8f6c068591ede518d
-SIZE (cabal/conduit-1.3.6/conduit-1.3.6.tar.gz) = 89043
+SHA256 (cabal/conduit-1.3.6.1/conduit-1.3.6.1.tar.gz) = 69902af03ea7e4cb982fa83da42afe36973b62d0a52ea140ae5362e52854ba3f
+SIZE (cabal/conduit-1.3.6.1/conduit-1.3.6.1.tar.gz) = 89114
 SHA256 (cabal/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz) = 9717d916a0422a7fb7cc262302333269607530d40cd0bea3be947872f906e7d3
 SIZE (cabal/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz) = 2204
-SHA256 (cabal/conduit-extra-1.3.6/conduit-extra-1.3.6.tar.gz) = 8950c38049d892c38590d389bed49ecf880671f58ec63dd4709d9fe3d4b8f153
-SIZE (cabal/conduit-extra-1.3.6/conduit-extra-1.3.6.tar.gz) = 33321
+SHA256 (cabal/conduit-extra-1.3.7/conduit-extra-1.3.7.tar.gz) = b2bd6f8626909c1784793d791078bedc0831fbaf97cb3e837d9fd94c89532b57
+SIZE (cabal/conduit-extra-1.3.7/conduit-extra-1.3.7.tar.gz) = 33170
 SHA256 (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 062fd66580d7aad0b5ba93e644ffa7feee69276ef50f20d4ed9f1deb7642dffa
 SIZE (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 13815
-SHA256 (cabal/cookie-0.5.0/cookie-0.5.0.tar.gz) = 0e51fe7090f8fbcd844bb7d1b7d9ed95b18ed3136a44836a9ce35f0a72a61a9d
-SIZE (cabal/cookie-0.5.0/cookie-0.5.0.tar.gz) = 6554
+SHA256 (cabal/cookie-0.5.1/cookie-0.5.1.tar.gz) = 1adde62726e3a3bbe147c02514fe0c4f5f2c5a2ff63842deac10c451a2a6f7a0
+SIZE (cabal/cookie-0.5.1/cookie-0.5.1.tar.gz) = 6680
 SHA256 (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6
 SIZE (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 15707
 SHA256 (cabal/cryptohash-sha256-0.11.102.1/revision/6.cabal) = 0e9de2ccce261e7a5b027e842f6f47f50eb0e6059a0de98a5479f75aa8164107
 SIZE (cabal/cryptohash-sha256-0.11.102.1/revision/6.cabal) = 5487
-SHA256 (cabal/crypton-1.0.1/crypton-1.0.1.tar.gz) = 9142bb14748cc57356cf4dacec822e80eaf6dba8e1538ec93be17ee37027c7a4
-SIZE (cabal/crypton-1.0.1/crypton-1.0.1.tar.gz) = 624895
+SHA256 (cabal/crypton-1.0.4/crypton-1.0.4.tar.gz) = b4885402206422450823e7001a40d0f6b11d0c603a0cb8bf8ff5a186b7c4011a
+SIZE (cabal/crypton-1.0.4/crypton-1.0.4.tar.gz) = 649976
 SHA256 (cabal/crypton-conduit-0.2.3/crypton-conduit-0.2.3.tar.gz) = 9e5e45f9b5115ef9a55f292e28d9d7910bd8e4c8f7f92ae3b434ec76d5ff71ce
 SIZE (cabal/crypton-conduit-0.2.3/crypton-conduit-0.2.3.tar.gz) = 5389
-SHA256 (cabal/crypton-connection-0.4.3/crypton-connection-0.4.3.tar.gz) = c98825ce395e6aed4550fefae7c8e7d6b5b4435f5ad57d12aad33fd356f82ae1
-SIZE (cabal/crypton-connection-0.4.3/crypton-connection-0.4.3.tar.gz) = 9322
+SHA256 (cabal/crypton-connection-0.4.4/crypton-connection-0.4.4.tar.gz) = 247068c222a5feec66ada8d599bfc4a878bef2cac104636afbc7d5cae93ca491
+SIZE (cabal/crypton-connection-0.4.4/crypton-connection-0.4.4.tar.gz) = 9324
 SHA256 (cabal/crypton-x509-1.7.7/crypton-x509-1.7.7.tar.gz) = efece48c8c4adfee209979c2967037d90e6ba1b7b4e7bb1081d1d4cd93daf382
 SIZE (cabal/crypton-x509-1.7.7/crypton-x509-1.7.7.tar.gz) = 21547
-SHA256 (cabal/crypton-x509-store-1.6.9/crypton-x509-store-1.6.9.tar.gz) = 3e6218af12e039cc291d19792db044df1647b5cf0bbc60b909a027e7595a256f
-SIZE (cabal/crypton-x509-store-1.6.9/crypton-x509-store-1.6.9.tar.gz) = 12735
+SHA256 (cabal/crypton-x509-store-1.6.10/crypton-x509-store-1.6.10.tar.gz) = cef0631c0dad9ca43984e51140f030e7de9a1f4bfd0b2223ed9c6d41fe4238b0
+SIZE (cabal/crypton-x509-store-1.6.10/crypton-x509-store-1.6.10.tar.gz) = 12720
 SHA256 (cabal/crypton-x509-system-1.6.7/crypton-x509-system-1.6.7.tar.gz) = a436261e5f5e83d85080f57a5509c8224c9e75a6e56d0c43a7d2967052b634ca
 SIZE (cabal/crypton-x509-system-1.6.7/crypton-x509-system-1.6.7.tar.gz) = 3496
-SHA256 (cabal/crypton-x509-validation-1.6.13/crypton-x509-validation-1.6.13.tar.gz) = 51275325511db717f0697d4f2561fdde05087807cd8a1a09223a811e41cc15d5
-SIZE (cabal/crypton-x509-validation-1.6.13/crypton-x509-validation-1.6.13.tar.gz) = 18981
-SHA256 (cabal/data-default-0.8.0.0/data-default-0.8.0.0.tar.gz) = 23f20e3089976fee1670077b745746219a25290bd5e654320c8af6aedf72dd31
-SIZE (cabal/data-default-0.8.0.0/data-default-0.8.0.0.tar.gz) = 4597
+SHA256 (cabal/crypton-x509-validation-1.6.14/crypton-x509-validation-1.6.14.tar.gz) = ed0e394127db59d66a0a8e4bde28fa0b8cc67cc9a810793b54a58e96df4c601d
+SIZE (cabal/crypton-x509-validation-1.6.14/crypton-x509-validation-1.6.14.tar.gz) = 19693
+SHA256 (cabal/data-default-0.8.0.1/data-default-0.8.0.1.tar.gz) = ce085de8ec2196f0c1d30af0ad8a517d5737c9edfd4ebfbb49e8687dfc40b6ca
+SIZE (cabal/data-default-0.8.0.1/data-default-0.8.0.1.tar.gz) = 5821
 SHA256 (cabal/data-default-class-0.2.0.0/data-default-class-0.2.0.0.tar.gz) = 0ae530c4fb0bd6c8a8ba399429ccd9c75f9c7696049117178f4ceeb2bd08d5b4
 SIZE (cabal/data-default-class-0.2.0.0/data-default-class-0.2.0.0.tar.gz) = 1589
 SHA256 (cabal/data-fix-0.3.4/data-fix-0.3.4.tar.gz) = 8df052d18c047ab9e9200536a8799b5af3997ebecbbb091a7384b6be8416ab37
@@ -145,6 +151,8 @@ SHA256 (cabal/data-fix-0.3.4/revision/1.cabal) = ee78be6168ca0878d670fede957195d
 SIZE (cabal/data-fix-0.3.4/revision/1.cabal) = 1406
 SHA256 (cabal/digest-0.0.2.1/digest-0.0.2.1.tar.gz) = cbf87b02e01f97dfe6d2d7f08065826cf552c8e8467ea990ed0d2f502e0a6498
 SIZE (cabal/digest-0.0.2.1/digest-0.0.2.1.tar.gz) = 23636
+SHA256 (cabal/directory-ospath-streaming-0.2.2/directory-ospath-streaming-0.2.2.tar.gz) = 1ade8fbee13db15e8d22a1ecdca54794617cabc69911b51d46a65e12f4554ef7
+SIZE (cabal/directory-ospath-streaming-0.2.2/directory-ospath-streaming-0.2.2.tar.gz) = 13734
 SHA256 (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = d7351392e078f58caa46630a4b9c643e1e2e9dddee45848c5c8358e7b1316b91
 SIZE (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = 8140
 SHA256 (cabal/distributive-0.6.2.1/revision/1.cabal) = 0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c
@@ -155,26 +163,30 @@ SHA256 (cabal/dlist-1.0/revision/2.cabal) = 854727594c5a816ab3d10f15b1bc4fedaf9e
 SIZE (cabal/dlist-1.0/revision/2.cabal) = 3942
 SHA256 (cabal/easy-file-0.2.5/easy-file-0.2.5.tar.gz) = ee0fa0914b3bb3662838a689d7cd23a2785ccbc29def366664f994bc524ff2bb
 SIZE (cabal/easy-file-0.2.5/easy-file-0.2.5.tar.gz) = 13358
+SHA256 (cabal/ech-config-0.0.1/ech-config-0.0.1.tar.gz) = b236b6d7ea1385c280b76051edc7d8f6db31c9cb7b35df5c06f5a0bd75b4feba
+SIZE (cabal/ech-config-0.0.1/ech-config-0.0.1.tar.gz) = 5423
 SHA256 (cabal/echo-0.1.4/echo-0.1.4.tar.gz) = c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43
 SIZE (cabal/echo-0.1.4/echo-0.1.4.tar.gz) = 5501
 SHA256 (cabal/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz) = d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d
 SIZE (cabal/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz) = 80034
-SHA256 (cabal/ed25519-0.0.5.0/revision/8.cabal) = 48383789821af5cc624498f3ee1d0939a070cda9468c0bfe63c951736be81c75
-SIZE (cabal/ed25519-0.0.5.0/revision/8.cabal) = 4028
+SHA256 (cabal/ed25519-0.0.5.0/revision/9.cabal) = f1550ddbe3b53f1087a035667364011460896cc2b1ff328b521c05ed5973bb78
+SIZE (cabal/ed25519-0.0.5.0/revision/9.cabal) = 3913
 SHA256 (cabal/extra-1.8/extra-1.8.tar.gz) = 2fa4ce5eae50560bba80f1883913cf2ed52b3d87fd290dae27d838c94f5389a1
 SIZE (cabal/extra-1.8/extra-1.8.tar.gz) = 47005
 SHA256 (cabal/fast-logger-3.2.5/fast-logger-3.2.5.tar.gz) = 315210080fec12654cae17f9feb32610e442efc1f86be0e46a30583051d8ad31
 SIZE (cabal/fast-logger-3.2.5/fast-logger-3.2.5.tar.gz) = 14795
 SHA256 (cabal/file-embed-0.0.16.0/file-embed-0.0.16.0.tar.gz) = 5f18672eff936355557cdd163905451205d7ee22742edac313dd27cf42a3f415
 SIZE (cabal/file-embed-0.0.16.0/file-embed-0.0.16.0.tar.gz) = 7198
+SHA256 (cabal/file-io-0.1.5/file-io-0.1.5.tar.gz) = 310a19e4c792de4d30c912bc71ff3becb40818d7c796b9999bcd0979dab87d5b
+SIZE (cabal/file-io-0.1.5/file-io-0.1.5.tar.gz) = 11890
 SHA256 (cabal/filelock-0.1.1.7/filelock-0.1.1.7.tar.gz) = 4d35645cdf4f0b7aa8d22238885a970aef2328a39bd4ea63c7274532b1748180
 SIZE (cabal/filelock-0.1.1.7/filelock-0.1.1.7.tar.gz) = 8109
-SHA256 (cabal/fsnotify-0.4.1.0/fsnotify-0.4.1.0.tar.gz) = d130fb4a871a181a3d1485f24da85aa49d6ff9022ce08f8401b4626143eaf7ef
-SIZE (cabal/fsnotify-0.4.1.0/fsnotify-0.4.1.0.tar.gz) = 22783
-SHA256 (cabal/fsnotify-0.4.1.0/revision/1.cabal) = c627fd1edf9714f0a14261a6877e8e53e44ab99b21a6de7477540c51da0118e5
-SIZE (cabal/fsnotify-0.4.1.0/revision/1.cabal) = 2995
+SHA256 (cabal/fsnotify-0.4.2.0/fsnotify-0.4.2.0.tar.gz) = 114d6533807d57dbbb9801f7edd5df079f18286d558e29dc2da98c1c40e5a25a
+SIZE (cabal/fsnotify-0.4.2.0/fsnotify-0.4.2.0.tar.gz) = 24179
 SHA256 (cabal/generic-deriving-1.14.6/generic-deriving-1.14.6.tar.gz) = f195c17f1a32a3c9a2bf8762b8f9a9b5f6271f9e6075c887aa3609364356b2af
 SIZE (cabal/generic-deriving-1.14.6/generic-deriving-1.14.6.tar.gz) = 50583
+SHA256 (cabal/generic-deriving-1.14.6/revision/1.cabal) = f47c071d90370e0eee27dad6139964bed29b2d896b404b3a9516138f0d92ac55
+SIZE (cabal/generic-deriving-1.14.6/revision/1.cabal) = 6755
 SHA256 (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 04c5a436bec4b041f71a733f56a1bd7f435f63dde8d3eb5c1f48d55b4dbc43cf
 SIZE (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 2870
 SHA256 (cabal/generically-0.1.1/revision/4.cabal) = 3f64278f5c582dd7c6963967b1290079bcd03b8348989f909ac9bd972ddc452e
@@ -183,32 +195,44 @@ SHA256 (cabal/githash-0.1.7.0/githash-0.1.7.0.tar.gz) = 1ad5e7c26bd9c9c4e4c32322
 SIZE (cabal/githash-0.1.7.0/githash-0.1.7.0.tar.gz) = 7661
 SHA256 (cabal/hackage-security-0.6.2.6/hackage-security-0.6.2.6.tar.gz) = 2e4261576b3e11b9f5175392947f56a638cc1a3584b8acbb962b809d7c69db69
 SIZE (cabal/hackage-security-0.6.2.6/hackage-security-0.6.2.6.tar.gz) = 84736
-SHA256 (cabal/hackage-security-0.6.2.6/revision/4.cabal) = a7311a70ce2cc820ee430c389f57f82a082f148230b37526c34eac72b7b3ff34
-SIZE (cabal/hackage-security-0.6.2.6/revision/4.cabal) = 9966
+SHA256 (cabal/hackage-security-0.6.2.6/revision/5.cabal) = f85f6f1ef55d1f91795f2c7c476db36fd7aedb55c877d47f2a4411f0151040a9
+SIZE (cabal/hackage-security-0.6.2.6/revision/5.cabal) = 9761
 SHA256 (cabal/half-0.3.2/half-0.3.2.tar.gz) = 19992e9fb6f4ea8a53b0ba0693565e8ec73c620b603e74b6d4f262e49d7df038
 SIZE (cabal/half-0.3.2/half-0.3.2.tar.gz) = 8319
-SHA256 (cabal/hashable-1.4.7.0/hashable-1.4.7.0.tar.gz) = 3baee4c9027a08830d148ec524cbc0471de645e1e8426d46780ef2758df0e8da
-SIZE (cabal/hashable-1.4.7.0/hashable-1.4.7.0.tar.gz) = 89467
+SHA256 (cabal/happy-2.1.5/happy-2.1.5.tar.gz) = 7af82f24f65bf951b24000b9e16ee01c750ed40edc0b256881d29daee85c41c4
+SIZE (cabal/happy-2.1.5/happy-2.1.5.tar.gz) = 61293
+SHA256 (cabal/happy-lib-2.1.5/happy-lib-2.1.5.tar.gz) = a25a6c5a2db150caf4b8c91e048e302f776372034b84b8f9461fea0483da94eb
+SIZE (cabal/happy-lib-2.1.5/happy-lib-2.1.5.tar.gz) = 93792
+SHA256 (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = e58b3a8e18da5f6cd7e937e5fd683e500bb1f8276b3768269759119ca0cddb6a
+SIZE (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = 89062
+SHA256 (cabal/hashable-1.5.0.0/revision/1.cabal) = 2f23146cbe0325029927b221647695a4c7d6e97548ff731110979e34361f58ef
+SIZE (cabal/hashable-1.5.0.0/revision/1.cabal) = 5914
+SHA256 (cabal/haskell-src-exts-1.23.1/haskell-src-exts-1.23.1.tar.gz) = 67853047169fff7d3e5d87acef214ee185a6ab8c6a104ed9c59e389574cf6c05
+SIZE (cabal/haskell-src-exts-1.23.1/haskell-src-exts-1.23.1.tar.gz) = 1264319
+SHA256 (cabal/haskell-src-meta-0.8.15/haskell-src-meta-0.8.15.tar.gz) = 26eab63199d5f112748ec7700173cf2157e18f766ac5e78ee2986c98576b0dbe
+SIZE (cabal/haskell-src-meta-0.8.15/haskell-src-meta-0.8.15.tar.gz) = 28071
 SHA256 (cabal/hi-file-parser-0.1.7.0/hi-file-parser-0.1.7.0.tar.gz) = 184331306434a2afdb9459c409e18aa6d1c528768a6212ae9363c85990345ae7
 SIZE (cabal/hi-file-parser-0.1.7.0/hi-file-parser-0.1.7.0.tar.gz) = 22855
 SHA256 (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 44335b5c402e80c60f1db6a74462be4ea29d1a9043aa994334ffee1164f1ca4a
 SIZE (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 25797
 SHA256 (cabal/hourglass-0.2.12/revision/1.cabal) = 85c46cb6cd30c84546929926d4402a534f723651198e5945c9e59b9e699a8979
 SIZE (cabal/hourglass-0.2.12/revision/1.cabal) = 3197
-SHA256 (cabal/hpack-0.37.0/hpack-0.37.0.tar.gz) = a47473235ecefb5f27044ef0dfe9dbd12baac3f350b76be8ac47f737121c2c73
-SIZE (cabal/hpack-0.37.0/hpack-0.37.0.tar.gz) = 71870
+SHA256 (cabal/hpack-0.38.1/hpack-0.38.1.tar.gz) = 6a3d315b57a87604a0e9f7c123b27c3c0408d03c5fcd259e36992c19ca7a1e0f
+SIZE (cabal/hpack-0.38.1/hpack-0.38.1.tar.gz) = 73133
+SHA256 (cabal/hpke-0.0.0/hpke-0.0.0.tar.gz) = 7b0b7dfb4f7081beab54c4cb0cb3df3f3c03ce05cb11747f190bab22df19b83c
+SIZE (cabal/hpke-0.0.0/hpke-0.0.0.tar.gz) = 25248
 SHA256 (cabal/hsc2hs-0.68.10/hsc2hs-0.68.10.tar.gz) = 6f4e34d788fe2ca7091ee0a10307ee8a7c060a1ba890f2bffad16a7d4d5cef76
 SIZE (cabal/hsc2hs-0.68.10/hsc2hs-0.68.10.tar.gz) = 40517
-SHA256 (cabal/hsc2hs-0.68.10/revision/3.cabal) = 276325277350cd2c2c88916ed3ae5cd35b2b4f494ec594fbd9534081eb7fb759
-SIZE (cabal/hsc2hs-0.68.10/revision/3.cabal) = 3008
-SHA256 (cabal/http-api-data-0.6.1/http-api-data-0.6.1.tar.gz) = 5a51cf8fc0502e5f7f26c332d7a4b6fe89aadb3f069ba6e2c1c1d0afa4c4e3cf
-SIZE (cabal/http-api-data-0.6.1/http-api-data-0.6.1.tar.gz) = 20848
-SHA256 (cabal/http-api-data-0.6.1/revision/1.cabal) = e389f4353cc6fc9a6522e2a6e21973fe627deac2fcae5df753fe1606a182813f
-SIZE (cabal/http-api-data-0.6.1/revision/1.cabal) = 3247
-SHA256 (cabal/http-client-0.7.18/http-client-0.7.18.tar.gz) = 9088b3d696024cbd0615e60f3abc298b7575abeb96ce37225f46598dbb873496
-SIZE (cabal/http-client-0.7.18/http-client-0.7.18.tar.gz) = 97359
+SHA256 (cabal/hsc2hs-0.68.10/revision/4.cabal) = 725ef6da03d3d6e332db4de0a35bee45d72e4d31decc5ec7f153e6837af5f03e
+SIZE (cabal/hsc2hs-0.68.10/revision/4.cabal) = 3114
+SHA256 (cabal/http-api-data-0.6.2/http-api-data-0.6.2.tar.gz) = dc84a9ff403922f03bdc497cedee145fdd0058b1bb47be59cf714460eaec8234
+SIZE (cabal/http-api-data-0.6.2/http-api-data-0.6.2.tar.gz) = 20873
+SHA256 (cabal/http-client-0.7.19/http-client-0.7.19.tar.gz) = a02c1be082e8f48c959ac7150a48a405f8d4383e0942639481e84b220f29ad61
+SIZE (cabal/http-client-0.7.19/http-client-0.7.19.tar.gz) = 96836
 SHA256 (cabal/http-client-tls-0.3.6.4/http-client-tls-0.3.6.4.tar.gz) = 7756006fee8ab924c521372e0f9d6705579016b9fab0b0312d1b9a335cfc18a3
 SIZE (cabal/http-client-tls-0.3.6.4/http-client-tls-0.3.6.4.tar.gz) = 7954
+SHA256 (cabal/http-client-tls-0.3.6.4/revision/2.cabal) = efe0a32d59c3a38ea35eb9c1b6e7beffa3592e39b2065a727cb84ccd654d16f3
+SIZE (cabal/http-client-tls-0.3.6.4/revision/2.cabal) = 2135
 SHA256 (cabal/http-conduit-2.3.9.1/http-conduit-2.3.9.1.tar.gz) = 13046d15ecd2332a5b80c8a34a6a1b6b8eecefce9d5c57e3413312b8c11641af
 SIZE (cabal/http-conduit-2.3.9.1/http-conduit-2.3.9.1.tar.gz) = 29275
 SHA256 (cabal/http-download-0.2.1.0/http-download-0.2.1.0.tar.gz) = 05ded2ad03e8b6982bffe35d74a5a15ede7e25bbcca6214c3726032e6f4fc824
@@ -217,8 +241,12 @@ SHA256 (cabal/http-types-0.12.4/http-types-0.12.4.tar.gz) = 4d4b1bb0cc817e5fef0c
 SIZE (cabal/http-types-0.12.4/http-types-0.12.4.tar.gz) = 18707
 SHA256 (cabal/indexed-traversable-0.1.4/indexed-traversable-0.1.4.tar.gz) = 58be09afdf3ad5a25c2aa0d2a7df80d602df09f4e76d3abf2b7cdb0e75d03b22
 SIZE (cabal/indexed-traversable-0.1.4/indexed-traversable-0.1.4.tar.gz) = 9465
+SHA256 (cabal/indexed-traversable-0.1.4/revision/1.cabal) = 42d9e84a65a0c17c248233cab98ada872ff6140dfa24d109d6eb285204d07e7d
+SIZE (cabal/indexed-traversable-0.1.4/revision/1.cabal) = 2098
 SHA256 (cabal/indexed-traversable-instances-0.1.2/indexed-traversable-instances-0.1.2.tar.gz) = 3c2bb62fba141d6696177070d63b88bc56b194bc60f6b73d2263b0244e2fc7c1
 SIZE (cabal/indexed-traversable-instances-0.1.2/indexed-traversable-instances-0.1.2.tar.gz) = 3673
+SHA256 (cabal/indexed-traversable-instances-0.1.2/revision/1.cabal) = 68df0fc8070ae2c15f9e6febf1449fee364c131a6d1e93cac45e7895ba86dd89
+SIZE (cabal/indexed-traversable-instances-0.1.2/revision/1.cabal) = 2401
 SHA256 (cabal/infer-license-0.2.0/infer-license-0.2.0.tar.gz) = 12e6fe616575159c03cf6fd4a4f30021ecf264a529ab4e4edd6e96e296a98e72
 SIZE (cabal/infer-license-0.2.0/infer-license-0.2.0.tar.gz) = 48173
 SHA256 (cabal/integer-conversion-0.1.1/integer-conversion-0.1.1.tar.gz) = c18164a048073310f6353ebc64c9037b52a4b8299963ce05e027bcf60e22155a
@@ -239,26 +267,26 @@ SHA256 (cabal/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz) = c134a95f56750a
 SIZE (cabal/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz) = 11700
 SHA256 (cabal/lukko-0.1.2/lukko-0.1.2.tar.gz) = 72d86f8aa625b461f4397f737346f78a1700a7ffbff55cf6375c5e18916e986d
 SIZE (cabal/lukko-0.1.2/lukko-0.1.2.tar.gz) = 28448
+SHA256 (cabal/lukko-0.1.2/revision/1.cabal) = 8334a8d810e385e1dc1423dc02945daaa1f1a9ba058e5227f1a3211e4882ca28
+SIZE (cabal/lukko-0.1.2/revision/1.cabal) = 4473
 SHA256 (cabal/megaparsec-9.7.0/megaparsec-9.7.0.tar.gz) = b9ed423625bf20ae7a72480d40d2dd16018a67e2ec45afb840a3607aa931ec97
 SIZE (cabal/megaparsec-9.7.0/megaparsec-9.7.0.tar.gz) = 67078
 SHA256 (cabal/memory-0.18.0/memory-0.18.0.tar.gz) = fd4eb6f638e24b81b4e6cdd68772a531726f2f67686c8969d3407d82f7862e3e
 SIZE (cabal/memory-0.18.0/memory-0.18.0.tar.gz) = 41957
-SHA256 (cabal/microlens-0.4.13.1/microlens-0.4.13.1.tar.gz) = 0a54abee8ff4f6aeb4bea0783409a3dbd28a4e7a892bac916b0fb6a71382d7fc
-SIZE (cabal/microlens-0.4.13.1/microlens-0.4.13.1.tar.gz) = 27436
-SHA256 (cabal/microlens-0.4.13.1/revision/1.cabal) = fc256e2b5d78e8e4f39b3dd359c57b8c19df50853a86eaf8f154a17441a5a51d
-SIZE (cabal/microlens-0.4.13.1/revision/1.cabal) = 4703
-SHA256 (cabal/microlens-mtl-0.2.0.3/microlens-mtl-0.2.0.3.tar.gz) = 4d6b6af37179814fe47e11763ea61b423b698bc15869f94e82c6a5e9fd079fc6
-SIZE (cabal/microlens-mtl-0.2.0.3/microlens-mtl-0.2.0.3.tar.gz) = 9191
-SHA256 (cabal/microlens-mtl-0.2.0.3/revision/1.cabal) = 92f6e76b1e0177a990496df2ab55972476a1f117d0a7b944f810bce6b4848377
-SIZE (cabal/microlens-mtl-0.2.0.3/revision/1.cabal) = 2026
-SHA256 (cabal/microlens-th-0.4.3.16/microlens-th-0.4.3.16.tar.gz) = 8770b1248443c6bcb465b3c7b1359633a90cd25c1b32c7875353910ec0cfa4bd
-SIZE (cabal/microlens-th-0.4.3.16/microlens-th-0.4.3.16.tar.gz) = 24248
+SHA256 (cabal/memory-0.18.0/revision/1.cabal) = 9f4de967352f80b6f174c9a166f315393dde80b77d7b67e41268ae7dec0319f9
+SIZE (cabal/memory-0.18.0/revision/1.cabal) = 4581
+SHA256 (cabal/microlens-0.4.14.0/microlens-0.4.14.0.tar.gz) = 56792a613e4fb0634bdedf54dcb773ac4baae8be0fec8bd88e1bb8b7a649922e
+SIZE (cabal/microlens-0.4.14.0/microlens-0.4.14.0.tar.gz) = 28262
+SHA256 (cabal/microlens-mtl-0.2.1.0/microlens-mtl-0.2.1.0.tar.gz) = fbd79c72e1f2a533cfe376ecdad73807db437c2a3cf3488bf7a8523d4377848f
+SIZE (cabal/microlens-mtl-0.2.1.0/microlens-mtl-0.2.1.0.tar.gz) = 9264
+SHA256 (cabal/microlens-th-0.4.3.17/microlens-th-0.4.3.17.tar.gz) = 1d762c027ca332ae906cb031e87a423c2bbedebe3bb9d988188692a5de4c0a94
+SIZE (cabal/microlens-th-0.4.3.17/microlens-th-0.4.3.17.tar.gz) = 24258
 SHA256 (cabal/mime-types-0.1.2.0/mime-types-0.1.2.0.tar.gz) = 013ae48a4c1726a4f91a64e882f3fe1fb903a7d4b8c14da51286fe5e4b974f61
 SIZE (cabal/mime-types-0.1.2.0/mime-types-0.1.2.0.tar.gz) = 12044
 SHA256 (cabal/monad-control-1.0.3.1/monad-control-1.0.3.1.tar.gz) = ae0baea04d99375ef788140367179994a7178d400a8ce0d9026846546772713c
 SIZE (cabal/monad-control-1.0.3.1/monad-control-1.0.3.1.tar.gz) = 13985
-SHA256 (cabal/monad-logger-0.3.41/monad-logger-0.3.41.tar.gz) = f54d0ffca81bfb1a16c1daa83c096ec29355618274aca5cf790354a688eefe1c
-SIZE (cabal/monad-logger-0.3.41/monad-logger-0.3.41.tar.gz) = 11954
+SHA256 (cabal/monad-logger-0.3.42/monad-logger-0.3.42.tar.gz) = 6623446cd42aa1f58a9e21f4abc18cfff13b8991d6ac852d9352d0ffea125010
+SIZE (cabal/monad-logger-0.3.42/monad-logger-0.3.42.tar.gz) = 11984
 SHA256 (cabal/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz) = 7eaaaf6bc43661e9e86e310ff8c56fbea16eb6bf13c31a2e28103138ac164c18
 SIZE (cabal/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz) = 4996
 SHA256 (cabal/mono-traversable-1.0.21.0/mono-traversable-1.0.21.0.tar.gz) = 4dd93ea334c0169500402f07aa39c98dbb7bffe55dc63fdf228da2cc22c7c5cd
@@ -271,6 +299,8 @@ SHA256 (cabal/neat-interpolation-0.5.1.4/neat-interpolation-0.5.1.4.tar.gz) = 8e
 SIZE (cabal/neat-interpolation-0.5.1.4/neat-interpolation-0.5.1.4.tar.gz) = 5741
 SHA256 (cabal/network-3.2.7.0/network-3.2.7.0.tar.gz) = 68548e660632a3c09b230c33fe08cc880273372b485e65cbe7a717936de9728b
 SIZE (cabal/network-3.2.7.0/network-3.2.7.0.tar.gz) = 145714
+SHA256 (cabal/network-byte-order-0.1.7/network-byte-order-0.1.7.tar.gz) = 480ce0ad7f67364ec8d4ce8d815f463d9e4074e3789be22a5722cfdebed08679
+SIZE (cabal/network-byte-order-0.1.7/network-byte-order-0.1.7.tar.gz) = 6402
 SHA256 (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228
 SIZE (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 31309
 SHA256 (cabal/network-uri-2.6.4.2/revision/1.cabal) = 6fffb57373962b5651a2db8b0af732098b3bf029a7ced76a9855615de2026588
@@ -281,24 +311,26 @@ SHA256 (cabal/old-locale-1.0.0.7/revision/2.cabal) = fa998be2c7e00cd26a6e9075bea
 SIZE (cabal/old-locale-1.0.0.7/revision/2.cabal) = 1071
 SHA256 (cabal/old-time-1.1.0.4/old-time-1.1.0.4.tar.gz) = 1e22eb7f7b924a676f52e317917b3b5eeceee11c74ef4bc609c0bcec624c166f
 SIZE (cabal/old-time-1.1.0.4/old-time-1.1.0.4.tar.gz) = 75542
-SHA256 (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 0bed2e63800f738e78a4803ed22902accb50ac02068b96c17ce83a267244ca66
-SIZE (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 2629
+SHA256 (cabal/open-browser-0.4.0.0/open-browser-0.4.0.0.tar.gz) = deff01d066a027bfb609522465e8e0580d8b56004cebb5b1f3e0f05f79cbf85d
+SIZE (cabal/open-browser-0.4.0.0/open-browser-0.4.0.0.tar.gz) = 5603
 SHA256 (cabal/optparse-applicative-0.18.1.0/optparse-applicative-0.18.1.0.tar.gz) = 63811ab4fd26e829b8868364325a88be3acc79819f5bb5005b2dd3b961ecc491
 SIZE (cabal/optparse-applicative-0.18.1.0/optparse-applicative-0.18.1.0.tar.gz) = 60682
+SHA256 (cabal/optparse-applicative-0.18.1.0/revision/1.cabal) = f30973861ac7e7ebff05ff8c7c3d1e4d283a1f3850e1cc14106b0693ec1b6d82
+SIZE (cabal/optparse-applicative-0.18.1.0/revision/1.cabal) = 5289
 SHA256 (cabal/optparse-simple-0.1.1.4/optparse-simple-0.1.1.4.tar.gz) = 1d01d85c477b42e5a6ab6595def68c800d5bccbeff5a06ccf63c6a86967a7878
 SIZE (cabal/optparse-simple-0.1.1.4/optparse-simple-0.1.1.4.tar.gz) = 5067
 SHA256 (cabal/os-string-2.0.7/os-string-2.0.7.tar.gz) = 339c35fd3a290522f23de4e33528423cfd0b0a8f22946b0b9816a817b926cba0
 SIZE (cabal/os-string-2.0.7/os-string-2.0.7.tar.gz) = 44683
-SHA256 (cabal/pantry-0.10.0/pantry-0.10.0.tar.gz) = d577510a32b889aeb39e2b2b8da0b823b78955da380a1583d7a44e81e4990cb8
-SIZE (cabal/pantry-0.10.0/pantry-0.10.0.tar.gz) = 108367
-SHA256 (cabal/pantry-0.10.0/revision/2.cabal) = d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec
-SIZE (cabal/pantry-0.10.0/revision/2.cabal) = 7912
+SHA256 (cabal/pantry-0.10.1/pantry-0.10.1.tar.gz) = 340a0ee06bd57916b6638eea0d8ec62b5bde9366f3d75ba646fc9129dfa7c9b2
+SIZE (cabal/pantry-0.10.1/pantry-0.10.1.tar.gz) = 108926
 SHA256 (cabal/parser-combinators-1.3.0/parser-combinators-1.3.0.tar.gz) = 9310ef0d49f8a8922acda10b1cded9854cbee04dea717effc6ee5983072e4447
 SIZE (cabal/parser-combinators-1.3.0/parser-combinators-1.3.0.tar.gz) = 11699
 SHA256 (cabal/parser-combinators-1.3.0/revision/1.cabal) = 8659573e0d443d573f5b53f81b81dafbdc988d282b90c11e3da73562b4ea7876
 SIZE (cabal/parser-combinators-1.3.0/revision/1.cabal) = 1640
 SHA256 (cabal/path-0.9.6/path-0.9.6.tar.gz) = 58500597525890272ea7046e079bfc1e78c06436adc7bee9c5c12649b7e799ff
 SIZE (cabal/path-0.9.6/path-0.9.6.tar.gz) = 40853
+SHA256 (cabal/path-0.9.6/revision/1.cabal) = 9b70aba36d9915d448f46353f47af511662ce33757df09b7698349d7a7a38ff8
+SIZE (cabal/path-0.9.6/revision/1.cabal) = 5739
 SHA256 (cabal/path-io-1.8.2/path-io-1.8.2.tar.gz) = cdad7f6b37903422c5c3bbea7292786512b141a5ff1db15888f9af2c98239aa8
 SIZE (cabal/path-io-1.8.2/path-io-1.8.2.tar.gz) = 22078
 SHA256 (cabal/path-pieces-0.2.1/path-pieces-0.2.1.tar.gz) = 080bd49f53e20597ca3e5962e0c279a3422345f5b088840a30a751cd76d4a36f
@@ -309,6 +341,8 @@ SHA256 (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 770c4c1b9cd24b3db7f511f8a48404a0d098
 SIZE (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 4717
 SHA256 (cabal/persistent-2.14.6.3/persistent-2.14.6.3.tar.gz) = 4df0e3888140afe7b47ff5257323aa3f452271f92c7dc761aa8ce8406b6815db
 SIZE (cabal/persistent-2.14.6.3/persistent-2.14.6.3.tar.gz) = 176943
+SHA256 (cabal/persistent-2.14.6.3/revision/1.cabal) = b157c777f6295ad4da83e3314c6d8b1c9186eba6c67c44994b58754e173ea0e7
+SIZE (cabal/persistent-2.14.6.3/revision/1.cabal) = 7482
 SHA256 (cabal/persistent-sqlite-2.13.3.0/persistent-sqlite-2.13.3.0.tar.gz) = bdc152911ce197cbaab66350354e90f863d74df1599c08b5c01e95e1b35a9104
 SIZE (cabal/persistent-sqlite-2.13.3.0/persistent-sqlite-2.13.3.0.tar.gz) = 2469325
 SHA256 (cabal/persistent-template-2.12.0.0/persistent-template-2.12.0.0.tar.gz) = dc488b567d373ebfbf5f3df8bba240e6203d1b13556872648d5f0d228fd02c31
@@ -317,14 +351,12 @@ SHA256 (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 5e6ea6903114fa11
 SIZE (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 56907
 SHA256 (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 813739308ad6050620578994effe21058a170a341716acf52573fae42b5b1db3
 SIZE (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 8879
-SHA256 (cabal/primitive-0.9.0.0/primitive-0.9.0.0.tar.gz) = 696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7
-SIZE (cabal/primitive-0.9.0.0/primitive-0.9.0.0.tar.gz) = 60580
-SHA256 (cabal/primitive-0.9.0.0/revision/2.cabal) = de20bf4eff1f972088854c8efda6eaca2d3147aff62232c3707f059152638759
-SIZE (cabal/primitive-0.9.0.0/revision/2.cabal) = 3203
+SHA256 (cabal/primitive-0.9.1.0/primitive-0.9.1.0.tar.gz) = 44b4de41813c7bc5db8a57f87c3612a069b65086946268ba165097252ebd3d76
+SIZE (cabal/primitive-0.9.1.0/primitive-0.9.1.0.tar.gz) = 61724
 SHA256 (cabal/project-template-0.2.1.0/project-template-0.2.1.0.tar.gz) = 2d99e5bf750e409d8f2daa2a9038ce39c40c310e2e52076549659968461f8429
 SIZE (cabal/project-template-0.2.1.0/project-template-0.2.1.0.tar.gz) = 8485
-SHA256 (cabal/random-1.2.1.3/random-1.2.1.3.tar.gz) = e9c81926a7d1e40328f645f73592b31efc9c631589669a7f130687b9cc3051dc
-SIZE (cabal/random-1.2.1.3/random-1.2.1.3.tar.gz) = 47117
+SHA256 (cabal/random-1.3.1/random-1.3.1.tar.gz) = d840ac83f265b0cfa2a678f8ec78627eb50cf9be2f067c52c8a4239c29b71a35
+SIZE (cabal/random-1.3.1/random-1.3.1.tar.gz) = 63846
 SHA256 (cabal/resource-pool-0.4.0.0/resource-pool-0.4.0.0.tar.gz) = 8c0d783e3e75788d65f79157309132999f1bbb70684bacc2ea5dd18f904ae9b1
 SIZE (cabal/resource-pool-0.4.0.0/resource-pool-0.4.0.0.tar.gz) = 8128
 SHA256 (cabal/resourcet-1.3.0/resourcet-1.3.0.tar.gz) = ec601785ee42a201f32adb205b8685c983f18757b1bd33d2e806d571e0f9996b
@@ -337,6 +369,10 @@ SHA256 (cabal/rio-orphans-0.1.2.0/rio-orphans-0.1.2.0.tar.gz) = 3c43cd96493750cb
 SIZE (cabal/rio-orphans-0.1.2.0/rio-orphans-0.1.2.0.tar.gz) = 3251
 SHA256 (cabal/rio-prettyprint-0.1.8.0/rio-prettyprint-0.1.8.0.tar.gz) = b154537c15f629ebfa2b1ac7af4f51bba1be0b21c3ae6ee22f9f16eeb491ca16
 SIZE (cabal/rio-prettyprint-0.1.8.0/rio-prettyprint-0.1.8.0.tar.gz) = 17787
+SHA256 (cabal/safe-0.3.21/safe-0.3.21.tar.gz) = 2c81fea42bbe79ec488774043c1ec54f30efba059df9a4f3681ce83d85007f01
+SIZE (cabal/safe-0.3.21/safe-0.3.21.tar.gz) = 11778
+SHA256 (cabal/safe-0.3.21/revision/1.cabal) = b928ea1645876788155b38ce85c7e46d157a1bb41d2b05f5770b13d60bc6a3f7
+SIZE (cabal/safe-0.3.21/revision/1.cabal) = 2400
 SHA256 (cabal/safe-exceptions-0.1.7.4/safe-exceptions-0.1.7.4.tar.gz) = 3c51d8d50c9b60ff8bf94f942fd92e3bea9e62c5afa778dfc9f707b79da41ef6
 SIZE (cabal/safe-exceptions-0.1.7.4/safe-exceptions-0.1.7.4.tar.gz) = 15347
 SHA256 (cabal/safe-exceptions-0.1.7.4/revision/1.cabal) = 8bb7261bd54bd58acfcb154be6a161fb6d0d31a1852aadc8e927d2ad2d7651d1
@@ -347,16 +383,16 @@ SHA256 (cabal/scientific-0.3.8.0/revision/2.cabal) = ba83a6701dd0110138443757aca
 SIZE (cabal/scientific-0.3.8.0/revision/2.cabal) = 4397
 SHA256 (cabal/semialign-1.3.1/semialign-1.3.1.tar.gz) = 66e87bc254ffec2ee908bf625c42d3b7363238d6ab1cfba8934bbee7590c9df7
 SIZE (cabal/semialign-1.3.1/semialign-1.3.1.tar.gz) = 10117
-SHA256 (cabal/semialign-1.3.1/revision/1.cabal) = 0ebafdb9c3bfac8c5311999ae195115c1452a205b273d54e7b1145a65c1bf610
-SIZE (cabal/semialign-1.3.1/revision/1.cabal) = 2209
+SHA256 (cabal/semialign-1.3.1/revision/2.cabal) = dfe515a9e43230f5308564a649a04ea1538499ed98b944644b77bed5394b9deb
+SIZE (cabal/semialign-1.3.1/revision/2.cabal) = 2224
 SHA256 (cabal/semigroupoids-6.0.1/semigroupoids-6.0.1.tar.gz) = 1d532030862414f5d4f2f6f001783f77aa14e5f05ee8e3c4a2d2129fca29cc1f
 SIZE (cabal/semigroupoids-6.0.1/semigroupoids-6.0.1.tar.gz) = 36372
-SHA256 (cabal/semigroupoids-6.0.1/revision/1.cabal) = f65892f65f941c7368334bdfdcdb9db2ad3952502e94e88785a5a428fa2f3f4e
-SIZE (cabal/semigroupoids-6.0.1/revision/1.cabal) = 7539
+SHA256 (cabal/semigroupoids-6.0.1/revision/2.cabal) = bfee06a6d88038a88ddd10fc21c230bf5ee3a14d0584dc6ab7ad54a9252c2c21
+SIZE (cabal/semigroupoids-6.0.1/revision/2.cabal) = 7539
 SHA256 (cabal/serialise-0.2.6.1/serialise-0.2.6.1.tar.gz) = 63949799ffd10675ef70ea701c1eb63e618629b3b2f7b25f07c5a966e24e77f4
 SIZE (cabal/serialise-0.2.6.1/serialise-0.2.6.1.tar.gz) = 75106
-SHA256 (cabal/serialise-0.2.6.1/revision/3.cabal) = e3ff5009a1d855cd1ad160bbfce47601a234e426bc1af237a2ee760cb5d95557
-SIZE (cabal/serialise-0.2.6.1/revision/3.cabal) = 8778
+SHA256 (cabal/serialise-0.2.6.1/revision/4.cabal) = 70495f88c1633bd432847b1d767e9e6832779f85b9d012b01a0a14f2cacbecc6
+SIZE (cabal/serialise-0.2.6.1/revision/4.cabal) = 8823
 SHA256 (cabal/silently-1.2.5.4/silently-1.2.5.4.tar.gz) = 5e23608965c1004b007dc771604998ae6da52c15772300bfdde30d8b5212746e
 SIZE (cabal/silently-1.2.5.4/silently-1.2.5.4.tar.gz) = 4640
 SHA256 (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 734447558bb061ce768f53a0df1f2401902c6bee396cc96ce627edd986ef6a73
@@ -369,30 +405,38 @@ SHA256 (cabal/static-bytes-0.1.1/static-bytes-0.1.1.tar.gz) = 492da0f8a4cc0da67d
 SIZE (cabal/static-bytes-0.1.1/static-bytes-0.1.1.tar.gz) = 5327
 SHA256 (cabal/stm-chans-3.0.0.9/stm-chans-3.0.0.9.tar.gz) = 7a060df537cb93c98380a770f88d4a1ff08b79fe07203c859be7bc815dc1325d
 SIZE (cabal/stm-chans-3.0.0.9/stm-chans-3.0.0.9.tar.gz) = 9987
-SHA256 (cabal/streaming-commons-0.2.2.6/streaming-commons-0.2.2.6.tar.gz) = 0180958a882eb0f6262b812fe886c2b1b8285474b5b958f814ae4f05409fbf79
-SIZE (cabal/streaming-commons-0.2.2.6/streaming-commons-0.2.2.6.tar.gz) = 37959
-SHA256 (cabal/streaming-commons-0.2.2.6/revision/1.cabal) = d5c6fb99efd4e71bdb0351d55f2d87e16c11880f42998e39363eb63f057ae24b
-SIZE (cabal/streaming-commons-0.2.2.6/revision/1.cabal) = 4827
+SHA256 (cabal/streaming-commons-0.2.3.0/streaming-commons-0.2.3.0.tar.gz) = 26384af91f5ab9470b0bbdd0ce2172db43fc79730b7c5a3405d89c3663eb1e57
+SIZE (cabal/streaming-commons-0.2.3.0/streaming-commons-0.2.3.0.tar.gz) = 37874
 SHA256 (cabal/strict-0.5.1/strict-0.5.1.tar.gz) = 77719280c2a86312e748227bfa732eeaae0e7df48d57acc3c2e5b7b07afe2f8b
 SIZE (cabal/strict-0.5.1/strict-0.5.1.tar.gz) = 11798
 SHA256 (cabal/strict-0.5.1/revision/1.cabal) = 58c373b7c7748cbb4a5a6c8c15073f99a1c10a9a9bb6894ac33f43a5cdb901f2
 SIZE (cabal/strict-0.5.1/revision/1.cabal) = 3557
+SHA256 (cabal/string-interpolate-0.3.4.0/string-interpolate-0.3.4.0.tar.gz) = 88838540b080308174d4fa51f20f15f46ed928bf1cf664f533f9bda5ae1e0b8e
+SIZE (cabal/string-interpolate-0.3.4.0/string-interpolate-0.3.4.0.tar.gz) = 23317
+SHA256 (cabal/string-interpolate-0.3.4.0/revision/2.cabal) = 7304fdb3ad1622e4832bf10e115ab4dc8879c34691bd798f858eb51e8fe68657
+SIZE (cabal/string-interpolate-0.3.4.0/revision/2.cabal) = 4274
+SHA256 (cabal/syb-0.7.2.4/syb-0.7.2.4.tar.gz) = ec7c1e8822d62ab910386361cdcee40a22a26cd344c34741fadd982302291e60
+SIZE (cabal/syb-0.7.2.4/syb-0.7.2.4.tar.gz) = 41809
 SHA256 (cabal/tagged-0.8.9/tagged-0.8.9.tar.gz) = 6daad88ebb414ba6a556d2898d2cbe7650e4276010e3a6eed939daf54b956784
 SIZE (cabal/tagged-0.8.9/tagged-0.8.9.tar.gz) = 8151
-SHA256 (cabal/tar-0.6.3.0/tar-0.6.3.0.tar.gz) = 50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814
-SIZE (cabal/tar-0.6.3.0/tar-0.6.3.0.tar.gz) = 54502
-SHA256 (cabal/tar-0.6.3.0/revision/1.cabal) = e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a
-SIZE (cabal/tar-0.6.3.0/revision/1.cabal) = 4634
+SHA256 (cabal/tar-0.6.4.0/tar-0.6.4.0.tar.gz) = 7949a50004a80993000512079bc03ebcad4872414fc181f45b3883d743c0f3aa
+SIZE (cabal/tar-0.6.4.0/tar-0.6.4.0.tar.gz) = 54956
+SHA256 (cabal/tar-0.6.4.0/revision/1.cabal) = a72549370449fe99e3008744ad2e43685e96bf86aa0db15898189fcbaafcd815
+SIZE (cabal/tar-0.6.4.0/revision/1.cabal) = 4971
 SHA256 (cabal/tar-conduit-0.4.1/tar-conduit-0.4.1.tar.gz) = 61a1a6c47e935d44fd78b3e6e448bc6e5b18738300a8fb6afc7505a641de5b4d
 SIZE (cabal/tar-conduit-0.4.1/tar-conduit-0.4.1.tar.gz) = 48682
-SHA256 (cabal/tasty-1.5.2/tasty-1.5.2.tar.gz) = 729cb0454fb9be2285eb51fe3bb191bd6096bd11d5fe08eda1ca59517731b737
-SIZE (cabal/tasty-1.5.2/tasty-1.5.2.tar.gz) = 66288
+SHA256 (cabal/tasty-1.5.3/tasty-1.5.3.tar.gz) = 54a0c7b644813af871a3726ac8771b5e17b5158c792a7acf8f9e2d3ae9360780
+SIZE (cabal/tasty-1.5.3/tasty-1.5.3.tar.gz) = 66548
+SHA256 (cabal/tasty-1.5.3/revision/1.cabal) = 9d56ea9dbc274fc853fc531373b2c91bfe360e21460c2c6a5838897d86e3f6d0
+SIZE (cabal/tasty-1.5.3/revision/1.cabal) = 2923
 SHA256 (cabal/temporary-1.3/temporary-1.3.tar.gz) = 8c442993694b5ffca823ce864af95bd2841fb5264ee511c61cf48cc71d879890
 SIZE (cabal/temporary-1.3/temporary-1.3.tar.gz) = 5686
+SHA256 (cabal/text-conversions-0.3.1.1/text-conversions-0.3.1.1.tar.gz) = c8770fba789ce80334cae628285103c49abec0fa074773cbb5a88e26f5a7725d
+SIZE (cabal/text-conversions-0.3.1.1/text-conversions-0.3.1.1.tar.gz) = 5258
 SHA256 (cabal/text-iso8601-0.1.1/text-iso8601-0.1.1.tar.gz) = 9dead2b7ceeae40fe0fc060bd54795c32e9926c9d1aebae8f9b9a621fba88202
 SIZE (cabal/text-iso8601-0.1.1/text-iso8601-0.1.1.tar.gz) = 9599
-SHA256 (cabal/text-iso8601-0.1.1/revision/1.cabal) = 0af50f6d2e8479b9a956c9c612ec270ea09df4c78c88c5b1bdd98066f576d73d
-SIZE (cabal/text-iso8601-0.1.1/revision/1.cabal) = 2478
+SHA256 (cabal/text-iso8601-0.1.1/revision/2.cabal) = e07a625eef969338992bf9bba8e5dc73f07ac65f991ba636b8f1175890d15849
+SIZE (cabal/text-iso8601-0.1.1/revision/2.cabal) = 2411
 SHA256 (cabal/text-metrics-0.3.3/text-metrics-0.3.3.tar.gz) = 3320aa5668a9a3522f15ef85515388e0696ff9a31f15d84b1543bff654ef853e
 SIZE (cabal/text-metrics-0.3.3/text-metrics-0.3.3.tar.gz) = 8288
 SHA256 (cabal/text-short-0.1.6/text-short-0.1.6.tar.gz) = 8173ea138d7dc398747b636012bf6e79e17186560b8a7a7fc9e6456d78556eab
@@ -401,32 +445,40 @@ SHA256 (cabal/text-short-0.1.6/revision/3.cabal) = 41be94ccd3f6646ab69b0b05c5130
 SIZE (cabal/text-short-0.1.6/revision/3.cabal) = 2827
 SHA256 (cabal/th-abstraction-0.7.1.0/th-abstraction-0.7.1.0.tar.gz) = f9b6184aba4c6b61dd0d96f7dad41a4c9db0a01d3cdbf993a7d860488f1c04c5
 SIZE (cabal/th-abstraction-0.7.1.0/th-abstraction-0.7.1.0.tar.gz) = 45428
+SHA256 (cabal/th-abstraction-0.7.1.0/revision/1.cabal) = 3011403d85b0070630e33d66b9370535ccd1e0e672ae58f847550b2b15bb4fd8
+SIZE (cabal/th-abstraction-0.7.1.0/revision/1.cabal) = 2268
 SHA256 (cabal/th-compat-0.1.6/th-compat-0.1.6.tar.gz) = b781a0c059872bc95406d00e98f6fa7d9e81e744730f75186583cb4dcea0a4eb
 SIZE (cabal/th-compat-0.1.6/th-compat-0.1.6.tar.gz) = 14622
+SHA256 (cabal/th-expand-syns-0.4.12.0/th-expand-syns-0.4.12.0.tar.gz) = 18e19967329c89f376cfc9ec04bd7871854ce0c70f803a1af15532be00c6ef0f
+SIZE (cabal/th-expand-syns-0.4.12.0/th-expand-syns-0.4.12.0.tar.gz) = 7090
 SHA256 (cabal/th-lift-0.8.6/th-lift-0.8.6.tar.gz) = 04309ad70ef80ed054ebda5b7d34a66642017604019f9e44ad321eec04a1ef1f
 SIZE (cabal/th-lift-0.8.6/th-lift-0.8.6.tar.gz) = 14310
 SHA256 (cabal/th-lift-instances-0.1.20/th-lift-instances-0.1.20.tar.gz) = f533c3f95addcca461a0ccd1aafef75dd801bfa6599c0d1184d54bfffb61d870
 SIZE (cabal/th-lift-instances-0.1.20/th-lift-instances-0.1.20.tar.gz) = 6721
+SHA256 (cabal/th-orphans-0.13.16/th-orphans-0.13.16.tar.gz) = e9900135821c4a2a8a52aeea203514c7c334bef9d636d51f89ebb3a8b92ba913
+SIZE (cabal/th-orphans-0.13.16/th-orphans-0.13.16.tar.gz) = 7145
+SHA256 (cabal/th-reify-many-0.1.10/th-reify-many-0.1.10.tar.gz) = 9d250e61242f2fb887dedc9d28c0141832ff256e63bebc2bf5abff81037be4a5
+SIZE (cabal/th-reify-many-0.1.10/th-reify-many-0.1.10.tar.gz) = 5825
 SHA256 (cabal/these-1.2.1/these-1.2.1.tar.gz) = 17d6d933365edabf801a16842c1403bdd37cc5300faa2fcca980decdab22e4de
 SIZE (cabal/these-1.2.1/these-1.2.1.tar.gz) = 9906
-SHA256 (cabal/these-1.2.1/revision/1.cabal) = c04f573531b37864506b071046e010a7a6aad11650cf895467f9f279d0130b8b
-SIZE (cabal/these-1.2.1/revision/1.cabal) = 2279
+SHA256 (cabal/these-1.2.1/revision/2.cabal) = 35c57aede96c15ea1fed559ac287b1168eb2b2869d79e62ed8c845780b7ea136
+SIZE (cabal/these-1.2.1/revision/2.cabal) = 2294
 SHA256 (cabal/time-compat-1.9.8/time-compat-1.9.8.tar.gz) = 502ef8694a5b131b47c0e5df2e9053d005a3b345b30f5225af04f081d3ef5cf0
 SIZE (cabal/time-compat-1.9.8/time-compat-1.9.8.tar.gz) = 63414
-SHA256 (cabal/tls-2.1.5/tls-2.1.5.tar.gz) = a1db76fe10c8288ae9b30ce48ff6f933df1db616c06d0de856d53f1ed0281801
-SIZE (cabal/tls-2.1.5/tls-2.1.5.tar.gz) = 163430
+SHA256 (cabal/tls-2.1.9/tls-2.1.9.tar.gz) = 152d77212c79a8606d9207e2a453dee56f34a981abc842463639401077abe93a
+SIZE (cabal/tls-2.1.9/tls-2.1.9.tar.gz) = 184895
 SHA256 (cabal/transformers-base-0.4.6/transformers-base-0.4.6.tar.gz) = 323bf8689eb691b122661cffa41a25e00fea7a768433fe2dde35d3da7d32cf90
 SIZE (cabal/transformers-base-0.4.6/transformers-base-0.4.6.tar.gz) = 2902
 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a
 SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485
-SHA256 (cabal/typed-process-0.2.12.0/typed-process-0.2.12.0.tar.gz) = 4cee3d3ae851de720f40ce671510c04b7938ca76552952bd7c5e8b1bec161be1
-SIZE (cabal/typed-process-0.2.12.0/typed-process-0.2.12.0.tar.gz) = 18957
-SHA256 (cabal/unix-compat-0.7.3/unix-compat-0.7.3.tar.gz) = 7a4fad870952d632d55c8cfe2aad8b55ac95585dacae052fbea4e32968821d87
-SIZE (cabal/unix-compat-0.7.3/unix-compat-0.7.3.tar.gz) = 15593
+SHA256 (cabal/typed-process-0.2.13.0/typed-process-0.2.13.0.tar.gz) = 9400966013b541df2e54ac8d57c3a670fc28bde2be87767ce98f13bbe2aa43a0
+SIZE (cabal/typed-process-0.2.13.0/typed-process-0.2.13.0.tar.gz) = 19160
+SHA256 (cabal/unix-compat-0.7.4/unix-compat-0.7.4.tar.gz) = 689b3a960c8fe12910554aa5b739d5c4769c1d180ade20402fde2ed49db7eff4
+SIZE (cabal/unix-compat-0.7.4/unix-compat-0.7.4.tar.gz) = 15586
 SHA256 (cabal/unix-time-0.4.16/unix-time-0.4.16.tar.gz) = ace2a7126d7344feb3221680c556de7f28a969fb287d49bd4a2d7df18fe638e9
 SIZE (cabal/unix-time-0.4.16/unix-time-0.4.16.tar.gz) = 52594
-SHA256 (cabal/unliftio-0.2.25.0/unliftio-0.2.25.0.tar.gz) = fb85a22291e78f9e58cd7f5e563a726500ad1a004b3b335b93c0975b828a112b
-SIZE (cabal/unliftio-0.2.25.0/unliftio-0.2.25.0.tar.gz) = 58335
+SHA256 (cabal/unliftio-0.2.25.1/unliftio-0.2.25.1.tar.gz) = 3bfc6f8dea6966c2c06df83e6d3f481bbd77531f58b8049c46738aad9268336e
+SIZE (cabal/unliftio-0.2.25.1/unliftio-0.2.25.1.tar.gz) = 58203
 SHA256 (cabal/unliftio-core-0.2.1.0/unliftio-core-0.2.1.0.tar.gz) = 99384cba8d56d9d61b85e38a313a93ebcdb78be6566367f0930ef580597fe3e3
 SIZE (cabal/unliftio-core-0.2.1.0/unliftio-core-0.2.1.0.tar.gz) = 3865
 SHA256 (cabal/unliftio-core-0.2.1.0/revision/4.cabal) = f6a2736f858b5390d9384dca43d3ea4d96e9ca17217791791ca4951ba6e8072a
@@ -435,18 +487,22 @@ SHA256 (cabal/unordered-containers-0.2.20/unordered-containers-0.2.20.tar.gz) =
 SIZE (cabal/unordered-containers-0.2.20/unordered-containers-0.2.20.tar.gz) = 59823
 SHA256 (cabal/unordered-containers-0.2.20/revision/4.cabal) = 233cbcdda6c2698932bb391ce0935fb44f80c115621ee815a21ed33ac8ede422
 SIZE (cabal/unordered-containers-0.2.20/revision/4.cabal) = 3921
+SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a
+SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726
 SHA256 (cabal/uuid-types-1.0.6/uuid-types-1.0.6.tar.gz) = 7e0dd953483d6fd3ca49bcaed6b11f9e3c2787213479b2581e07747836b8357e
 SIZE (cabal/uuid-types-1.0.6/uuid-types-1.0.6.tar.gz) = 11222
-SHA256 (cabal/uuid-types-1.0.6/revision/2.cabal) = 88e78c100b699cb829524af914cea82422bd518ce90625122ebe4c8048aee13d
-SIZE (cabal/uuid-types-1.0.6/revision/2.cabal) = 2619
+SHA256 (cabal/uuid-types-1.0.6/revision/3.cabal) = 5ac2b681a8d7676f6a51ac1b113bfdcf18dd7fdbb313034850ed6493eef96da0
+SIZE (cabal/uuid-types-1.0.6/revision/3.cabal) = 2619
 SHA256 (cabal/vault-0.3.1.5/vault-0.3.1.5.tar.gz) = ac2a6b6adf58598c5c8faa931ae961a8a2aa50ddb2f0f7a2044ff6e8c3d433a0
 SIZE (cabal/vault-0.3.1.5/vault-0.3.1.5.tar.gz) = 5431
-SHA256 (cabal/vault-0.3.1.5/revision/9.cabal) = 5412162c1a7ed00798e064310d4a111d547f9ca81bb09f210d500535219b2a98
-SIZE (cabal/vault-0.3.1.5/revision/9.cabal) = 2209
+SHA256 (cabal/vault-0.3.1.5/revision/10.cabal) = 212cc25cd6730a565def636d39fe3fbfeb01adee91617a264b13e28bc04adc0e
+SIZE (cabal/vault-0.3.1.5/revision/10.cabal) = 2210
 SHA256 (cabal/vector-0.13.2.0/vector-0.13.2.0.tar.gz) = 28f203c786cbf8ac6dc3fea3378ec36f34173d505fb4a1dd60fc8418ad91c423
 SIZE (cabal/vector-0.13.2.0/vector-0.13.2.0.tar.gz) = 185739
-SHA256 (cabal/vector-algorithms-0.9.0.3/vector-algorithms-0.9.0.3.tar.gz) = 61900b798fc6a581dd0916b32a1397aaed022d7f92fd737d663cbbf4d7144d9e
-SIZE (cabal/vector-algorithms-0.9.0.3/vector-algorithms-0.9.0.3.tar.gz) = 29395
+SHA256 (cabal/vector-0.13.2.0/revision/1.cabal) = b736a57b73520d2acf4865e3e2b40030d69782f35f870e376dc717ee2508d81f
+SIZE (cabal/vector-0.13.2.0/revision/1.cabal) = 8804
+SHA256 (cabal/vector-algorithms-0.9.1.0/vector-algorithms-0.9.1.0.tar.gz) = d2b674676802670d8a682b357da6b6b5741b4a33b191f0ffe5f2b2bc40558eb2
+SIZE (cabal/vector-algorithms-0.9.1.0/vector-algorithms-0.9.1.0.tar.gz) = 29426
 SHA256 (cabal/vector-stream-0.1.0.1/vector-stream-0.1.0.1.tar.gz) = d0f507334bdea5431a2f07f525a97f29e76522c32210f5de6d5a2b4f1d42bf7c
 SIZE (cabal/vector-stream-0.1.0.1/vector-stream-0.1.0.1.tar.gz) = 12577
 SHA256 (cabal/vector-stream-0.1.0.1/revision/3.cabal) = 5ac96695212a45ae7dc16d8031dbf5311da53e052c35f7ad4a8e2db7fafb651e
@@ -467,5 +523,5 @@ SHA256 (cabal/zlib-0.7.1.0/zlib-0.7.1.0.tar.gz) = 6edd38b6b81df8d274952aa85affa6
 SIZE (cabal/zlib-0.7.1.0/zlib-0.7.1.0.tar.gz) = 29318
 SHA256 (cabal/zlib-0.7.1.0/revision/2.cabal) = 85e64a75c0b490506a7edaa2d54950c668e66b65758bb08bb14cd31faf53a206
 SIZE (cabal/zlib-0.7.1.0/revision/2.cabal) = 5357
-SHA256 (cabal/commercialhaskell-stack-v3.3.1_GH0.tar.gz) = 9a8dc9dd403fa8fd56339353091d438fd5d97ee6f2001a0cc11ba94b19271d98
-SIZE (cabal/commercialhaskell-stack-v3.3.1_GH0.tar.gz) = 975891
+SHA256 (cabal/commercialhaskell-stack-v3.5.1_GH0.tar.gz) = 00de60eaefdba1aa289ed409a9cabe8d63f9f6d554018456ab7f78531b2c3629
+SIZE (cabal/commercialhaskell-stack-v3.5.1_GH0.tar.gz) = 978639
diff --git a/devel/tabby/Makefile b/devel/tabby/Makefile
index 3b3d3d379d88..04228ea8556c 100644
--- a/devel/tabby/Makefile
+++ b/devel/tabby/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tabby
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel # machine-learning
 PKGNAMESUFFIX=	-ai-coding-assistant
 
diff --git a/devel/tokei/Makefile b/devel/tokei/Makefile
index 86e99d96e919..ad482e0e699e 100644
--- a/devel/tokei/Makefile
+++ b/devel/tokei/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	12.1.2
 PORTREVISION=	39
 CATEGORIES=	devel
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Display statistics about your code
 WWW=		https://github.com/XAMPPRocky/tokei
 
diff --git a/devel/uv/Makefile b/devel/uv/Makefile
index bf88a801e50a..7f2915fcf1a7 100644
--- a/devel/uv/Makefile
+++ b/devel/uv/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	uv
 DISTVERSION=	0.6.14
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/wasi-compiler-rt20/Makefile b/devel/wasi-compiler-rt20/Makefile
index a3d338d6d213..309937cc791a 100644
--- a/devel/wasi-compiler-rt20/Makefile
+++ b/devel/wasi-compiler-rt20/Makefile
@@ -1,5 +1,5 @@
 # must sync with devel/llvm20
-DISTVERSION=	20.1.3
+DISTVERSION=	20.1.4
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
diff --git a/devel/wasi-libcxx20/Makefile b/devel/wasi-libcxx20/Makefile
index 332b7252280d..c1f0efa5de96 100644
--- a/devel/wasi-libcxx20/Makefile
+++ b/devel/wasi-libcxx20/Makefile
@@ -1,5 +1,5 @@
 # must sync with devel/llvm20
-DISTVERSION=	20.1.3
+DISTVERSION=	20.1.4
 
 MASTERDIR=	${.CURDIR}/../wasi-libcxx
 
diff --git a/devel/yyjson/Makefile b/devel/yyjson/Makefile
index 2f3498552d8f..162c0f2103e6 100644
--- a/devel/yyjson/Makefile
+++ b/devel/yyjson/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	yyjson
-PORTVERSION=	0.10.0
+PORTVERSION=	0.11.0
 CATEGORIES=	devel
 
 MAINTAINER=	pkubaj@FreeBSD.org
diff --git a/devel/yyjson/distinfo b/devel/yyjson/distinfo
index 6644030977a5..6188bbaf49aa 100644
--- a/devel/yyjson/distinfo
+++ b/devel/yyjson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720611233
-SHA256 (ibireme-yyjson-0.10.0_GH0.tar.gz) = 0d901cb2c45c5586e3f3a4245e58c2252d6b24bf4b402723f6179523d389b165
-SIZE (ibireme-yyjson-0.10.0_GH0.tar.gz) = 1538409
+TIMESTAMP = 1746618350
+SHA256 (ibireme-yyjson-0.11.0_GH0.tar.gz) = 0cc453318ff299ab61ec233b5b92dd474dee39028ad77904b19a45a79651574e
+SIZE (ibireme-yyjson-0.11.0_GH0.tar.gz) = 1591254
diff --git a/devel/yyjson/pkg-plist b/devel/yyjson/pkg-plist
index e0f7683188a4..c74889ae3312 100644
--- a/devel/yyjson/pkg-plist
+++ b/devel/yyjson/pkg-plist
@@ -3,5 +3,5 @@ lib/cmake/yyjson/yyjson-config-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/yyjson/yyjson-config.cmake
 lib/libyyjson.so
 lib/libyyjson.so.0
-lib/libyyjson.so.0.10.0
+lib/libyyjson.so.0.11.0
 libdata/pkgconfig/yyjson.pc
diff --git a/dns/dnscontrol/Makefile b/dns/dnscontrol/Makefile
index d8adc083f2a3..87a6fda83580 100644
--- a/dns/dnscontrol/Makefile
+++ b/dns/dnscontrol/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dnscontrol
 DISTVERSIONPREFIX=v
-DISTVERSION=	4.18.0
+DISTVERSION=	4.19.0
 CATEGORIES=	dns
 
 MAINTAINER=	decke@FreeBSD.org
diff --git a/dns/dnscontrol/distinfo b/dns/dnscontrol/distinfo
index ce142ae27b5d..dc7fd7547750 100644
--- a/dns/dnscontrol/distinfo
+++ b/dns/dnscontrol/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1744573645
-SHA256 (go/dns_dnscontrol/dnscontrol-v4.18.0/v4.18.0.mod) = b5b3380bda567e479d445828f4aa10b7babec99fba96ef069b88b4dbfb66928a
-SIZE (go/dns_dnscontrol/dnscontrol-v4.18.0/v4.18.0.mod) = 7897
-SHA256 (go/dns_dnscontrol/dnscontrol-v4.18.0/v4.18.0.zip) = 3d8a4966b499388f81533b2711b8087365c04f6873e4a1514f71cc9ccd0c9e92
-SIZE (go/dns_dnscontrol/dnscontrol-v4.18.0/v4.18.0.zip) = 5544443
+TIMESTAMP = 1746644422
+SHA256 (go/dns_dnscontrol/dnscontrol-v4.19.0/v4.19.0.mod) = 93532268b81ad64d1d4773b7d80e793b603aa604bd5b930fc0db95c6dfa2a452
+SIZE (go/dns_dnscontrol/dnscontrol-v4.19.0/v4.19.0.mod) = 8026
+SHA256 (go/dns_dnscontrol/dnscontrol-v4.19.0/v4.19.0.zip) = fec390e9212aebb5c698ad4e443a3545aa3e92039b9811d80c12bfc80b3eac24
+SIZE (go/dns_dnscontrol/dnscontrol-v4.19.0/v4.19.0.zip) = 5551770
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 4de431023645..9808488e9eee 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	knot-resolver
-DISTVERSION=	5.7.4
-PORTREVISION=	6
+DISTVERSION=	5.7.5
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -42,7 +41,6 @@ SHEBANG_FILES=	scripts/bench.sh \
 		scripts/make-archive.sh \
 		scripts/make-doc.sh \
 		scripts/make-obs.sh \
-		scripts/run-pylint.sh \
 		scripts/run-scanbuild-with-args.sh \
 		scripts/test-config.sh \
 		scripts/test-integration-prepare.sh \
diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo
index 196aff0949d3..8ebd0e07bcb2 100644
--- a/dns/knot-resolver/distinfo
+++ b/dns/knot-resolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724065353
-SHA256 (knot-resolver-5.7.4.tar.xz) = 6b6da6ecf06828041afad44dfa227781f0ae34ad183a667008509355d18bd9c8
-SIZE (knot-resolver-5.7.4.tar.xz) = 1931124
+TIMESTAMP = 1746521207
+SHA256 (knot-resolver-5.7.5.tar.xz) = 80239cf9aa92599d9cbad4642dea5520b2ccfbc9c6f968886ea46179cb3cdf66
+SIZE (knot-resolver-5.7.5.tar.xz) = 1924960
diff --git a/editors/Makefile b/editors/Makefile
index 2edb318879a2..69d8bca00905 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -258,7 +258,6 @@
     SUBDIR += sly-asdf
     SUBDIR += sly-named-readtables
     SUBDIR += sly-quicklisp
-    SUBDIR += ssed
     SUBDIR += sted
     SUBDIR += tamago
     SUBDIR += tea
diff --git a/editors/amp/Makefile b/editors/amp/Makefile
index 236cc09df862..6ea0abedd896 100644
--- a/editors/amp/Makefile
+++ b/editors/amp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	amp
 DISTVERSION=	0.7.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	editors
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/editors/bee-host/Makefile b/editors/bee-host/Makefile
index dc997d8f8954..cf12c5f38a3e 100644
--- a/editors/bee-host/Makefile
+++ b/editors/bee-host/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bee-host
-DISTVERSION=	1.3.7-2
+DISTVERSION=	1.3.7-3
 CATEGORIES=	editors www
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/editors/bee-host/distinfo b/editors/bee-host/distinfo
index 8bbbbcdf328f..374d080c50a2 100644
--- a/editors/bee-host/distinfo
+++ b/editors/bee-host/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702564012
-SHA256 (rosmanov-bee-host-1.3.7-2_GH0.tar.gz) = 337d575d2bfa618bb3bce41690911442b5fea7a7ee6602584adf7ee0fe0b88fa
-SIZE (rosmanov-bee-host-1.3.7-2_GH0.tar.gz) = 31212
+TIMESTAMP = 1746552217
+SHA256 (rosmanov-bee-host-1.3.7-3_GH0.tar.gz) = a9b023f313754716f4ac2ce05615711d3df334e5cbf06ed4de0d94dd17e9a5d1
+SIZE (rosmanov-bee-host-1.3.7-3_GH0.tar.gz) = 31443
diff --git a/editors/bee-host/files/patch-CMakeLists.txt b/editors/bee-host/files/patch-CMakeLists.txt
index e5040671000d..cfc68a29e43f 100644
--- a/editors/bee-host/files/patch-CMakeLists.txt
+++ b/editors/bee-host/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2023-03-12 06:35:07 UTC
+--- CMakeLists.txt.orig	2025-04-21 15:28:54 UTC
 +++ CMakeLists.txt
-@@ -38,27 +38,7 @@ endif()
+@@ -39,27 +39,7 @@ set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
  
  set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
  
@@ -29,7 +29,7 @@
  
  # beectl
  set(BEECTL_SRCS
-@@ -69,21 +49,13 @@ set(BEECTL_SRCS
+@@ -70,21 +50,13 @@ set(BEECTL_SRCS
    src/mkstemps.c
    # This is nasty, but I couldn't find a way to use CMAKE_TOOLCHAIN_FILE
    # for the external project (see comments below.)
@@ -51,12 +51,13 @@
  
  # The following would be better approach than including cJSON files in our
  # source list. But the build fails when cross-compiling, since
-@@ -110,13 +82,13 @@ string(TOUPPER "${CMAKE_SYSTEM_NAME}" uppercase_CMAKE_
+@@ -126,14 +98,14 @@ set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFI
  
  message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
  set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFIX}/bin/beectl")
 -set(BEECTL_CHROME_MANIFEST_DIR "etc/opt/chrome/native-messaging-hosts")
 +set(BEECTL_CHROME_MANIFEST_DIR "etc/chrome/native-messaging-hosts")
+ set(BEECTL_CHROMIUM_MANIFEST_DIR "etc/chromium/native-messaging-hosts")
  
  if(uppercase_CMAKE_SYSTEM_NAME MATCHES LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(amd|x86_)64$")
      # Fedora 36 amd64 may have a separate /usr/lib64 dir different from /usr/lib.
@@ -67,7 +68,7 @@
  endif()
  
  # RPM package properties
-@@ -238,7 +210,7 @@ elseif(uppercase_CMAKE_SYSTEM_NAME MATCHES DARWIN)
+@@ -288,7 +260,7 @@ else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
          COMPONENT config)
  else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
      # Install host app
diff --git a/editors/bee-host/files/patch-vars.sh b/editors/bee-host/files/patch-vars.sh
index 12201417b955..d1cb28c9ef22 100644
--- a/editors/bee-host/files/patch-vars.sh
+++ b/editors/bee-host/files/patch-vars.sh
@@ -1,12 +1,14 @@
---- vars.sh.orig	2022-04-07 09:03:56 UTC
+--- vars.sh.orig	2025-05-06 17:29:25 UTC
 +++ vars.sh
-@@ -45,8 +45,8 @@ case "$kernel" in
+@@ -47,9 +47,9 @@ case "$kernel" in
    *)
      if [ $EUID == 0 ]; then
        # If superuser
 -      chrome_target_manifest_dir='/etc/opt/chrome/native-messaging-hosts'
+-      chromium_target_manifest_dir='/etc/chromium/native-messaging-hosts'
 -      firefox_target_manifest_dir='/usr/lib/mozilla/native-messaging-hosts'
 +      chrome_target_manifest_dir='%%LOCALBASE%%/chrome/native-messaging-hosts'
++      chromium_target_manifest_dir='%%LOCALBASE%%/chromium/native-messaging-hosts'
 +      firefox_target_manifest_dir='%%LOCALBASE%%/lib/mozilla/native-messaging-hosts'
      else
        # If normal user
diff --git a/editors/bee-host/pkg-plist b/editors/bee-host/pkg-plist
index cd3eb79eefcb..6ee2e5f2a045 100644
--- a/editors/bee-host/pkg-plist
+++ b/editors/bee-host/pkg-plist
@@ -1,5 +1,6 @@
 bin/beectl
 etc/chrome/native-messaging-hosts/com.ruslan_osmanov.bee.json
+etc/chromium/native-messaging-hosts/com.ruslan_osmanov.bee.json
 lib/mozilla/native-messaging-hosts/com.ruslan_osmanov.bee.json
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index b71d696ab9c8..9f94e9b1408f 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	calligra
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/editors/elementary-code/Makefile b/editors/elementary-code/Makefile
index 336e2e322200..cf003bacd214 100644
--- a/editors/elementary-code/Makefile
+++ b/editors/elementary-code/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	code
 DISTVERSION=	7.4.0
+PORTREVISION=	1
 CATEGORIES=	editors
 PKGNAMEPREFIX=	elementary-
 
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 801f2af74287..10f54e4076ba 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	flim
 PORTVERSION=	1.14.9.${SNAPDATE}
-PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
@@ -17,9 +16,9 @@ RUN_DEPENDS=	apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
 USES=		cpe emacs iconv makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	wanderlust
-GH_TAGNAME=	23bb29d
+GH_TAGNAME=	f14c8bf
 
-SNAPDATE=	20240221
+SNAPDATE=	20250506
 CPE_VENDOR=	gnu
 NO_ARCH=	yes
 
diff --git a/editors/flim/distinfo b/editors/flim/distinfo
index 0f5a9d95140a..8d9397cda3fb 100644
--- a/editors/flim/distinfo
+++ b/editors/flim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727583206
-SHA256 (wanderlust-flim-1.14.9.20240221-23bb29d_GH0.tar.gz) = 9588faae930232399d072e537362e28ec97a3958b1903a5f0374e41e6fc5bc1f
-SIZE (wanderlust-flim-1.14.9.20240221-23bb29d_GH0.tar.gz) = 144820
+TIMESTAMP = 1746521347
+SHA256 (wanderlust-flim-1.14.9.20250506-f14c8bf_GH0.tar.gz) = 5b92494b8440da63b85e5d669acbda00022cfb82fdef24de7f4cbf0162d865e9
+SIZE (wanderlust-flim-1.14.9.20250506-f14c8bf_GH0.tar.gz) = 145412
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index d4e6ca479f73..472a4b1c9efc 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gedit-plugins
 PORTVERSION=	43.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
diff --git a/editors/jucipp/Makefile b/editors/jucipp/Makefile
index c1979e78c559..c22055a4fcfa 100644
--- a/editors/jucipp/Makefile
+++ b/editors/jucipp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jucipp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 
 MAINTAINER=	info@babaei.net
diff --git a/editors/kakoune-lsp/Makefile b/editors/kakoune-lsp/Makefile
index 21b81d038108..54dddbb61522 100644
--- a/editors/kakoune-lsp/Makefile
+++ b/editors/kakoune-lsp/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	18.1.3
 PORTREVISION=	1
 CATEGORIES=	editors
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Kakoune Language Server Protocol Client
 WWW=		https://github.com/kakoune-lsp/kakoune-lsp
 
diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile
index b491b990d9a9..e28525d80f10 100644
--- a/editors/lapce/Makefile
+++ b/editors/lapce/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lapce
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.2 # Cargo.lock patched: `make patch cargo-crates`
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 5bee62bbe04a..ad3faa23f197 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mp
-DISTVERSION=	5.61
-PORTREVISION=	1
+DISTVERSION=	5.62
 CATEGORIES=	editors
 
 MAINTAINER=	jhale@FreeBSD.org
diff --git a/editors/mp/distinfo b/editors/mp/distinfo
index 673637c13b0c..bcfe1a8481d7 100644
--- a/editors/mp/distinfo
+++ b/editors/mp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693629490
-SHA256 (ttcdt-mp-5.x-5.61_GH0.tar.gz) = b36e357096ed639f028e73219bebac46d06c7adf7a46e58a67ebe8e6ab3fa4a3
-SIZE (ttcdt-mp-5.x-5.61_GH0.tar.gz) = 469201
+TIMESTAMP = 1746427190
+SHA256 (ttcdt-mp-5.x-5.62_GH0.tar.gz) = 9727068c4bf5e052227a608dc72ae4225a1e07b6a192116efc2a559b4fe4e206
+SIZE (ttcdt-mp-5.x-5.62_GH0.tar.gz) = 472107
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index a409dab4677a..6241cfb961e5 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -56,7 +56,6 @@ BUILD_DEPENDS=								\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
 		dmake:devel/dmake					\
-		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		libunwind>=20211201_1:devel/libunwind			\
@@ -258,7 +257,6 @@ CONFIGURE_ARGS+=							\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--with-system-dicts				\
-			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
 			--disable-fetch-external			\
 			--without-fonts					\
diff --git a/editors/openoffice-4/files/patch-configure.ac b/editors/openoffice-4/files/patch-configure.ac
index 9340d7d40ccf..e7b392f1aea2 100644
--- a/editors/openoffice-4/files/patch-configure.ac
+++ b/editors/openoffice-4/files/patch-configure.ac
@@ -1,32 +1,11 @@
---- configure.ac.orig	2019-11-12 05:10:21 UTC
+--- configure.ac.orig	2025-04-12 20:16:51 UTC
 +++ configure.ac
-@@ -367,11 +367,11 @@ AC_ARG_WITH(bundled-extension-blobs,
-                           and comply with their distribution requirements by updating the
-                           files LICENSE_aggregated and NOTICE_aggregated accordingly
- ],,)
--#AC_ARG_WITH(bundled-prereg-extensions,
--#[  --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
--#                          are to be bundled as pre-registered extensions. Make sure to only bundle
--#                          extensions which can be installed without requiring a license dialog
--#],,)
-+AC_ARG_WITH(bundled-prereg-extensions,
-+[  --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
-+                          are to be bundled as pre-registered extensions. Make sure to only bundle
-+                          extensions which can be installed without requiring a license dialog
-+],,)
- AC_ARG_ENABLE(bundled-dictionaries,
- [  --enable-bundled-dictionaries  Download dictionaries (spelling, hyphenation, thesaurus)
-                            according to main/extensions.lst and bundle them. Make sure to
-@@ -1538,9 +1538,9 @@ else
- fi
- AC_SUBST(BUNDLED_EXTENSION_BLOBS)
- 
--#dnl ===================================================================
--#dnl Check extensions that are to be bundled as pre-registerd
--#dnl ===================================================================
-+dnl ===================================================================
-+dnl Check extensions that are to be bundled as pre-registerd
-+dnl ===================================================================
- if test -n "$with_bundled_prereg_extensions"; then
- 	BUNDLED_PREREG_EXTENSIONS="$with_bundled_prereg_extensions"
- else
+@@ -3377,7 +3377,7 @@ if test "$enable_epm" = "yes"; then
+    dnl ===================================================================
+    dnl Check for epm - not needed for windows
+    dnl ===================================================================
+-   if test "$_os" != "WINNT"; then
++   if test "$_os" != "WINNT" -a "$with_package_format" != "archive"; then
+       if test -n "$with_epm"; then
+ 	      EPM=$with_epm
+       else
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index f75a044d7623..573d7754ae6c 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -57,7 +57,6 @@ BUILD_DEPENDS=								\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
 		dmake:devel/dmake					\
-		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		libunwind>=20211201_1:devel/libunwind			\
@@ -292,7 +291,6 @@ CONFIGURE_ARGS+=							\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--with-system-dicts				\
-			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
 			--disable-fetch-external			\
 			--without-fonts					\
diff --git a/editors/parinfer-rust/Makefile b/editors/parinfer-rust/Makefile
index 9f943ace9fea..86e9d642b9fe 100644
--- a/editors/parinfer-rust/Makefile
+++ b/editors/parinfer-rust/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.4.3.20220110
 PORTREVISION=	30
 CATEGORIES=	editors
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Infer parentheses for Clojure, Lisp, and Scheme
 WWW=		https://github.com/eraserhd/parinfer-rust
 
diff --git a/editors/pluma-plugins/Makefile b/editors/pluma-plugins/Makefile
index 4aa84c2519f8..48add844f372 100644
--- a/editors/pluma-plugins/Makefile
+++ b/editors/pluma-plugins/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pluma-plugins
 PORTVERSION=	1.28.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
deleted file mode 100644
index 4e76384a032b..000000000000
--- a/editors/ssed/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-PORTNAME=	sed
-PORTVERSION=	3.62
-PORTREVISION=	5
-CATEGORIES=	editors textproc
-MASTER_SITES=	http://sed.sourceforge.net/grabbag/ssed/
-PKGNAMEPREFIX=	s
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Heavily enhanced version of sed(1)
-WWW=		https://sed.sourceforge.net/grabbag/ssed/
-
-DEPRECATED=	Legacy "fork" that's based on legacy GNU sed 4.1 and last release in 2005
-EXPIRATION_DATE=2025-04-30 
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--program-prefix=s
-
-OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.include <bsd.port.mk>
diff --git a/editors/ssed/distinfo b/editors/ssed/distinfo
deleted file mode 100644
index 1f00504136dd..000000000000
--- a/editors/ssed/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sed-3.62.tar.gz) = af7ff67e052efabf3fd07d967161c39db0480adc7c01f5100a1996fec60b8ec4
-SIZE (sed-3.62.tar.gz) = 855644
diff --git a/editors/ssed/files/patch-Makefile.in b/editors/ssed/files/patch-Makefile.in
deleted file mode 100644
index 9337c8c34990..000000000000
--- a/editors/ssed/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig
-+++ doc/Makefile.in
-@@ -518,7 +518,7 @@
- 
- info-am: $(INFO_DEPS)
- 
--install-data-am: install-docDATA install-info-am install-man
-+install-data-am: install-docDATA install-man
- 
- install-exec-am:
- 
diff --git a/editors/ssed/files/patch-configure b/editors/ssed/files/patch-configure
deleted file mode 100644
index 718b9d368f7b..000000000000
--- a/editors/ssed/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Feb  9 04:31:24 2005
-+++ configure	Sat May 28 00:24:01 2005
-@@ -1508,7 +1508,7 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+if (mkdir -p --version . >/dev/null 2>&1;  test ! -d ./--version); then
-   # We used to keeping the `.' as first argument, in order to
-   # allow $(mkdir_p) to be used without argument.  As in
-   #   $(mkdir_p) $(somedir)
diff --git a/editors/ssed/pkg-descr b/editors/ssed/pkg-descr
deleted file mode 100644
index 210544a068b1..000000000000
--- a/editors/ssed/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a version of sed based on GNU sed. It is not a version of
-GNU sed, though.
-
-There are several new features (including in-place editing of files,
-extended regular expression syntax and a few new commands) and some
-bug fixes; see the NEWS file for a brief summary and the ChangeLog
-for more detailed descriptions of changes.
-
-The biggest note, i think is the *huge* speed difference, where
-regular sed might take a few mins, super-sed can take only seconds
-this is not true in all cases, and sometimes you have modify your
-regexp syntax, however for the speed increase, it might be worth
-it.
diff --git a/editors/ssed/pkg-plist b/editors/ssed/pkg-plist
deleted file mode 100644
index 8dc1da72f49f..000000000000
--- a/editors/ssed/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/ssed
-share/man/man1/ssed.1.gz
-%%NLS%%share/locale/af/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/da/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/el/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/et/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/he/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/id/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ssed.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ssed.mo
diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
index 023ad220cf9a..9b1c915557d6 100644
--- a/editors/texstudio/Makefile
+++ b/editors/texstudio/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	texstudio
-DISTVERSION=	4.8.6
-PORTREVISION=	2
+DISTVERSION=	4.8.7
 CATEGORIES=	editors
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/editors/texstudio/distinfo b/editors/texstudio/distinfo
index a04438bb6c74..09128d72fbf1 100644
--- a/editors/texstudio/distinfo
+++ b/editors/texstudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739000047
-SHA256 (texstudio-org-texstudio-4.8.6_GH0.tar.gz) = ea09549e65a11520995a5b542f88ac4d21ea550c070008e1087add87856db02f
-SIZE (texstudio-org-texstudio-4.8.6_GH0.tar.gz) = 114147097
+TIMESTAMP = 1746577521
+SHA256 (texstudio-org-texstudio-4.8.7_GH0.tar.gz) = b8272bc6a067b7132805f8877aad9bee077e80970728cdb889edef2bb23e3b70
+SIZE (texstudio-org-texstudio-4.8.7_GH0.tar.gz) = 114210486
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index d39c95fb1d4c..e1bff9a2dfb7 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	vim
-PORTVERSION=	9.1.1265
+PORTVERSION=	9.1.1362
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 3a1c7ebfe8ee..6c199923feb3 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743519905
-SHA256 (vim-vim-v9.1.1265_GH0.tar.gz) = 0312671cf417e17267f7bc8ccb3377ca6d16336c5bc25ad876729fbca178fd6f
-SIZE (vim-vim-v9.1.1265_GH0.tar.gz) = 18695477
+TIMESTAMP = 1746315566
+SHA256 (vim-vim-v9.1.1362_GH0.tar.gz) = 4282a7e75e4099f46e1d44a9e32edb691bea4892826e5b252923e3329295be3c
+SIZE (vim-vim-v9.1.1362_GH0.tar.gz) = 18790833
diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile
index be1b41d20b81..03c0416c7b26 100644
--- a/emulators/dosbox-x/Makefile
+++ b/emulators/dosbox-x/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dosbox-x
 DISTVERSIONPREFIX=	${PORTNAME}-v
-DISTVERSION=	2025.02.01
+DISTVERSION=	2025.05.03
 CATEGORIES=	emulators
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo
index b1194a2d6ea4..219e59f0ef95 100644
--- a/emulators/dosbox-x/distinfo
+++ b/emulators/dosbox-x/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738510808
-SHA256 (joncampbell123-dosbox-x-dosbox-x-v2025.02.01_GH0.tar.gz) = 3a6fdfd659bb05db82bf2d850af806f666562cce9a37609fd33b59f7e4bd8fa4
-SIZE (joncampbell123-dosbox-x-dosbox-x-v2025.02.01_GH0.tar.gz) = 122016342
+TIMESTAMP = 1746305468
+SHA256 (joncampbell123-dosbox-x-dosbox-x-v2025.05.03_GH0.tar.gz) = b29a2c9c38bfe1d1c1f2420d546b8c2456ae2ddce4c1f6b4d19f258841ce1581
+SIZE (joncampbell123-dosbox-x-dosbox-x-v2025.05.03_GH0.tar.gz) = 122834930
diff --git a/emulators/es-de/Makefile b/emulators/es-de/Makefile
index bb9cc6754970..842897494274 100644
--- a/emulators/es-de/Makefile
+++ b/emulators/es-de/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	es-de
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
diff --git a/emulators/fbsd-duckstation/Makefile b/emulators/fbsd-duckstation/Makefile
index 5f80e5201153..86a9bab4f004 100644
--- a/emulators/fbsd-duckstation/Makefile
+++ b/emulators/fbsd-duckstation/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fbsd-duckstation
 PORTVERSION=	20240614
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org
diff --git a/emulators/fbsd-duckstation/files/patch-disable-pch.txt b/emulators/fbsd-duckstation/files/patch-disable-pch.txt
new file mode 100644
index 000000000000..92610948e32a
--- /dev/null
+++ b/emulators/fbsd-duckstation/files/patch-disable-pch.txt
@@ -0,0 +1,61 @@
+Disable PCH to work around the following errors on arm64:
+
+In file included from /wrkdirs/usr/ports/emulators/fbsd-duckstation/work/duckstation-0.1-6937/src/util/audio_stream.cpp:9:
+In file included from /wrkdirs/usr/ports/emulators/fbsd-duckstation/work/duckstation-0.1-6937/src/util/../common/error.h:6:
+/wrkdirs/usr/ports/emulators/fbsd-duckstation/work/duckstation-0.1-6937/src/util/../common/small_string.h:353:3: error: non-const lvalue reference to type '__builtin_va_list' cannot bind to a value of unrelated type 'std::va_list' (aka 'std::__va_list')
+  353 |   va_start(ap, format);
+      |   ^~~~~~~~~~~~~~~~~~~~
+/usr/include/sys/_stdarg.h:43:49: note: expanded from macro 'va_start'
+   43 |   #define       va_start(ap, last)      __builtin_va_start((ap), (last))
+      |                                                            ^~~~
+In file included from /wrkdirs/usr/ports/emulators/fbsd-duckstation/work/duckstation-0.1-6937/src/util/audio_stream.cpp:9:
+In file included from /wrkdirs/usr/ports/emulators/fbsd-duckstation/work/duckstation-0.1-6937/src/util/../common/error.h:6:
+/wrkdirs/usr/ports/emulators/fbsd-duckstation/work/duckstation-0.1-6937/src/util/../common/small_string.h:358:10: error: non-const lvalue reference to type '__builtin_va_list' cannot bind to a value of unrelated type 'std::va_list' (aka 'std::__va_list')
+  358 |   va_end(ap);
+      |          ^~
+/usr/include/sys/_stdarg.h:49:40: note: expanded from macro 'va_end'
+   49 |   #define       va_end(ap)              __builtin_va_end(ap)
+      |                                                          ^~
+2 errors generated.
+
+(see also: https://reviews.llvm.org/D18557 and https://github.com/llvm/llvm-project/issues/69524)
+
+--- src/util/CMakeLists.txt.orig	2024-06-14 05:59:32 UTC
++++ src/util/CMakeLists.txt
+@@ -74,7 +74,9 @@ add_library(util
+   zstd_byte_stream.cpp
+ )
+ 
+-target_precompile_headers(util PRIVATE "pch.h")
++if(NOT((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")))
++   target_precompile_headers(util PRIVATE "pch.h")
++endif()
+ target_include_directories(util PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ target_include_directories(util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ target_link_libraries(util PUBLIC common simpleini imgui)
+--- src/core/CMakeLists.txt.orig	2024-06-14 05:59:32 UTC
++++ src/core/CMakeLists.txt
+@@ -133,7 +133,9 @@ set(NEWREC_SOURCES
+   cpu_newrec_compiler.h
+ )
+ 
+-target_precompile_headers(core PRIVATE "pch.h")
++if(NOT((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")))
++   target_precompile_headers(core PRIVATE "pch.h")
++endif()
+ target_include_directories(core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ target_include_directories(core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ target_link_libraries(core PUBLIC Threads::Threads common util ZLIB::ZLIB)
+--- src/duckstation-qt/CMakeLists.txt.orig	2024-06-14 05:59:32 UTC
++++ src/duckstation-qt/CMakeLists.txt
+@@ -169,7 +169,9 @@ add_executable(duckstation-qt ${SRCS} ${QM_FILES})
+ )
+ 
+ add_executable(duckstation-qt ${SRCS} ${QM_FILES})
+-target_precompile_headers(duckstation-qt PRIVATE "pch.h")
++if(NOT((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")))
++   target_precompile_headers(duckstation-qt PRIVATE "pch.h")
++endif()
+ target_include_directories(duckstation-qt PRIVATE "${Qt6Gui_PRIVATE_INCLUDE_DIRS}" "${CMAKE_CURRENT_SOURCE_DIR}")
+ target_link_libraries(duckstation-qt PRIVATE core common imgui minizip scmversion Qt6::Core Qt6::Gui Qt6::Widgets)
+ 
diff --git a/emulators/fbsd-duckstation/files/patch-src-core-gdb_server.h b/emulators/fbsd-duckstation/files/patch-src-core-gdb_server.h
new file mode 100644
index 000000000000..5f00d0fc7755
--- /dev/null
+++ b/emulators/fbsd-duckstation/files/patch-src-core-gdb_server.h
@@ -0,0 +1,13 @@
+Add missing type declarations (u8/u16/u32)
+
+--- src/core/gdb_server.h.orig	2024-06-14 05:59:32 UTC
++++ src/core/gdb_server.h
+@@ -2,6 +2,8 @@
+ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
+ 
+ #pragma once
++#include "common/types.h"
++
+ #include <string_view>
+ 
+ namespace GDBServer {
diff --git a/emulators/fbsd-duckstation/files/patch-src-core-memory_card_image.h b/emulators/fbsd-duckstation/files/patch-src-core-memory_card_image.h
new file mode 100644
index 000000000000..ba374a851c8a
--- /dev/null
+++ b/emulators/fbsd-duckstation/files/patch-src-core-memory_card_image.h
@@ -0,0 +1,12 @@
+Add missing type declarations (u8/u16/u32)
+
+--- src/core/memory_card_image.h.orig	2024-06-14 05:59:32 UTC
++++ src/core/memory_card_image.h
+@@ -2,6 +2,7 @@
+ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
+ 
+ #pragma once
++#include "common/types.h"
+ 
+ #include <array>
+ #include <string>
diff --git a/emulators/fbsd-duckstation/files/patch-src-core-pine_server.h b/emulators/fbsd-duckstation/files/patch-src-core-pine_server.h
new file mode 100644
index 000000000000..990b7cf42008
--- /dev/null
+++ b/emulators/fbsd-duckstation/files/patch-src-core-pine_server.h
@@ -0,0 +1,12 @@
+Add missing type declarations (u8/u16/u32)
+
+--- src/core/pine_server.h.orig	2024-06-14 05:59:32 UTC
++++ src/core/pine_server.h
+@@ -5,6 +5,7 @@
+  * here: https://code.govanify.com/govanify/pine/ */
+ 
+ #pragma once
++#include "common/types.h"
+ 
+ namespace PINEServer {
+ bool IsRunning();
diff --git a/emulators/fbsd-duckstation/files/patch-src-duckstation-qt-graphicssettingswidget.h b/emulators/fbsd-duckstation/files/patch-src-duckstation-qt-graphicssettingswidget.h
new file mode 100644
index 000000000000..a0e72b513709
--- /dev/null
+++ b/emulators/fbsd-duckstation/files/patch-src-duckstation-qt-graphicssettingswidget.h
@@ -0,0 +1,12 @@
+Add missing type declarations (u8/u16/u32)
+
+--- src/duckstation-qt/graphicssettingswidget.h.orig	2025-05-07 13:16:56 UTC
++++ src/duckstation-qt/graphicssettingswidget.h
+@@ -2,6 +2,7 @@
+ // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
+ 
+ #pragma once
++#include "common/types.h"
+ 
+ #include <QtWidgets/QWidget>
+ 
diff --git a/emulators/fbsd-duckstation/files/patch-src-util-page_fault_handler.cpp b/emulators/fbsd-duckstation/files/patch-src-util-page_fault_handler.cpp
new file mode 100644
index 000000000000..5b1f40faca96
--- /dev/null
+++ b/emulators/fbsd-duckstation/files/patch-src-util-page_fault_handler.cpp
@@ -0,0 +1,15 @@
+Fix build on arm64
+
+--- src/util/page_fault_handler.cpp.orig	2024-06-14 05:59:32 UTC
++++ src/util/page_fault_handler.cpp
+@@ -188,8 +188,8 @@ void PageFaultHandler::SignalHandler(int sig, siginfo_
+   void* const exception_pc = reinterpret_cast<void*>(static_cast<ucontext_t*>(ctx)->uc_mcontext.mc_rip);
+   const bool is_write = (static_cast<ucontext_t*>(ctx)->uc_mcontext.mc_err & 2) != 0;
+ #elif defined(CPU_ARCH_ARM64)
+-  void* const exception_address = reinterpret_cast<void*>(static_cast<ucontext_t*>(ctx)->uc_mcontext->__es.__far);
+-  void* const exception_pc = reinterpret_cast<void*>(static_cast<ucontext_t*>(ctx)->uc_mcontext->__ss.__pc);
++  void* const exception_address = reinterpret_cast<void*>(info->si_addr);
++  void* const exception_pc = reinterpret_cast<void*>(static_cast<ucontext_t*>(ctx)->uc_mcontext.mc_gpregs.gp_elr);
+   const bool is_write = IsStoreInstruction(exception_pc);
+ #else
+   void* const exception_address = reinterpret_cast<void*>(info->si_addr);
diff --git a/emulators/flycast/Makefile b/emulators/flycast/Makefile
index f5eeae7d7f79..cf5a8593268d 100644
--- a/emulators/flycast/Makefile
+++ b/emulators/flycast/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	flycast
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4
-PORTREVISION=	4
+DISTVERSION=	2.5
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
@@ -11,19 +10,21 @@ WWW=		https://github.com/flyinghead/flycast
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	asio>0:net/asio
 LIB_DEPENDS=	libchdr.so:devel/libchdr \
 		libcurl.so:ftp/curl \
 		libminiupnpc.so:net/miniupnpc \
-		libzip.so:archivers/libzip \
-		libzstd.so:archivers/zstd
+		libzip.so:archivers/libzip
 
-USES=		cmake compiler:c++17-lang pkgconfig sdl
+USES=		cmake compiler:c++20-lang pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	flyinghead
 USE_SDL=	sdl2
 
 .include "${.CURDIR}/Makefile.tuples"
 
+CMAKE_ON=	USE_HOST_LIBCHDR
+
 OPTIONS_DEFINE=		DOCS LUA OPENMP VULKAN
 OPTIONS_DEFAULT=	ALSA AO LUA OPENMP OSS VULKAN
 OPTIONS_GROUP=		AUDIO
@@ -39,7 +40,7 @@ ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 AO_LIB_DEPENDS=		libao.so:audio/libao
-AO_CMAKE_BOOL=		USE_AO
+AO_CMAKE_BOOL=		USE_LIBAO
 
 LUA_USES=		lua:52+
 LUA_CMAKE_BOOL=		USE_LUA
@@ -51,9 +52,10 @@ OSS_CMAKE_BOOL=		USE_OSS
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSEAUDIO
 
-VULKAN_BUILD_DEPENDS=	glslang:graphics/glslang \
+VULKAN_BUILD_DEPENDS=	glslang>0:graphics/glslang \
 			vulkan-headers>0:graphics/vulkan-headers
-VULKAN_CMAKE_BOOL=	USE_HOST_GLSLANG USE_VULKAN
+VULKAN_CMAKE_BOOL=	USE_HOST_GLSLANG \
+			USE_VULKAN
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/emulators/flycast/Makefile.tuples b/emulators/flycast/Makefile.tuples
index be52324f87b1..3dc85b571e43 100644
--- a/emulators/flycast/Makefile.tuples
+++ b/emulators/flycast/Makefile.tuples
@@ -1,4 +1,4 @@
 GH_TUPLE= \
-	vinniefalco:LuaBridge:fab7b33b896a42dcc865ba5ecdbacd9f409137f8:LuaBridge/core/deps/luabridge \
+	vinniefalco:LuaBridge:5d21e35633a1f87ed08af115b07d3386096f792b:LuaBridge/core/deps/luabridge \
 	GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:6eb62e1515072827db992c2befd80b71b2d04329:VulkanMemoryAllocator/core/deps/VulkanMemoryAllocator \
 	RetroAchievements:rcheevos:563230b1c249774b4852c944dc7cdcb952c9e8e8:rcheevos/core/deps/rcheevos \
diff --git a/emulators/flycast/distinfo b/emulators/flycast/distinfo
index 615fcccec971..2072eb036c5b 100644
--- a/emulators/flycast/distinfo
+++ b/emulators/flycast/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1731443633
-SHA256 (flyinghead-flycast-v2.4_GH0.tar.gz) = 44b2ff5d172f7be2be9db613ebd22635760cfc846ddb4c25e1da0d8fa79b1a1b
-SIZE (flyinghead-flycast-v2.4_GH0.tar.gz) = 30398953
-SHA256 (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f409137f8_GH0.tar.gz) = d393adc6bf1659faf2683f6ef2766ee7223650c8087ce53f8ab529e44c1c1575
-SIZE (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f409137f8_GH0.tar.gz) = 543800
+TIMESTAMP = 1746622585
+SHA256 (flyinghead-flycast-v2.5_GH0.tar.gz) = 019cae6c0eb196f8222c6640e36be5e3d6b551f1c7782e66c831dbcb43ef6d11
+SIZE (flyinghead-flycast-v2.5_GH0.tar.gz) = 34653480
+SHA256 (vinniefalco-LuaBridge-5d21e35633a1f87ed08af115b07d3386096f792b_GH0.tar.gz) = 75af9f79e1f818990fca3a9173dcc32a55f4ebd088c931193be4c9b2d8336abc
+SIZE (vinniefalco-LuaBridge-5d21e35633a1f87ed08af115b07d3386096f792b_GH0.tar.gz) = 1197538
 SHA256 (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-6eb62e1515072827db992c2befd80b71b2d04329_GH0.tar.gz) = 9afe46ce02681799ca907fb79990ff276877dfb6324d48da21b215b92649368d
 SIZE (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-6eb62e1515072827db992c2befd80b71b2d04329_GH0.tar.gz) = 877925
 SHA256 (RetroAchievements-rcheevos-563230b1c249774b4852c944dc7cdcb952c9e8e8_GH0.tar.gz) = fab0809e60d8ed64a4a2bef2964315e9f4b6e770db4c963630441352d1dd21d1
diff --git a/emulators/flycast/files/patch-CMakeLists.txt b/emulators/flycast/files/patch-CMakeLists.txt
index 8fdc9d16811a..f76a3fdcbd15 100644
--- a/emulators/flycast/files/patch-CMakeLists.txt
+++ b/emulators/flycast/files/patch-CMakeLists.txt
@@ -1,60 +1,6 @@
---- CMakeLists.txt.orig	2024-10-21 14:13:00 UTC
+--- CMakeLists.txt.orig	2025-05-07 13:21:40 UTC
 +++ CMakeLists.txt
-@@ -410,9 +410,13 @@ endif()
- 	target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV)
- endif()
- 
-+if(USE_OSS)
-+	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OSS)
-+endif()
-+
- if(NOT LIBRETRO)
- 	find_package(ALSA)
--	if(ALSA_FOUND AND NOT ANDROID)
-+	if(USE_ALSA AND ALSA_FOUND AND NOT ANDROID)
- 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_ALSA)
- 		target_include_directories(${PROJECT_NAME} PRIVATE ${ALSA_INCLUDE_DIRS})
- 		target_link_libraries(${PROJECT_NAME} PRIVATE ${ALSA_LIBRARIES})
-@@ -463,7 +467,7 @@ if(NOT LIBRETRO)
- 	endif()
- 
- 	find_package(Lua 5.2)
--	if(NOT APPLE AND LUA_FOUND)
-+	if(USE_LUA AND NOT APPLE AND LUA_FOUND)
- 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
- 		target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source)
- 		list(TRANSFORM LUA_LIBRARIES REPLACE "\.dll" "")
-@@ -471,9 +475,8 @@ endif()
- 	endif()
- endif()
- 
--add_subdirectory(core/deps/libchdr EXCLUDE_FROM_ALL)
--target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
--target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
-+pkg_check_modules(libchdr REQUIRED libchdr)
-+target_link_libraries(${PROJECT_NAME} PRIVATE ${libchdr_LINK_LIBRARIES})
- 
- if(NOT WITH_SYSTEM_ZLIB)
- 	set(ZLIB_RELATIVE_PATH "core/deps/libchdr/deps/zlib-1.3.1")
-@@ -490,7 +493,7 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND 
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
- 	pkg_check_modules(AO IMPORTED_TARGET ao)
--	if(AO_FOUND)
-+	if(USE_AO AND AO_FOUND)
- 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LIBAO)
- 		target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::AO)
- 	endif()
-@@ -510,7 +513,7 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND 
- 	endif()
- 
- 	pkg_check_modules(LIBPULSE IMPORTED_TARGET libpulse)
--	if(LIBPULSE_FOUND)
-+	if(USE_PULSEAUDIO AND LIBPULSE_FOUND)
- 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_PULSEAUDIO)
- 		target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
- 	endif()
-@@ -1338,8 +1341,7 @@ if(USE_VULKAN)
+@@ -1421,8 +1421,7 @@ if(USE_VULKAN)
  		target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_METAL_EXT)
  	endif()
  
diff --git a/emulators/flycast/files/patch-core_rend_vulkan_vulkan__context.cpp b/emulators/flycast/files/patch-core_rend_vulkan_vulkan__context.cpp
index dbc4bc7501e7..5f654a2ba530 100644
--- a/emulators/flycast/files/patch-core_rend_vulkan_vulkan__context.cpp
+++ b/emulators/flycast/files/patch-core_rend_vulkan_vulkan__context.cpp
@@ -1,14 +1,14 @@
---- core/rend/vulkan/vulkan_context.cpp.orig	2024-10-21 14:13:00 UTC
+--- core/rend/vulkan/vulkan_context.cpp.orig	2025-05-07 13:47:18 UTC
 +++ core/rend/vulkan/vulkan_context.cpp
 @@ -42,6 +42,7 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
  #endif
  
  #include <memory>
 +#include <set>
+ #include <vulkan/vulkan_format_traits.hpp>
  
  void ReInitOSD();
- 
-@@ -146,7 +147,7 @@ bool VulkanContext::InitInstance(const char** extensio
+@@ -147,7 +148,7 @@ bool VulkanContext::InitInstance(const char** extensio
  #if defined(__ANDROID__) && HOST_CPU == CPU_ARM64
  		vkGetInstanceProcAddr = loadVulkanDriver();
  #else
diff --git a/emulators/linux-rl9/Makefile b/emulators/linux-rl9/Makefile
index 98d63313060e..d878a46c372d 100644
--- a/emulators/linux-rl9/Makefile
+++ b/emulators/linux-rl9/Makefile
@@ -21,7 +21,7 @@ USE_LINUX=	alsalib alsa-lib-devel alsa-plugins-oss alsa-plugins-pulseaudio \
 		libpciaccess libpsl librsvg2 libsecret libsigc++20 \
 		libsndfile libsoup libssh libstemmer libtasn1 libthai libtheora libtool-ltdl \
 		libtracker-sparql libunistring libusb libv4l libva libvdpau \
-		libvorbis libvpx libxcrypt libxkbcommon libxml2 libxslt llvm \
+		libvorbis libvpx libxkbcommon libxml2 libxslt llvm \
 		lz4 nettle npth nspr nss ocl-icd openal-soft openldap opus orc \
 		p11-kit pango pixman pulseaudio-libs pulseaudio-utils python3 \
 		qt3d qtbase qtconnectivity qtdeclarative qtgraphicaleffects qtimageformats \
diff --git a/emulators/linux_base-rl9/Makefile b/emulators/linux_base-rl9/Makefile
index e8e0337eefac..6b60d59bdf8f 100644
--- a/emulators/linux_base-rl9/Makefile
+++ b/emulators/linux_base-rl9/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rl9
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 EXTRACT_ONLY=	${DISTFILES:N*${SRC_SUFX}*:Nf/filesystem-*:C/:[^:]+$//}
@@ -67,6 +67,7 @@ LIB_DISTNAMES=	bzip2-libs-${bzip2_ver} \
 		libgcc-${gcc_ver} \
 		libgudev-${libgudev_ver} \
 		libmount-${util_ver} \
+		libnsl-${glibc_ver} \
 		libproxy-${libproxy_ver} \
 		libselinux-${selinux_ver} \
 		libsepol-${sepol_ver} \
@@ -75,6 +76,7 @@ LIB_DISTNAMES=	bzip2-libs-${bzip2_ver} \
 		libstdc++-${gcc_ver} \
 		libuuid-${util_ver} \
 		libverto-${libverto_ver} \
+		libxcrypt-${libxcrypt_ver} \
 		libzstd-${zstd_ver} \
 		mpfr-${mpfr_ver} \
 		mtdev-${mtdev_ver} \
@@ -132,6 +134,7 @@ SRC_DISTFILES=	acl-${libacl_ver}${SRC_SUFX}:SOURCE \
 		libsepol-${sepol_ver}${SRC_SUFX}:SOURCE \
 		libsigsegv-${libsigsegv_ver}${SRC_SUFX}:SOURCE \
 		libverto-${libverto_ver}${SRC_SUFX}:SOURCE \
+		libxcrypt-${libxcrypt_ver}${SRC_SUFX}:SOURCE \
 		mpfr-${mpfr_ver}${SRC_SUFX}:SOURCE \
 		mtdev-${mtdev_ver}${SRC_SUFX}:SOURCE \
 		ncurses-${ncurses_ver}${SRC_SUFX}:SOURCE \
@@ -185,7 +188,6 @@ REMOVE_FILES=	bin/chfn bin/chsh bin/findmnt bin/login bin/lsblk bin/lscpu \
 		usr/share/man/man8/partx.8.gz usr/share/man/man8/swapoff.8.gz \
 		usr/share/man/man8/swapon.8.gz usr/share/man/man8/switch_root.8.gz
 
-
 .include <bsd.port.options.mk>
 
 PLIST_SUB+=	NEWGLIBC=""
diff --git a/emulators/linux_base-rl9/Makefile.version b/emulators/linux_base-rl9/Makefile.version
index e71d9c497af6..b54ebe994cd9 100644
--- a/emulators/linux_base-rl9/Makefile.version
+++ b/emulators/linux_base-rl9/Makefile.version
@@ -13,7 +13,7 @@ gdbm_ver=		1.23-1.el9
 geocode-glib_ver=	3.26.2-5.el9
 glib-networking_ver=	2.68.3-3.el9
 glib2_ver=		2.68.4-14.el9_4.1
-glibc_ver=		2.34-125.el9_5.3
+glibc_ver=		2.34-125.el9_5.8
 gmp_ver=		6.2.0-13.el9
 grep_ver=		3.6-5.el9
 info_ver=		6.7-15.el9
@@ -34,6 +34,7 @@ libnattr_ver=		2.5.1-3.el9
 libproxy_ver=		0.4.15-35.el9
 libsigsegv_ver=		2.13-4.el9
 libverto_ver=		0.3.2-3.el9
+libxcrypt_ver=		4.4.18-3.el9
 mpfr_ver=		4.1.0-7.el9
 mtdev_ver=		1.1.5-22.el9
 ncurses_ver=		6.2-10.20210508.el9
diff --git a/emulators/linux_base-rl9/distinfo b/emulators/linux_base-rl9/distinfo
index 6e5aad097208..ff2b4e9497ec 100644
--- a/emulators/linux_base-rl9/distinfo
+++ b/emulators/linux_base-rl9/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745140230
+TIMESTAMP = 1746515966
 SHA256 (rocky/b/basesystem-11-13.el9.0.1.noarch.rpm) = 9f707e8d1046381c9b4a4df6a6674327df6ffe0298d48e1750972212c97aafad
 SIZE (rocky/b/basesystem-11-13.el9.0.1.noarch.rpm) = 6565
 SHA256 (rocky/b/bash-5.1.8-9.el9.aarch64.rpm) = f6b8bbdbd96ecb8d240a4d3c4a038f58faeab170015b07c7096d02157838279d
@@ -79,26 +79,26 @@ SHA256 (rocky/g/glib2-2.68.4-14.el9_4.1.i686.rpm) = 70fc96806a62a13d46e6786f52b3
 SIZE (rocky/g/glib2-2.68.4-14.el9_4.1.i686.rpm) = 2824506
 SHA256 (rocky/g/glib2-2.68.4-14.el9_4.1.x86_64.rpm) = 80a459770f044a232087c6e3483ceaf118807987d51e2501c4e5bdf64b1bb58d
 SIZE (rocky/g/glib2-2.68.4-14.el9_4.1.x86_64.rpm) = 2741037
-SHA256 (rocky/g/glibc-2.34-125.el9_5.3.aarch64.rpm) = 9dd0d6994d5b482e8d419db7021b8bb1a8e392b690820e0d6ef5399cb6b23c50
-SIZE (rocky/g/glibc-2.34-125.el9_5.3.aarch64.rpm) = 1771511
-SHA256 (rocky/g/glibc-2.34-125.el9_5.3.i686.rpm) = 87879f5ab2d562bc163c438a2130c944a83ea3db60dd2868b33910b05d4415f2
-SIZE (rocky/g/glibc-2.34-125.el9_5.3.i686.rpm) = 1983672
-SHA256 (rocky/g/glibc-2.34-125.el9_5.3.x86_64.rpm) = 702fae901ab50e2437d8a70c215572881ef11def8ccd5a7a5cfdb401017983c5
-SIZE (rocky/g/glibc-2.34-125.el9_5.3.x86_64.rpm) = 2039272
-SHA256 (rocky/g/glibc-all-langpacks-2.34-125.el9_5.3.aarch64.rpm) = 4e1f2793efa8a36638aadc3800a27e738cddc1cc842af4528c6fbfa3fd508049
-SIZE (rocky/g/glibc-all-langpacks-2.34-125.el9_5.3.aarch64.rpm) = 18729926
-SHA256 (rocky/g/glibc-all-langpacks-2.34-125.el9_5.3.x86_64.rpm) = f773278a04d196e3fe8444e113012ae0c6c9444d4481e568af5709198de83909
-SIZE (rocky/g/glibc-all-langpacks-2.34-125.el9_5.3.x86_64.rpm) = 18729974
-SHA256 (rocky/g/glibc-common-2.34-125.el9_5.3.aarch64.rpm) = 538480a309567f1b8ac578bd23f07114d4c93b68413bffcaadb321b58d357d08
-SIZE (rocky/g/glibc-common-2.34-125.el9_5.3.aarch64.rpm) = 287032
-SHA256 (rocky/g/glibc-common-2.34-125.el9_5.3.x86_64.rpm) = 8130fd2add1b9c5bb3afe374cbbeaff6c803cf78436247e4e34d428bf0391bce
-SIZE (rocky/g/glibc-common-2.34-125.el9_5.3.x86_64.rpm) = 297010
-SHA256 (rocky/g/glibc-gconv-extra-2.34-125.el9_5.3.aarch64.rpm) = 2b53c06758ef742b336fe2fe8f5a744533b346cb0db70eaffcb95fd6f58e2acd
-SIZE (rocky/g/glibc-gconv-extra-2.34-125.el9_5.3.aarch64.rpm) = 1711320
-SHA256 (rocky/g/glibc-gconv-extra-2.34-125.el9_5.3.i686.rpm) = b0cec23a4387eacc391f0a0c4954f170ddfc872b99d14e1387c1f1bc01062924
-SIZE (rocky/g/glibc-gconv-extra-2.34-125.el9_5.3.i686.rpm) = 1680404
-SHA256 (rocky/g/glibc-gconv-extra-2.34-125.el9_5.3.x86_64.rpm) = 7b3de7bbe12a967f036e0b8d547f5675478452226f46945208faf821d947afe2
-SIZE (rocky/g/glibc-gconv-extra-2.34-125.el9_5.3.x86_64.rpm) = 1645781
+SHA256 (rocky/g/glibc-2.34-125.el9_5.8.aarch64.rpm) = 7110fd3359cce2266a72df6e9b4f85320c54ca8e90ff159f58f3fe65d287698d
+SIZE (rocky/g/glibc-2.34-125.el9_5.8.aarch64.rpm) = 1772281
+SHA256 (rocky/g/glibc-2.34-125.el9_5.8.i686.rpm) = 143b942ced528c17fc3e2bd8cb0cfed70aeb8f098d4e82f533e7a8703946e9c7
+SIZE (rocky/g/glibc-2.34-125.el9_5.8.i686.rpm) = 1984225
+SHA256 (rocky/g/glibc-2.34-125.el9_5.8.x86_64.rpm) = b7fcc189398338475f84a2538e628de3fd0bb0ac778d66c9e4ee06e0fc177689
+SIZE (rocky/g/glibc-2.34-125.el9_5.8.x86_64.rpm) = 2039086
+SHA256 (rocky/g/glibc-all-langpacks-2.34-125.el9_5.8.aarch64.rpm) = bd033f52cd6c65b4b4faccd7c012d6af4e85a670452a847af6ea2bfe54d68d49
+SIZE (rocky/g/glibc-all-langpacks-2.34-125.el9_5.8.aarch64.rpm) = 18730073
+SHA256 (rocky/g/glibc-all-langpacks-2.34-125.el9_5.8.x86_64.rpm) = c138c3b76ee3bf0d4268068ff560c0ffb821ac0135f78ab6825c817ec3539cb2
+SIZE (rocky/g/glibc-all-langpacks-2.34-125.el9_5.8.x86_64.rpm) = 18731797
+SHA256 (rocky/g/glibc-common-2.34-125.el9_5.8.aarch64.rpm) = a0e38ead8793c1071f2f6e7cd6c8cb5c764e21d7b7e5f40d8c6700beadb3c3e4
+SIZE (rocky/g/glibc-common-2.34-125.el9_5.8.aarch64.rpm) = 287567
+SHA256 (rocky/g/glibc-common-2.34-125.el9_5.8.x86_64.rpm) = 07878f56af2ac82507b59e13e786b7dd9811243c4230c5a310ecfb2c43877b1d
+SIZE (rocky/g/glibc-common-2.34-125.el9_5.8.x86_64.rpm) = 296884
+SHA256 (rocky/g/glibc-gconv-extra-2.34-125.el9_5.8.aarch64.rpm) = 431e843b276b489f1872969fb53c17059ec576917b9ea08b9c7d849f86bfc1fa
+SIZE (rocky/g/glibc-gconv-extra-2.34-125.el9_5.8.aarch64.rpm) = 1711363
+SHA256 (rocky/g/glibc-gconv-extra-2.34-125.el9_5.8.i686.rpm) = d343406cbb75cf8609ff61e02e41d17b3edd6b755666de35bb5708fbc65f0e4f
+SIZE (rocky/g/glibc-gconv-extra-2.34-125.el9_5.8.i686.rpm) = 1682322
+SHA256 (rocky/g/glibc-gconv-extra-2.34-125.el9_5.8.x86_64.rpm) = 57d45448e415f7447d20320596031e01a609f102d341c3a8a2cafadacc31ac1d
+SIZE (rocky/g/glibc-gconv-extra-2.34-125.el9_5.8.x86_64.rpm) = 1645776
 SHA256 (rocky/g/gmp-6.2.0-13.el9.aarch64.rpm) = 54f5999feb6a26c57616d64cc880dccb5e44723911f52b06a36311e389a568ce
 SIZE (rocky/g/gmp-6.2.0-13.el9.aarch64.rpm) = 270794
 SHA256 (rocky/g/gmp-6.2.0-13.el9.i686.rpm) = 186f9821881081e526d4a8a6e34240e55db8830380bf4d1303e4e1d5d6e9f755
@@ -223,6 +223,12 @@ SHA256 (rocky/l/libmount-2.37.4-20.el9.i686.rpm) = 21eddd2c18c7c9d68d8f5f24786db
 SIZE (rocky/l/libmount-2.37.4-20.el9.i686.rpm) = 145048
 SHA256 (rocky/l/libmount-2.37.4-20.el9.x86_64.rpm) = 8ae34772bc519310fbb3eae367bb81ebcc0add25d75155cba8d9af67947d7fb0
 SIZE (rocky/l/libmount-2.37.4-20.el9.x86_64.rpm) = 137687
+SHA256 (rocky/l/libnsl-2.34-125.el9_5.8.aarch64.rpm) = 75d7046c0a82d6c2e925af8e6b82da273e4f9cc51bf932a109ebbdc1afe83a26
+SIZE (rocky/l/libnsl-2.34-125.el9_5.8.aarch64.rpm) = 57614
+SHA256 (rocky/l/libnsl-2.34-125.el9_5.8.i686.rpm) = 1228b53e473128050b7a708a16d72a9dbad5d16986968115ea91ff2549182bef
+SIZE (rocky/l/libnsl-2.34-125.el9_5.8.i686.rpm) = 62745
+SHA256 (rocky/l/libnsl-2.34-125.el9_5.8.x86_64.rpm) = f4913ddc988030d92b68a9c7bd8ae2af0c8521870cf931b72e59232c96fe2fef
+SIZE (rocky/l/libnsl-2.34-125.el9_5.8.x86_64.rpm) = 58181
 SHA256 (rocky/l/libproxy-0.4.15-35.el9.aarch64.rpm) = 31daa01dfa6eb8e0ae100cbdc20f0d73320598a934f0eabad830b0060027f2d2
 SIZE (rocky/l/libproxy-0.4.15-35.el9.aarch64.rpm) = 71753
 SHA256 (rocky/l/libproxy-0.4.15-35.el9.i686.rpm) = 44c7d66545b791a88f1faf63dc6d686ddfaa8154aa45899cd1469dd7aed9f657
@@ -271,6 +277,12 @@ SHA256 (rocky/l/libverto-0.3.2-3.el9.i686.rpm) = aaa5c950e270962b5d5c1f59225dc96
 SIZE (rocky/l/libverto-0.3.2-3.el9.i686.rpm) = 21727
 SHA256 (rocky/l/libverto-0.3.2-3.el9.x86_64.rpm) = f430f1b95b7467c461c7a745eba07beab00306984f2f21ecfcc04f37100405d1
 SIZE (rocky/l/libverto-0.3.2-3.el9.x86_64.rpm) = 21177
+SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.aarch64.rpm) = ec12e0266ce1f96af43495c95f95fbb6d972af576f19473ea231985f8cd4d2d6
+SIZE (rocky/l/libxcrypt-4.4.18-3.el9.aarch64.rpm) = 122619
+SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.i686.rpm) = a9df06cdddf956ae3de2052767bc8d1c9307b990a9de0e43e68b3880cc287658
+SIZE (rocky/l/libxcrypt-4.4.18-3.el9.i686.rpm) = 124057
+SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.x86_64.rpm) = e3c178ed2e04ac25699d5af612fad51694a23f5d544b72cab2f65d35b8db5f28
+SIZE (rocky/l/libxcrypt-4.4.18-3.el9.x86_64.rpm) = 117617
 SHA256 (rocky/l/libzstd-1.5.1-2.el9.aarch64.rpm) = b997fa077e854b7541c044dd2c213e9ecf18b67176a9e7f70dba11dc53f48d5e
 SIZE (rocky/l/libzstd-1.5.1-2.el9.aarch64.rpm) = 314410
 SHA256 (rocky/l/libzstd-1.5.1-2.el9.i686.rpm) = be7a85f4e09963396cdc297cfaea7d0ee3551b733d5841ce8c5083f465afe8f5
@@ -431,8 +443,8 @@ SHA256 (rocky/g/glib-networking-2.68.3-3.el9.src.rpm) = aa6bb6cb4406d2b1aa6d7561
 SIZE (rocky/g/glib-networking-2.68.3-3.el9.src.rpm) = 254741
 SHA256 (rocky/g/glib2-2.68.4-14.el9_4.1.src.rpm) = 4137a8f97ec2b906dabc48b93e12d3c5d916711087cbce82dd2d233016c2ddfc
 SIZE (rocky/g/glib2-2.68.4-14.el9_4.1.src.rpm) = 5068111
-SHA256 (rocky/g/glibc-2.34-125.el9_5.3.src.rpm) = 185db2c8d2aab7d58ac33a5b1fb85ec2f253fe20f95dcc36beb510b205a4e1a0
-SIZE (rocky/g/glibc-2.34-125.el9_5.3.src.rpm) = 18609420
+SHA256 (rocky/g/glibc-2.34-125.el9_5.8.src.rpm) = 2a0ea9e22af53f2c9f5f9819b000f970206e8b2242132ae6165f1ecd3eb3c2ea
+SIZE (rocky/g/glibc-2.34-125.el9_5.8.src.rpm) = 18631240
 SHA256 (rocky/g/gmp-6.2.0-13.el9.src.rpm) = 8297b96da5460fd78d81e38c3ac1559a35eb51bea3c3d398efaacd62868d20d4
 SIZE (rocky/g/gmp-6.2.0-13.el9.src.rpm) = 2500190
 SHA256 (rocky/g/grep-3.6-5.el9.src.rpm) = d7e0368575da276796d79537cb4897092988285541a2ede0b5688ba42215f34b
@@ -469,6 +481,8 @@ SHA256 (rocky/l/libsigsegv-2.13-4.el9.src.rpm) = 36dc113c8837b27c3c12b021e05786b
 SIZE (rocky/l/libsigsegv-2.13-4.el9.src.rpm) = 471565
 SHA256 (rocky/l/libverto-0.3.2-3.el9.src.rpm) = 08f0b27aaf3b288e10ab3c1068ee09f3f2afe036879787d3f66b871ef161cb33
 SIZE (rocky/l/libverto-0.3.2-3.el9.src.rpm) = 394523
+SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.src.rpm) = dba21a9a96b6532e452b45190b9ba38b56c2a1fbaecae037505c5315de014b3d
+SIZE (rocky/l/libxcrypt-4.4.18-3.el9.src.rpm) = 542268
 SHA256 (rocky/m/mpfr-4.1.0-7.el9.src.rpm) = 94cb2af3328fd57d3c4f1f56f8ae856dd8ae37c0ec61de793037f5c1c7146fa3
 SIZE (rocky/m/mpfr-4.1.0-7.el9.src.rpm) = 1554505
 SHA256 (rocky/m/mtdev-1.1.5-22.el9.src.rpm) = 6c5c7d9595a3accbc75aa61d8a43847a53b893540b1c6766621cce875fb9b6e5
diff --git a/emulators/linux_base-rl9/pkg-plist.aarch64 b/emulators/linux_base-rl9/pkg-plist.aarch64
index abdcabfddda5..543159638632 100644
--- a/emulators/linux_base-rl9/pkg-plist.aarch64
+++ b/emulators/linux_base-rl9/pkg-plist.aarch64
@@ -294,50 +294,56 @@ usr/bin/zdump
 usr/lib/.build-id/00/28e554acd9c16064b12195dcc8dffd7caea925
 usr/lib/.build-id/00/8c49e4fa52d5c6b4421efe93a2e0a97b34953f
 usr/lib/.build-id/00/e9e02ed1f5eceff9fd22ce6b60614cff4923ac
-usr/lib/.build-id/01/04e60502be3b325202b17234c18be5ca38aa65
-usr/lib/.build-id/01/0d96c7cac4f3abbd6e7952a6501fce60c5a4f9
 usr/lib/.build-id/01/583f6240dd9b8816b13a961865f5300765f96f
-usr/lib/.build-id/02/a5f5a8c3fe684f89ed45adbe062f49766895ed
-usr/lib/.build-id/02/c609401d234a6b4af43b914be2f4571680b81d
+usr/lib/.build-id/01/a03e4c212790df1b5b8536a369fbce672ea0ba
+usr/lib/.build-id/01/ccf7f8b258b4d32de576f1ec45d006aec2397c
+usr/lib/.build-id/02/7d2af4f8d48eb0d6f76086d9a9aa20cc32866e
 usr/lib/.build-id/02/ec43c4270173dfaaa729bfb411c39f6c05e689
 usr/lib/.build-id/02/ec509c1887bed47f214291315b934ebd5331ee
-usr/lib/.build-id/03/1770e4bd284e1fc515ea94f9324019d1f26714
+usr/lib/.build-id/03/3d7014e704a1754ada5b4b7251f51288f24deb
+usr/lib/.build-id/03/3d7014e704a1754ada5b4b7251f51288f24deb.1
+usr/lib/.build-id/03/3d7014e704a1754ada5b4b7251f51288f24deb.2
+usr/lib/.build-id/03/3d7014e704a1754ada5b4b7251f51288f24deb.3
 usr/lib/.build-id/03/73ec6d70882a8d6be0de64027b6afac8e5ff7f
 usr/lib/.build-id/03/860dc639b33f7b611df9436e75b7ed9d282cac
 usr/lib/.build-id/03/e0dec25a905d88b1a66e3f4888bdf3e127e458
+usr/lib/.build-id/04/00eb89b7a2c633b6826a1725eeb542a342e9e7
 usr/lib/.build-id/04/25c5c3f3209030214db909f391036b77dc216f
-usr/lib/.build-id/04/57112c0f1f6556aee85f678eeb1401427d3a3b
-usr/lib/.build-id/04/5b719bda8f68b1adab8266d494f089dc07bde4
+usr/lib/.build-id/04/4137595229c7c14f25a6e0fc15c2730048bcde
 usr/lib/.build-id/04/e90816c511b49f014942b11701f2b033252c7d
 usr/lib/.build-id/04/efefdf2cde1cbc93e7a06a27a0df1a01c5e549
+usr/lib/.build-id/05/1e2c62f858d0fc2768a432bce6a6ae314c6469
 usr/lib/.build-id/05/23a385c1cc29e8666e6b76d72c1e65faedeff9
-usr/lib/.build-id/05/59847d8c13d526f5a2a236fded87b9e814c701
-usr/lib/.build-id/05/63730396a1467385727c2ceffc5cd837296126
+usr/lib/.build-id/05/8cee041af1ac78582d809da84fac235b3e33a4
+usr/lib/.build-id/05/cd47cd3f1b85fe2a3180d44149f3ec1854cf01
 usr/lib/.build-id/05/d06e8936fc01653c07ddd2aff996f6c3342dd9
+usr/lib/.build-id/07/273c74672ec5f8cb236410988c012256a10c36
 usr/lib/.build-id/07/2a1fabdb5b468d0c63c216f25a99f6e6126d08
-usr/lib/.build-id/07/66de381ad6d9061dd11c7c9faead97100f5836
-usr/lib/.build-id/07/66ef92af6db04f35e321f4e7dbd5d8d1b4658e
 usr/lib/.build-id/07/b4d247838028f97395772b1123f2adb888ea04
-usr/lib/.build-id/07/de4b2203f41380594f0223f7d6522c49e689b4
-usr/lib/.build-id/08/1d8fd4c2763777a6bfb4856433b36fea8d0b83
 usr/lib/.build-id/08/1ddb412a3d7fe0c8707a0c77bf267f8c2e6be0
-usr/lib/.build-id/08/337f917be784f45ea2bb417a968630c031a389
+usr/lib/.build-id/08/67c8958c0d2301cd56a6684cd127a3a6c7ca7f
 usr/lib/.build-id/08/a3257453f24caa1385d01e55529dd9d37bde97
+usr/lib/.build-id/08/ece9705554a20668769989c03aefda757c9e4b
+usr/lib/.build-id/09/3fb5505d8463d4b548b94427840235abdecd66
+usr/lib/.build-id/09/7bb2ce9b724a4aa558d3b5d74605bfec11941e
 usr/lib/.build-id/09/7c38b6959e1ed0c991800e3760ed23f7786e5b
 usr/lib/.build-id/09/91197b6880e2d437050c6ac13c2e9478dbbe94
+usr/lib/.build-id/0a/012043c71c0375c69b6b59b18cc1190ddeb5fe
 usr/lib/.build-id/0a/b9b26d6947f6579c584c7d7a86d0d5c8871f4b
-usr/lib/.build-id/0b/688c0f4591b9e0453add93f4da9baef085a6ba
-usr/lib/.build-id/0b/992ee4d28f61d29acb1662e6066ef8221dd2b2
-usr/lib/.build-id/0b/bba265cc08d0149f0d761a0a48feb0351f79aa
+usr/lib/.build-id/0a/e5f47d3779a0034fb6f223b88e31c61d97d987
+usr/lib/.build-id/0c/5d8cefb95ac8ba99d3c8ffcece49a9990639f1
+usr/lib/.build-id/0d/2ecf014d0a4a7e716086a684b84b25c8d7a1af
+usr/lib/.build-id/0d/40b80f1b4c81c1a48cf26963b7b2a2dfb6428a
 usr/lib/.build-id/0d/7052cc8bf4b5c8eb0d08d69096ac19e5305aab
 usr/lib/.build-id/0d/83f71b7e625aec20b43e2b8af1a9c2eebbfa4d
-usr/lib/.build-id/0d/bfccd918c0f3202165199abca242543b26f7b3
+usr/lib/.build-id/0d/8cf7b47310a145132cdf078c8c728b6a8f9528
 usr/lib/.build-id/0e/316d97e94a6db78db9eb7307fd42be3dd4a146
-usr/lib/.build-id/0e/9d83aacd0e2ca8798994d3a7af40bc12110a20
-usr/lib/.build-id/0f/386e8b4e9fba633399203b21ab68681a136f61
+usr/lib/.build-id/0e/5f65272031391f298cb5c3b6b7d1dee2994163
+usr/lib/.build-id/0e/95bf3e9389a373837be8ba4351b8908261511a
 usr/lib/.build-id/0f/5e4c65dacbd3c3633f9fe64e6b2141960c6800
-usr/lib/.build-id/0f/6dc65b0604c901067480f2a3512bd13dc5377f
+usr/lib/.build-id/0f/64b9662a9331da8410b42f71e83b63dac29002
 usr/lib/.build-id/0f/735384fa1d8b8ce48647c8e0f0d2f47c4ba86d
+usr/lib/.build-id/0f/8ef51f38e46af5db95876ce29e75e31b23fa44
 usr/lib/.build-id/0f/de05b2ba67bc59e94c565b94e6a33d2d04836d
 usr/lib/.build-id/0f/fcd218d9c919b874371b4b70b3ad63887e426c
 usr/lib/.build-id/10/10651b00165f486e48686964f4b8aa9bde964a
@@ -346,624 +352,620 @@ usr/lib/.build-id/10/cb7f5973e6ef4e9f3a16595b8e6c4301621b13
 usr/lib/.build-id/10/d9d4601e6658b709a8464e8d31a8354af74b07
 usr/lib/.build-id/11/25fd031769dd0d900b39447f356307c445f4c5
 usr/lib/.build-id/11/351f731fefb7d05e17c32f88f7afa6e6afe1ac
+usr/lib/.build-id/11/e25a8131aa87dff1e1a2d6c6b04257e6caadca
 usr/lib/.build-id/11/e96e9ddf3de4ed63e41d44cc9d527728db242b
+usr/lib/.build-id/12/142227e77518a53a06e2705c4df9f9e9111684
 usr/lib/.build-id/12/2a5bd09c03d696cd8d76b9b3a167a6fce7ca52
-usr/lib/.build-id/12/3d18827fbc699df010e04e072bf220ccaf3f39
 usr/lib/.build-id/12/4469f55a1e05fc14ce67b98b25f511b68f252b
-usr/lib/.build-id/13/208bbe715fe979c1aa6945e0e263f5cffd0c70
 usr/lib/.build-id/13/36f318182548c0c7e0a523925a3485993a1aee
 usr/lib/.build-id/13/6fb155b0e1511d4427e32b6fcebeddc04847d1
 usr/lib/.build-id/14/1b8bebadc641dfba1edfcfbb8f7eb0695958ac
-usr/lib/.build-id/14/ed025e19363bdb98a59eb3aea807a2b8575321
-usr/lib/.build-id/15/05e99560486c34a894e800588ef1b3bbf104f9
-usr/lib/.build-id/16/680410d5ff1b385de4e9ce906eae2c64401150
+usr/lib/.build-id/14/703307203f8ad722d46782fe8003e2fbc4feef
 usr/lib/.build-id/16/e32f31b1003250856db043211675d12d68da03
-usr/lib/.build-id/17/3a1f4c66e2e3fc882c3815b806c703444c8dbc
 usr/lib/.build-id/17/50f667b5910e546e33bac7b86b754d468f7d35
-usr/lib/.build-id/17/88149f4775579214b02c49935208e785efe073
 usr/lib/.build-id/17/ddb0be85f497ae363da00615c61d42a64b8c8d
-usr/lib/.build-id/17/dde75345d12af9d6c76607d3ad3caeddbed3f6
+usr/lib/.build-id/17/df6b541b28aa001ddc51a3132c10ab44230f44
+usr/lib/.build-id/17/fdd1e9d012608599f2d0a7c3fe92f67053c302
 usr/lib/.build-id/18/33df465fa91aaff396b5a1c7a963c446320c33
 usr/lib/.build-id/18/369eaa44e29a9b4d3c9b09a2580c02ff8e275b
+usr/lib/.build-id/18/4d62558aff37f2e342e5108a5a9f89b33d0883
+usr/lib/.build-id/18/af7fda2cba0787ec5ce301f19c08c28692af8d
+usr/lib/.build-id/19/1f53d617797d33429d889dd538bdf54c438a7b
 usr/lib/.build-id/19/61f692e311a49a82dace870268331fbe5eb27e
 usr/lib/.build-id/19/78a7dfecc1917d7e4a4c80880648127155ede8
 usr/lib/.build-id/19/e5e08f360ff8fa73b6ba6ff0be39a4f108535c
 usr/lib/.build-id/1a/2e0a366961633ad97feeaa2240f6a1e80f3a12
 usr/lib/.build-id/1a/4b74c00d9951cd46d7e8136d8b2ce98ef36e14
-usr/lib/.build-id/1a/8e3b3114444dc4f2c99c952e7c7353a3f509dc
-usr/lib/.build-id/1a/a50dac4c13e6fd9038870bfa52d06db956b8f5
-usr/lib/.build-id/1a/b93625ebdce2bb7460e7c1ef24c581f10ac047
+usr/lib/.build-id/1a/a63105df0f360f28b2790f57754e24a41262bf
 usr/lib/.build-id/1b/42fa71a5299d33ebead63172ae39ba7f47ac54
+usr/lib/.build-id/1b/52de80e2c6482462f0172bd29f5368a6015445
 usr/lib/.build-id/1b/79c67b93a0a80f4b8bca30f84c72471ba2189b
 usr/lib/.build-id/1b/ade8bcbc42cceeae103d157bb513233ea44f41
-usr/lib/.build-id/1b/f52a72f23dafa6f9312603941801c0eb93b96b
 usr/lib/.build-id/1c/19227c52247d85a561c86b6aee287fb7fc60c3
-usr/lib/.build-id/1c/58e74b777a799f1b205d6a6d04aae29be89299
 usr/lib/.build-id/1c/673e755912468f7ec6b65b8e821a70852af609
+usr/lib/.build-id/1c/903ff37e7804e14404f3fa48c6ec2a2cc9077e
+usr/lib/.build-id/1c/b89d5ef1adbcdf36af5e347545416c9594ff99
 usr/lib/.build-id/1c/e502ea5885da82dfddab2217ef849ac2132b73
+usr/lib/.build-id/1d/0451c454b062f4dae778ab850c0edafa9ced13
 usr/lib/.build-id/1d/27f4ce7169ac8bdb4e6e280e6b5dd9a7dd1b8d
 usr/lib/.build-id/1d/7b43f2e60db6c1b226bd8eaba65239445a68a0
-usr/lib/.build-id/1e/4120e1e4970427265e4236f79f77a350238f22
+usr/lib/.build-id/1e/3e9f8dcc345fa9f60524904dcb88e9c9bdf94b
 usr/lib/.build-id/1e/67008be973e6b64dfeab6de0bb63824456c4e4
 usr/lib/.build-id/1e/8c919499ee13b6f837b4e9094e324a04a2941a
 usr/lib/.build-id/1e/bd7a60bb061c8da0f20466e75e413d3223d775
 usr/lib/.build-id/1e/c2a5e0f10c60fddeb63f2948b7052e881436aa
-usr/lib/.build-id/1f/01e365b5ca8b578e5132c3b25dbea86ac9cb4c
 usr/lib/.build-id/1f/19d589314996cf8da7ace4ed63729d03b590b2
 usr/lib/.build-id/1f/7152cd259e2082402f0469d9c195a7a3a64d21
-usr/lib/.build-id/1f/da97b7fcf35e2bfcbeaa2143c55d372ce71b96
-usr/lib/.build-id/1f/f5feb93e81bf4ba941ae5c230071114b6f5d96
-usr/lib/.build-id/20/2de27aeb3a3fe70817501ec6961eab1696604b
-usr/lib/.build-id/20/386f707989ba31434fb5ff9218977dffc37e14
+usr/lib/.build-id/20/3e2270451d35d8a0eaa2a4f9b195f65f4e87f9
+usr/lib/.build-id/21/50e2a6bd01b6840d91e04efaf0e4562c20e20a
 usr/lib/.build-id/21/7452ad5f1e94ec5c3ab241acd625b98b4631e6
+usr/lib/.build-id/21/96ed74dd2d28ff191057d36b95339fe794a317
+usr/lib/.build-id/22/1161078c0203fdded34d8be06728fb624127eb
 usr/lib/.build-id/22/b9864f184379217f0f44fac62032525d3cd197
-usr/lib/.build-id/23/3b1b3aa1726ba50a7d1bf4eba2633acca5efe8
-usr/lib/.build-id/23/7b769459589a9f16717badad6f6011a750f00f
-usr/lib/.build-id/24/25af78a753f8ae37152b6646c45e6ee8da23da
+usr/lib/.build-id/23/d506ef78a76e9881d6777e14194d2e67fee302
+usr/lib/.build-id/24/24c715a351c02aa5b72ebbd06d798d3e71c1be
 usr/lib/.build-id/24/bccd65d8a79bde2195317d93f63ce5704ef007
-usr/lib/.build-id/25/227d827151450a0e654b3b1da7b00b408f7c81
-usr/lib/.build-id/26/0afcc9606fdefe12139274937211bbc32a25c9
+usr/lib/.build-id/25/0cd48b635d3ea9ea71d11ee4204a6f2f5b39df
+usr/lib/.build-id/25/119ecb08b21caf2155918b11d76059d43172f8
+usr/lib/.build-id/25/38c1e68feca53ffd9f77e1c480b180b4d7aa2d
+usr/lib/.build-id/25/5149056f16234a7f50424d9c43468f6ee9f5a7
+usr/lib/.build-id/25/8d3cf5a8bf66fd9c1c0c6015159e36f477d06b
 usr/lib/.build-id/26/0cb85d8f0184984f67e90091068fa247df75ba
-usr/lib/.build-id/26/257146054ea7c4ee8b92d69fc502dad79bb7ee
-usr/lib/.build-id/26/4c759fc6b76f0afb3c8fa80c8c5ce524686615
-usr/lib/.build-id/26/d6dc858909504463e05b13d33dc418c16d45b3
-usr/lib/.build-id/26/eed18900b636c6875436ace7bc16df13fc7124
-usr/lib/.build-id/27/070627d49f778c67d01f7755d9ed126857ac53
+usr/lib/.build-id/26/33c0c2e2cc3da988db402fd6f8d1efc0888a95
 usr/lib/.build-id/27/3416a3af7c2f15fb2bd318d5bf19f12d14f42e
-usr/lib/.build-id/27/912519ff0a0e8ab6f73590aec4d6122c721770
+usr/lib/.build-id/27/6f65c9e5242a45312e2cc1362bd3f02cba8663
+usr/lib/.build-id/27/dc9a781eaadc74fde64246dd29a4685186cfb9
 usr/lib/.build-id/27/e751c348b820531337afa30f4199175ac03aeb
 usr/lib/.build-id/27/f521a21633384da435194852e211d578255c36
 usr/lib/.build-id/28/40547b50293771a1f8408225c37984ea84f0d8
+usr/lib/.build-id/28/cfd18c8dace506007fcf1ec5527da11046d084
 usr/lib/.build-id/29/ea354feb218567ed9c481f389c0a6ba2269be3
+usr/lib/.build-id/2a/38c1fe4ed1011cb9a86c2f8b21600c64959159
 usr/lib/.build-id/2a/70b4c3835e3c7a3576216afcdc4b19790317c9
 usr/lib/.build-id/2a/70dd0b68a6aba00d9a7eca54fa50653fe3a5d9
 usr/lib/.build-id/2a/bbfc484c0f85b5f59e9ba2d42130443ce2888d
 usr/lib/.build-id/2b/39b903c0885e6d5d74a0c4366c46e4ecdc9ca2
-usr/lib/.build-id/2b/3e461d53fa575effe29b68ca76c9f2e6a91e75
-usr/lib/.build-id/2b/a02a24ae10dca0dc4a94bcdd178fcf3d3a7351
+usr/lib/.build-id/2b/3ce68ccf1222b25dbb89f5b84d45bd7551f9fe
 usr/lib/.build-id/2c/1db267f28cb249023af08ca5a27030eddc37f8
 usr/lib/.build-id/2c/21c5ce360b332381d3304764e0815b90c72304
-usr/lib/.build-id/2c/91549d80dcacb2522c45e232ae9c33407c2651
 usr/lib/.build-id/2c/ee087a6df7b68a255c63ced0dd0c0788faab11
+usr/lib/.build-id/2e/00394d8ed1368bd37ddc789ac90bd84830484d
+usr/lib/.build-id/2e/4f9868c014ae968a483157dd40dbcc04cbef86
 usr/lib/.build-id/2e/d14e84c4dea044671f02a06b86080922887182
 usr/lib/.build-id/2f/ac382f935f8a137c698004f7f4352f4c353ce7
-usr/lib/.build-id/2f/ce5fadd63391e49254d279309626dc6cb66fd2
-usr/lib/.build-id/2f/e75b5fcdebb65eef7442c299a160a3f7af61b9
+usr/lib/.build-id/2f/dbed728a9e261b391b6afb22cee96d18552e71
 usr/lib/.build-id/2f/f778a8d7e5ad58f57c5584a1c5bea3c81932e8
 usr/lib/.build-id/30/64e17094cf77a8f6e4570f9896c45c71927b5d
+usr/lib/.build-id/30/87282a3f41b8ee003da6b5ffad5839af70b770
+usr/lib/.build-id/30/e2cf2fef64ad892bf21121244f6bfd374c66c1
+usr/lib/.build-id/31/3da7f06966b673fa41e6578234a4d0f7345ea8
 usr/lib/.build-id/31/414509974439cebe965d21a2e7699372e343f3
 usr/lib/.build-id/31/43e5d37834fa1244ca9022a9ef6f7e9d676ac2
 usr/lib/.build-id/31/8d360ca9ac24b10786257ebb88ab12a69f5446
-usr/lib/.build-id/32/73b28b9d35521e8c17be92fb906f4aa5127aeb
+usr/lib/.build-id/31/e7ffebb669a830cf818326c4ed736c18ce3539
+usr/lib/.build-id/32/29944e4ff1ae6348cf12a7fbf3b87237368e9e
+usr/lib/.build-id/32/36a5b31fbe904162c98a56fbf969b86cacd4a1
+usr/lib/.build-id/32/70f0e330ecc2daa9b9d4aff024ec0647b68c60
 usr/lib/.build-id/32/747a056f4e4efb64bfd3f8672c161bf4c707ea
 usr/lib/.build-id/32/747a056f4e4efb64bfd3f8672c161bf4c707ea.1
 usr/lib/.build-id/32/747a056f4e4efb64bfd3f8672c161bf4c707ea.2
 usr/lib/.build-id/32/747a056f4e4efb64bfd3f8672c161bf4c707ea.3
-usr/lib/.build-id/32/82621b45aabd4a8ed45f30cf280fe6c6224f04
+usr/lib/.build-id/32/a2b8b40d5d4ce831a684615d3ee5ca656b45b3
+usr/lib/.build-id/32/cf645b197ee775a3592ae3d5ef85a4c450a1ec
 usr/lib/.build-id/33/13eeeeb9e9ee4feb96456ff6650dea7cdb4a14
-usr/lib/.build-id/33/437e8eb3cc75418ab6d7ba89568587b247b039
+usr/lib/.build-id/33/2f40799882f6d8152c6c0ef02d031fe45aa5c3
 usr/lib/.build-id/33/5c71bb58d78cbce232328f154e70d3435c9209
 usr/lib/.build-id/33/aa2ae5425cba1d356cffd437bce0eba8543b8e
-usr/lib/.build-id/33/d659d4e6ec4e73afa90c3604c3e44634b8e009
-usr/lib/.build-id/33/d659d4e6ec4e73afa90c3604c3e44634b8e009.1
-usr/lib/.build-id/33/d659d4e6ec4e73afa90c3604c3e44634b8e009.2
-usr/lib/.build-id/33/d659d4e6ec4e73afa90c3604c3e44634b8e009.3
-usr/lib/.build-id/34/1672478e41680d0ade679a281094cbaeedbc29
+usr/lib/.build-id/33/ce0d74de03e0a215065ebddabe62a9b403c80b
 usr/lib/.build-id/34/63af0614b4c9f70870d5b381e55bfa8cb9f883
-usr/lib/.build-id/34/a8765b5d9e83cc523a16ac01a44285ef08420f
-usr/lib/.build-id/34/c1ab726f7ca242d200c2fb622e24f8f827bce3
+usr/lib/.build-id/34/9b642661186c6596a68fea6a970c53f0c4e952
 usr/lib/.build-id/34/d31542b2cdb87c9e0a2adaf5a089fe1bd7a57e
 usr/lib/.build-id/35/1786247a3a18b0472b15f746f43779cc6080f4
 usr/lib/.build-id/35/22a6985bf0aef3b023db9747c04532234e7ff6
-usr/lib/.build-id/35/7ca78aba5d3b0385f413b93c720d9327ef0c50
-usr/lib/.build-id/35/8f97199b1db106125ed7d2176c1146509d6308
+usr/lib/.build-id/35/5340c9573f2bf227487ded615c70231a26e7b4
 usr/lib/.build-id/35/a9124d3b62dddfe11545b164e3c41a1905c796
-usr/lib/.build-id/35/d3bfd0faf09d5b27df462aef3d34a30e59f241
-usr/lib/.build-id/35/f0565307fe133eb9fd6e69acc2c6509435e91e
+usr/lib/.build-id/36/95757d3e24e40185f36cc0343905b1057a89e6
+usr/lib/.build-id/36/a8b6a34131940cabc39d5b800272552f57d273
 usr/lib/.build-id/36/d9870834ecf90dc0c1bd5ddb74531ced8bfa5b
-usr/lib/.build-id/37/26581e253e2639eacabde68b5181485ed14583
-usr/lib/.build-id/37/a7ac1c72f5a8c691d1e00a1dc78482355e4050
+usr/lib/.build-id/37/4e962d9ba3ef78fb1b9485b58c73a1ef40515b
+usr/lib/.build-id/37/891470842a2a99824c65b7b464f47ebed0057b
 usr/lib/.build-id/38/2c142e81cedc9fe38732f7abb678b138999ba4
-usr/lib/.build-id/3a/1c9e05819cecf4fc180d45bf539ee2db4b951b
-usr/lib/.build-id/3a/c49358599fc96f629b69dbfd3a6a4d759821b4
+usr/lib/.build-id/38/4d099bce6d6944ceaf23d255cff0771e198847
+usr/lib/.build-id/38/7dd0a895314c431af54f60cf2b12a3dfffc964
 usr/lib/.build-id/3b/aa2f316a950a0de75a6f0a8e4d6694a80130fa
 usr/lib/.build-id/3b/aea3f0cab85809d71e862c1b2bf02adec065ce
+usr/lib/.build-id/3b/d155e72f0bb584555db424bf993ee256b10267
 usr/lib/.build-id/3c/32b4c8d138f95d97073cf4ecea207d7bc7b100
 usr/lib/.build-id/3c/ab931e7bb6c868059877b8bee99acc8afa3a18
-usr/lib/.build-id/3c/f692aedf8f9a01653c734a70d633713ed6486b
-usr/lib/.build-id/3c/f6b8914200ed8d0ad0ea2ffbe5d09f51116457
-usr/lib/.build-id/3d/170f10b76084a31e6df3492bc54c7445ff6fcc
-usr/lib/.build-id/3d/d42071430bb1c8679cb27ccbe4215f5d449aa4
-usr/lib/.build-id/3e/163bfc95d78e3744afa2ef09fc4aeaaf8e8f1f
+usr/lib/.build-id/3d/4a70d90c0d82d9f88005a96ffb01702ac560b2
+usr/lib/.build-id/3e/30436ff8f17a59c4f47ed0301f80d5501ebc4b
 usr/lib/.build-id/3e/4939d19ef92f67c99a7e439f286624ebbefd9f
+usr/lib/.build-id/3e/9a094ae2273a46c62f6b86546efae5a84a6170
 usr/lib/.build-id/3e/c130c040011eb3666d22f43d3f5b692fa96c28
 usr/lib/.build-id/3f/71f326f67ba7d7bce2d5b7d3b5a6d7364a8aa3
+usr/lib/.build-id/3f/737dcda35d1ec08980963b4e17c4569cad95f5
+usr/lib/.build-id/3f/7d14abc06408404429ac937736b3f462cb740b
 usr/lib/.build-id/3f/bbb7486f2524c1451fea0a2ff68d518c0f8987
-usr/lib/.build-id/3f/ffd5a2d6cb8fbde06d501b515cb05affc0a586
+usr/lib/.build-id/40/8b7239ab9785203b2cb897b07b7ad7b468c808
 usr/lib/.build-id/41/01660be93ed09467d5147a84ac0268395d5c63
 usr/lib/.build-id/41/01660be93ed09467d5147a84ac0268395d5c63.1
 usr/lib/.build-id/41/01660be93ed09467d5147a84ac0268395d5c63.2
 usr/lib/.build-id/41/01660be93ed09467d5147a84ac0268395d5c63.3
 usr/lib/.build-id/41/053a6d2d04742bec7d7d1f999c477dc9df0370
-usr/lib/.build-id/41/206076313d27f1ff7a5d995c81eb851bd4b6de
-usr/lib/.build-id/41/6fcfbe3cc956a8a6332d02b6850d166c1475ca
-usr/lib/.build-id/41/792ac1f7c330ae9dc79a52db4d6a9156cd8211
+usr/lib/.build-id/41/30769428670079c6f2e7035fd5f35ec2d67672
 usr/lib/.build-id/41/8c6d9426eaa2732cbd96c790e2e97956c09e9e
 usr/lib/.build-id/41/da172fcad8c82b69016217a8d860e46268acc7
-usr/lib/.build-id/42/64ffc3a4f3bb3e11a65ff25335469cd9a9f775
+usr/lib/.build-id/42/2d698d5711c14adb162b46090239e80701e28d
 usr/lib/.build-id/42/67681cba1156a6de39de4b02fdc3f44e424b1c
+usr/lib/.build-id/42/b591a025a25942c9bc9d57e0cb64d207ad83e6
+usr/lib/.build-id/43/0863e62424734746ae82349b8d91c0697629c3
 usr/lib/.build-id/43/36f8b9eb39fb053898519839636d54f238df27
-usr/lib/.build-id/43/3fadcbdce00243c9efbb5cb964fc0bdf03165b
-usr/lib/.build-id/43/9c3efb38d35e8dc01968954c16bcae7d8f6247
-usr/lib/.build-id/43/a00cce8e1a767c64805826b2f7fc533f967154
+usr/lib/.build-id/43/775f309990052ca774ff5430e52cf5bd041305
 usr/lib/.build-id/45/a3c2ffa00fafe2019ee5a48be405d71b2e0155
-usr/lib/.build-id/45/d49e67cd4301ce2d7157b81ef06d62a9ef3294
+usr/lib/.build-id/46/111d8ad3028e58c9c72b1b79ce00b0e9b87246
 usr/lib/.build-id/46/24bc9074d03d7eab9f71869b20fc8c61010cab
 usr/lib/.build-id/46/3b3d8bed276197e9d36125d6cbdacd64cb5aa6
 usr/lib/.build-id/46/4ea91297e872636a174f68b0901ee47af7244e
-usr/lib/.build-id/46/b0c3a24d47c61fab0a6b1551912252eb05ec48
+usr/lib/.build-id/46/783416b4880f7201d151236c88b5dd2c86da1d
 usr/lib/.build-id/46/ceb3d85da7c066ac31c693dd57759907a234a9
-usr/lib/.build-id/46/f6233186b1657f5d65d1b09aa4380e51f341c7
+usr/lib/.build-id/47/18bfba9c3b8e2d38f39aa44cc88e418c1845e1
 usr/lib/.build-id/47/1f533b1453332b4d40577b12691e336b11ea16
 usr/lib/.build-id/47/75a09a12603694b1dd620169af525c10d64a60
-usr/lib/.build-id/47/891b82009eb0c7a3631bd92c93a69786c5c1bf
 usr/lib/.build-id/47/916887fa0e52bab4b14ea960b5f10125ded4cf
 usr/lib/.build-id/47/99e99f0b01f3e5482cc5784a3558dd31cf3e2e
 usr/lib/.build-id/48/2bcdf5d4204b723b2c57b582fffdf54c99c379
-usr/lib/.build-id/49/f7207f2c3ec1e391159586559fa39804bef2f5
 usr/lib/.build-id/4a/cce70b64d9caa416c6a48c1c33a78a3830c815
-usr/lib/.build-id/4a/ea3330306daae96fc19c1b790bdd6ff4b2f975
+usr/lib/.build-id/4a/edd1545a39c21e2882df116dad4405fbf14676
+usr/lib/.build-id/4b/ae81da85f05b8d2dbe7ad54181bdb754d0f984
 usr/lib/.build-id/4b/ced9c7c37582597e7343d4e66374c5484a3659
-usr/lib/.build-id/4c/c0ea33d8f15ea77c2c6da63296f60265fa2fb4
+usr/lib/.build-id/4b/d403d604f17c0677e40488f3c9fbf9d607787d
+usr/lib/.build-id/4c/178603ac0184e780ba7b233f9edb41084c858e
 usr/lib/.build-id/4c/e610bafeb88c27e9a11fd0771308e5d49e8cfa
-usr/lib/.build-id/4d/08e518d6e47ca32a0842877a444bb6ccaeb3ac
-usr/lib/.build-id/4e/1b826ae66753b2b61faef9d5d48790cea95b2b
-usr/lib/.build-id/4e/37a569003b4826ffa98049c7da747b6dbf78c9
-usr/lib/.build-id/4f/10b4f8f6eb729f2c195782bede383f3c8a989c
-usr/lib/.build-id/4f/4882c15d05368cb90b5f1be1264d6466de9e54
+usr/lib/.build-id/4c/f49cca2955a1f1a6940e83e8273229e7d88576
+usr/lib/.build-id/4e/4f49c6a09a136eb3491c9856237f16e971a5d2
+usr/lib/.build-id/4f/2f237ded6281276ed3a1488a6aaaac1d5aab5a
 usr/lib/.build-id/4f/6ee0146d39d57eff9b918df38a1f00981b1dd6
 usr/lib/.build-id/4f/b38f408e233e5e001ea1da9edcafc46c5886c4
 usr/lib/.build-id/4f/cfb61a346219c3a01fbd4b260670a79118ac79
-usr/lib/.build-id/50/449e538575dbb4ad8c2752a3a254df078fcea9
 usr/lib/.build-id/50/5d30bd25bf0728f79fbd0d5ce5ce5a3aa15f9a
-usr/lib/.build-id/51/64d1f415b7121178a56a82eee2b8a08f5347d1
+usr/lib/.build-id/51/6eaf32bb73f3e5d9f8dce1575bef1ae8c1b3d0
 usr/lib/.build-id/51/b08c195320b24eb666c9cb0ff02103341ff4de
+usr/lib/.build-id/52/697f5405f8c97d922906f99f25dd9d391e7065
+usr/lib/.build-id/52/82036bfd7791e973b81d0d08b5193fa6b35ce6
+usr/lib/.build-id/52/94f252f3996ea13fa15569330d0eb76e77ad86
 usr/lib/.build-id/52/b8b0973476b650c8e446bdca960227263b81b3
-usr/lib/.build-id/53/84659ff0351e8b595426b3cc312f4de220bd4c
+usr/lib/.build-id/52/d3ffa05d6a4403f9fc351a6fb00dec1171946b
+usr/lib/.build-id/53/2eef15ffb5d6cca142eeebe1a1431c31440b81
 usr/lib/.build-id/53/b2aba40bfdbabbc78e553918ebcaf2b527864f
+usr/lib/.build-id/53/ecb40719ca87fc7f6ef15705d359321b95a67c
 usr/lib/.build-id/53/f2be8d44499f8d481181ade95d9ccd1347a6b0
-usr/lib/.build-id/54/5bc50fea611a578054cd5be5d5778fcb09eeda
 usr/lib/.build-id/54/9bd5673270e62be97c71eb734e974db529a5dd
-usr/lib/.build-id/55/8787a997f972d67c1cd581e7e09cf8fafa33be
-usr/lib/.build-id/55/d42ededfe6189cff636aa6dc4b5a16a534e2e5
+usr/lib/.build-id/54/a33908901201cf8fa5446adafeedba3c129195
 usr/lib/.build-id/56/7325763c1bc34acbdbf6753560230580999154
 usr/lib/.build-id/57/92deae190ad9dd8ce653d975eed7a4a902d8c0
-usr/lib/.build-id/57/9fbffe7f49bc01e174736aaa4f95b50a109bf9
-usr/lib/.build-id/58/11e7f42db82140ea44b73f617c8441fe18b146
+usr/lib/.build-id/58/1e25e4fe190fbbbbe64c3410fa7214075d8ece
 usr/lib/.build-id/58/812bf2faadef019faa6adbecaa65397f468240
-usr/lib/.build-id/59/80e8fb390b92a051588063f2c80ba581e8cd28
 usr/lib/.build-id/59/872f43be9f38166a0f47d96aea016cab048351
+usr/lib/.build-id/59/a175dae175525e58ff35cac8606c41701e0190
+usr/lib/.build-id/59/e448b9becea98b4adaf3aa8db8f2615953c3aa
 usr/lib/.build-id/5a/07e13ce76c4a58b6e36833b2c1a8e38a1793ce
 usr/lib/.build-id/5a/1c585343dc90c604aa019918367da132fc6f8d
 usr/lib/.build-id/5a/3e89565e8d6715b7311c377d140e1059b755e8
 usr/lib/.build-id/5a/5dd17e4bd2e52471f3de5a8c2f44462bb4b987
+usr/lib/.build-id/5a/792b980c50ab1e4ea62e31d6fac6028fbf17f6
+usr/lib/.build-id/5a/7aa7835c5d1e93b3d4dc5e06dd30e769e45427
+usr/lib/.build-id/5b/4c355874c3a34d50a7330dabd0c643470761ba
+usr/lib/.build-id/5b/8cba0a0a3f5b539fe58766083c839f1489c353
 usr/lib/.build-id/5c/bae2b689656dd0b63e1dd6000bedfc1002a64d
-usr/lib/.build-id/5d/1019186b6d5fa5ddda4e5b9887e577f0206899
-usr/lib/.build-id/5d/4de53c0c6614af30df7afce9cf2298922339f1
 usr/lib/.build-id/5d/b91b2a54c56348eb3c53016003fd4eb0e9dd4b
-usr/lib/.build-id/5e/1be58dddfb512d5c69441f28bc5d60514813ad
-usr/lib/.build-id/5e/bbe0b0eb68d172ae392b2487b351bb9c2a7d2c
-usr/lib/.build-id/5e/fe9a9b9e5e0408ce2ed2696a73a238ab266999
-usr/lib/.build-id/5f/19f8e7a9f10b4266848485c7aeca272054ffcb
+usr/lib/.build-id/5e/a669641835fe0b3a7658d3c207d1ef19373d57
 usr/lib/.build-id/5f/70e609764522a774c19ca08facadba1108b242
-usr/lib/.build-id/60/0c1e7768dd024af805ec7957ecf044cf423b35
+usr/lib/.build-id/60/a6a669a3641ed094e4c1d615145668a9709ee8
+usr/lib/.build-id/60/fc3cba5b188e56db9ae184d7b391c5dbe6a6b3
+usr/lib/.build-id/61/52da2e3aaf9f6ee1c0086d98c80bcb36003633
 usr/lib/.build-id/61/555cc285f6fa044d229d9010d64f35ab09262a
-usr/lib/.build-id/61/e8358d2df690b5b5fad3b55132dd70ce9a2210
-usr/lib/.build-id/62/81904655898cd9ea18dc00d3820a7b35733f48
+usr/lib/.build-id/61/bf0deb1bacddde16a62637037b3598d9f909e2
+usr/lib/.build-id/62/10bd9a59dec23f6969c8c3c05f2886b4a5ec6d
+usr/lib/.build-id/62/53a1b0054ef3f06ac0a9f0983f52fa79722629
+usr/lib/.build-id/62/66870544ab714af415f40920038bd2850f9c90
 usr/lib/.build-id/62/90bed5ee48b8e82dfce4680b636f96a1d4e2b7
 usr/lib/.build-id/62/a225b8996813e373efbc664e7ba98745f9e249
-usr/lib/.build-id/63/2d44d7f2eb1779012e3ffa62760e68f557255b
+usr/lib/.build-id/63/391d964b60f5f53b62594f793f3b3ca5ebd0bf
 usr/lib/.build-id/63/4230e98b4a30e471708f77b072ef3adb19c04e
 usr/lib/.build-id/63/48faa7d1b1b21beeaaa05cf62d2bbee6b3a1a7
+usr/lib/.build-id/63/65779383e3c28c56c410ee293bd7bf6206a73f
 usr/lib/.build-id/64/adcfaf67952bd02642c3f3684b3dbb44ed013e
 usr/lib/.build-id/65/0acf559cdf61bb308a900f38dc21cd8163ec51
 usr/lib/.build-id/65/124f7ea804a19f88b7abd135eb2c93f6006ec3
 usr/lib/.build-id/65/608143ad38c3f236e2266222c70a4800afc655
-usr/lib/.build-id/65/73d1886025155886992c2f734780bde0b5a004
-usr/lib/.build-id/66/20a0e0ccad20e81566c938cfc73b91a87787f1
-usr/lib/.build-id/66/380409f61b158fd9b3c78801410225ed9b231a
+usr/lib/.build-id/65/ca3a887a1060062108aa70583fb6809a97e522
 usr/lib/.build-id/66/873ec9dc07d97c1a99785e653c1e719832bfc5
 usr/lib/.build-id/66/9b36adaa916a8e6fed83e511db4404096004c0
 usr/lib/.build-id/67/0b4b4e4b774e898f90f953c8f2facef616a293
-usr/lib/.build-id/67/778bcbf6e5b09d5f02f8ba4151cc9b4118f9f9
 usr/lib/.build-id/67/879008fb6bd24f08f920f538efadd7603ec5b3
-usr/lib/.build-id/69/24d0f3c6c60896706ceae8c4be6aa1a4c56415
-usr/lib/.build-id/69/61c5edf8e4d4a71f5b7cef2bdbd736f7ec8eb3
-usr/lib/.build-id/69/869c2f11d2e5e47f29fa1388cf30c563bb034b
+usr/lib/.build-id/67/8a2e246ea5c76ef90a728d4738e2e23efee06e
+usr/lib/.build-id/67/ed6e502db24c8c6beda334303ab9387f631603
+usr/lib/.build-id/68/807ccc643c3c1f5aa55ebf6549c9b08f408fb8
 usr/lib/.build-id/69/e6517be863c8d34715771bbe79548c65317756
 usr/lib/.build-id/6a/466e07c5d3a3afeaabb2344e60f9c21a2c1a67
 usr/lib/.build-id/6b/3d4878cb8e2b0948e7f73272f603a892b353a1
-usr/lib/.build-id/6c/1789460337ce124e80e9183ccfc7cb60a7b886
-usr/lib/.build-id/6c/7e4a125e8581cdabf636756db841b77dd4ad68
+usr/lib/.build-id/6c/1d29ac89b49488a51a73bcc297af10a748eb3e
+usr/lib/.build-id/6c/d7b02f9387d41dbd75ad5d5026be7395db391f
 usr/lib/.build-id/6d/07a1add50b565eaa5e9f9ece1c2a490ae795b8
 usr/lib/.build-id/6d/2e76c3173a8695877caf2e6b0c04d89d384df6
-usr/lib/.build-id/6d/e09af04bb0e946078856c11a1656f434dce715
-usr/lib/.build-id/6e/1f8597171ee5cb44098c1971c4ca6d1c1bb010
 usr/lib/.build-id/6e/978abbbfff7458fa2bf2251f5bb8bbef6f7530
-usr/lib/.build-id/70/06273db5a8170ddc0d5323664ced4468cdcfec
-usr/lib/.build-id/70/161f238bc87036b59abe377159aabe9106b812
+usr/lib/.build-id/6f/2e1b4d8ef75fd769acff19b2d6ed5d771b044d
+usr/lib/.build-id/6f/443b23b1c3278c48be97e20b7c4ba937233806
+usr/lib/.build-id/6f/7e8e9fce4f337723e11c2b261369948fc85f05
+usr/lib/.build-id/70/246358827e77d4751b1a2aa4cbcc9d6ba5db39
 usr/lib/.build-id/71/1ee170506e3987b4b29d8a5f0bb072589c3624
-usr/lib/.build-id/71/dc50b94c447a2f1c9da9d1060b1f61945c8389
-usr/lib/.build-id/72/e38214b216218709ce778896ef3b793a5e08c3
-usr/lib/.build-id/73/589673a2fa07cb1a88385aa994ff84f20eaba5
-usr/lib/.build-id/73/fd97b7fdedbc7b28b6421a8503d9656559c3f7
-usr/lib/.build-id/74/6558edcc6496178c5a7195c4d56b17aa22d68f
+usr/lib/.build-id/71/b42758b562f3e962f7c1d1607460fdbbb1117f
+usr/lib/.build-id/72/c9393c41bb01868be3dfe9147bfcf9ae2eeb94
+usr/lib/.build-id/73/de08d957bb1ec53c9e18ce7f2505ec4c87c6bc
+usr/lib/.build-id/74/5c72cb342ba47249b3b34c213b774bc7bb1f4d
 usr/lib/.build-id/74/9cdddd0a80a8dac20ea44918aa7363d13118da
+usr/lib/.build-id/75/6107fc92abcc7b100fd0fe34ae09332d72b456
 usr/lib/.build-id/75/857064fd182628f8e6ddd98cb01f112c5329d3
-usr/lib/.build-id/75/9cc0cbde9aed32f0a1a4db76eff7187cd45002
 usr/lib/.build-id/75/cf85bcf85e11ffe1d570ae23d6cabe75ddd31c
 usr/lib/.build-id/76/06497195592772b76632c35487fd90d273ca4c
 usr/lib/.build-id/76/28f3889ba60f9d297631806d4e8c72947af1ad
-usr/lib/.build-id/76/2f1a29a50bd5f34cf5d1229bd746c64f5d22c3
-usr/lib/.build-id/77/1a3a9f10d4e8f69984b70f9fd375feb63840c0
-usr/lib/.build-id/77/7cd841eabe47d5d8ff2556fae2505e98b87e4e
+usr/lib/.build-id/77/187b857e50f6c380630d9c97fcc7a38298682d
+usr/lib/.build-id/77/37b3fec619e82428e185bd8bdfe70d2cd93f29
 usr/lib/.build-id/77/b00f081dcd548ae4aebdac3f0237994ceb7023
 usr/lib/.build-id/78/4e133f4efb8993bc56ddf3bd894a5ccc810c7e
-usr/lib/.build-id/78/64a9ce37b07c9662c11a7e5a74fee0a0f7c568
 usr/lib/.build-id/78/796927e4ff0033cdd0c66c19a7ec4cdf2171b7
+usr/lib/.build-id/78/9f2485aa5ce4421b91e795893008bcb79b60d7
 usr/lib/.build-id/78/ca9a7996903f1f3ae5bee470abcb36b776fd2b
 usr/lib/.build-id/79/2a68e4ce0c9673f8942ca7a8f4192a366a0db9
 usr/lib/.build-id/79/733712bf173a0c1d40ec8df7da13c0cdab5557
-usr/lib/.build-id/79/a05b1756f07fd7dd36c0262a74febc49546a00
 usr/lib/.build-id/7a/019a7b0cb962dee98f28eaee55d9c420c2fdeb
+usr/lib/.build-id/7a/7baeb477bb525f5107eb5dfd173c192cb6d2c5
+usr/lib/.build-id/7a/a14436fc98358781d5d52f18a9ae9ff0114c56
 usr/lib/.build-id/7a/f2cb3b7ddc1c6c6f96bfeda8dc6d5cee8f6456
 usr/lib/.build-id/7b/d444e7f789c250625dc8f8b312ae37978b2a27
+usr/lib/.build-id/7c/09477b5e1fd07287bb2eb0c7d938e65a6bd369
+usr/lib/.build-id/7c/c2ba49c384b5229da722bbe2f288025c80a481
+usr/lib/.build-id/7c/e83f1301a3ce00efdc056603a4c3fe96d143a9
 usr/lib/.build-id/7c/eb73fa8e07afa864b3ce8567513add1f81d4a6
+usr/lib/.build-id/7e/3ad0c3fb2fc72459b8c6f42325be06ec08c4b8
 usr/lib/.build-id/7e/a7069c85b6a9eccc8f7ce303dcc17f05173260
-usr/lib/.build-id/7e/c055ac20fd9ccd09f4ed54da6de783a023197e
 usr/lib/.build-id/7e/fece4b45ff135c7d590c8ea05271c504ecfc65
-usr/lib/.build-id/7f/2540d36b49ac55915cbf53a78c90a9f26dc82f
-usr/lib/.build-id/7f/266354482110d781b78062973d7fc69d7d7660
-usr/lib/.build-id/7f/577138c0ee8e9b874445800cb37155c0e3f35b
+usr/lib/.build-id/7f/394e0909f13d6c85233ae2a84e50f4c38c06b8
 usr/lib/.build-id/7f/70b1b20e3837ec7b8e631cd801de87a0791e1d
 usr/lib/.build-id/7f/7ce9ae761776d514cc180db994b24e0be08bb1
 usr/lib/.build-id/7f/8079fccfe143fa6866ba5fcd76866be5f091dc
-usr/lib/.build-id/7f/b61c697ffaf91f1d74f5dfccaac305648fac01
 usr/lib/.build-id/7f/b9ceb02b93358fa227e543053af25e05a97d9e
-usr/lib/.build-id/7f/bdc759d9266f9ed846e177ccd1159e6dc19a8d
 usr/lib/.build-id/80/3f3e904445cc5beb0bcb76e029d65a4da6b8b9
 usr/lib/.build-id/80/40e9c3d52f5ee7e16f1544d3ea4f64f90b1a52
-usr/lib/.build-id/81/1b997099b677d664c3af28cb54fe082b62ff93
-usr/lib/.build-id/81/518054a030e14f4e900e7095d394fd3259329f
-usr/lib/.build-id/81/a721e52ebd3c714db4084d2a619a1c86d7df80
+usr/lib/.build-id/80/a4bfef0360bc88b8ac6488e56e960d92cdbb29
+usr/lib/.build-id/81/1bfde267ec6d48fcf954c6452a15b9df826df8
 usr/lib/.build-id/81/b52e020409c7e46958ed2357b668d8800f974c
-usr/lib/.build-id/82/22df69a5b71d1c9e893e74ce3d3b552def29d8
+usr/lib/.build-id/82/01ee44eee4a480f610e2b48f1245a427a34ab7
 usr/lib/.build-id/83/cc91e6148b03ab988aba7a95968df5d26e61fb
-usr/lib/.build-id/83/fe0bce5d8d45fcf772f81fdc7bac0c355be09f
+usr/lib/.build-id/83/dc683b7f1d53b6519b02fb0d9bcb8da482ca8a
 usr/lib/.build-id/84/00863d0e3867147e7ebc76ab1399a19fe5c3ce
-usr/lib/.build-id/84/11c56d6634328b32aab1c8ed432b8d97cc8a8d
+usr/lib/.build-id/85/3aa448381048f4ebb6a2610d58e3a5e828f662
 usr/lib/.build-id/85/719f365dd81205a5e43cfa153c53959537e0e1
 usr/lib/.build-id/85/929f5e2e360b436f603904fbbcaef23d419ee3
-usr/lib/.build-id/86/3ca9ccbf25b91bbec2acdce10ef9ec8f410391
-usr/lib/.build-id/87/475034033c63974da48822f9e3e1812499b42d
-usr/lib/.build-id/87/6b5feefd21004f5d8dec6d8f9a6ab2d32b4ac3
-usr/lib/.build-id/87/bbe033a21bb861eebfd2c83005500bddaa08a6
+usr/lib/.build-id/87/b0fe613fb9ee13d402bebafe5095155027707c
 usr/lib/.build-id/87/c01a6aefa09aa72889f724e3f455fb5bc5a3fe
 usr/lib/.build-id/87/d393e8c011e20d504dd3083be6ed63afb18cd2
 usr/lib/.build-id/88/1ce654b2fb61d63b3a9faa4de789095b735f0a
-usr/lib/.build-id/88/fae2b6186ecc1b31e200026abc3602ff230a05
-usr/lib/.build-id/89/2940260a1e9ba48b0e5de47fb6ff2667804574
+usr/lib/.build-id/88/1edb5e32dc1b86357da17b5664da0f9ba9b7ff
+usr/lib/.build-id/88/a19dd79b79e0e66479d45aaf079163e9affae4
+usr/lib/.build-id/89/500a8ce6e528ed406bc97a0183df1bf7842c86
+usr/lib/.build-id/8a/1b0122ab6c9f949dd6e4018f281dffd8ae0eb7
 usr/lib/.build-id/8a/2b357bfd269c7f585f7c3d1b92a9760dbb5e32
+usr/lib/.build-id/8a/3c9d6d702ccdfbd367e160b9e9098deff47262
 usr/lib/.build-id/8a/42798b1e7e3bcfee668a4ff274a3d5745bce3d
 usr/lib/.build-id/8a/8af90f268f7f29a142078468855948633d8a67
-usr/lib/.build-id/8a/9a21a6c8e7fbdc8cb06c58dce1b4ebd6cf53b6
 usr/lib/.build-id/8a/9ad4d659f37c867796164be5ebe460c19b6b08
+usr/lib/.build-id/8a/bc02b35aa54c9e348afc0a58a034a32cf88f79
 usr/lib/.build-id/8a/cbc27ec15f2797322a6097d4659319ee781438
 usr/lib/.build-id/8b/01ae6fbb2f653a016c1f86d5fba874dd53e97c
 usr/lib/.build-id/8b/05243fff1b1ed9bf4a99e04d091572fb205a4c
-usr/lib/.build-id/8b/67704150c0ced1fc6c495e0b179cf336b6fc9c
-usr/lib/.build-id/8b/b2fa5c6a58a5b76f7bf15585096e878d7fd816
+usr/lib/.build-id/8b/9fd4e9dde71d3b2d3a1f504e46801669c5eaa7
 usr/lib/.build-id/8b/c73745a27220272ea09b8de846630d5361cd26
 usr/lib/.build-id/8b/cd598a33e05e44abda90d775828622c1304c38
 usr/lib/.build-id/8c/6a2860073f2c1732777b642e1024995615b6ea
+usr/lib/.build-id/8c/6c2f3935eb9aa28185dc46e2c522499e66b582
+usr/lib/.build-id/8c/8a3c208c0e4ff503335d587e8d580a52c45425
 usr/lib/.build-id/8c/968e5227668ad4224a93a8372f4be0f84e887e
+usr/lib/.build-id/8d/13860e1d19880e9d54eca53aa0d397d1f5dc6f
+usr/lib/.build-id/8e/16f5dc41f51d4d3e09d04f81fdd8926c33cc88
 usr/lib/.build-id/8e/a0dae7c0f0bfd15847b81407179acbe98a07f0
 usr/lib/.build-id/8e/deabd074677dfea936b9fb288037b2bdf5cf4a
-usr/lib/.build-id/8e/fdb891a5b9809fa40251745fb4ca474ed826cf
-usr/lib/.build-id/8f/06e7dad5d655053825af058a3685c0c28e3187
 usr/lib/.build-id/8f/197c2693a3ca1913042933308daf475e689231
 usr/lib/.build-id/8f/83ffbfc86fea6b596ed7e4c167547e4abf99ed
-usr/lib/.build-id/90/016b4a4b78599c97b84a2b88ed22fb43257df6
-usr/lib/.build-id/90/1f12a5a44eb8e904831c15fd6e625307d149bb
 usr/lib/.build-id/90/46dd34d98a05cf6fdbb12a37e665dbff86a6ee
-usr/lib/.build-id/90/ece7614f4535b17b2f7242946d19ac9b854612
+usr/lib/.build-id/90/7c2e782c5e4f55a8b26cfb74be03c83f47f2e5
+usr/lib/.build-id/91/cab8b12acad5525d7c38b7e4cf2851173079a6
+usr/lib/.build-id/91/d0fe09a703938e1e05af9b9fdce2ea81981a6f
 usr/lib/.build-id/92/3846e434b797490185827a948446a1e4298a6e
 usr/lib/.build-id/92/3ddd3c9d8e4655b0372430448104bff3be5236
 usr/lib/.build-id/92/4aff50a5b2b78090c88022dcbaafa7688ae0f0
 usr/lib/.build-id/92/568e45aa3a0863b4f0061ce9b6df1a30eba532
-usr/lib/.build-id/92/5cf66bd208bbaad890a61422fe4b30f8a457a4
-usr/lib/.build-id/92/bd7ece69fb35b79ceedf56b33599d2407e5b2a
 usr/lib/.build-id/93/17230f60df2ec1216b95b9b24392c12cfa3fe4
-usr/lib/.build-id/93/3738565aa017f78d0563db7fc0f5e844da4173
-usr/lib/.build-id/93/60f1d2fe47a0eaa58359b60f211e82e95aead3
+usr/lib/.build-id/93/22658928f6036bda7b69ac0756c942cbd8d520
+usr/lib/.build-id/93/490f4e659e7c20938efa1f5c1f25739bf1e1a0
+usr/lib/.build-id/93/b8f83fa3fcfc1be716d8cc0816f818ccd5f7ec
 usr/lib/.build-id/94/04a135442b47586b2dbe6ce08f726e098fccc7
-usr/lib/.build-id/94/e250d0c66ecb6064a1cfacbf80789ed70bd88b
-usr/lib/.build-id/95/43ca8b06cfb0cc99064b0ad1fdeb4860f06e6f
+usr/lib/.build-id/94/3ff7ccd59b3094c2acbc4e669c26dd2535438c
+usr/lib/.build-id/95/e917a404c0f9e7c76ad613f8f75f13ad62c939
 usr/lib/.build-id/96/39fee3f5dade41b816660fb49552246e723bc3
-usr/lib/.build-id/96/420eb2e5a5b0545523216d3b96fd5cdb4aed30
-usr/lib/.build-id/97/0f2b7378ee0058c52fa91ac12a1ddd11b1bb99
-usr/lib/.build-id/97/6780ac6d7f5d946270aede309b159d680eca68
+usr/lib/.build-id/97/9b2f00c5dc97a2f8ccbf7b734eb7fb93ddb860
 usr/lib/.build-id/98/13c3053264cae2e3cf57e3bed3ebace4768563
+usr/lib/.build-id/98/2c5e96a5def3d0c9865bb58d635be56faf6daa
 usr/lib/.build-id/98/4830b9ecdae9e4811a1a576f0ea751ccf86bc9
+usr/lib/.build-id/98/78b44025aecc118c75e06224ed965b5682a5e0
+usr/lib/.build-id/98/8333dda6bf1fa1faa6d3ea0b58ffbbfdb4e49a
+usr/lib/.build-id/98/baaa56c4f0c168f8d0c95790c4306ba048d11d
 usr/lib/.build-id/99/136b0135aea13eaa2686e2d0f15f67023d5729
-usr/lib/.build-id/99/14b8bc0fa19f0c25e05b45d806b267ab176ca3
+usr/lib/.build-id/99/30610324bceeac249bcfeb91bc0449065ff46b
 usr/lib/.build-id/99/5e010799c564cc76b579477e47ef6a9df77b72
 usr/lib/.build-id/99/badfe9e60045e168e8a5f55b6fb5a2f0f36a1f
 usr/lib/.build-id/99/e8169b7ba36dd6a7431ac1099f1d7d4536bcd5
-usr/lib/.build-id/9a/af1e586b70fda6fa22b6218535f1c3a77f364f
+usr/lib/.build-id/9b/2f872ed5287579bbf4cd78a330204b548aa09a
 usr/lib/.build-id/9b/9e1b838b35c90ea863a317fe996a09a1997c89
-usr/lib/.build-id/9b/b81d30beff70830f4fa96e2a3968ceee998340
 usr/lib/.build-id/9b/f2ae80033953784c803dad2bbfe3a44f788e31
-usr/lib/.build-id/9c/7f3ba4026b062e90170602958d56a5a5be4449
-usr/lib/.build-id/9c/f59405cbc32cff945a3e125d36d648aae59a2d
-usr/lib/.build-id/9d/69313097a7bc3b2eec560e0da507c3ae701154
+usr/lib/.build-id/9c/bd95463c2c199d3f179dd18be100033601fd15
+usr/lib/.build-id/9d/70980161eb99604d73a0da3f2bf57522bf8ed4
+usr/lib/.build-id/9d/ae080c054590aa8cf6c64331432bfddb18950c
+usr/lib/.build-id/9d/ce776fc5e9be48efce88cc94d026cb28c02864
+usr/lib/.build-id/9d/d74ec8f9396d8fd0f31eacb45dfb8c8b628666
 usr/lib/.build-id/9e/34dca6d0680e869d9e3999d079a65f08a5161a
 usr/lib/.build-id/9f/092c70ddd3cb3657b7600616d986774cc6e869
 usr/lib/.build-id/9f/156ddcc0985fb9015cdde479be8d51bb3bd6fa
-usr/lib/.build-id/9f/9573767d8c89f5025cc874c0b52bf4ebc4c27e
+usr/lib/.build-id/9f/7630d26fce0309f783dc4727bd0dbca5ca2b3d
+usr/lib/.build-id/9f/94113bff0ea36f23acb37f44ccabc388e20e20
+usr/lib/.build-id/9f/946c792da6e3d2ec9e944b82a4133973b81eb0
+usr/lib/.build-id/9f/b5d59c44bf7deb03003f238c4c59683c145f78
 usr/lib/.build-id/9f/bc285cbdf87ec1bdad67d16ada5342419ff88d
-usr/lib/.build-id/a0/acbecbf0d66f53ff2759247a02adcdb1d629a0
-usr/lib/.build-id/a0/fd4f1d13b74e82b2e49a8e4b7155c9dbf78cf3
+usr/lib/.build-id/a0/466b2bcf78108d4d951e0cda01f36642ed4f01
+usr/lib/.build-id/a0/ddfc50b76f0bc651c12a6862f0b0dcfac3bf00
+usr/lib/.build-id/a0/e52c5f32c0e7cc28fb85569a0608c695be0183
 usr/lib/.build-id/a1/1939a9ce91a10f646eeac1c97f445ff99593ef
 usr/lib/.build-id/a1/4c03278c9f3444954c77012ce45e55d4e59edf
-usr/lib/.build-id/a1/8f59e525aceaa7293956a8f647d6882e944b89
-usr/lib/.build-id/a1/e64eacf1b271e8aec14eee5d507bb647bda3fd
+usr/lib/.build-id/a1/a3dea3b2d92a088f73330bc861527ea0a61d57
 usr/lib/.build-id/a2/a91cf5b3f87d73b510d639bdc02be12ec9c62c
 usr/lib/.build-id/a2/aca59cab9932947e82dfbe3aff9d70f3e19ef6
+usr/lib/.build-id/a3/3da990bb3833aae1b11317f2024c6c0be8a646
 usr/lib/.build-id/a3/52c54b8a26e2eab606ce013f0be43f48f79899
 usr/lib/.build-id/a3/67a7f7e3465986299f99964a5f20e4b7c7030c
 usr/lib/.build-id/a3/c8baabb0ec84a78b1318c7b199e29c6e2a563a
+usr/lib/.build-id/a4/254a26afe6f6b9692bddce5b11557bdb00e495
+usr/lib/.build-id/a4/71b5ed97e5b4d9f09a07efc964d8b166990e9e
 usr/lib/.build-id/a4/9f5c27a2dcc585826275c240f35f186447b216
-usr/lib/.build-id/a5/491273fc11b111e0aeb2b1b74f88b2394ec0df
 usr/lib/.build-id/a5/4b396fc6b4cf4aef40b333bf834b044a91ef34
+usr/lib/.build-id/a5/6161e022dac5155bf5bb358aec578f793ef641
 usr/lib/.build-id/a5/64dbe0e5d342241321849e2a71431c45cae215
 usr/lib/.build-id/a5/d95e1db2df52d29aab66f48a9da682010bf5d6
-usr/lib/.build-id/a6/88861a6150776abb29cdb0d79a85b90d235052
-usr/lib/.build-id/a6/ad4e51bac644da9fd04ca62d2dc2755da73e8a
 usr/lib/.build-id/a7/75f1e5adf16bb15e97d71df001f5ba23123081
 usr/lib/.build-id/a7/87ab9bc430d8e3e284a352307b8906fa1d5e50
-usr/lib/.build-id/a7/b5c25a63bf89fa22125909d473260b64dde759
+usr/lib/.build-id/a7/90c66d4575fd7e286bab9415b0c7293374ae1c
+usr/lib/.build-id/a8/1c662f20b941f05da4c346553d722061ecbd4a
+usr/lib/.build-id/a8/4a70aede94b365683184141161b0d907619555
+usr/lib/.build-id/a8/b54e8149ca03dbc8cbabfbaa627674f2f89ba6
+usr/lib/.build-id/a9/2181ece19fb80c188fb1e9e7efcaf7e21317f3
+usr/lib/.build-id/a9/26a0a4c4e968e565c6d91f91067eea59c8b42a
 usr/lib/.build-id/ab/171f860154f5d2f1099e8ecd9df6fc96111c56
-usr/lib/.build-id/ab/3a2abdaefc4be2a9082f395e494dae99b907aa
-usr/lib/.build-id/ab/a6dc6d90afdb9a223cfd3376624b73d47407fb
-usr/lib/.build-id/ab/ae90901e7ab6f98f654ba4c6f2e37e26ddbd35
+usr/lib/.build-id/ab/4d525c85e05293a15a79ec60a808822541c401
 usr/lib/.build-id/ac/5abbb4e34c23ced45fbb704b32f4b153645422
-usr/lib/.build-id/ad/1b141d59c5156b56eeab590a07c4a3480ef263
-usr/lib/.build-id/ad/b7337c9d449c78ec6e5d2f3dcff96af2c93dda
-usr/lib/.build-id/ad/c721578a2001de3e69b7eb2e441ddbe0c2167a
-usr/lib/.build-id/ae/3d9b94381c6079c9748ff7c4f7195b2bceb965
-usr/lib/.build-id/b0/548ff3f3280e8f7c4df2b742b7cf9fa22d3e5a
+usr/lib/.build-id/ac/c3a3720299bd993c0255466ee3a481d41d6ca4
+usr/lib/.build-id/ad/2fcd710b272844c9028ca12e9a0c4347479818
+usr/lib/.build-id/ad/41207e46f3baf02a08e70acac0c086a8be5c66
 usr/lib/.build-id/b0/6a67c9bedfcd7ef64937748d21d402c31e18d3
 usr/lib/.build-id/b0/78022e227686601d031b9a846409cedc1ed34d
-usr/lib/.build-id/b0/877a6c270cc9004bc765ec1fe60e64788ff055
 usr/lib/.build-id/b0/b12c47ed01e445f0e4f534edf738a76f25df1e
 usr/lib/.build-id/b1/45f503b2fce621bb5f6df874d18d71244c1cf6
 usr/lib/.build-id/b2/05198e94889dcb93415bb03b2ad3a695856934
 usr/lib/.build-id/b2/86935b39c09b86a4d7a3b3aaa6303d4a5180bf
+usr/lib/.build-id/b2/9343b9b140e4bf1581761e4e179553f373b8e4
 usr/lib/.build-id/b2/f2ec797ed1487053070b0aebeeee414ba2330d
+usr/lib/.build-id/b3/25ccf2ea9388383fb7d8146b53c1ea0c4d2509
 usr/lib/.build-id/b3/52fe2e657c492d5024f0a08d8d9532cd660412
-usr/lib/.build-id/b4/e6eeba77db2fd5c9c401158a5266136e11f9be
+usr/lib/.build-id/b3/624afd6380e4b8e2496246434f2d84001a11b6
+usr/lib/.build-id/b3/de6078f171e70fcb011f57ba3c2d99a9518a96
+usr/lib/.build-id/b4/85ffbaa9747a9442d4eedf2643e6f949c6a22c
+usr/lib/.build-id/b5/be8c6475fc7b63ac959d7fd71b020b0ec8fcb3
 usr/lib/.build-id/b6/2ea3532d14825713d1bbdcf9c9c93d06c6ff12
 usr/lib/.build-id/b6/97d44edc30bb0134e19c3f0a194c193f3eff38
 usr/lib/.build-id/b6/ca302bdcba646afa138ee64b47cf655c29ac01
-usr/lib/.build-id/b6/cde613e4eaf431df5cd0fdcb0b0ade2086d880
+usr/lib/.build-id/b7/27435848e12e40147d01c046ff204b6d18579d
 usr/lib/.build-id/b7/ba2187c015c879a572f12e1289a7096c92e2a5
-usr/lib/.build-id/b7/df0d1ff58f1e81d0ec960151ad0622fb92ea0b
-usr/lib/.build-id/b8/06e1ba9a695319a1a63d89db2b8e2defa7dfd3
-usr/lib/.build-id/b8/9a1799701fe21a3f1ef0a261e1fd4eb43d7a6e
+usr/lib/.build-id/b8/375c53370816f0bd342c7ae7e80e6b5250a8de
+usr/lib/.build-id/b8/b1d0b957d23bee9e21d52e7c35eb9b6678442a
 usr/lib/.build-id/b8/c1fb97caca36225cf3d0bf9c55ee39f5c1678e
 usr/lib/.build-id/b9/3e1f585386ae3f8d55c49dea92f6bd85623d1f
 usr/lib/.build-id/b9/9f3960d9cc205a397f3045eb2eaf95a34fd835
-usr/lib/.build-id/b9/c4b74dcb0eb4ee7714864c571428b064dd000c
 usr/lib/.build-id/ba/0e1989fd2b1a9fc3f53d0240e980eca608c631
 usr/lib/.build-id/ba/7b6d4e5bc9babf41ecdf569e64201611ea9dc6
 usr/lib/.build-id/ba/a22819032d92f1f63ad06946cf62bbb9fd2acc
-usr/lib/.build-id/bb/0a21ef06b9cec04ae4b16ef7b30a8885e09f50
+usr/lib/.build-id/ba/e234c38681b052fdddc6d67b984a048d08d2e7
 usr/lib/.build-id/bb/0b5764b80a235d29a0dcb5fd0429d7caf24064
+usr/lib/.build-id/bb/108fa2f563b8408d3bc51cc50925e058a1ac7d
 usr/lib/.build-id/bb/4ead92c09db3731bcc812f22099f345d553bb1
-usr/lib/.build-id/bb/ac8b9ffab311464da0061f720d6f99aee20c2e
 usr/lib/.build-id/bb/be0e5dee082762e77bbae9133599fd82d1798d
+usr/lib/.build-id/bc/1f0bbdd70686b64fefc72c63115eb87feded07
 usr/lib/.build-id/bc/36d47aa4f027a1b767c0c2c6ee0ff5eb3ab3c2
-usr/lib/.build-id/bc/474316e829a835ad5bb5e218ab48fa8f700d68
 usr/lib/.build-id/bc/70bc5a44c0c84da5a32f5617d4052079ca0632
 usr/lib/.build-id/bc/9788e1a74f3b943bcb4e56f29cd27081f45c9c
-usr/lib/.build-id/bc/ade98a9ef3537c10c2c8dc929afa68480b3cd4
-usr/lib/.build-id/bc/dfe3590639a23e3655ce69e2e81b8717016906
 usr/lib/.build-id/bc/ef23bb1b2db2f32674eede07f5f598600cf7b2
-usr/lib/.build-id/bd/0a11358edfae6385f4dd30e011276601bc9a08
 usr/lib/.build-id/bd/3a64916c76cf377d71563f0cc08dd3642c2b0f
-usr/lib/.build-id/bd/47798d8216ed51cf87f1ca47137d3760964b18
 usr/lib/.build-id/bd/dc065a42841a1c70b262de6d022d677089770b
-usr/lib/.build-id/be/7f9bdc6a6fc53795eef90f88b5ca4215fb887e
-usr/lib/.build-id/be/aa974161d9ec00a5a472d70d7f265893f37ce4
 usr/lib/.build-id/be/ab4f34ca1333bb518a7acc1203b899d486afbd
 usr/lib/.build-id/be/dfc9d91b1d74995c8e19478125379bd2cadc76
-usr/lib/.build-id/be/feef3e2e517dafa0e6909c411203ea77a48b3e
-usr/lib/.build-id/bf/325691b0f1426ac787136c5146d4cd91638ad1
+usr/lib/.build-id/bf/f047ac7fb9df6bd69506752b8eb5bac43b4365
 usr/lib/.build-id/bf/f62a550e07d6be016aac2ea0b6f4414e8968e6
 usr/lib/.build-id/c0/1e07b8d0ffb5e59afb553c3c8c698a9ff2603b
+usr/lib/.build-id/c0/7d1d6b2d382819bd50b158bb019b52affde66a
 usr/lib/.build-id/c0/dcbe6b1d12a467424afbba802e86532002f6a5
 usr/lib/.build-id/c1/42d0d13b1a1b868752de2fbbc130ac6a045816
 usr/lib/.build-id/c1/6aa0e9b8df8f7866907dce37d3c414606b573f
 usr/lib/.build-id/c1/7db0b2a175402e80a8c5bb9718f9461499a612
+usr/lib/.build-id/c1/9b8164491806dd1245ef4721f4b1a3158a591c
+usr/lib/.build-id/c1/c151aed009d5a2fac8378caf9c5589f52c156f
 usr/lib/.build-id/c1/d251686498a1ca8c6192e32617de17142b1ea3
-usr/lib/.build-id/c1/e2c4f647ea90fb7371e3c419c1d0cee18ae8fb
 usr/lib/.build-id/c2/1f06bd4e3d8c366ce2e89e1dba6e56bc86db1e
-usr/lib/.build-id/c2/882a2a04aa8bb77660bdeb635ff9c40dd35345
-usr/lib/.build-id/c2/9ccda2686df467f8e488d3af502f58105e9bbd
-usr/lib/.build-id/c2/e79cec4017ae72eb217ea8df4a98c3db180f3d
-usr/lib/.build-id/c3/2b4465a21113641588858cd7af926bc5140a7e
+usr/lib/.build-id/c2/b913320d43344ea72b29ef398cb4663d9ce5b3
 usr/lib/.build-id/c3/8aa3c1bde579ae9d6ea4cb491140d0a4f51f4a
+usr/lib/.build-id/c3/cd62b7576dd87682b49becfb78398120fa65d7
 usr/lib/.build-id/c4/1f3b2beb780739c951eec38a32daa93c42d182
-usr/lib/.build-id/c4/3731b809a5dcd4faf6d9fc5ef7d408ac578a4f
 usr/lib/.build-id/c4/6880d64992d8664f227e13e7faaf205a03fb56
-usr/lib/.build-id/c4/879d8f0816f679b32bbdf5b7f63144fd5da1b7
-usr/lib/.build-id/c5/2c952c0b28c2485ad6dd886c936c7645e36507
+usr/lib/.build-id/c5/3d41f2c3b3e06e2bc594ff3b614f84d221cad0
 usr/lib/.build-id/c5/a28fc995bc98ccfa2bf9a1c6bdf2e4c4837920
+usr/lib/.build-id/c5/f3063607b091da4f3bd3710e08dba3ea7b575f
+usr/lib/.build-id/c6/2aa6e422a3d9757738d5abf0a17266ae60e16b
 usr/lib/.build-id/c6/3841e8d1860dc9f523da6526b65da0408ac7c2
-usr/lib/.build-id/c6/53b16a051b5f19d142b2468c4ac2da00b94638
+usr/lib/.build-id/c7/8bd0cf2c37a7c6473316a7fdb05084643cf152
+usr/lib/.build-id/c8/1c2753e516af45518b062d0ae196bc71699729
 usr/lib/.build-id/c8/53eca560eb208100c6fac6a36a7e07e49942d4
+usr/lib/.build-id/c8/982fc01494db3c34e8560aeee71cb5ef0caeae
 usr/lib/.build-id/c8/be8f827442d2e527655e897dd070fcaeb7b28c
 usr/lib/.build-id/c8/efd63640906a09d597d704554444c0ab758e98
 usr/lib/.build-id/c9/3ae2e7d69da1a6214c213dec0fd5d78314ed57
-usr/lib/.build-id/c9/4f47497b95ad4e16665342db6a6a87656ce6fb
 usr/lib/.build-id/c9/5392dbd979f1c676a8015d1f33d17e547efda6
-usr/lib/.build-id/c9/d556f8cb47c2e36d66f670e18a3adc21f025f0
+usr/lib/.build-id/c9/aeec38440db42321f264d0b8a9503b30e7f30e
 usr/lib/.build-id/ca/36ea24bfe24e2c51132d5b989ff9a609d662ba
 usr/lib/.build-id/ca/4f9ab74faaadb0afcfe0124aa079f8673a9543
-usr/lib/.build-id/ca/b29a8ae193adea647ce5c21a2a639d7dcb706c
 usr/lib/.build-id/cb/1b7c1c06b1da1cee1a452372578aa59ee60783
 usr/lib/.build-id/cb/ab08e797ffa02330eef64a9449f16774b8938d
 usr/lib/.build-id/cb/e0410585309c22cb0b459d87d5545bf839cb14
+usr/lib/.build-id/cc/09459083f6c9c3420b4019bc4479a1d5fc8488
+usr/lib/.build-id/cc/0ba558646ba30b0a7f64a578da515ded64c807
 usr/lib/.build-id/cc/df732ac325c6a05324d40e1e0287c4de050a44
 usr/lib/.build-id/cd/0f7f0f64dced101ae808a0d78fea9bf3dbe2a4
-usr/lib/.build-id/cd/160fc85e2a6424341501a126cbbfba556da080
 usr/lib/.build-id/cd/c25854eb76748ba3104b699b711be32f63462a
-usr/lib/.build-id/ce/2329403948b9a7add307014dc18b2d77796313
-usr/lib/.build-id/ce/46b2b420fd451bd24c60d6899ccfca6b71738e
 usr/lib/.build-id/ce/4970a5a73f69e31e81117f6d4e2fb36f45cd6c
-usr/lib/.build-id/ce/63e349b4f9be7dd9dc5bfc75f8079c6ef44133
-usr/lib/.build-id/ce/91cef7a649383b75f151150c06a8e368ed5d97
 usr/lib/.build-id/ce/9bca1db1e6602e41c46c959253b16528a8d244
 usr/lib/.build-id/ce/9f128460303111618d3093bdd18e1f7e3f0847
-usr/lib/.build-id/ce/de382bc422ccb9f0b6c0a771eceb2657b5fe22
 usr/lib/.build-id/cf/082ade3414c70883238823f90acb54da3c013b
+usr/lib/.build-id/cf/3498af1c288d7339552c08dbab5f1d9e99d9a9
 usr/lib/.build-id/cf/578ac2329f0603267f9a246b7b10ed248bd63e
-usr/lib/.build-id/cf/8f795933d2a2691c65e41d1df1bc65c7b8d994
-usr/lib/.build-id/d0/cd936fc445dcf7807194905dc08a7e5822f0b3
+usr/lib/.build-id/d0/42efd615fcb16b223609577616ab9f6f5af05c
+usr/lib/.build-id/d0/7df47a1219c7b69a152b66c77c2abef9f44a2d
 usr/lib/.build-id/d1/8de439d4c56f86f1df779cd9bc461eaafaac57
 usr/lib/.build-id/d1/c7147cec90ee4d42fbbf5b0887d660203d962e
-usr/lib/.build-id/d1/dfaabc20d94006eac988a40fab442e496014e9
 usr/lib/.build-id/d2/0d6b496087dc5994fc08cf642788be1693cc08
 usr/lib/.build-id/d2/1687457d9bc8f5f2fb0258e2cc359581e45329
-usr/lib/.build-id/d2/20ee38c73aeae9be32a52d4487738407924514
-usr/lib/.build-id/d3/44d42ce2c20829c496cfd8c75f9a11887bb289
-usr/lib/.build-id/d3/d04bc632b52cd93e92ee37bf9bcfbc5725152f
-usr/lib/.build-id/d4/07a9a4087b9488096d72bd85687dd57b81152f
+usr/lib/.build-id/d2/9485eebe58856e75ec9369bd1c31aad697e641
+usr/lib/.build-id/d3/0c98f494bb91dbfbc2333ecc590dca0d8f7771
+usr/lib/.build-id/d3/3aa486600f044bf4ce4f307cb1a5edcb89ba67
+usr/lib/.build-id/d3/ef07e214a5799ac605beadabf1573829ce0d2a
+usr/lib/.build-id/d3/f5eb80a9b5a7765beaadef64841764032ef52f
+usr/lib/.build-id/d4/73b09b4d91fdae794de3df685d149c007eed95
 usr/lib/.build-id/d4/e0dd632959b064d31589080124a304156407f8
-usr/lib/.build-id/d5/0d0c2556c887ce29e279fcf8718729d94a85b9
-usr/lib/.build-id/d5/8bc176a83b38ed0a73adbbef526bfca9bd2c7f
-usr/lib/.build-id/d5/cca4618ce970960b13b5a250b1fd3db78048de
-usr/lib/.build-id/d6/121888633e775369aa7f06edfc1a5e4d5dad8f
+usr/lib/.build-id/d6/203895632b3bdc648972a8b37708d211dcc9df
 usr/lib/.build-id/d6/2f178c8100ba148efa8b3944b3420b742650c8
 usr/lib/.build-id/d6/3dc0289ef3ed55f6303103a2efd7b735d906fd
-usr/lib/.build-id/d6/6dad09e83ffd9c1ac0985f13db2c5d1d99d316
-usr/lib/.build-id/d6/8837c82d0c1648d60eeac2e43e6bc3efa8dd2a
+usr/lib/.build-id/d6/5b1cea89c586e06f593a12027c640f48195e78
 usr/lib/.build-id/d6/8df8db642de998d623d92e5c21abc7cfc583bb
+usr/lib/.build-id/d7/07b5b366eb1aeaa854a4e3639a3f0bc2a71882
 usr/lib/.build-id/d7/16ff2479e74a7960cf12c75c048255777ebfea
-usr/lib/.build-id/d7/20d841e95616a709a7322150094de3fc554efe
 usr/lib/.build-id/d7/2f58464c84ca6927ba1fcde2ed190ba1a0a7c4
 usr/lib/.build-id/d7/94d2d419c748c56d553c60cf863b081aa44b94
 usr/lib/.build-id/d7/c3984b4b461270a1972d3601aa27d6fa08c11e
 usr/lib/.build-id/d7/c3984b4b461270a1972d3601aa27d6fa08c11e.1
-usr/lib/.build-id/d8/035e83d7ce4df028fbb4a176e81dca9842e94c
 usr/lib/.build-id/d8/dea2c1b851b2d07f44cd5bf3deacd0f3df6643
 usr/lib/.build-id/d8/fbd944d8f23f4e0f02bc833aa7e369bd1ae8d6
 usr/lib/.build-id/d9/5159f2d8164bf4a722b0d93b14cbe6cb44df50
-usr/lib/.build-id/d9/972a7058c8565fb1ca075e455ebe1f37da5e8a
 usr/lib/.build-id/d9/ad1c2c48bb6b69eec6c07dd9e772be408be17a
 usr/lib/.build-id/d9/f88ecfafac71e57f7d3c717a68dab5d2cdd76a
 usr/lib/.build-id/da/4145ec9cd6ba78724a5eddefa8fb40b92d8e35
 usr/lib/.build-id/da/f5ed23ee84a5eaed42688941e72e4dd80b28c5
 usr/lib/.build-id/db/14f5ebfab3b8ccc904710687df2ebb2d268199
-usr/lib/.build-id/db/97947a8266ddcfe8e4d5f03d8e7098d38c3f6a
+usr/lib/.build-id/db/2f1f43a3e9181f09b75439b67e19e7120c175a
+usr/lib/.build-id/db/9cc748a2bcfe89cbcb6ee47480f12de00f3b5d
 usr/lib/.build-id/db/c74f6ad7c9d54f4feb294109d2225c318186bf
-usr/lib/.build-id/dc/a855f4ff7d35a0c1f361bf1edfb603594ee445
-usr/lib/.build-id/dc/da5d892a740ebec9f8cfd9bd37b613a7ecfdd8
+usr/lib/.build-id/dc/2f89840cbe2a839172a5fc30bf5ab62a529cc1
+usr/lib/.build-id/dc/ba73fdd7978f554e1d0a52a1fcd41ff9455b3d
+usr/lib/.build-id/dd/44b4e9099efddaa9340a79d763beaaa891e3c7
+usr/lib/.build-id/dd/642b5408aed5707ffbf544feab134776f87664
+usr/lib/.build-id/dd/bf31a18c1e7dab7ab04e61c0597f97db7bb6dc
 usr/lib/.build-id/dd/ce873a712e52481282e717597f676a2b3ca7d0
+usr/lib/.build-id/dd/def81be1b20358130899ef6577c56a92247f22
+usr/lib/.build-id/de/09af2f59150dab7fa7192c3dd6183085308472
+usr/lib/.build-id/de/2168603d46b596f879a1e3ce55e9f63a47de19
 usr/lib/.build-id/de/51b788f5accce1218596db86c3e996a6410d29
+usr/lib/.build-id/de/acda4228d1fac7480ee0f1195e502859fe0ce9
 usr/lib/.build-id/de/d808d43836f23c3e6c975c4978776f5a7de1d4
-usr/lib/.build-id/de/e0024eae2c290ae5960a7a1135165ad0099bf7
 usr/lib/.build-id/df/0b5c7ef77fb831aae9cf426a1b65e730585921
-usr/lib/.build-id/df/16ade70f0f5c7e3864f1cffc42715b085760ab
 usr/lib/.build-id/df/1a3c5ee90bf8c9a165b6741e048369985e119b
-usr/lib/.build-id/df/8c7c840139ab82cada7c75448198abe8fe8ada
-usr/lib/.build-id/df/de9774a4f55e7c34bac43b5e50ca79209be153
-usr/lib/.build-id/e0/5e7a9b6b53111045644b329f48fd56c0feca8b
-usr/lib/.build-id/e0/cc0c2831db3e5befb7af43c9ce991f937afd23
-usr/lib/.build-id/e0/f30fa9c164a3e93bde283f89d7eeb6a8b8ec0e
+usr/lib/.build-id/df/52de2d4fa80156cefde96f1baa7a93d79e815b
+usr/lib/.build-id/df/a012e581ec0a44c510d251ec83124dce930d99
+usr/lib/.build-id/e0/7e32352d404d5c80c9b277e5614fbcf9c5990d
+usr/lib/.build-id/e0/aa0cc782acb17a27ccb9d3905ca00cd89d8602
 usr/lib/.build-id/e2/6c40ec3ffb8c68c6884ef24553ec0ccd2767c5
 usr/lib/.build-id/e2/ae2fd3245dd49e9708c349d1ab2574b912c890
-usr/lib/.build-id/e2/bf3a01642f19dd00e0e1ca1421d2c2b9d5d42a
+usr/lib/.build-id/e3/317130b5733f588340145ed19a970010d724c9
 usr/lib/.build-id/e3/34b6463967aa5c62663a0ed0499d973fcd0e19
+usr/lib/.build-id/e3/373348e98df983d5427fa7a449c1b25266adac
 usr/lib/.build-id/e4/1da92f519d488732152c0ccaff8d40ac1d85d0
 usr/lib/.build-id/e4/1da92f519d488732152c0ccaff8d40ac1d85d0.1
+usr/lib/.build-id/e4/56876295d4f0a1f84b5e8252bbe40d83c74a01
+usr/lib/.build-id/e4/61f53613589686c40a8532daab77853384be84
 usr/lib/.build-id/e5/1545990a70477e0f788421789298cb082cae05
+usr/lib/.build-id/e5/65421a9a98266dd85864c83e93cca94f571cb3
+usr/lib/.build-id/e6/54b36219c41b7bf0e53da8b852ac0f16c6fe68
 usr/lib/.build-id/e6/c8b4a33186e3bef9109140f3933cea85160e49
 usr/lib/.build-id/e6/d3d786e45ed72e64aa51b411b6bfd10b3cd5ed
-usr/lib/.build-id/e6/d545fbaf2aae2e08ded9dfc86770a034714a5f
-usr/lib/.build-id/e7/303b50e3de4973c12d3081bf8d9cd442d4414b
 usr/lib/.build-id/e7/7f12cde0b4650b235c4ff8b16c14ad69640cc1
-usr/lib/.build-id/e7/e32ffe58e15a55298ff5e6991f48437d37331c
-usr/lib/.build-id/e8/328b83580d2371d34070fc3672608e4da5e266
-usr/lib/.build-id/e9/c86dd3d8ec5b107e7adafbf482e469372ee46e
-usr/lib/.build-id/e9/d1dc5fffe543a68ecdcae58d4c78a7af5c347c
+usr/lib/.build-id/e9/b33780ee9e28d4c32fa5676913a5b4f21fabb6
 usr/lib/.build-id/ea/72858daf12161670cae59dedd094e906860449
 usr/lib/.build-id/eb/1567d781c7041e9f0de36ce4a938e0f49a9b87
 usr/lib/.build-id/eb/3e689620ed80333c0c242cb33ec8958f09e34d
-usr/lib/.build-id/eb/655cbd88eef0e16211b4dbd30b15a303516271
 usr/lib/.build-id/eb/8607c5f94bd46daeecf053cf258f17e99de04a
 usr/lib/.build-id/eb/94b56bd6f0c9105bd23a18f04b7fc323278a53
 usr/lib/.build-id/ec/cfb4321e8627415a5c047e2dde51333c0e5335
 usr/lib/.build-id/ed/2f3218bc11e1634afb036bad1c322d23ea6dc4
+usr/lib/.build-id/ed/322aaba1b31c206c16263e3888d63c089a298c
 usr/lib/.build-id/ed/5437e0cbcc920bca459752ad0e35c1f175679d
 usr/lib/.build-id/ed/5d03d530f26f2b97851f7df46f4ffbb8299123
 usr/lib/.build-id/ed/5fed0e7d68d5b7cdc3f28c14f492031a2ef82e
+usr/lib/.build-id/ed/752ac7517a23fee747a1d63915e1ca07fef1f9
 usr/lib/.build-id/ed/76776e0c126c32ad64012752a7b06625b68983
 usr/lib/.build-id/ed/c14c719a218de144d10ec189672809cbf21412
-usr/lib/.build-id/ed/c5d22247beec75f7681d01276be09050f84286
 usr/lib/.build-id/ee/af42b4939a64d6121437942b6a6cdc835af6cf
 usr/lib/.build-id/ee/be2c6e75dadb513feb462393ff0152b461ed51
 usr/lib/.build-id/ef/0dbde9a935b7aad080cf4e0a339f39b4b2e848
+usr/lib/.build-id/ef/25daadef5c9256b0c8f78fa6c68bec50d77498
 usr/lib/.build-id/ef/b5632cead05a7106a883225ed5ade31d564133
 usr/lib/.build-id/f0/5ad2e73fe7df93582c144ac14509064367d6f8
+usr/lib/.build-id/f1/1837cea531bb63a62c9697cb7d1cac2412201b
 usr/lib/.build-id/f1/34d5797db2043828d4692273b8d856e9d2d5ce
-usr/lib/.build-id/f1/cf2841a99ac548ca0c315276275dba6977bb25
-usr/lib/.build-id/f3/86e908501988cb70bae3ed53538f214425ad79
-usr/lib/.build-id/f4/3c6e756ddbc3dd0e3187757fe0747c4979c612
+usr/lib/.build-id/f1/49b217168c897dfdb893c101929d3388cee40f
+usr/lib/.build-id/f2/c3d1e4b45d2ac2c8e8f51765335b7887cda041
+usr/lib/.build-id/f2/c4bd462aed834a18ea784a6b579f59be2e0dce
+usr/lib/.build-id/f3/5da0d6441d3c52d1828278f3b086e7f8040c59
 usr/lib/.build-id/f4/a4dab4b507caab83fc8658b59c0645fb8bc7af
 usr/lib/.build-id/f5/48fac9852f35f367e7ff7362d503b41549d2d1
-usr/lib/.build-id/f5/51c52a6cc32b17f49b2da0bfd1471f35637470
 usr/lib/.build-id/f5/63d2f6cf1f319e380bf133bd655920509e83ea
+usr/lib/.build-id/f5/de75e7442a041f452c3139774a368c31e0c1d8
+usr/lib/.build-id/f6/560bea696fe1557e8d7954bdaf2b957535a0f9
+usr/lib/.build-id/f6/8daa8ecc068c68961a935f5fdebca23eeca60a
 usr/lib/.build-id/f7/3490d54e0af4bec74b5963c929f760d39ada1b
 usr/lib/.build-id/f7/4da02afa108ca2fed4f73c30482fa5e4666de5
 usr/lib/.build-id/f7/6814dd76420c0abf87f12d0d45efb6fb563087
 usr/lib/.build-id/f7/9c3627b581707a6c81eb1a3b6543138be850d4
-usr/lib/.build-id/f7/a44883b2480d72bdbc948f9a92ef0760b3ba1b
-usr/lib/.build-id/f7/b0796ccc2de75f77a3cee74b00fae71464bf37
-usr/lib/.build-id/f7/b3d0d06ede64cc4e0e49ce62f2e08b28f33e20
 usr/lib/.build-id/f8/33da8e61498c59c4b5c19b85609bb5532393a9
-usr/lib/.build-id/f8/980c713b19f618d98a76deeb4dee9e142fdcc1
 usr/lib/.build-id/f8/ae65cef6bdfdfc1b8e3ad615262408182dc631
+usr/lib/.build-id/f8/db8c26a0c69d788f8fd8ceeaf1ca214c6f62b4
 usr/lib/.build-id/f9/01cf2fb4a4a175107b63449c9f34f3d1215164
-usr/lib/.build-id/f9/2a0c3086d7cd0040ed640978fbb4341fc04088
-usr/lib/.build-id/f9/5a3e2e937119ab00b0dc61cf415be13eade854
-usr/lib/.build-id/f9/5ca5110cef0053a9dd4767e02d91745bfa6689
-usr/lib/.build-id/f9/cccda64deaac88de07700386b80eacb783c9c3
+usr/lib/.build-id/fa/4245e55d63335ffd990485510feed18f16655e
 usr/lib/.build-id/fa/44339b6ab408b15503d3f135319cda6900611f
 usr/lib/.build-id/fa/a50353e70cf980986923fb644ff31cbeb4d8e9
+usr/lib/.build-id/fb/96a1b1fcc82ad575c8ccbb3f823e5f36c676f8
+usr/lib/.build-id/fb/b8d4947efe2f43e6b24b3635dc0bba9d0b5d1f
 usr/lib/.build-id/fb/bbfeaa275b77a801622715da0b579ecd99bfd7
 usr/lib/.build-id/fc/27d40c916b23437641a70513e1ffc2ccfa7557
+usr/lib/.build-id/fd/0943f9bd6fcd66337053221a27259a2ca501f4
+usr/lib/.build-id/fd/293e96cab1a5967f602f98d4232b9536c3f3ff
 usr/lib/.build-id/fd/3ffce6a8a3ed60adc092a815191df1cfbecb63
-usr/lib/.build-id/fd/6b5c01d2d33064b95391f5b6ca1af2a2382809
 usr/lib/.build-id/fd/728af0cf15feae944716ff7269ec21a71c58ef
-usr/lib/.build-id/fd/9ca87c55b3a0bc0c160e0537f27d0df4bb1186
 usr/lib/.build-id/fd/9fa6cff82c006b6c588386983e1bb5c8b30857
 usr/lib/.build-id/fd/e188f5067218099974ab4e600a6a43170aea60
 usr/lib/.build-id/fe/8da1a3d7fa5e281198dc6d10e3f9d79f278851
 usr/lib/.build-id/fe/ce5696d52c8bb4f3e4e4379dad30e230923437
-usr/lib/.build-id/ff/ac295fb00f97b118add6748e7bbbe3e92e87b8
-usr/lib/.build-id/ff/dcfbbb16e04930435b7d56f73f0c76bc7273b2
 usr/lib/ld-linux-aarch64.so.1
 usr/lib/locale/C.utf8/LC_ADDRESS
 usr/lib/locale/C.utf8/LC_COLLATE
@@ -1000,6 +1002,8 @@ usr/lib64/engines-3/afalg.so
 usr/lib64/engines-3/capi.so
 usr/lib64/engines-3/loader_attic.so
 usr/lib64/engines-3/padlock.so
+usr/lib64/fipscheck/libcrypt.so.2.0.0.hmac
+usr/lib64/fipscheck/libcrypt.so.2.hmac
 usr/lib64/fipscheck/libgmp.so.10.4.0.hmac
 usr/lib64/fipscheck/libgmp.so.10.hmac
 usr/lib64/gawk/filefuncs.so
@@ -1296,6 +1300,8 @@ usr/lib64/libcap.so.2
 usr/lib64/libcap.so.2.48
 usr/lib64/libcom_err.so.2
 usr/lib64/libcom_err.so.2.1
+usr/lib64/libcrypt.so.2
+usr/lib64/libcrypt.so.2.0.0
 usr/lib64/libcrypto.so.3
 usr/lib64/libcrypto.so.3.2.2
 usr/lib64/libdatrie.so.1
@@ -1381,6 +1387,7 @@ usr/lib64/libncurses.so.6
 usr/lib64/libncurses.so.6.2
 usr/lib64/libncursesw.so.6
 usr/lib64/libncursesw.so.6.2
+usr/lib64/libnsl.so.1
 usr/lib64/libnss_compat.so.2
 usr/lib64/libnss_dns.so.2
 usr/lib64/libnss_files.so.2
@@ -1714,6 +1721,10 @@ usr/share/dbus-1/services/org.gtk.GLib.PACRunner.service
 %%PORTDOCS%%usr/share/doc/libverto/ChangeLog
 %%PORTDOCS%%usr/share/doc/libverto/NEWS
 %%PORTDOCS%%usr/share/doc/libverto/README
+%%PORTDOCS%%usr/share/doc/libxcrypt/NEWS
+%%PORTDOCS%%usr/share/doc/libxcrypt/README
+%%PORTDOCS%%usr/share/doc/libxcrypt/README.rhel
+%%PORTDOCS%%usr/share/doc/libxcrypt/THANKS
 %%PORTDOCS%%usr/share/doc/mpfr/BUGS
 %%PORTDOCS%%usr/share/doc/mpfr/NEWS
 %%PORTDOCS%%usr/share/doc/mpfr/PATCHES
@@ -1848,6 +1859,9 @@ usr/share/licenses/libsmartcols/COPYING.LGPL-2.1-or-later
 usr/share/licenses/libuuid/COPYING
 usr/share/licenses/libuuid/COPYING.BSD-3-Clause
 usr/share/licenses/libverto/COPYING
+usr/share/licenses/libxcrypt/AUTHORS
+usr/share/licenses/libxcrypt/COPYING.LIB
+usr/share/licenses/libxcrypt/LICENSING
 usr/share/licenses/libzstd/COPYING
 usr/share/licenses/libzstd/LICENSE
 usr/share/licenses/mpfr/COPYING
@@ -2583,6 +2597,7 @@ usr/share/man/man3/time.3am.gz
 usr/share/man/man5/.k5identity.5.gz
 usr/share/man/man5/.k5login.5.gz
 usr/share/man/man5/adjtime_config.5.gz
+usr/share/man/man5/crypt.5.gz
 usr/share/man/man5/e2fsck.conf.5.gz
 usr/share/man/man5/editrc.5.gz
 usr/share/man/man5/ext2.5.gz
diff --git a/emulators/linux_base-rl9/pkg-plist.amd64 b/emulators/linux_base-rl9/pkg-plist.amd64
index f74fde7336cc..8cb78167bdfa 100644
--- a/emulators/linux_base-rl9/pkg-plist.amd64
+++ b/emulators/linux_base-rl9/pkg-plist.amd64
@@ -295,1057 +295,1061 @@ usr/bin/yes
 usr/bin/zdump
 usr/bin/gio-querymodules-32
 usr/lib/.build-id/00/9b48d5cb84a9cdd20e8d9cb6f4503a6f94b2ee
-usr/lib/.build-id/00/df16660dd0b92f22b1d22959b0600b34e579c6
 usr/lib/.build-id/01/201b981f51b64cfb0e07db34a8252a31353426
-usr/lib/.build-id/01/66346717d5116adbece3bf068b3e18e1812b5e
-usr/lib/.build-id/01/c819b24acb0c795efbcc374317234409ee0dc7
-usr/lib/.build-id/01/ce006278edd05b689661529163bbcef5a95f19
 usr/lib/.build-id/02/603e4246c063d1c34cd9fbbd2721fc1be4c049
 usr/lib/.build-id/02/86ab2bbba17240d53eaf82c32695d971e46c86
-usr/lib/.build-id/02/9beac2db0085954d573547756d6a93861d74bc
+usr/lib/.build-id/02/d217bb279662aa8deb8aa69a855365bf030e8e
 usr/lib/.build-id/02/d409ecc45523a36fcfae2ca5edc7f2f5d5d5de
 usr/lib/.build-id/02/f091863382147c7bbc959a3990af53fccde1d3
-usr/lib/.build-id/03/3aefb76061c2fba806a29f1f3175c9563d2d75
-usr/lib/.build-id/03/8267eca624272d73f20020655d8f4575fb4130
+usr/lib/.build-id/03/062287a83b8a02758757eb5faa50eca18b9a67
+usr/lib/.build-id/03/16d79b382abb8deba8acefeb2099203d9d9492
+usr/lib/.build-id/03/5397d794a2e2357120e37f842bf8b292b9bf9e
+usr/lib/.build-id/03/6e9719c32ed3cd88b2f89eddd06415ba5ce7c6
 usr/lib/.build-id/03/9385093a26e86647a6c9323e0d863be2fcd965
+usr/lib/.build-id/03/c3a8ca9bc5a41b1f0cff56749add9fd16d511e
+usr/lib/.build-id/03/f27794d098ed66b2fc6bea6abf8901dd2f128a
+usr/lib/.build-id/04/0c4605d103e0dd364c95dec2b047787e472024
 usr/lib/.build-id/04/220b5e9381dfa16798b371d71990945971aac7
-usr/lib/.build-id/04/2b1f691362ff98b5818677d6016fdf2bcd3bcf
-usr/lib/.build-id/04/2f200d922683d2853de0fd9ea8934e661ad1f1
-usr/lib/.build-id/04/56eb1df488919f5be0a14fa5a5386c31b05074
+usr/lib/.build-id/04/67d718ac7b0e931394da3df929d94c8135cb81
 usr/lib/.build-id/04/6e0c6c02d81e2fe834d7153ac571fc23d5e5e9
 usr/lib/.build-id/04/a1e29956fd714c494aace0710f7e63a5ffe849
+usr/lib/.build-id/04/a2b622d97e62f8963491f4f522087eacdfdc59
 usr/lib/.build-id/04/c564e1d028792291cb6c7fbdef662e3a063c36
 usr/lib/.build-id/04/ce1b9f02dd35786a2a43a51c0a5deda750ccc8
-usr/lib/.build-id/04/e6e6cf1bcf0d5aa57f24aa66e9d6471b261720
 usr/lib/.build-id/05/06bf6451812b3f340946fcb6b7fe92129c39a2
 usr/lib/.build-id/05/2b3c0efa00d425d1d8d4d1f9b8d5c90f5aec4a
+usr/lib/.build-id/05/439c543395d1136d16b6bc12999aae5651ea4c
+usr/lib/.build-id/05/7d7194233570202972f8ca1a0212ea2d1d925e
 usr/lib/.build-id/05/b8339e3eb56f73fc5ba51f2a657356e51a1350
-usr/lib/.build-id/06/076af747bc91c790a2f38ef296ad8a09816f3b
-usr/lib/.build-id/06/2e245c79ac8e920d3de5fea963bfff7e6c52e9
+usr/lib/.build-id/06/37f16913d1372ef9ff7fe7146cb3c767f01324
+usr/lib/.build-id/06/4101991e2ce488e6ce50a466151dd581da8286
+usr/lib/.build-id/06/4def25b6799a475799b7169c05d676f5acfcaf
 usr/lib/.build-id/06/68831ab28fd5a6801a8dbc0e7f85af12065e3b
-usr/lib/.build-id/06/9d73e6b04b64cd754fee9f7bc2f1562cf00383
-usr/lib/.build-id/07/68bc1584135c16b88c585ab0104ee0eefcee18
-usr/lib/.build-id/07/7a0fa74e43a9f1ef9be20d7f5db499d2b68b46
-usr/lib/.build-id/07/c6dc4a8e90f5cff4f78c4b36b6dfbda1ed6681
+usr/lib/.build-id/06/b1642cbf7c5b8579240a3f30b10447c399dcbc
+usr/lib/.build-id/07/177b20d9cc92b5d2efd1b676101479a7e0f792
+usr/lib/.build-id/07/364ae680ca15c23aaa22d1bb7898f4b3cca433
+usr/lib/.build-id/07/4afdcce33254270af0e2193f9d37bbf560830d
+usr/lib/.build-id/07/52fb9dc0a7f786f019b884b6b1585ce341507e
+usr/lib/.build-id/07/c2f4cab4509892360abc52650b2548f1d0e2ee
 usr/lib/.build-id/07/d7230d562e99284e7da17928b6ea8ea43f1f61
-usr/lib/.build-id/08/315fb2598e2e4b50959929e0a052d69f20b444
 usr/lib/.build-id/08/3f7cceb6cb05a1ed1d6ce5bd07fcfc2523b28b
 usr/lib/.build-id/08/506448a1c1355fd65b579cde2e90bd45a7d4fd
-usr/lib/.build-id/08/f65bd33d7f0d76f319ea4ceee17f88432757d5
-usr/lib/.build-id/09/39bb08703b9cdde04fd7729971934e780d5547
-usr/lib/.build-id/09/ab9a884a4fa06ba54e77f1f1ad8d12ee6f87ff
-usr/lib/.build-id/09/f69dd6ffe8e32d47c5241b135cadaed906c5af
+usr/lib/.build-id/08/6d288f6ad3991af642ae4374601a660984b991
+usr/lib/.build-id/08/6f6f995a6e1c297267d796fbda20bbf4e684cd
+usr/lib/.build-id/08/a83f7542848dd168d6b1581b897aef0397a87d
+usr/lib/.build-id/08/c2d78ca1d752a6b422812fdff07589e0cd4440
+usr/lib/.build-id/09/2c3eeef149754537800950a044d8027c8ee279
+usr/lib/.build-id/09/ade426a0f0d95a968c7c334fca0d7d92ef6f7b
+usr/lib/.build-id/09/e916f1d06781c9877666aad8e80757a9cd13f9
 usr/lib/.build-id/0a/47fead2b5d45d6d43e4313ce68ae67bbc7e051
-usr/lib/.build-id/0a/63697b6e0f3dac98c0d77b1cee91d2a6d178fa
+usr/lib/.build-id/0a/62cb1e0a6e041922acb7e0cfdcab148ea7dbfb
+usr/lib/.build-id/0a/66b40b9fcc71d5984fd80121dbf28156a122a6
+usr/lib/.build-id/0a/8d9d48119c75ff6b732436bb51968844e49093
 usr/lib/.build-id/0a/ecc3bb2562cc7be4dd38b029b1da10c6992c9c
 usr/lib/.build-id/0a/ed4fe4432a4f41efb80c0eaf4045282b7eca14
-usr/lib/.build-id/0b/19d482d7009827b01f2bc5bc657796ca98513a
-usr/lib/.build-id/0b/4cfe51791f3bed4f552b611aff059f7bee1b2b
-usr/lib/.build-id/0b/91bb3b88e0f36a6d4415d37a7a1320f046e153
 usr/lib/.build-id/0b/e639b952fb9f808211717faa02779a11cf579a
+usr/lib/.build-id/0c/0502bcc3c0505c450f566ab26fa0a351100d6c
+usr/lib/.build-id/0c/1fb29e44ffedfc03fe04edb425c3c10ddd50e4
+usr/lib/.build-id/0c/331b968ebbc6757277334ad1d715d62cda2b3e
 usr/lib/.build-id/0c/447c3cd1f62c711bee115ad4ea10ced1a73a1d
-usr/lib/.build-id/0c/52945288ded9f43495badf8f04060208d6ffb0
 usr/lib/.build-id/0c/e90498e8909bac8c1be7e54156d557897db045
-usr/lib/.build-id/0d/0a550a21cf1c7f33492d68aa4bef4685b6f15b
 usr/lib/.build-id/0d/1ff2e1036f0599c76d625ae462995fb476c5d9
+usr/lib/.build-id/0d/617cf4757dc9c4d26d258d569d87fe9d5f2dd1
 usr/lib/.build-id/0d/68de3287952a29e179b69a7a10ab8942d73835
-usr/lib/.build-id/0d/80d7dd117df059f244e303fb1e54072b414f5c
+usr/lib/.build-id/0d/77efbdc6cebad15c79e6d67b894e87d9b11ba6
 usr/lib/.build-id/0d/87305c724b6f99adc6ae43fb712d214193400e
-usr/lib/.build-id/0e/01f7b205159e4f344711c0d2af37fc02f64e56
-usr/lib/.build-id/0e/83f587f05be2d84c9dd3c75a715647a1a7894e
+usr/lib/.build-id/0d/c5842ce84ffbe90bdbf2a26f95df2a7ef541a2
+usr/lib/.build-id/0d/d5d1e96ee5e5221acec0d0d679fce140a8870a
+usr/lib/.build-id/0e/5504419054f87c060a2f8a42329db0efcc1f74
 usr/lib/.build-id/0e/b696ed41bbb6340f02e51ac2ff911a3914913a
-usr/lib/.build-id/0e/b84a1b08cd321e382e3ba1f1b3595d005e31e8
-usr/lib/.build-id/0e/e07c8304a63ef37bc7c81563c01eef2196c542
 usr/lib/.build-id/0f/10bbf5b58079746d984ca5d507abc397d1e726
-usr/lib/.build-id/0f/6d02f9f5503a61fd79b174d895522e6790d8fb
-usr/lib/.build-id/0f/729b1a7856f1b0b184e28c1eadc8b3e5512452
 usr/lib/.build-id/0f/aa1f58f643f887684769f00926672cab2b4d1c
-usr/lib/.build-id/0f/cb07d951bd42155685462aa8c5512d3484af4b
-usr/lib/.build-id/10/693d84098a9da8eba727474e6cea0bfdd79dd7
-usr/lib/.build-id/10/d40b75d0bae460ec3a4144682e8e73251cf6b0
-usr/lib/.build-id/10/ee1ae223d6ba56abfbc3e4f7e432f42584aae7
+usr/lib/.build-id/0f/d15b020669fff3a9139c2e0ecf6c0f28fea964
+usr/lib/.build-id/0f/d4ad8c5bfe16a4c56d019bfe873400089656c0
+usr/lib/.build-id/10/e67e54d514e889112e55451593f41e272151e2
 usr/lib/.build-id/11/911eb584a6fc3bc6ad5c273c013f0e3b0cb750
+usr/lib/.build-id/11/be5274782dc2d71a17a15593a87c8b2765a272
 usr/lib/.build-id/11/d44db5144a78924cb899c406d13005b0db14e2
-usr/lib/.build-id/11/f4d01941de538f148bc7ae371c4d5772ce5302
+usr/lib/.build-id/11/e14f70384d58523b5a212ba2314d0d82564aff
+usr/lib/.build-id/12/1ec78d27505e9eecb3c3855fe6cbd46e5ad8b9
 usr/lib/.build-id/12/4d1817758a962a625176da9162fd4e24fd42ec
-usr/lib/.build-id/12/5a159c4b6a2aa9be60bbb5cf6a70fee9acb441
+usr/lib/.build-id/12/617edffb869e15bbc2cfb4293881c2ab174e02
 usr/lib/.build-id/12/d66c4f7bd57543eb79b930030468052706a913
-usr/lib/.build-id/13/32d30004987e580858f252689af5183e79740d
+usr/lib/.build-id/12/e6d259b4e2f56fe4ecef95c4125d671cb12fe7
+usr/lib/.build-id/13/4d72b9d34e340386abf7993638f06183ded311
 usr/lib/.build-id/13/7984e6ccb42ed823e65c7b60076bb12029cb58
-usr/lib/.build-id/13/882f57fc3a7e2a10c44fc09295ce8352c35bf0
+usr/lib/.build-id/13/f00cf4467e44d7ab133fe8348091766c4e0047
+usr/lib/.build-id/14/19c287fbedfecb3b0a47276cce4b4d01102f9a
+usr/lib/.build-id/14/2b832e9c52420d06a784d79883ccaa49aae8b9
+usr/lib/.build-id/14/507a78057c144fc3e03f754a95d0264b00eb6e
 usr/lib/.build-id/14/ba44d98dc5c53be4e0c9779daac3236539303d
+usr/lib/.build-id/14/cb06b5cbf54a1abd57a200c79804a227aaf622
+usr/lib/.build-id/15/166b0b3fdee269bac2ca282ca3aae38f1bf7f9
 usr/lib/.build-id/15/3a0afe684399893b9d6b87892112ba0079287d
 usr/lib/.build-id/15/7a13cb06ec55fd0d269ce803f61b9ef82a4b78
 usr/lib/.build-id/16/14c986f49425ffa721e2e4fb89ce93cbe55161
+usr/lib/.build-id/16/37fc992cd8a1386674815a47b40fd0be601266
 usr/lib/.build-id/16/47e6c1ec7d06fe6883562165f2ae6635d9f7c4
 usr/lib/.build-id/16/4eaaa145d567edd6d609552872bff37e062fdf
-usr/lib/.build-id/16/72369236f08f9a396428b0a5633f872a4cfb15
 usr/lib/.build-id/16/79889bb0661d4cb993be96851596941f4bce0a
-usr/lib/.build-id/16/a99f3d033979fcea2c0e97f8b827ec43c3f26f
-usr/lib/.build-id/16/cde5c607d6a8cd974338fdd4388780d53e5975
+usr/lib/.build-id/16/7a6c45aec35d49296e7516a67ec2ba904dd5e8
+usr/lib/.build-id/16/8c1b5cbb5b0d24da1a86bd58d9b3468983f22c
+usr/lib/.build-id/16/9d7744cff9529ed9e27c2407e89ff78ffd717d
 usr/lib/.build-id/16/d27cd949ba654c0f950d677ef4ad62ed710e71
 usr/lib/.build-id/16/d75a2180d07f8f2c0a2437e42c902b3f27298e
 usr/lib/.build-id/16/df1257f952199714091bcde5901591b8da75bb
-usr/lib/.build-id/17/3c1848c0526c215f082c665fe285cbe6189803
 usr/lib/.build-id/17/8dbb548216a6c622d775047241a88fbbdc3d9c
+usr/lib/.build-id/17/992b8ae248be7aa0564b8ee4672e47305e8ff9
 usr/lib/.build-id/17/d7b517501f82efb533812f68bb2c37b0509d62
 usr/lib/.build-id/17/e18c891b2ef433be8de522d1f520b062732351
 usr/lib/.build-id/18/3f6a3902997fd73232226905a4ff481489b61e
 usr/lib/.build-id/18/501cdca644b8daef36b94eb324cebf28060440
-usr/lib/.build-id/18/a267e8924d6d126e850a4df20a75a0f1c579df
-usr/lib/.build-id/18/a5699c75468b82d0b9d07905c2b7ed7e7fba56
-usr/lib/.build-id/18/d73d574bff2ee169572ebc298e6b23322f9e43
+usr/lib/.build-id/19/768950eb8f77b9a0872d4c605a23fb23cbfa32
 usr/lib/.build-id/19/8bdc74d716c5d62fe8837667f9201ad797edf8
-usr/lib/.build-id/19/c04598ad5e8e4b494a0302ec317438c8c72e9c
-usr/lib/.build-id/1a/3b922ab7ba964ea4a22ac2a50353b92da10090
-usr/lib/.build-id/1a/3fc646154a28294354a007366ac0f74cd2fe6e
-usr/lib/.build-id/1a/723f4147a2bb5363bf061b89920095fd7671ce
-usr/lib/.build-id/1a/c3c85591ebf14f7fc288019f41b34cc1924fa6
-usr/lib/.build-id/1a/fd5f5aca99c72c0308f691a35b55fd54dfe1bd
+usr/lib/.build-id/1a/222a088cdae970ee38feac0f694290ac5819fa
 usr/lib/.build-id/1a/fdd52081d4b8b631f2986e26e69e0b275e159c
-usr/lib/.build-id/1b/a31745f5f62adbfa78fa4543295c07ac01d0c2
+usr/lib/.build-id/1b/435c03d0bc17ce5a32f02322d93e67a18ec9f8
+usr/lib/.build-id/1b/a3d01fecd560ac4d815bdd8c5f34ccd463daa6
 usr/lib/.build-id/1b/dc46d11b04765bc149e374dd80650ce36b04ed
-usr/lib/.build-id/1b/fa6bbbb327429e62a81b98a587bfc70a51df13
-usr/lib/.build-id/1b/fda153cc0ffe05047ed39f00620e96103f6f1c
 usr/lib/.build-id/1c/1474e035d147524ca893caca4930b5b83cb300
-usr/lib/.build-id/1c/4a9ffa28a7fce0bdb02882ac0d26c18b0da92b
+usr/lib/.build-id/1c/619a9d7e8211c33b37941b4ff4bb2470c082ee
 usr/lib/.build-id/1c/6c9c6a471b0cecf138ebed4b82ec09f21f5781
-usr/lib/.build-id/1c/8491b89815caab4d2e7d0fb10d2a45648ac579
+usr/lib/.build-id/1c/c185303ead50b30b1b3196a373af94e1341063
 usr/lib/.build-id/1c/ffe6225840cffffe9b53b214c34d9596f16660
 usr/lib/.build-id/1d/80840ca029e24a485f5d927235be6d7f033443
 usr/lib/.build-id/1d/8806a634247fc5e9f94e8ad300be792393d093
-usr/lib/.build-id/1d/c9d198881e462604cb87e5a49c2cb8767e489d
-usr/lib/.build-id/1e/07deb253729188284dc331fffd9cc57827ef42
-usr/lib/.build-id/1e/3a46f3c1dc3609529f0ce7172caeb185f89dc4
-usr/lib/.build-id/1e/69ff79e3df823a76231dc668b7628558ff95e7
 usr/lib/.build-id/1e/aa00f32b11667b98f2133a50d637a344a4ea33
+usr/lib/.build-id/1e/c1cc5cb1f3bbca7d9ad0efee379dbc3e357f57
+usr/lib/.build-id/1e/ea9f03a47141c816966c43b3b60ecf34450a37
 usr/lib/.build-id/1f/023413a08dc91ac12b572b134ae1db890df9fb
-usr/lib/.build-id/1f/5cdb5e88624bbfc6c26173ae8c4599c9b76d14
+usr/lib/.build-id/1f/0f7445c7f6a1c61907ea8209bddabb20c12b2d
+usr/lib/.build-id/1f/4fc7586d64292e52862d181dfd01c747dca170
+usr/lib/.build-id/1f/b0c1325053c38efc5f5b08c41033c80063cd2d
 usr/lib/.build-id/1f/d21a63dfce9da882b4a1b9846e7191439d1262
-usr/lib/.build-id/20/34c0d84f52a18e5098bae3b3aa40739ecc393e
+usr/lib/.build-id/1f/d95cdc1df286938a613c8a5aa9e1af2db9825e
+usr/lib/.build-id/20/5cffad0f813924c786d5d2060878a166666266
 usr/lib/.build-id/20/a839a93a5de52e70917ce96ed81baf4f96813e
-usr/lib/.build-id/21/18903e71ee0fa513f97001b2c8b1aca9b94d81
-usr/lib/.build-id/21/caabc6781adc0a62dae8abd00b09f7704c8676
-usr/lib/.build-id/22/288ad4eaa52a24c6fa38737295a34866422c15
+usr/lib/.build-id/20/e14f4d24b0764a19c0174e41797c67deefea44
+usr/lib/.build-id/20/ffcd4b18e66ee4a5e162eef9874234275a9587
+usr/lib/.build-id/21/2fd015d1c4ad4765a63d668a6056e5a1d9fa8c
+usr/lib/.build-id/21/5fa1e676ded39ddb636f46d060d7ca434f5572
+usr/lib/.build-id/21/d1bda9764072e1208e7df64bb131dd491f7b8e
+usr/lib/.build-id/22/00130affc9d911b7feb6094eed3cf89f220627
 usr/lib/.build-id/22/2d5960bd543161135ee0af1de949b6589bde28
-usr/lib/.build-id/22/f89d41655d0219224b5305c2d8116f7d0ff178
+usr/lib/.build-id/22/7632cb0ce62a4c762a54d57174d539763f1968
+usr/lib/.build-id/23/4f960a326f00e4fe81daa9e3e854031b7296b7
 usr/lib/.build-id/23/5ad5379c9648c80188041abb97894713885f13
-usr/lib/.build-id/23/abb0a0ec5430efccb3b9b50df35915993d54f1
-usr/lib/.build-id/23/f565e91b3810bd4d3fb14a4956da96388b32f6
-usr/lib/.build-id/24/0ed649f6fe03c76a5f12614e07534925eb07be
+usr/lib/.build-id/23/6188e8040f520c2b1ab560ddebfb56baae5159
+usr/lib/.build-id/23/b3fcdd360ad3d7cdca4051a7139ddca68ce3fc
+usr/lib/.build-id/24/14f0bbbebe7e315d9c282efc4acfe1ebdb09ad
+usr/lib/.build-id/24/16ea4246da4b547271112a459c84b085c28ced
 usr/lib/.build-id/24/26f958c9bdd6adb34c8c53f31d45b487be18c5
+usr/lib/.build-id/24/4eec2014bef8c0f990f319d7d70c967aa2b6c1
 usr/lib/.build-id/24/88284c48975afc3d0378e2f0cf7ee0a84c4f7d
+usr/lib/.build-id/24/8ae7e8de1d7500f3f7b1e051f363a5405eb060
 usr/lib/.build-id/24/ce29bd8e77a973abcc485e55c03da87ea872ee
-usr/lib/.build-id/24/d1f2c6f1b056bfca628b5d23d097ed40bffdd5
 usr/lib/.build-id/24/e371893b0c7c1640748977809bcd2dd4b3e50d
 usr/lib/.build-id/25/28c02e46dd8c38ce3608fc0374b818e3fb719f
+usr/lib/.build-id/25/2dd4e41e79de2ad12d2b38820b759ddc022ebc
 usr/lib/.build-id/25/497b6840cc7e39f69f06948e40bcbaf3a4374b
-usr/lib/.build-id/25/6e4081dea7737f7fb6a24cbca39bd7d260e205
 usr/lib/.build-id/25/6e6f7b6763f0cbfd6d86a37ca732355ab2aeb2
+usr/lib/.build-id/25/7b5e1bc5a05f69ffcf4e62761479bfce6f6595
 usr/lib/.build-id/25/b03ef02064391339f3b6b9f5552d2172e3257e
+usr/lib/.build-id/26/0089a28a7a472785094b5f1300c54cf765c1fc
+usr/lib/.build-id/26/0e0e5bcef926258b70b96d6a3dbe3ea48bd805
 usr/lib/.build-id/26/52926db8a4e657316e89317abe73d46139bdf8
-usr/lib/.build-id/26/96851035bc4c18cb16857c0b2342b60255261f
-usr/lib/.build-id/26/d7ef3d3d1f06fa06a10afd6ce46eed1772e908
-usr/lib/.build-id/26/ed25f3e9fe3e38f23041f2ef593f7568974a61
-usr/lib/.build-id/27/5a9d3705c9b1a62cdae4b65a3c52b0be6b6e32
-usr/lib/.build-id/27/91d6d6919e23010fd149ed442136885a88a6bc
-usr/lib/.build-id/27/bc8a7b7851200d63ad3ff31286dd18d615becd
-usr/lib/.build-id/27/d47765e69850061833b237437f578ea0450342
-usr/lib/.build-id/28/15a98e6e331d1acf907f6171ecf1a41773324d
-usr/lib/.build-id/28/22eb80db4341b4abec14105b5c9cfb7ee21948
+usr/lib/.build-id/26/5e868cd577dd221569f97b7859f93a567bdf23
+usr/lib/.build-id/27/ce3fb7eb5e2fff2baf9547af07b297bd1dabd6
 usr/lib/.build-id/28/38b2989eb5ab64daaad09897a14edca2738af2
 usr/lib/.build-id/28/473f458848741ae8309d500ceff30c47ab07ec
-usr/lib/.build-id/28/783527c7671240fc0e4992fcb2ee438eff1a20
 usr/lib/.build-id/28/a8886b4f45b97b8ca274e4b43cb6e60f7683a6
 usr/lib/.build-id/28/aed38833551909c33c1cfe4541305be86a1cf0
+usr/lib/.build-id/28/ba95acc559b5658e7efd450fbd6e6ab1b7cfc9
+usr/lib/.build-id/28/c02c0bcbbed3cea52d5346be581c25df621490
 usr/lib/.build-id/28/d0c126740a5c73b5c74afa5961423f5a35d893
-usr/lib/.build-id/28/fe01c438de90c401b12a3123a82067f5ff41f6
-usr/lib/.build-id/29/42ac2c05aad1275f2d5b1c2bbec048dae11860
 usr/lib/.build-id/29/c8af889a69598556c7a771818108360551771c
 usr/lib/.build-id/29/e21b11c114ff95151f13164087d268a82cdfa5
-usr/lib/.build-id/2a/7de06e98b7c4d4eb0ada384615fff62f2b344c
-usr/lib/.build-id/2a/bd10556b40b91a157d53a2ac90f9b5f480379f
+usr/lib/.build-id/29/ef50d614d86024c6de685ba17e66a61e1ac6d5
+usr/lib/.build-id/2a/43011d91d3b5e159f3d998ddb16b2b7f6e7eac
+usr/lib/.build-id/2a/8c710a0c5a8f9914c97b4dc7a9b57476faea9a
+usr/lib/.build-id/2a/d5bd6053f51b8d184aa851525c3bf5ebdc8720
+usr/lib/.build-id/2a/fe89c4c905efa73df8bda6e4f842fa8b831c66
 usr/lib/.build-id/2b/19a01be99cf3a522aa381e7ca6b4d86b5a7ffc
-usr/lib/.build-id/2b/1aea710b05e0be192b46fa93fe624327c50289
-usr/lib/.build-id/2b/3db11dedcc37e9df3d315d1b1dbd4e929ef958
+usr/lib/.build-id/2b/1b8d5c4986ba6ac748b48fa4a1a46b88b748e6
 usr/lib/.build-id/2b/4f81148e03cffd18204543db195b6bbf00c4ca
 usr/lib/.build-id/2b/65d4f00729b94cc4d6e2bd0f1e0b6195190588
 usr/lib/.build-id/2b/78ebf119aee2b429d59df3b2a91042a282d0e6
-usr/lib/.build-id/2b/a3d8643bdda2e7e6cb3b45336d2bd9e81424a5
-usr/lib/.build-id/2b/fd8a712cc2806c173289f30b2e6837ba6dc7ce
-usr/lib/.build-id/2c/5ca00323813c4096d2e5be274d058f00f7b59d
-usr/lib/.build-id/2c/8435a204247cda840dcfed0ef2407deb3a9c7d
-usr/lib/.build-id/2c/e1be597d604b5bf9c5fd64072ec6158a31dfaf
+usr/lib/.build-id/2b/bfe14bbb7bb83eb84865b863f9a93b773c0348
+usr/lib/.build-id/2c/60bc7dc51c28174c0ad67b250437efd334a8b2
+usr/lib/.build-id/2c/8a1b04ea282ab9267d6e8df109892871e5125d
+usr/lib/.build-id/2c/c7914158d0dbfd873a9d4eed4abc8c6fde5e73
+usr/lib/.build-id/2c/dade33efa0097beb3ac42c877098f63add5806
+usr/lib/.build-id/2c/ee9a36e606c340cf3507085d30b46bf04e1e63
+usr/lib/.build-id/2d/172346a2410deb41811cdecc70ac1971e29ffa
+usr/lib/.build-id/2d/17b84063aee726ff5c194620cf62a003145e43
+usr/lib/.build-id/2d/4fa836c53551b53d08f44c5e32ef322a792216
+usr/lib/.build-id/2d/60674cd25fb10f5a95aaba0d5dc10e2c9ad532
 usr/lib/.build-id/2d/754e4c2db42564146d024425dd15c680b2598b
-usr/lib/.build-id/2d/e2aee05936f8547c8e43c49b72a5866ea0c9f2
+usr/lib/.build-id/2d/ae2a9b3bb62eac2a6095b4d1faaaebaa689f0a
 usr/lib/.build-id/2d/e6d1a8cdbae5bab780876ec29852a0848a05fb
 usr/lib/.build-id/2d/ee3c96998d9989214e218b82fbed50b36d6f20
 usr/lib/.build-id/2e/074a7253e75d943a188602c92a97dd62939739
-usr/lib/.build-id/2e/0b677cfc877e21068a7e45a58a3ba274e5b312
-usr/lib/.build-id/2e/1dee793025fb562af9f113be06bd6378bb4a1d
 usr/lib/.build-id/2e/3fe23f9a6a9e40cb80be90ff6ae14f7a2c0520
-usr/lib/.build-id/2e/47295faecb3bcd4be152bc83e031021c320b16
 usr/lib/.build-id/2e/6af17020caef00d163c1303e507daf66f360e3
-usr/lib/.build-id/2e/8e9a70c3ed2395a28c638c50e862b2040856d7
-usr/lib/.build-id/2f/52468c489875db6409c9e8f58038c895a897ce
+usr/lib/.build-id/2e/dfb7fec9ce44253bd9a8f8242faf21b5125139
+usr/lib/.build-id/2f/89ff0c6a7702e786f0a6a6042213eae8c3c65c
+usr/lib/.build-id/2f/bf0333ce72ed095f6631a257303c8256d883c6
+usr/lib/.build-id/2f/cb8ee41a62a927ca37d919d7d0150583c88bee
 usr/lib/.build-id/2f/f971b8e527fb547fc3133dff1fca1a26109cd4
-usr/lib/.build-id/30/5d600e11d1cd29d56d6a1563d2ce895fa780c8
-usr/lib/.build-id/30/df4cb1e0fa8f186eec409ae0408536451bb934
-usr/lib/.build-id/31/00f5a5c749df40a0007c0c915910b96b255c9b
-usr/lib/.build-id/31/403f31420a9bb366d703450c3893c5806defa5
-usr/lib/.build-id/31/5b894fe3e6b402131509400e797c692545b099
+usr/lib/.build-id/30/3488fd485a6e642422b3c2bafafe58ad797e7c
+usr/lib/.build-id/30/7789b8a82a4466a0aca6b3a13d9d466811e7e8
+usr/lib/.build-id/30/e6cc1800c6272775f23976f97c43bf217f4dd7
 usr/lib/.build-id/31/79dba8ce63f373162f78dd3ae023144efb319a
-usr/lib/.build-id/31/a25b66002a791b2f589ace7e23ac52886c6779
-usr/lib/.build-id/32/0d202ea2dcd17fa5f2d6af9265167a552c3b36
-usr/lib/.build-id/32/1dd0946c624e0df39d558bdc52080668863e4a
-usr/lib/.build-id/32/2e7424e4345cd3bc2052d4c4c00d7e5d8e327e
-usr/lib/.build-id/32/388ac45ae726299f3761a9f578d234a5308fcf
-usr/lib/.build-id/32/6ba02922934136728e652acfcc2e666657121a
-usr/lib/.build-id/32/7ac14bdd628ccd7e0df93000001be589a57792
-usr/lib/.build-id/32/93130ab6e01eb070ebaf979a46fd6fa92bb551
-usr/lib/.build-id/32/a6e8ea3e731bda513ef815e59500d6c3e744b6
+usr/lib/.build-id/31/89ec95cc77eb74883ff1588e2c8fb7013475ad
+usr/lib/.build-id/32/4845a206fe5bd927c6bb1b0421938cff415a9b
+usr/lib/.build-id/32/69643ecb69d55368cdcf559e5c43be7a761208
+usr/lib/.build-id/32/f19d02baa2b4db8dce4640d652ac41655c6ee2
 usr/lib/.build-id/33/0eb2fe0769e5466e2e0ac1b158e1e8452738c9
 usr/lib/.build-id/33/72acac67d8bb011c524331e39d851313c1403a
-usr/lib/.build-id/33/d15e43346f25bae317e2adb494c07fb56578b7
+usr/lib/.build-id/33/a375bba365103b26935b8b9938f0c1f65b4bf7
+usr/lib/.build-id/33/dbe6f6382d838a8dcf13e879de96da6ce94d30
 usr/lib/.build-id/34/076457399cf4f107d985d3b513a115d8c329ec
 usr/lib/.build-id/34/0f42758119d3cd45eb79e8ceafd89dcb34e8d0
+usr/lib/.build-id/34/2953310e9ed38e5e8c46fbc4acb14988473517
 usr/lib/.build-id/34/46712c07e22f5b4ce8f480e2cd7c35b34bec00
-usr/lib/.build-id/34/47a5a5430761d17f4f86a723576731eca1e323
-usr/lib/.build-id/34/4d5d974d214b4452af3c0bc1abfcd9e255f76f
+usr/lib/.build-id/34/6b006d5914caed4742b741eeb95c0507e1ad9d
 usr/lib/.build-id/34/abb974a72680be6aac83d6803f76396b49142d
-usr/lib/.build-id/34/acf4845888ed21e4adbaa88bea386f18919714
-usr/lib/.build-id/35/116f61304bea9e531ec17eaec8fc84260abe59
+usr/lib/.build-id/35/19023de67c7b48e6148bbe10e0fe60d87ee3e3
+usr/lib/.build-id/35/31417f06743e7be1b8e499688182ecfd159fbf
+usr/lib/.build-id/35/31aff32ce3e8977feeeb1a74cc6a02e0f70a62
 usr/lib/.build-id/35/45c9ddce2756d9cfb7c1e9364045aa70ea3f40
+usr/lib/.build-id/35/55ce26f6067927d3cd6cf3b4236273f68dd7ad
 usr/lib/.build-id/35/6c30fe5c10b93b44fa43a409ffffcd47c17a46
+usr/lib/.build-id/35/c573664af9e7006cfdf2f34d29d3c27d04c6b7
+usr/lib/.build-id/35/e669a9ab52556a4e1785953674f8d967d7f46c
 usr/lib/.build-id/36/04e280efd030e778e56849c37137e4f8f44d4d
-usr/lib/.build-id/36/55fe0024a3836bf6fac197f13bf6d92d48309a
-usr/lib/.build-id/36/644bbc91b17b3a87ce54b19ec8821a884e85b0
-usr/lib/.build-id/36/a55362a2f8a8611f0f31f1da8704b59874f351
-usr/lib/.build-id/36/e828a0be6e9fbdc28a09cc2cb599e2b986ed9a
-usr/lib/.build-id/36/eade03d24d1269e06f05917de95f512e7585d6
+usr/lib/.build-id/36/63e07ce96098a90871cfb343db397d03faadc2
+usr/lib/.build-id/36/e450e3e137a48aedd6005c0f624cee6f6e7dec
 usr/lib/.build-id/37/07e8e3291c47f45a7329d9d648fced7358a540
-usr/lib/.build-id/37/ce72a57af374c97c4ac36f09753d59b4275bad
+usr/lib/.build-id/37/71eabfefea7f6c46964e5877be2ee331b02276
+usr/lib/.build-id/37/eeaed8ba1de87af6c1bab38d60004d6981348e
 usr/lib/.build-id/38/2d079775ef7ffc4763a0eb6ccde192aa16b2fc
-usr/lib/.build-id/38/9a2785e5b7562bcab110db87b1f35303834306
+usr/lib/.build-id/38/ad24fb97b180069b53ec7caa5cb9edbf318047
 usr/lib/.build-id/38/b52d57cb41682da851921d0f3e0a2a398e8701
+usr/lib/.build-id/38/c8340b8331ac198c4b1607963161d62332cbaf
 usr/lib/.build-id/39/037426720c32f039bddfe8b2080b477215a7eb
-usr/lib/.build-id/39/2ee9a13c87e57fec330ea3fcfd761a688211d8
-usr/lib/.build-id/39/2fbd4e37c4e337ece6b1bc90f36daea0f879db
-usr/lib/.build-id/39/74fb0c4581bc067c992cfa31109445101c8496
-usr/lib/.build-id/39/8e80023b2be877875b9c88cb4e6a3834a9ab55
-usr/lib/.build-id/39/cd6a69a9d243dd5df5f4d539b1ae8e373afd8e
+usr/lib/.build-id/39/96a8758741c02a809e985828d3da8b7c5ce2b4
+usr/lib/.build-id/39/acaa5afd619b85e7e291b426e08ef141cd440b
 usr/lib/.build-id/39/edf0feded78519191369c3977bbbfc0c87769a
 usr/lib/.build-id/39/ff827efadbb14ff6e67e76b153b36c9e8899f4
 usr/lib/.build-id/3a/0fc075029d3fc1919a6be940b00bbeff17527e
-usr/lib/.build-id/3a/2e26b8903ffe5773db4c66c9b6940f5b66f905
-usr/lib/.build-id/3a/3b4321262798477f5294ab08829f2ecfdd3e2e
-usr/lib/.build-id/3a/46eac75018e14700050da66ca2d78a539c12a9
-usr/lib/.build-id/3a/c3b53f169e598d9d4cfe084965e6a0422113d4
+usr/lib/.build-id/3a/158e17fc85443ddbf8a50ed38431fa7a4895e1
+usr/lib/.build-id/3a/22271b885b13c3227c8bbabb28e944549c9252
 usr/lib/.build-id/3b/69b2c0981ee9210e538463bf0edf5b1e54fc01
-usr/lib/.build-id/3b/9efb0612e6ebc9989125236da156ffd255b312
-usr/lib/.build-id/3b/ce9139f7e0b16132e354ab81b8a5588152bcc7
-usr/lib/.build-id/3c/c24feabe7d7ee16c175201fd9b1c00501f9b89
-usr/lib/.build-id/3d/06f7a1c3a61b67dfec4f62ad014c059c241693
-usr/lib/.build-id/3d/2a0335a4d4735605a5981760051dfdb1d1d11e
+usr/lib/.build-id/3b/8f06d66836c2d7c79bf5c6e90bea84c587f93a
+usr/lib/.build-id/3b/9e0c93ae119d0f124df5eec088e953dae1e05f
+usr/lib/.build-id/3b/9eb77b4d6884ef5c0478e0d505392077c8d4d5
+usr/lib/.build-id/3b/da1e7983c21cf2bc81ab758b8b2932ae08c665
+usr/lib/.build-id/3c/24d031b256528ca43f00b856ccf94195f122d5
+usr/lib/.build-id/3c/a0b27bd7f314abc8c87c88ac6c25d4412d9d79
+usr/lib/.build-id/3c/d04f7b4a78499cf7aefdc4be419fd508db7e72
+usr/lib/.build-id/3d/3129ff44af70e1cf435609307fed0677784fc7
 usr/lib/.build-id/3d/74bc0156fb37a2b5a273277ce81c1765fcd9d2
 usr/lib/.build-id/3d/829b238137efcf6c3b8e51339866d6c6fd5bb8
 usr/lib/.build-id/3e/4ca89ad898a819230b8627b8a9b224b7e8822f
-usr/lib/.build-id/3e/68016018aa61ff89e701d3af6f9bdd8658a1f1
-usr/lib/.build-id/3f/1be926cd6a1491a88d1d78715d169ee7d5708a
+usr/lib/.build-id/3e/b11ab58ac1dffc204c6ffc06f7eaa658ed23ce
+usr/lib/.build-id/3e/b74844b19744bab47a845aef84e3d710528bb2
+usr/lib/.build-id/3f/e28c90619c1c8b8cdc109408f82ff8e0b5c018
+usr/lib/.build-id/3f/e3a3b39b04594f51b653533fab5645284954e6
 usr/lib/.build-id/40/2dfd48b743057d0227f5dbd6e7a28c672ac749
 usr/lib/.build-id/40/4b4faef8a12bbd4b065b5c46233ed4c13a146e
-usr/lib/.build-id/40/55202cdf140017f178277f0e4786a0ef2b0dea
-usr/lib/.build-id/40/9df1dbd1c301dd0e078b34a9b5d0c31faa1cfd
 usr/lib/.build-id/40/b5cff5fd5f36660b638da8ffcfce3831e8265d
 usr/lib/.build-id/40/be2400cbdf17b0ceea6af996cf7b0cf5118848
+usr/lib/.build-id/41/247447abfaac7e615f28bce995ddc84b3b083b
 usr/lib/.build-id/41/5d19a7bdbe26b352c0391f7200dd9b8c0eabf8
-usr/lib/.build-id/41/6aa9be96ff55132b506db55e8c5041bc8a1e21
 usr/lib/.build-id/41/6d3603a3a4416ca0e2da2ba1803734669b023a
 usr/lib/.build-id/41/d733eb930bc4db53541cfe4c84a3e82db4a523
+usr/lib/.build-id/41/da7e13ca2c57f04bcd75dab8dc9c601deabeee
 usr/lib/.build-id/41/e9da7ddd609eec33dc85a5d8e603f9897aa00a
-usr/lib/.build-id/42/a5e820d9df5c61415203d25d0acfe2e07f81c7
-usr/lib/.build-id/43/57a0a32da062b727bcae6de1301c0b9d312c6e
+usr/lib/.build-id/42/2270916cdff731c68ddb05a9167fc2eb7daea7
+usr/lib/.build-id/42/779344e881f4e90a88cab86ac55604fd16b6e8
+usr/lib/.build-id/43/1726e417e84477d21112b033c171506954c6f3
+usr/lib/.build-id/43/288b1feba114c85f50774164d77497e12a2d25
 usr/lib/.build-id/43/5b8ef08c4e844ae705d0bd223af4b8081af723
 usr/lib/.build-id/43/709467b9d7ad5a1180464902c0ffdcc28a40cb
-usr/lib/.build-id/43/7231edc21132254b1c83e76e543fa6869f9e98
-usr/lib/.build-id/43/ac1b47607ae7790254f1fba5cef87241af6213
+usr/lib/.build-id/43/8fae1ca6506e99610b2b61cf43bae7b25f975c
 usr/lib/.build-id/43/c2cc269f54d42bdf554daf38d8068d9cea0078
+usr/lib/.build-id/43/cc909d67a7573957be572f25a1bda51b9d72d6
+usr/lib/.build-id/44/0f5c8bd4d05905bc8ffd0265d9de798bf37cc8
 usr/lib/.build-id/44/1295ed429ed097c0733db5de78ca631a943971
+usr/lib/.build-id/44/28d833e57048bdc5c4074f794e7341c721533c
 usr/lib/.build-id/44/2b073905f1137930d40e334651e48251fa1af9
-usr/lib/.build-id/44/9fe8a20c9c1ba0e1036aed3b0a6767cefdd893
-usr/lib/.build-id/45/01395a75fc7836c8f6fc535a0f585235099433
-usr/lib/.build-id/45/12814d7add2bc06d416a5787a4ca9b665c2038
-usr/lib/.build-id/45/6aefd460b9cdc36d84320c52edf132a880a12b
-usr/lib/.build-id/45/7a5cf2158310eb1804375bbb48fbb3d7d59931
+usr/lib/.build-id/44/a42a89f541d098fe9eda3220525a65cb3c172c
+usr/lib/.build-id/44/ac8888c8f6ce558e40e52e188b0758c8ae377f
+usr/lib/.build-id/45/3f1c9295e007a5e39e0b452c98602954fb650d
+usr/lib/.build-id/45/62c0cbb71f72f0ab95bb5593967214c3976ef5
 usr/lib/.build-id/45/9309e61ef551c6551d8333576c113ddc30f126
-usr/lib/.build-id/46/0b51f1918c9ae0e615a4c0bec24950dacb40ba
+usr/lib/.build-id/45/eb8312f0f2732f1b9bdf9f9a5b06dd1a13cb57
+usr/lib/.build-id/46/224d6b3c5ec6dee17f48e0eec4240aed3c0305
 usr/lib/.build-id/46/6da8f72dca0d750ca0913d75ef7e11ed25596a
-usr/lib/.build-id/46/9908de1ab82407861224ec0eb1b21ae0b2c368
-usr/lib/.build-id/46/d3b72bf020eefa5ff5c9c78cc3ace0ccd27ba3
-usr/lib/.build-id/47/6eefecf5dae0160fe2cafc4b5c1656f5f7095d
-usr/lib/.build-id/47/6eefecf5dae0160fe2cafc4b5c1656f5f7095d.1
-usr/lib/.build-id/47/6eefecf5dae0160fe2cafc4b5c1656f5f7095d.2
-usr/lib/.build-id/47/6eefecf5dae0160fe2cafc4b5c1656f5f7095d.3
-usr/lib/.build-id/47/6eefecf5dae0160fe2cafc4b5c1656f5f7095d.4
-usr/lib/.build-id/47/6eefecf5dae0160fe2cafc4b5c1656f5f7095d.5
+usr/lib/.build-id/46/97981adb0ffdddf2e4f02df36b8ce85dcaeb96
+usr/lib/.build-id/46/c287568283b5b7b8b32324f83d455ca36e6d64
 usr/lib/.build-id/47/cabe6cbfc6209e3e1b7b5c098862d99a4ae95e
+usr/lib/.build-id/47/fc10ede2f35e8b5d1def40978736b15559f7c0
+usr/lib/.build-id/49/0ab19ab6058a0c489c441b93850ffbec0e6cd8
+usr/lib/.build-id/49/26fda2d19b787534508f2064b44e6668e7bc47
 usr/lib/.build-id/49/60c104b0bf2f2337b6e8bae8e1a0b7efb1da33
-usr/lib/.build-id/49/b71c559c251c4ba8ba5a069f00522577ef5ce4
-usr/lib/.build-id/49/d1c1957bf25390c78a47470e2f349d6617272d
-usr/lib/.build-id/49/eaab94ec93133d67c040b35f8d591aff5bf435
-usr/lib/.build-id/4a/f1a8b700eed98cfbabc4a3215359245f2d8d02
+usr/lib/.build-id/4a/0dc8909f74931e763f2ffb3b7dfdd2a174ee7d
+usr/lib/.build-id/4a/1913b445b40bdf12435113865314a7b313a3b7
+usr/lib/.build-id/4a/7d37200f86fb73e9adc67b3e402d06c6d7faf7
+usr/lib/.build-id/4a/eb7b8f3a598852867920d3ee347ce0aa434b9c
 usr/lib/.build-id/4b/17d2f7436aeef57c753585f117d2c86a538ade
-usr/lib/.build-id/4b/19fa24059fa19db6571c008ae9050dd53c66b4
-usr/lib/.build-id/4b/4b35cfe951e9a24405c3f3255cd29876e2bcaf
-usr/lib/.build-id/4b/98a2442a1198d30e7ae483c24be9821c166336
-usr/lib/.build-id/4b/9be38cac3d8e175d3b44a4444bc8648dcef339
-usr/lib/.build-id/4b/e2dbca1a6a944000410fb88a44ece9c528ed28
+usr/lib/.build-id/4b/69cabcd0f183b0398eaf315ab7f189fb123fbb
+usr/lib/.build-id/4b/b525a876b4a1b998bfd8974883eb24c58b6037
+usr/lib/.build-id/4b/e88b7186256c7f79de0e86e872ece8b53a1087
 usr/lib/.build-id/4c/2a4c60e84137c24446af2f9a45c66f63024b2a
-usr/lib/.build-id/4c/3beb76169c188812bc67d890885476c7dae595
-usr/lib/.build-id/4c/41a0568d3ff33067a133793a09eae0cc7dc2d9
-usr/lib/.build-id/4c/447293d2e32332310ac3fdcd55ab8dcc282e12
 usr/lib/.build-id/4c/aa1cbf3324d8c99dcb6cd0655f4998f2e4b04c
-usr/lib/.build-id/4c/b5245f8c4c990d45a79688edcc41ba30547408
-usr/lib/.build-id/4d/33bdf3f44ab77a41eb948dcf7a845acd6d0ee3
-usr/lib/.build-id/4d/cfa487ff29f0b871a79cb651484be23eb45d59
-usr/lib/.build-id/4e/23d240bc6fc88111b70b7f69b33164cb97ea63
+usr/lib/.build-id/4c/fcec89fb655c8b0c82c0f72bf7903ef1ad0662
+usr/lib/.build-id/4d/35695ef0e42a24fe42b83743b0c6777e5d4849
+usr/lib/.build-id/4d/35a76cbad5ee968f90c3288260ff68f21a0a66
 usr/lib/.build-id/4e/2e5ead21777d007585882d5a16eec9dec0c81d
-usr/lib/.build-id/4e/be80fe11e62df3893b7797b75ebaa15b021e69
+usr/lib/.build-id/4e/3c5718f36867dcc55b17255f3a3b19d5e6cd14
 usr/lib/.build-id/4e/da7771a125344cf362d9964c68ae0bceb5319a
-usr/lib/.build-id/4f/1136472edd11219770970ca2397f604d23bdaa
-usr/lib/.build-id/4f/12822138acd4b52b069f546b6693b0193922a7
-usr/lib/.build-id/4f/39cf1a1441f05faf2b2048636767e7de43d6cd
 usr/lib/.build-id/4f/5deea12b421879216fac18e9bb60de4ac9fb0f
+usr/lib/.build-id/4f/66748c61c17fc9b7bc3a7248c9ca7d8f86699c
+usr/lib/.build-id/4f/97c1cf9935cdbd1dc36267ddbc8890578615cb
 usr/lib/.build-id/4f/bd40d274a792d3214cd6da5e9274c16942235c
+usr/lib/.build-id/4f/e712f7d9d854c5c140b7599d8e64a0e0de647a
+usr/lib/.build-id/50/01ba7a11dc5c3aa45478ed5f9294e5256f2d47
 usr/lib/.build-id/50/60d940577ea597058faa1a36611afd8b0d658c
 usr/lib/.build-id/50/695f23da4647a1b765e512c6bc0b3b91e8af97
-usr/lib/.build-id/50/794cc25b66c2ddcfc35cd346cf8e9225b5b83f
-usr/lib/.build-id/50/92905f8fa450f73c659278490552d69c7ecc13
-usr/lib/.build-id/51/59c276ac9833e59b8d9dc22b9dfa299c37183c
+usr/lib/.build-id/50/844834aa33e0d8d245cd2d19ac41e86e89de8a
+usr/lib/.build-id/50/fa583d292a9985ba8aa9b4584fe48146174473
 usr/lib/.build-id/51/5f683ec1b7a3d4f6f40216e077d3fca77818b7
 usr/lib/.build-id/51/673dac30aa14a615e03a50ac6853b1540a0104
-usr/lib/.build-id/51/c3ff4c109df5cc30c368600e13f62b5f019ff5
+usr/lib/.build-id/51/badb6f16c429f76bf1250bc7ddeeb5629b0164
 usr/lib/.build-id/52/1a4729b3f5f5c16d71b99ce42e95a5f91d7de4
-usr/lib/.build-id/52/1d5df764f127e5ec652ff4d60e30fed2c2f316
 usr/lib/.build-id/52/2125b6594a50582cab344ee8bf9abfcd487445
 usr/lib/.build-id/52/2f62c83fa9161d2c199b914e9096ed785a19bf
-usr/lib/.build-id/52/3994f9fd4b7181a312a67e37f05ae144a66365
 usr/lib/.build-id/52/512c9969331362cbd4ce77a1e4e3a3019b4b42
 usr/lib/.build-id/52/90a3fc9a71fa6b4296638c9c2a57143f7c4a8b
-usr/lib/.build-id/53/59b5660bfb844f1b09f322ab47e60d3c616c43
+usr/lib/.build-id/52/9c76869e6990af735d33e9d135376b57b04e64
+usr/lib/.build-id/53/4d18135bfb3e04a0341160e107aa13a22ec6f3
 usr/lib/.build-id/53/8b08d13ccb8685680153c64221a5a225b5239b
-usr/lib/.build-id/54/34722036b86d3a699815528119203a907b6bd8
-usr/lib/.build-id/54/6707a6b82f1ebffdb4dc5fb3126e46c6a64c5a
+usr/lib/.build-id/53/c8858d0009958ec30aacd2fe6dbbb405b973e4
+usr/lib/.build-id/54/577da2136d945ca6760f973d2825614a99ae8c
+usr/lib/.build-id/54/5b849f56e86ebfd8e3af8912e73385d1e49725
 usr/lib/.build-id/54/900d6303fe1a016dd9ad0593c4ca3559c6a47e
-usr/lib/.build-id/54/a4f7171f7aa9f6278dc2621f28bf9ef115cc0e
 usr/lib/.build-id/54/f89ec05da34d5e9f53e91bc26ed5d938fe2313
-usr/lib/.build-id/55/703446176a2cc213a36cfe2af1597e4f4be4cc
-usr/lib/.build-id/56/5fb60a80ef72641744677ecfca5e47e67a0d06
 usr/lib/.build-id/56/710ad4beb4461457be62b64e65f328d46502a0
 usr/lib/.build-id/56/80f884c707256a2a85e21b4bf0b6805c1a6914
+usr/lib/.build-id/56/81365aaebd39bab636dd671c68b358da98bb96
 usr/lib/.build-id/56/87823a18f153cd5e6d45cbac9b3c06af221380
-usr/lib/.build-id/56/cb9470f0f0796fe13e8156ab66f50d11f84fa7
 usr/lib/.build-id/56/d4af62456d823067b7cf0b813a85e410ea073f
+usr/lib/.build-id/57/59e44385dd4a81a0fc7b56fc756cadbe87a331
 usr/lib/.build-id/57/b46cf1d5ba66e7eeb9a566843a144e2ce73989
 usr/lib/.build-id/58/32aa17cb6e5e27d6110fb69e71cafa3dbaf554
-usr/lib/.build-id/58/4e18fc613ed1777d70fb37a351966becf71752
 usr/lib/.build-id/58/5ff3833574647a623ae848d8b8031fec46c4da
-usr/lib/.build-id/58/8faa497cff0504fdeaed270e7dac636337a5ab
+usr/lib/.build-id/58/b6d55941506ea060d1200aa7ab73c6ad1b538e
 usr/lib/.build-id/58/bb916f28a8bafb0c2cf57d9c280d3e10735d7a
-usr/lib/.build-id/59/297066a74218178617a1cda5c1baf40172d6a8
-usr/lib/.build-id/59/48453eeb4fbe90095e3e09aba11d782bdf8403
+usr/lib/.build-id/58/f8adf08b4a81ec891424357a87cd3c16b82a59
+usr/lib/.build-id/59/42d2377730d1edd2b952b7ab6c5218e1d4e8fd
 usr/lib/.build-id/59/a68e56d5456df11d1339f57f6e91a3af7581f2
+usr/lib/.build-id/59/cd703a329ea5fe4287d43cec700f147524da95
 usr/lib/.build-id/59/d80c810d74964488e2a8ae54288d9e51026c60
-usr/lib/.build-id/5a/1ef8e14eff76e7eea536b7ddbfdb1e854e5571
-usr/lib/.build-id/5a/41662db4931d6c44ab3783c9be124f22b058fe
-usr/lib/.build-id/5a/4ab65e82a72e4b984e392401e6ac04ba1a2987
-usr/lib/.build-id/5a/af167a3c1d4271ff3174a3a2c83b03823be687
+usr/lib/.build-id/5a/0493fb786bd9276d6973bd2b053d9279eff4e4
 usr/lib/.build-id/5a/d82e5076fc9c5315539716faaf9ad57e9caf3f
-usr/lib/.build-id/5c/230e1142b16c9d650c1439bb7065d882761a84
+usr/lib/.build-id/5b/c59605a701ac9a370ff6c955767c23c97ab250
+usr/lib/.build-id/5c/5cd466c46ecc7551e08fb5f615e037f9ed033c
+usr/lib/.build-id/5c/7cb28c9c22916ce344083275d9150e0811def2
 usr/lib/.build-id/5c/8c3a430a8a9c7680ff920b9b5f2ce05c4c507a
 usr/lib/.build-id/5c/d5496ac1c8ca089476c63e1ef5104a491c3b90
+usr/lib/.build-id/5c/d682a041f9a9118c546034b8bcb6ee36c0c1c8
 usr/lib/.build-id/5c/ddaee0f95aee615fe5b8da32156e0d0f161e54
 usr/lib/.build-id/5d/68c0b5a06cf9aa0c45967421fb1eeabe61d548
 usr/lib/.build-id/5d/7045cd456afcb8d095fdf7e39e7dd8164c9840
-usr/lib/.build-id/5d/984d6782ceeb4dfbc592b9fdd95ecf6d0e7e1d
+usr/lib/.build-id/5d/73a42d0a85c6f9a6a53f2cbb310511f5b84619
 usr/lib/.build-id/5d/addeaefe2b21fdbb7fd698bf25fe9f7654f022
-usr/lib/.build-id/5d/dfe33585917230bd57d4232ddbffcc413b0d5a
 usr/lib/.build-id/5e/2707aea4c6695fa2aca5169bb6d53991aa87bc
 usr/lib/.build-id/5e/3f19ec7e492f44ff5ba61a159a47cf4cad6251
-usr/lib/.build-id/5e/4e2828d56570a11c15913faa0a13565047e546
 usr/lib/.build-id/5e/c40020a7ef7879d43a0788143f960cee5bc1ab
+usr/lib/.build-id/5e/f3af806098e612525f6380609cadaf07907c01
 usr/lib/.build-id/5f/0500a9a923b26865877cc03e493c351e0752ce
-usr/lib/.build-id/5f/3e38e50e3a44a61e0bd7b3396a933b98615afe
-usr/lib/.build-id/5f/74c1e41dc2be40a0cce4d56d5beaee20d5fed0
 usr/lib/.build-id/5f/974be838845545e23b6397dd0d25b7ff701412
 usr/lib/.build-id/5f/99772d9718c44bdc5c1d8869234efbd220f618
+usr/lib/.build-id/5f/9a6ed3e2c62a3193f58ff7657e6053e91b4cad
+usr/lib/.build-id/5f/af6c98c9354819622ac8869a8466ccd98b0d85
+usr/lib/.build-id/5f/d4562b6deecd1b8f633ac4f33a8c1e502546ff
+usr/lib/.build-id/60/2562843d5b10446348e7624aa8341cfc5c3ebf
 usr/lib/.build-id/60/400bd3c6ba4a0207c4e5951f42c846acc52bc9
 usr/lib/.build-id/60/4155eb331a13112ecbdd6a936195c1e41ce54e
 usr/lib/.build-id/60/51d147bd6f6eddcb06e9bf48b4796284310227
-usr/lib/.build-id/60/be75df148a0b983cca944a6a29053974a12772
+usr/lib/.build-id/60/63d663dfc10dcb87857f4032f403b7460e68b6
 usr/lib/.build-id/60/bf8bb1e00c7e4ccd8def383688a1e8a12e3fcf
 usr/lib/.build-id/61/1d21660219be5e13b322396cc7828a62d981e9
-usr/lib/.build-id/61/48f28c2a11e7247c62003d4e7cbb5349095194
-usr/lib/.build-id/61/5329eb295112871fe565ddd20b1ac4b644bb67
+usr/lib/.build-id/61/501b10afd6dc3230b1c51dc720b3884c7c5268
+usr/lib/.build-id/61/a62f876e8860582e6aa8f080e386922861b98b
+usr/lib/.build-id/61/d1a397d615dc216e1bc934cde9d35b30adbb05
+usr/lib/.build-id/62/015d86faf73e594886bf037f409cc98f47a8ea
 usr/lib/.build-id/62/054854b8430ab5543432847cd3fd43245ceda9
+usr/lib/.build-id/62/11892b718b8e5081985684c401bca3ac28e4a0
 usr/lib/.build-id/62/218a0846867cd7077ffcd14b4b5445edb9f32b
-usr/lib/.build-id/62/28ab76bf0edf18123b92e9b43bc96395f13428
-usr/lib/.build-id/62/772fbf3a567cb14d1da0cd48dd0486afa12c58
+usr/lib/.build-id/62/593355e1c5597adf0833d6d2581beefdbd69ef
 usr/lib/.build-id/62/98520010e619d3873b5a9e1e892799c3231a40
-usr/lib/.build-id/62/dbf9ed3be59c61aeb6fc9c162bd386349b51a2
-usr/lib/.build-id/62/dd03c6c1960e78808f0c015638f64b37b9292e
 usr/lib/.build-id/63/21a194fffeaba48a14f3cc2e0ac43b2923547e
 usr/lib/.build-id/63/3664f69850fddbbd6cd7ad2cc732b11ec643ae
-usr/lib/.build-id/63/7dde8081260d54146c0b6dcfa0b9491e83a602
 usr/lib/.build-id/63/b65e9f026c70c67da02e5f0361a2c8e8e40245
+usr/lib/.build-id/64/200eafd1beeba14a1d61584c1ac96e9f9015b7
 usr/lib/.build-id/64/c7833a12471ed8d44e34d3e07f5384478b5128
-usr/lib/.build-id/64/dd20e2299d79338efcd4d610bb93ddcfad57bc
-usr/lib/.build-id/64/df10c400b3002b8b65dba073dcfce509e50c97
 usr/lib/.build-id/64/f7848246fad49da74c3985e72c00e5d11950b1
-usr/lib/.build-id/65/ada36b4002c590928ae3f7b518b37c4a82fc64
+usr/lib/.build-id/65/34d973d12c4ab7e6bfb2c7d7530d5a954ca33f
+usr/lib/.build-id/65/a74bab62ceb0bd4b01da0330a272003b7b47b0
 usr/lib/.build-id/65/bf3dad8dc868baa3d348c66e8733018f0d22a2
-usr/lib/.build-id/65/d3334c0e39178c0f5b9b38a343c985cb529770
 usr/lib/.build-id/65/e6e3e54d790b580026e4ca146a54c1ddb3d642
+usr/lib/.build-id/66/387939f3d78bca05a3e61e02c3e3bce593455c
+usr/lib/.build-id/66/6cb362ce3a837e3bdad74e38cea6c595e7efbf
 usr/lib/.build-id/66/7c163e5ba26365a303a6a953a459af58cf0628
 usr/lib/.build-id/66/c69e25e48242ab7101afb037425a7705c86008
 usr/lib/.build-id/66/e53686abfc4289726db40f122ea3d9928ca42e
 usr/lib/.build-id/67/16744f4a89a11ca8402520b6c45accb7491ad1
 usr/lib/.build-id/67/16744f4a89a11ca8402520b6c45accb7491ad1.1
 usr/lib/.build-id/67/228fce3d6418ac3712e70518ad0e1e7be0a51b
-usr/lib/.build-id/67/5bad61b470c579be6a8246328b49608e2d5daa
 usr/lib/.build-id/67/a0e66569da3105f6cfc63106392c71f7ff037b
+usr/lib/.build-id/68/04f5abe303b6d5c5a3b06f892c9d7cf3aca73d
 usr/lib/.build-id/68/1878a0761abc8e3a9bdd403b20d59b3c7f0b76
-usr/lib/.build-id/68/298fbe92ae48f816127025c1dba5e24a287f27
-usr/lib/.build-id/68/bd794acdf3958dea85a260aace62c14b6a63c0
-usr/lib/.build-id/68/cce027da8b713d253a5263c653b67453fc525a
-usr/lib/.build-id/69/1e6207ca81614591df04e116fe4dc8b15e5147
+usr/lib/.build-id/68/3d4607162968e3cc73c3209ae8a10fa79fae33
+usr/lib/.build-id/68/aaf9a40f6873a9d97d64ff828db49ccf262f1c
+usr/lib/.build-id/69/27eae5ee8ac5df4441e577be434d7b07d05394
+usr/lib/.build-id/69/75f7085e57230b80492f7fbb9a5e9739f3bb61
+usr/lib/.build-id/69/a8ef887b713af7b6e4a695901905c00c2b953b
 usr/lib/.build-id/69/f0231c4c007b6438098b7fcbd0be357b50e83e
+usr/lib/.build-id/6a/456f31ac3d34b4931e5d019ce14aeca4509079
+usr/lib/.build-id/6a/a9bcfba0b2814b674ec17cde2d40bf0cb7e524
 usr/lib/.build-id/6a/c651fdb605b539d773a583f32cc1569faab4b4
+usr/lib/.build-id/6a/e22b3b0995a6651af879e2afbd861b0d5fc3ec
 usr/lib/.build-id/6a/eb0d7d71f67aa91762188ec9d906e9b7639fe8
-usr/lib/.build-id/6b/195bd57a75c3018cfd2ed039dbb899070e4818
-usr/lib/.build-id/6b/36385d1c7d30e546166dc18637f80b03a7bc72
+usr/lib/.build-id/6a/fbaa6948c26f376eb77c2c1ea0547feaf1df28
 usr/lib/.build-id/6b/3fc4f3652ed7021b9bde3f9ecb04f7adffbf62
+usr/lib/.build-id/6b/5e8399f9806d8e8608e29c88ab02ae250cb433
 usr/lib/.build-id/6b/8d88623cda0a9feab482117f589fa392f7c5ea
 usr/lib/.build-id/6b/9d357635817bb19f7d6499c333aaa3b34242b4
-usr/lib/.build-id/6b/c6909d5fb75ddab800d1653924dc49ad12b793
-usr/lib/.build-id/6b/f93c59898a43f7c03da8c564aaf9c070f5ecd8
-usr/lib/.build-id/6c/0ed4ffd3ad28e636091e874ea34d752223f29d
+usr/lib/.build-id/6b/ad864e3d7d194a34ab4455539402810178ab6a
+usr/lib/.build-id/6b/d62dab6f7e1a3bf42fcdef417b2218b4f4003d
+usr/lib/.build-id/6b/f63c1eb8c54694140375a8ccacbbfdc98f7bdd
 usr/lib/.build-id/6c/4f63aa651798e01cb5fbcd5464207b3203c3f3
-usr/lib/.build-id/6c/af2026d507487ebaee5cbe5b720ca5901862ad
+usr/lib/.build-id/6c/9e5389056ab1181031c341f6539d8cd69e7332
 usr/lib/.build-id/6c/b8083b7c52ef6075e2ae44f9b51efe63628282
-usr/lib/.build-id/6e/0bec8bcdcb535d2cfccc0f2caa73ffec98bc88
-usr/lib/.build-id/6e/4ce6c91360acacf180fc9302def6da1768db26
+usr/lib/.build-id/6c/ee061b146f1356a81c2f8c80928192e3960ee2
+usr/lib/.build-id/6d/60b18c387742ae3394b8d4ca96c9226c3806cd
 usr/lib/.build-id/6e/665bce394f302d74cad544801828ab9833e23a
-usr/lib/.build-id/6e/bb372eaaa6d42ef6e19942412e9969c609e3c9
-usr/lib/.build-id/6f/1d806f1490cfa7f1d7f1eb799166e089d2506d
-usr/lib/.build-id/6f/822274529a617243c0058af33cd8dd044aea68
+usr/lib/.build-id/6e/d0034e5150950458d4e9e0b9d22432379e5e2f
 usr/lib/.build-id/6f/d4747c0832366888eb7cbd976de5dad4a219bd
 usr/lib/.build-id/70/02e7e58805e5529d91f267279d56aa5800ba45
-usr/lib/.build-id/70/714788640fa05bf1f760f405379bb91285c864
-usr/lib/.build-id/70/c016996e4d8b5a4d577764ed1e5c026ad73ae0
-usr/lib/.build-id/71/51dc038e1d9e5b821623984f3ecfcdb1ddbde2
+usr/lib/.build-id/70/40ffb15f2551653e448ce0267d46bfca7a7861
+usr/lib/.build-id/70/e0253b7868401893c741d9f49603a8073e144a
+usr/lib/.build-id/71/27d326f4d344bf0eb270b75ec09fbacd60cfbd
+usr/lib/.build-id/71/7f0e634b01a39c01e6605d58bc2b7635ebbc0b
+usr/lib/.build-id/71/87c398556fdd58a97e82d4400edea8743c83db
 usr/lib/.build-id/72/0b534c560012f218a86ab308f031f1f8c13f0d
-usr/lib/.build-id/72/ab61328581f4e21a2a9e5f9e6a8ca6f6d5be5c
-usr/lib/.build-id/73/7efbc6c214e826c3fe06ca2799fcb3c376051f
-usr/lib/.build-id/73/8dc559670431942bde38f13431aaf523ab2daa
+usr/lib/.build-id/72/d7bf1f45e722afc8d32660368e2169257bacba
+usr/lib/.build-id/73/2dddcf3178120f876ab83c37c1e3a1404e34ff
+usr/lib/.build-id/73/405acadf75ca5a6fbbfcea4b00cace7b3184a6
+usr/lib/.build-id/73/6f12e5b7bc726c9bd30de780505ba86aebfdf5
 usr/lib/.build-id/73/8f149c2491e64004db5109fabb5ecf08c4b889
 usr/lib/.build-id/73/b1f2f5adeca0dad6fdcce48543c631fb28d232
-usr/lib/.build-id/73/b460fe189def44cbedd1163e672bfe177427cc
-usr/lib/.build-id/74/4a45cb7a5c4c97aefb940cf3c2a132c9c753a0
-usr/lib/.build-id/74/5b57d7f7bf94ddb28b8d9a6fe1bd5047041858
+usr/lib/.build-id/73/fe106c0f38ea3a2e68d94077fac8b0d84b65ef
+usr/lib/.build-id/74/0df787ba13208b5a0a373f9892e6060c419c90
 usr/lib/.build-id/74/b7cfb3ce0b7570c13047a0688b4a3f0c121528
+usr/lib/.build-id/74/ed73e39bcdd0f7999570e6ed5461d2aee8cc9e
 usr/lib/.build-id/75/0c33ddfb39517cc96f36394df6825d06ea932e
-usr/lib/.build-id/75/0f3c5ae1f58c2f02f4d619cdf0b99dd7c8c817
+usr/lib/.build-id/75/37f2192f64059f51bc554318d336ff7b2df5a2
 usr/lib/.build-id/75/8c1401f19799ab07b1703d4772a65554cb3ed5
-usr/lib/.build-id/75/8f5d8fefaa1ac7248bd7cf62ecc86550be9e82
+usr/lib/.build-id/75/a0bcfa041a465d4f6f1fba768304c4f6317b77
 usr/lib/.build-id/75/adfb163d1796466ce81f08cf2248847415b77d
-usr/lib/.build-id/76/2c0cc2dfd8efedf1070d59d3e671e8e9eae0da
+usr/lib/.build-id/76/72b4cd54f2c48ea4e48ac8ed271389ab61cd5b
 usr/lib/.build-id/76/c823f4f8d714997cf7d6ef2b986b26a365c46e
-usr/lib/.build-id/76/cf3384c6f54ca748e5cc9e0f4900fdb236ef11
 usr/lib/.build-id/76/e75e0d8b09f3e897633c6508431fbdce3e8908
-usr/lib/.build-id/77/16a050c8032c09fee83946a49b351dd3dddecb
-usr/lib/.build-id/77/49a00497d94bb068a0818bd13fff5bb8402291
 usr/lib/.build-id/77/a11610b4a142145bb8476ce43c2e1e54740d6f
-usr/lib/.build-id/77/c11d04947621144ba2bc5c2ca064c45f74d232
+usr/lib/.build-id/77/ea098a6385770eab758b6372e10254c0613563
+usr/lib/.build-id/77/f2dbb5800da9cbc766b9bba3b529d71517d661
 usr/lib/.build-id/77/f57e1407c76f822168495c6f8c6b907c9dc9c2
+usr/lib/.build-id/78/2eda7ba39f0904a39d540f6c724336f1ee7705
 usr/lib/.build-id/78/43623017b58b79af0a49614101e1d14623b940
-usr/lib/.build-id/78/56f3e7e7264ed8473d3c3a473cc10b2832abd1
+usr/lib/.build-id/78/45e91968137653bcfbf746c3d523435f204528
 usr/lib/.build-id/78/8ca4eccb689af0d2c9d7103b69a579bb251029
-usr/lib/.build-id/79/41307057208d45b89cc25b94050dd521bdf8c0
-usr/lib/.build-id/79/530f3d0971039c7f841ca06584951a3c5652f6
+usr/lib/.build-id/79/01b85e2fa79d15b110f3c4a5e08c0f2de279e7
+usr/lib/.build-id/79/0fca7de5261fcb803a3809480903f29b557f97
 usr/lib/.build-id/79/6fa2186dc9d0bc96aed18088a6ff23c8b0e9d4
-usr/lib/.build-id/7a/222777d14739491fcb45b2a40a073627d4039b
-usr/lib/.build-id/7a/22f4d70b68b126127682085bd5497f5b3c8012
-usr/lib/.build-id/7a/40a22c9a82854f3d66767232ae364a99174860
-usr/lib/.build-id/7a/5f14b6421e2ad843fc3d900d5fb9cec99b550b
-usr/lib/.build-id/7a/8e602a791b906aa4fc16c0adc6ccbd3839ccb5
-usr/lib/.build-id/7a/8e602a791b906aa4fc16c0adc6ccbd3839ccb5.1
-usr/lib/.build-id/7a/8e602a791b906aa4fc16c0adc6ccbd3839ccb5.2
-usr/lib/.build-id/7a/8e602a791b906aa4fc16c0adc6ccbd3839ccb5.3
-usr/lib/.build-id/7a/bcae5304c0323eeb41fcfcf01e2822770d25f2
+usr/lib/.build-id/79/8c5778f5e06ae917492cde88880764894f15d3
+usr/lib/.build-id/79/dbc8d21e16b951bec0e74ddd2655d1c693cd57
+usr/lib/.build-id/79/e8e93fc7b049551b54f22d806c2437d6f895d3
 usr/lib/.build-id/7b/21deaf8238308d6f6a837fed9a8c0a315ba898
-usr/lib/.build-id/7b/462e2d6fe27ab947d827a3a40801b64ee0c3e0
-usr/lib/.build-id/7b/658280c9ffda3b29d891324b30d679969dcf3a
+usr/lib/.build-id/7b/2e9c94c1345db483e9b43f44c3ae1ccb93b519
+usr/lib/.build-id/7b/329f12f7ce1daa438db842da103daa874d6fe7
 usr/lib/.build-id/7b/6a4b2b509fa003f51ad6aa00c1031726878032
-usr/lib/.build-id/7b/7f79afc40649973b804e9e5ff1122bbfd2c581
 usr/lib/.build-id/7b/8d8b616f5d290e3d27a1e440286e5581e3ec6f
+usr/lib/.build-id/7b/f934707ecb43845b1a8c8a160dca466378f37b
 usr/lib/.build-id/7c/49f1e34ae5c9e22fc5a4c90427a2c764c3db9d
 usr/lib/.build-id/7c/5344c7a172faf96b8de710055ab84ac5882582
-usr/lib/.build-id/7c/6dd3629aa0e6b734cbaccbc230e300ef82c1d4
-usr/lib/.build-id/7c/859c32f3d8c0d864be7c2c7cc74c863bb12876
-usr/lib/.build-id/7c/d4ca05623c43050a377a3c91f2469eca32ee7a
+usr/lib/.build-id/7c/8ce369851fe3df1bf0a2cbc98fae78f1777767
+usr/lib/.build-id/7c/ae178c523c7646b44c8c329dfd77157c9031da
+usr/lib/.build-id/7c/da9320266c918c6f1a78af8bc8d496a3b223ad
 usr/lib/.build-id/7c/f0aa1ca21596ba7ffcfbcb0129f521aaf29c57
+usr/lib/.build-id/7c/f84880736a34fdec6d71132e0fac0a6191bdae
 usr/lib/.build-id/7d/14681b3e8c8db168b33b696b247d95417ed5b5
 usr/lib/.build-id/7d/20d81f868562e66d084d12de749089a5f2bd0a
+usr/lib/.build-id/7d/7af2405c8c34bb8a56935d1674fa41a830558a
 usr/lib/.build-id/7d/9a34ba0ea25d233e03d2a1b5fa200d9eb60ac1
-usr/lib/.build-id/7e/87379290424a4ffb80627e7eeb266b48fc5214
-usr/lib/.build-id/7f/8daab1e2a4328936fb1fa69eb89a18ee02bf83
-usr/lib/.build-id/7f/98cf0c2f60488a14f359b867dad7fb80017530
+usr/lib/.build-id/7e/4cfa81ecd4c6fc2044bf8f47f2423adcaaf306
+usr/lib/.build-id/7e/4cfa81ecd4c6fc2044bf8f47f2423adcaaf306.1
+usr/lib/.build-id/7e/4cfa81ecd4c6fc2044bf8f47f2423adcaaf306.2
+usr/lib/.build-id/7e/4cfa81ecd4c6fc2044bf8f47f2423adcaaf306.3
+usr/lib/.build-id/7e/4cfa81ecd4c6fc2044bf8f47f2423adcaaf306.4
+usr/lib/.build-id/7e/4cfa81ecd4c6fc2044bf8f47f2423adcaaf306.5
 usr/lib/.build-id/7f/ddb97efc78cacae6dc06a2ba98aa730c83b833
 usr/lib/.build-id/7f/e2062321b909bbd666fc91211462aa3333a62a
-usr/lib/.build-id/7f/f9499554c78aabe08ac23fc7d43ba7b35f0baa
-usr/lib/.build-id/80/1eee3ecafc317b894a91fa2a556d01754d66ba
-usr/lib/.build-id/80/6de1a6b926f4f5abadbf8561af26a794a323be
-usr/lib/.build-id/80/afac9a521997c7d2411501d110b7809ac8fd1c
+usr/lib/.build-id/80/55e8dc692062721717364437686016bcd617c3
+usr/lib/.build-id/80/e228c7c2064b641b8c4aeadc0629d212c9a75e
 usr/lib/.build-id/81/1263addacc122923afb52b14d7dcbae540b04f
-usr/lib/.build-id/81/512af17e53b28812d82c4f7cce8c2b2f395f7a
-usr/lib/.build-id/81/6b957c89084c8c8fa83fb8d8e91f3e2d5a9df7
-usr/lib/.build-id/81/a1d90a335d3dd0fe9debf59c03a1f7025a730f
+usr/lib/.build-id/81/36dbcf9653da9e1b6111fd546b0eae14d16d89
+usr/lib/.build-id/81/432c2da5c313f088ca24e3c20b1691f666beb2
+usr/lib/.build-id/81/848d9f24c9632b23886894b09449656e4308a4
+usr/lib/.build-id/81/90d3f66418325d305777b436f0b2e38e6a42a1
 usr/lib/.build-id/81/b43af15cc364d8537f0698e8c7bd1cf0d54ca0
+usr/lib/.build-id/81/ce32e9132d0fbbe545f5ebe26f5e6a880b08ff
 usr/lib/.build-id/81/dd63f2c8460c6a28884b7289c17997eb342525
+usr/lib/.build-id/81/e60f144433fc8128127dc5d7e37dce2f677161
 usr/lib/.build-id/81/e9543fd391b19eb11b18d3a049e4b2e25cd7f0
-usr/lib/.build-id/82/1da4b09e9d4e9081eab87795a1dd17a3ccdede
-usr/lib/.build-id/82/363a52e5b0e59bffce32157e8de8e032c15c0f
-usr/lib/.build-id/82/964f150f13b476e3249b9eddc71aa34f4a503b
+usr/lib/.build-id/82/2746af6d3d854f6ba3bebbe8759d1637faa43e
 usr/lib/.build-id/82/b4315c0b20cdc8f884c76cee57bf92d88750f7
 usr/lib/.build-id/82/fa01a9561169a388240813d130a6a70ffd0c0f
-usr/lib/.build-id/83/142a77e39a4036d7a4cd0d02da7369c1cd08b5
-usr/lib/.build-id/83/f6b1bf683edcfdfa9e2e326f213ce903cb8f99
+usr/lib/.build-id/83/ea38bdecf0e11f38eb3b3e68a7ebff8ca9fd6f
 usr/lib/.build-id/84/17fbf8880dbaa8749efc9dada8ffc122ac60ee
-usr/lib/.build-id/84/35dcaf9bb49935568c0c44f46c9a20439f45cd
 usr/lib/.build-id/84/3e3ab2549df1d9397a4ef4797289fd485a4b33
 usr/lib/.build-id/84/9bb7cc1d1515503222043e7503294517e13b8e
-usr/lib/.build-id/84/cf2908cf7ce3634388628fe9f0ed17bde77596
 usr/lib/.build-id/85/2fba24ab65aa2f8db3643c0e3a7abe57670294
 usr/lib/.build-id/85/8570ea2ae7f8eb785ece0e50aa1a678b3aa664
+usr/lib/.build-id/85/9af4f52af6e749c4103b3e642d38c8243a4aaa
 usr/lib/.build-id/85/a78415bcd0b54bd2e6d0798803be4786a334b4
-usr/lib/.build-id/85/ac5c78ad9fdbf48f4150055c5b58106ed47364
-usr/lib/.build-id/85/ae1dafe7491be584d6580c11f89704f0eea597
+usr/lib/.build-id/85/ec6b8bce4bb109302f14054f148aaeb22d09b1
+usr/lib/.build-id/86/5b1f284c495193224d8e277919012dc36e51f0
 usr/lib/.build-id/86/7006057ac8be939441030fac89db3d23cce48e
 usr/lib/.build-id/86/8490c186b84efc9962a169dca52558287a92db
 usr/lib/.build-id/86/91d08fef3d9f042028d462e5b4e17b78332215
+usr/lib/.build-id/86/c4252046f8529ab44ee90da35695a62006f8b4
 usr/lib/.build-id/86/cef162137533b8ecb35b7cd2c9af3ce74a99f6
-usr/lib/.build-id/87/25e9807142e85e0dc0b90b5485d09058956809
-usr/lib/.build-id/87/557f779a13b035cc2a3fbbef61fde0d8130655
-usr/lib/.build-id/87/aebd42051b098fb396cc7d5c5cd553591c7e95
-usr/lib/.build-id/87/b0c6a0527c6e7ad2c809178766454c3eb4f7ec
-usr/lib/.build-id/88/4bfde5242c2dfaa3ef7ca3d3bbb3d5d61aedf1
-usr/lib/.build-id/88/60f2c1e359051fd2244c92b8bc9596f9db046a
+usr/lib/.build-id/88/4b3d9ea6af056916b0442a8deef60574c540f8
 usr/lib/.build-id/88/73a4c72ac6f08df9d2211f588d9e1496a37cd0
 usr/lib/.build-id/88/74f55db2e70222caa814a8dc3c6997ced3e11d
 usr/lib/.build-id/88/832c7cbdce766c57b6c5146b0b072388949998
-usr/lib/.build-id/89/0650b7fe5fbea713527c4a1a99e027b544d88e
-usr/lib/.build-id/89/1ea8e785d2c39325201bf8bbd17da34cc78c9a
-usr/lib/.build-id/89/4d0ff198a7ea8dafd37d5d422f80e0d2379e5e
-usr/lib/.build-id/89/e218575fc052f926f151e5f42c21913c1516b6
-usr/lib/.build-id/8a/12ae6c30f739d1b3e8e488673d86cb0363e03a
-usr/lib/.build-id/8a/5363696c6d6d03d6d09382dbf9a7d7443425e4
-usr/lib/.build-id/8a/855e4363fd24f776abb5f69ea18b081723b16f
-usr/lib/.build-id/8a/ca729c93509212bffd8f18cf661bd83b7acf9a
+usr/lib/.build-id/88/e4843448778fd49d40e1da0b5a7305038825ab
+usr/lib/.build-id/89/08c0645605e4dbb927ca85211bf61545597cad
+usr/lib/.build-id/89/35586a81857523f3907c8052f8d248cf74a289
+usr/lib/.build-id/89/c537967306ac3f25592be4da176347076e4962
+usr/lib/.build-id/8a/3205a84d51e9b5ac741dc74889065461aa9a39
+usr/lib/.build-id/8a/42f62b3e766e3cbbe33c566cd7aca5d60b428e
+usr/lib/.build-id/8a/972b3a57e2c021eae569774320e6d209015c21
 usr/lib/.build-id/8a/d6ece459b100ff372a9cf898e306f1ed61c151
-usr/lib/.build-id/8a/df32dc7b70cf48a481cd6899bf3dd683fdaa55
-usr/lib/.build-id/8a/e879c4e665c1194166fe45b363eec4acdace94
-usr/lib/.build-id/8b/43234e4ff69954417f7bd81cbadc93ddc91696
-usr/lib/.build-id/8b/89211ea805d8e86c0acd1a206266641f7e1e57
+usr/lib/.build-id/8a/fd8ce278d954fe8b901b3eed7e7748f387b300
 usr/lib/.build-id/8b/94594604a18ea2f63e1a5c70e876354cbdb3b6
-usr/lib/.build-id/8b/c6c230041de9708380440816213b0806c2630f
+usr/lib/.build-id/8b/9cfc86256c4fefcc3ffb983722cce2f3e679c9
 usr/lib/.build-id/8b/e0fbea5edee960415e957793fd15926b80f494
 usr/lib/.build-id/8c/1081f37cf1e36a1ecf1f75b87092890d92f220
 usr/lib/.build-id/8c/1081f37cf1e36a1ecf1f75b87092890d92f220.1
 usr/lib/.build-id/8c/4f2b1570d1b12d82e28c5d679f8a106096e0d1
-usr/lib/.build-id/8c/573ef8a3483110700a92f2a029414148a62420
+usr/lib/.build-id/8c/86efc0db265fa05071dcedec6646841b253fa2
 usr/lib/.build-id/8c/9868a5868d4adf37a8e9d1d68e47a5341b659b
-usr/lib/.build-id/8d/d756cb20069e008766fc676c4934f5e03ca024
-usr/lib/.build-id/8e/2fac040f95a034d6b7639481e0d3599468ba54
+usr/lib/.build-id/8d/a53546b3ae2c5beb3cf3c6494525063a5f54ac
 usr/lib/.build-id/8e/40935dc3e6a68cf299a74fdab501ef7da6861e
+usr/lib/.build-id/8e/4671b33951fe3a2ba6369dca0b959436cb4c77
 usr/lib/.build-id/8e/57338680e59ce4fca0af8760935fdd13b12a9d
+usr/lib/.build-id/8e/88671af55dbeea74ba0c352d352a93fe3bfe5b
+usr/lib/.build-id/8e/93637e2c2807527c16632ee09eab8bd7933f84
 usr/lib/.build-id/8e/cca1364d34d1da280fbfc9ee326f5c78346277
+usr/lib/.build-id/8f/a84f6a74f486188d439aeb5efd69c6db955412
+usr/lib/.build-id/8f/ad6870bd7edd4fe38fd1cfce3f1eeba3d096eb
 usr/lib/.build-id/8f/ea1662d8c14a67b758ea5673b88a404b1123ee
-usr/lib/.build-id/8f/fe8cbdf12d2155de0bdcef2a342ec045ea5c14
-usr/lib/.build-id/90/9699c2b70dfe6eefd06e07ad72415bfe31c485
+usr/lib/.build-id/90/8a31447b4a2a595978b37d76083f779f320e42
 usr/lib/.build-id/90/a4ea155beff2ae04a02731e18aa8c1bc6903db
 usr/lib/.build-id/90/e8c48cdcb958fd676789e6ac6e5eafdf26c64e
+usr/lib/.build-id/91/0811dec34dcb1c7dedde473013505b92f70f46
 usr/lib/.build-id/91/409a68114f3b9d0d7f246323c54aea3b01ffe5
 usr/lib/.build-id/91/77f56b1889010304c17109173d5a82b9a052e7
-usr/lib/.build-id/91/86de72f39927298416be1c56596a0bb3a8a25a
-usr/lib/.build-id/91/ce7e7be7ebfb6d8ab7ea48533dc5f0d07d83f0
-usr/lib/.build-id/92/d295538fb48f417e5e9c43108e17357adc2be2
+usr/lib/.build-id/91/d0cc4ed87c491336e5cc5b5056f82792235a4c
+usr/lib/.build-id/92/1ff39d37cd1549bb9222c61f1f7abb6137839b
+usr/lib/.build-id/92/505f4073a8a235f6e3dcaf46ad397d2adb4f18
+usr/lib/.build-id/92/79569e26de95d4b6e0ec10ca863e418042e73a
+usr/lib/.build-id/92/79569e26de95d4b6e0ec10ca863e418042e73a.1
+usr/lib/.build-id/92/79569e26de95d4b6e0ec10ca863e418042e73a.2
+usr/lib/.build-id/92/79569e26de95d4b6e0ec10ca863e418042e73a.3
 usr/lib/.build-id/92/ea47d37841ca86259455ba025e0cd52b1dc553
-usr/lib/.build-id/93/30b405cf54453f82ff213fd7eaa53a9d4c7a65
+usr/lib/.build-id/93/45dfeb5e8945f911ecd58e8b1d2a152e4baf3d
 usr/lib/.build-id/93/674b011480d831889552f20ec6ed5e0f437907
 usr/lib/.build-id/93/7b98871b78ac8e0013c346a8dbbd794817272b
 usr/lib/.build-id/93/8ff443d4127711f322efb86ab693d10e7930ec
-usr/lib/.build-id/93/f67643a072fb0857a2049d629784b4046b56a4
-usr/lib/.build-id/94/fd06a625fdcb1a8fb98b9a3c2b0588c92eded6
-usr/lib/.build-id/95/313fa355cef72bbd303c2fec30bb2d4273e6f9
+usr/lib/.build-id/94/ca912a89ac1f6edd945891b917fde2f1b5625e
+usr/lib/.build-id/94/f60a8116ac809252433fb51ec9e2ca14d5d38f
+usr/lib/.build-id/95/99c8aa8899f4d1feee7fb09ae78b3890f7461e
 usr/lib/.build-id/96/07c26251d85a17b1dddcea2d0e4980ff2431e8
 usr/lib/.build-id/96/246730dc288abc088cb67f5f09429ef270ecce
-usr/lib/.build-id/96/81019d1c76ba4c631a2ecfccc960beb6940f62
 usr/lib/.build-id/96/a902362c51d1f357a58183643fd7bdcee5fe35
-usr/lib/.build-id/96/cf0c1f609177070cdb0f4cde63d387eec4ee30
 usr/lib/.build-id/96/dfb4f4c5456974279f8e27b2f75b06a9ef8de9
 usr/lib/.build-id/96/e110e8c4f3d13d6db6754ed4b3136e14fb3347
 usr/lib/.build-id/96/f7b1214efa81dce610806904ce64d47556b9bf
-usr/lib/.build-id/96/fd49cb4ddba4922f15f052873d3d4871883f94
 usr/lib/.build-id/97/52db898c37cd55c2b9338dde8851a568b9883a
+usr/lib/.build-id/97/5f05938274f7189867032f565d7bdc0826e5f5
 usr/lib/.build-id/97/783782421dae1b5e724e43252ddf2c58fcba39
-usr/lib/.build-id/97/8c4272cea05fd04cd8699818a5fd338972a655
-usr/lib/.build-id/97/a2f28cb2997e0c143afff7d97230f8a5f0087a
 usr/lib/.build-id/97/ab61718b43032e37b69cf43be9b1711ae8e940
 usr/lib/.build-id/97/af3ced2febb1c77cef0922595e63709df6a1d7
-usr/lib/.build-id/97/ebeb6cbd154239c04075519e76efdb4324ddee
-usr/lib/.build-id/98/060c37f745d1aaa6fd5635436fd8b74223b9cf
-usr/lib/.build-id/98/326430e57acba98d86174b184b94865e269e64
-usr/lib/.build-id/98/6b8b1f1679725af8e80aa4ddb63d9686672ae9
-usr/lib/.build-id/98/893e472436aa8236f7df2e96cc71a5c2c41fc4
+usr/lib/.build-id/98/0381c3ac52e3b99ac5245bacae48792a3ee7bf
+usr/lib/.build-id/98/6d5d76dd634b8f800f68595794b886b4a755e8
 usr/lib/.build-id/98/b6ee5197f95a0bece49c53f27b2f6af25f9254
 usr/lib/.build-id/98/e2f63b351351418546cfa58fc02dde4735c6b1
 usr/lib/.build-id/98/fe59e5531e0207a3b26340023413bdfc3ac866
-usr/lib/.build-id/99/545d738d81c4b1b4dcaeaba81253384a64d483
-usr/lib/.build-id/99/9aab3ffdd44d4f2ffe6abd6c6d36ccebadf3b3
+usr/lib/.build-id/99/43248c382f3203a9b2b40599ed609ee78d7582
+usr/lib/.build-id/99/4c1869b0cb09376e3903edab0865c4a0f28511
 usr/lib/.build-id/9a/23c951e336a915679cd9024cad86ab3f2847a6
-usr/lib/.build-id/9a/97cf3467d4c7cd8b43a457bc62a05fc26569cd
+usr/lib/.build-id/9a/3c1315f04e3c3f5429b55729668409b9cfe2fe
+usr/lib/.build-id/9a/9a6ba3723329523390a8a33a55345415bb477b
+usr/lib/.build-id/9a/de86dfec28f8ee98fd984bc90a6613d4ea7315
+usr/lib/.build-id/9b/12d4c26078c8945ec1e4cd4d04ece3c4a506a8
 usr/lib/.build-id/9b/665b2fd9375774245bdb4f47c5ee8c0a08adc8
-usr/lib/.build-id/9b/8cb116fd99ee1b4fe06f20153fb14fc7182168
+usr/lib/.build-id/9b/8bae872cd65bc334635170c5f959f1ef8d3ef1
+usr/lib/.build-id/9b/e9277ba5651885f66a444d6bdde84a80f7dcfe
 usr/lib/.build-id/9b/fc4c71a06b0be9ee73a993f3c9f7a3af131482
+usr/lib/.build-id/9c/09a89fbd6e168c0f9ae514fcde5a92dc41c34c
 usr/lib/.build-id/9c/0eecc52d0b8a4bd75683b8ab6d301ce1ddd6de
 usr/lib/.build-id/9c/260fabda23bfa76848f34dc87a2606d96ed3f0
-usr/lib/.build-id/9c/3ff33ed4dbce1d9f57a1a65f6888382a1a08b1
-usr/lib/.build-id/9c/a46619561097061aae382a7d699b574c3e915c
+usr/lib/.build-id/9c/853258a524f22d94cdb71dca4a747b4778fb31
 usr/lib/.build-id/9c/c4bdf73b7b214832345b1835bee877a8aee317
 usr/lib/.build-id/9d/33eeef685841d5162fd71c00fe9242c804f5bf
 usr/lib/.build-id/9d/8fee9f9084bc756f35b11dcc2e94474eac89f4
-usr/lib/.build-id/9d/a62ff2df0fdc0231637212a7970a212f8a2c96
+usr/lib/.build-id/9e/0d29f3c0cb8bcee1ea92ce28f6700bf5276191
 usr/lib/.build-id/9e/51ca94596fd497a980a831e86847d4be38249d
 usr/lib/.build-id/9e/54edb2f329e8696f91a72bc7680743eeb07a25
-usr/lib/.build-id/9e/93f75d07d84b70f14c0dbdad7c538987ab2e2e
+usr/lib/.build-id/9e/8ddb70f53dcb66acaacc8b04a902b27441245b
+usr/lib/.build-id/9e/a54c87c0fbbc7f0d0d0da20fd4c3df0c7f26c3
+usr/lib/.build-id/9e/bcbc82d7d1c4e30c9a0e2c73d2455e2eed9ef8
 usr/lib/.build-id/9e/c3458e3f8d8307e9fde43ea2d645c713fd6561
-usr/lib/.build-id/9f/0daf8f905ef39a353c83873f35a4ead760da84
+usr/lib/.build-id/9f/2f106621f179a8f1f3ac4df9985e68fad7a255
 usr/lib/.build-id/9f/31c010d936621c0c85237d4cee0b9a4aac0144
-usr/lib/.build-id/9f/e8dbdd3a3a340b97362fc36770327b0363b2a1
-usr/lib/.build-id/a0/20586d373b4931ea3e5d760f04fb0010c50527
-usr/lib/.build-id/a0/2503cb4f413863e0d473f5466015dff0bcc0aa
-usr/lib/.build-id/a0/5e538107651931a476168ba8a21a13f7040bc4
-usr/lib/.build-id/a0/ee3ed09c3d8a2b8917eb02b4233a149646c428
+usr/lib/.build-id/9f/3aa342b304d745fcee9adfb0064a4f9daaf05c
+usr/lib/.build-id/9f/a421eec167c98a3637e09c494f7ee1ffe4db1a
+usr/lib/.build-id/a0/499878f0209918acffcf15078960b75cfb9f79
+usr/lib/.build-id/a0/63611bbb9d4ab9b137fdddfc9128f3ac80b461
 usr/lib/.build-id/a1/06353ded26bf376234fd5b04d0e5952bd52ad1
-usr/lib/.build-id/a1/799c79fefd146749af58a28f3ca91f24243782
-usr/lib/.build-id/a1/956bee5bbef91bc7e63b289deb9b23d1b2a2aa
-usr/lib/.build-id/a1/f5b7dc98028572d375084aee8be53b7b2dde1f
+usr/lib/.build-id/a1/4292ccd0d447e24cf0a17aeb03c0a2179ed7a8
+usr/lib/.build-id/a2/94dc67b0211fa7a4ae51d31115f9f021710083
 usr/lib/.build-id/a2/9f34c67b668ceb72c11d25b91e83a5234d791c
-usr/lib/.build-id/a2/d13cc09af21dca99d65680d4894480c5bc32d4
+usr/lib/.build-id/a2/db163308bcb09f1c996ee13678480474f5a377
 usr/lib/.build-id/a3/258273512458334cbc24ce2f2cf9609f0b9909
-usr/lib/.build-id/a3/29c4d379a9224b1db9a35873afedc8217e169b
 usr/lib/.build-id/a3/6ab4f7a6464d01bd7ea1b9542fbebc39237796
-usr/lib/.build-id/a3/6ed3636ed028d4835f3c16630b7087152c7c58
+usr/lib/.build-id/a3/b1812b4f406e555c74ea09726d7f7c46c3c99c
+usr/lib/.build-id/a3/baffd1c21922de3b0e92d6e608332c8064da0b
+usr/lib/.build-id/a4/053e13ae8464b0fac21455c7cc604411c3cace
 usr/lib/.build-id/a4/091b6bcb744cf6c3edf445a3d3813e946dd734
-usr/lib/.build-id/a4/5a56dac1931258a50f2c8431263d83a2fc8970
-usr/lib/.build-id/a4/752c55773246f2d8b6918d881b2e229e929afa
+usr/lib/.build-id/a4/2ef1c78e170a1d1d55cfb1dfa60428a298650e
 usr/lib/.build-id/a4/987b4cf78c632393ef2453308b0a3803d7eec2
-usr/lib/.build-id/a4/ad3068a08da40a8d3e3ee0287265aac9740294
-usr/lib/.build-id/a4/c9b99ab34b40e4a5e937f30dcf2a66c1d89cf9
-usr/lib/.build-id/a4/e479f730ad1fadaee5098661bbe36923050081
+usr/lib/.build-id/a4/c9d4e3dbb904d92d858c9829bba67943c22bde
+usr/lib/.build-id/a4/dda759853add945edfe690262305cc1c90bdce
+usr/lib/.build-id/a4/f6a29b5aa0e965e9c61324ef1457dd75208f8b
 usr/lib/.build-id/a5/122452f2f956f492396bf64e82d12cc2b635ce
 usr/lib/.build-id/a5/2fc1db31e2c9d6c2bca255984692c20f747bc9
-usr/lib/.build-id/a5/3fb2ea5c71b1f52b8e9cd86ed937ec4f1ae654
 usr/lib/.build-id/a5/48430b7c152e3dfc6e3f398487cc5eae2c4f52
-usr/lib/.build-id/a5/66b664f8c1043c8419fc06b82a0ee0dbb2fc94
-usr/lib/.build-id/a5/7ba6ddca621e062ddb7ff7a4bfddf7bcbc0c2a
-usr/lib/.build-id/a5/94a6f6b47787994b3d8c74034eeb8f5dd9c755
+usr/lib/.build-id/a5/591fcc120fee79242fb773b8ea83f2b06c9891
+usr/lib/.build-id/a5/80b49e5b0e1db63103565a9c22ec8a1e2097c8
 usr/lib/.build-id/a5/97c5f31a4974fc5e3e1a2452c12fb211b26dd6
 usr/lib/.build-id/a5/a1d56ae6739d81cce21f67d1d5910c5a0e9609
-usr/lib/.build-id/a6/998d8799db11c1e5d0686bdfa90f87495c756a
+usr/lib/.build-id/a5/e103868627a26f653dbf93e6d6ed56f081f125
+usr/lib/.build-id/a6/0c4da09db0188c032dc9b18ec8c09b997c66bd
+usr/lib/.build-id/a6/c09ea22691158c488026540acab9f5675f675e
 usr/lib/.build-id/a6/d10687dc0f44bce6d5ebea74cbbefd77a3535b
-usr/lib/.build-id/a8/0f978205f9e5a0eb61c50396f02f93c3953c59
-usr/lib/.build-id/a8/61bb007100c21ddd867c5a270167bdca89f64d
+usr/lib/.build-id/a7/5f584f89a67983fc50e86b37d2d3e58e8f678b
+usr/lib/.build-id/a7/a3e66158ee7e81881f791779699792cb8b5126
+usr/lib/.build-id/a8/31937da80fc09ff65d9fd3817afa648f854895
 usr/lib/.build-id/a8/c25c9d96859f17a91b87fffdb24cccdc0b5f7b
-usr/lib/.build-id/a9/246d29d2b72e87f25ca32967585200286aa71c
-usr/lib/.build-id/a9/45f5cc2603da2b73609047f57f62dfd79c35ab
+usr/lib/.build-id/a8/de1343fbd9d95b05e5a2d1c89cebca098178da
+usr/lib/.build-id/a9/16ea80741920b540705a766848a73d1b0c385d
+usr/lib/.build-id/a9/76a9976ddc75db335d744f37579e38690cbede
 usr/lib/.build-id/a9/84bfee4df4cfe2d1956dac3cc10f4d55e83316
 usr/lib/.build-id/a9/959750f4da8411a75d2fb511cabddfd876a4e6
+usr/lib/.build-id/a9/a2d4cca5b2f7edcf41a8fe85571f99e5222ae3
 usr/lib/.build-id/a9/ac1b8d71f9f6f29c7486563376e295e17585d6
+usr/lib/.build-id/a9/ad071f1d9a3b29acef392735bef99610c6390e
 usr/lib/.build-id/a9/e118f6e8615748c17332535b146030fc181a81
-usr/lib/.build-id/aa/5acf60cf1aa39d6c4c82781f3123fc294a1dbf
+usr/lib/.build-id/aa/280855835ab01ad2944d6e07bbb326807f4e02
+usr/lib/.build-id/aa/84dd42c5424413fa075dff9a0982acaf74df96
 usr/lib/.build-id/aa/967c83cd29f89a1f5f729a8a0720f81e3f7746
-usr/lib/.build-id/aa/bd1eae9f04b1473dbdae49cc7e43a6ba666d6b
 usr/lib/.build-id/aa/e3b6a50fab84dd1f68f49c7345e17eca0a2d6a
 usr/lib/.build-id/ab/1fbd96602c83ca1eec4eb6207a3c5d8c63f6c1
-usr/lib/.build-id/ab/4dc30bca7589b1fccb713f29583df59556bc39
 usr/lib/.build-id/ab/c6a6a835e6371c621f0a08991bfaf3d078b1f1
+usr/lib/.build-id/ab/e85d6ed328ca087dfa4db3d1e20bb046f8896c
+usr/lib/.build-id/ab/fb165368b55b4425e0d77d7da0a830c7fc4480
+usr/lib/.build-id/ac/407d6675dc2c9d4a078d33d56e0bcfa9dd449c
 usr/lib/.build-id/ac/5155179b2793b388b2d099e669e9c7533db3a9
-usr/lib/.build-id/ac/84356bdb7ba9426e09dc1089b539ae4ffc49b7
-usr/lib/.build-id/ac/ae8d077283d05cc14a65eaf7b780c6178f6f0c
+usr/lib/.build-id/ac/9b1dd6ab73a396e56943db51ccfc08657de34a
+usr/lib/.build-id/ac/9b4d120b2a461156c79a66babc15da0a69bbe2
+usr/lib/.build-id/ac/f62677c4a5177ce6501f6e62a6607cd3576dcf
 usr/lib/.build-id/ad/00edd277873eb18631c5b3ce37f0e21f7f87c4
-usr/lib/.build-id/ad/031325d5ff768fc18d3826be840b9f4c1d2223
-usr/lib/.build-id/ad/89b1ee7a31b83218f9ef13ac572687176a5446
+usr/lib/.build-id/ad/a2334714f8653977a4926c4a7f3450d574c98a
+usr/lib/.build-id/ad/abd6660433b2029a6e1010a2ead1617b0995f9
 usr/lib/.build-id/ad/b9f79ebe950148e4abfcdc6df751e06f2e4da5
-usr/lib/.build-id/ae/1159473087ea30284702e387deabb03e5c8e7e
 usr/lib/.build-id/ae/62833d903d8c583e429769bc1b138e12d1a56a
-usr/lib/.build-id/ae/c870bec00491b88e355b69b52b54fa9769837a
-usr/lib/.build-id/af/0e5624afc6434d4dbcc5e784fc37857790a231
 usr/lib/.build-id/af/283c28bbaf5f173899cb4c5c6b41682dbc315b
 usr/lib/.build-id/af/2bcd903f115d5aa6b418862b1b20ae83565738
-usr/lib/.build-id/af/9d6ce37e5b7bbd429269263443774e54ced567
-usr/lib/.build-id/af/b2b760c08cc06606db6eba85affc78fdb7db3e
-usr/lib/.build-id/af/cc29f7a63fe24df4b2ec36aea99c9ca554b742
-usr/lib/.build-id/b0/2c34b783f75f44a1e65dd1154b05218e2066f2
-usr/lib/.build-id/b0/cae95ab30a57058a58442d38c3098f75a7b83a
-usr/lib/.build-id/b1/6a185b85d2d2c1c0089d784699cb9cd21e0747
-usr/lib/.build-id/b1/7f33621bf6ad0f259356c3e0cef3f383470fe3
-usr/lib/.build-id/b1/c6a17eb17bb58d9e717f6dc975dee3f18646b1
-usr/lib/.build-id/b1/c9e2d298afe1d9312591b19974ebab3b7c077a
+usr/lib/.build-id/af/9d89f708fecc6390a915692edce3b5f5783e8f
+usr/lib/.build-id/af/adf8efc64cc1a1356becb7e12bd9c4c519a086
+usr/lib/.build-id/b0/5846a0c34d2df2564d80213722984bb11f2071
+usr/lib/.build-id/b0/d37a5729b62304aba087b4cd7bb6f3c51a3438
+usr/lib/.build-id/b1/73c2269bb0d5efc7cce3c76d1b4dfdf7e9f944
 usr/lib/.build-id/b2/1ad70f94c08ad8c509e607d6094c5e042d5d1e
-usr/lib/.build-id/b2/589356c00f2efb4a2437faec2ec111ac085361
+usr/lib/.build-id/b2/2d63c1bf09e6b0285aca929aa08bcfb181fffd
 usr/lib/.build-id/b2/81a4ad3157172f472577082f6a66fa28bf1af9
 usr/lib/.build-id/b2/9b1fc39017fd2e92a1da94ac68cd88a170bd9a
-usr/lib/.build-id/b2/e4a9b2aff56b81a8b2a1e045f511d4eb30d7ce
-usr/lib/.build-id/b2/fb8a9201990639f8df740cebc6647c5e6b0aa9
-usr/lib/.build-id/b3/25bfc1a74a56e52cff8912a4a23d54e70c22d4
+usr/lib/.build-id/b3/051d5e4936b54c88cf35cee924ff09a064a065
 usr/lib/.build-id/b3/bbd514914024d9bf72859640a8cada72df0ddd
-usr/lib/.build-id/b3/df6280137b8d4f059902c8eaffa9628cafd2b2
-usr/lib/.build-id/b3/e9965a54bf80257a4e38422f8a461163dde085
-usr/lib/.build-id/b4/1aa22433b9663b73e5b7884edf1b2560dba505
-usr/lib/.build-id/b4/333f7511f9a556e42b00dda41eedec9a029eba
-usr/lib/.build-id/b4/3d917b4e7292dce61a328e49106e3d4aa660df
-usr/lib/.build-id/b4/6db8d8507ea5708bf003e49e3731600beaf035
+usr/lib/.build-id/b4/7553159357fe9f067968a9da5591bd5456bccb
+usr/lib/.build-id/b4/84173a1894f156548a8cf428a1bdc21d86415d
 usr/lib/.build-id/b4/97432156d3b35d15b1177c85fff452efc2363d
 usr/lib/.build-id/b4/cebdd7b4c9aba923ed6a8f9a6fc479042ddf5c
-usr/lib/.build-id/b5/0fe7ecf6095a8588c885815db876949f20ef01
-usr/lib/.build-id/b5/4528ce7c534d1a8650b18db99c9d180ce2607b
+usr/lib/.build-id/b5/136094a881789ec0ffbec5837fe95c4daf35bd
 usr/lib/.build-id/b5/7bb61fdb1f7c3a1a3c8e409cb33980e845e364
-usr/lib/.build-id/b5/c0053ac09d7698649047c5b4ab9bfaa9353051
+usr/lib/.build-id/b5/7e2d3e835c6c6f29cfcad77499bf65084c9c25
+usr/lib/.build-id/b5/9a40ffdbe35bdb82b95dba55c5be90ef010631
 usr/lib/.build-id/b5/fdcfe4fbbcb34d72b0be46cb32d8ceab33ca9c
-usr/lib/.build-id/b6/0edab46d1c77f0a441541794b29d80e12e4df4
+usr/lib/.build-id/b6/2e1dea468148ef6821897489edd822e30f9ce1
 usr/lib/.build-id/b6/3a3c47eeaa75b6ac2849868efe07b01da2ba3d
-usr/lib/.build-id/b6/5ca06bb6f749bd68fdf6466fe4e8cdd745a0de
-usr/lib/.build-id/b6/95a5f4bc05d799c3c6076c690934695d761914
+usr/lib/.build-id/b6/58687790fa3a31aada72c8b3858041e076d74b
+usr/lib/.build-id/b6/d5c4bb60e3060eb879d4153e68df0336c0da45
+usr/lib/.build-id/b7/038cacc0040413c2ec6375e34dbf021311fb23
 usr/lib/.build-id/b7/06398164d8df2c0f9e7ab8b727d3164de96e79
-usr/lib/.build-id/b7/595b92adff15a83a4dcbe2589c0516f32e28e6
+usr/lib/.build-id/b7/420fb6af73efcec9d82632598d384b6f892b94
+usr/lib/.build-id/b7/459d01f70c3399dcf1611837f166914ba0cea9
 usr/lib/.build-id/b7/a2c605645efad44843cd6b8849dac92d17eca2
-usr/lib/.build-id/b7/ce9e2f50a7626f42b7764bde3b353163c3fa74
-usr/lib/.build-id/b7/dd28e7d5311bc57181ec38d8c876e918524b72
-usr/lib/.build-id/b8/2322a3b5c4b596bece96416af52e032692143c
+usr/lib/.build-id/b7/aff522f4d65a9992c2e6c890b4e4afa38c9b6e
+usr/lib/.build-id/b8/3a59349f9f4d309d74851cda0b34985e5a63ee
+usr/lib/.build-id/b8/9a347816dcb53bd0bee07adb2949f0bf66e3a8
+usr/lib/.build-id/b8/a951cabbb0b5bed2bd5411434f96b9396173d6
 usr/lib/.build-id/b8/ab5f4aea724a861c6894130f367ba713ea2b8d
-usr/lib/.build-id/b8/f73cdbbed2ec26ff6b33095b0bf8575b3d86e4
 usr/lib/.build-id/b9/339800015bc78b353b73175e4504db3b912184
-usr/lib/.build-id/b9/8014f2871075940cda898bd53a6df509ea5772
-usr/lib/.build-id/b9/eaa5afec480aaf8321dc081d86e9e226c03f5c
+usr/lib/.build-id/b9/84429a968c823424bbfa8d34f191b4a357d509
 usr/lib/.build-id/b9/f57906bc9abf2ac8f98d8305fbd4a2979279ce
-usr/lib/.build-id/ba/196c6dc793025aca5871c62a1aca55e5ed65f7
-usr/lib/.build-id/ba/6764dab7dfb0b2d121371e00744adbc2831342
-usr/lib/.build-id/ba/9fcd2c4cb085cdb104e759691ec3749a0511ea
-usr/lib/.build-id/ba/d0149aa6b9131f19e0cfc4f3783464b7a1be53
+usr/lib/.build-id/ba/9e652df50099e9ce590361dd4136efe6906c7b
+usr/lib/.build-id/ba/d38b11e988233132340bd8e4c940a305ae1a3e
 usr/lib/.build-id/bb/1ac1fe00b0b31f758812da72057fd7372acbc7
-usr/lib/.build-id/bb/2fc96c8a9662c741757796ebbbc7f0f9b5534d
+usr/lib/.build-id/bb/6d0c4138d5babda51b78f2df9952610d0e220f
+usr/lib/.build-id/bb/a190d81dc0570b1c1b22cddf0e022161d4dac1
 usr/lib/.build-id/bb/cecd2f3830dc81dc12e1c263f32bf876886aa5
 usr/lib/.build-id/bb/f350c37617c73e29a5ab6f78b14c97a5c09092
 usr/lib/.build-id/bb/fd288c3035b18c6f0ac291f28ca2527d7a448a
-usr/lib/.build-id/bc/0145d7b7c30f6837de09602f517b1f6226a964
-usr/lib/.build-id/bc/128fb3de23970b403672c4443fdaf66521ba94
 usr/lib/.build-id/bc/181132be929ba4d551c2d56d44210579f36650
-usr/lib/.build-id/bc/37a975122cea6eefc542ea21eabc1e50f6f485
 usr/lib/.build-id/bc/995af1c7722691ca92b24ea8a48d74609fbe74
-usr/lib/.build-id/bc/d73fbd5746f9f7f6ac09a4daf7221457226700
-usr/lib/.build-id/bd/016c12f33cf31091f821d12dba5b150731cf83
-usr/lib/.build-id/bd/100c1298721fe5bc9ece011bf56edbb6a49aea
-usr/lib/.build-id/bd/25a0b81351901d6b2429d36d8b58a2170be86b
-usr/lib/.build-id/bd/45a29b039032b2b46c6e8a7489d73e721ae42b
+usr/lib/.build-id/bc/fa8195639305890e3f21a116adda6ddc8c163c
+usr/lib/.build-id/bd/2a40bccee31324ec5226263cc59edcf4071e2a
 usr/lib/.build-id/bd/56eb18a23799b3a60bf316a453db7250026a11
-usr/lib/.build-id/bd/d02b7b660634b022a8bd8eff6ef5f9a2bfb71e
+usr/lib/.build-id/bd/68fc3a253a847f1d627460fba65b51332c5270
+usr/lib/.build-id/bd/b0731dcf251c2bffa44849b90f11b4e84cebb5
 usr/lib/.build-id/bd/e58488c3c26d88abb774b24eb46a84ad443564
 usr/lib/.build-id/be/42d39bfb309c98d6cecb0deddb8074e00d412c
-usr/lib/.build-id/be/595b0883b45f1d3c78649f91730f4c352bc180
-usr/lib/.build-id/be/7259bd795343121c07bde1fb2406521f66f462
 usr/lib/.build-id/be/83223e141d9963545ef188af72f94dca92d5aa
 usr/lib/.build-id/be/ae3eb7a9e1556e67d8121633a56456141e1270
+usr/lib/.build-id/be/b0e4b811efdd066eb78337bdc255e3a78e573c
+usr/lib/.build-id/be/c4bcdf038ca51bf2dacb0461fdbbf8d250806f
 usr/lib/.build-id/be/cf156e5c0cc2a28a81fc514132422c45e89e87
 usr/lib/.build-id/bf/0aed0e8032b776d14d49f64c28ccda3f4de369
-usr/lib/.build-id/bf/6d36740d336d643cbd55d5b812537fa9ff94c5
-usr/lib/.build-id/bf/9186bcf49ccc58d4ebccf143fe3617d4e3d8c4
-usr/lib/.build-id/bf/c431ebfe9d8ff4dc4a02c340fb352968405051
+usr/lib/.build-id/bf/ba81bb7ef95a64a9cb5a9cb9cf50db57cfc162
 usr/lib/.build-id/c0/a65afc039f74306a0209caf95fe793e5ac343c
-usr/lib/.build-id/c0/c35a26835f446576838f671a8b3fd5ac7696b8
-usr/lib/.build-id/c1/5408ac870ce6b741ff36950dc14195bc200dcd
-usr/lib/.build-id/c1/6cf7cfa6a84ab2bbdad1c8ad1b76a65023ea57
+usr/lib/.build-id/c0/dbe15a8e45f30799d193277d176063a58b7755
+usr/lib/.build-id/c0/e699ad81a71a94dbaf2ad438bc58ef9df9a1f5
+usr/lib/.build-id/c0/f7d07b6f8e8ff53f61be32e1fc10e7e43a957e
 usr/lib/.build-id/c1/7f9db1aca8b33846684bc3e45448fd36a9882d
-usr/lib/.build-id/c2/0bf048c58f637a29769700ebc2da1967ce9127
+usr/lib/.build-id/c1/ab465634fcd5710b0eace2ef6f1a178e9d997e
+usr/lib/.build-id/c1/eeaca3f4e2300b90d63a0609c9915af67c639b
+usr/lib/.build-id/c2/0c3b7f4cdf5171113e064f7774c2876216de59
 usr/lib/.build-id/c2/40fc71b17631b401747a59c4b259016073b984
 usr/lib/.build-id/c2/75f5d3b57b52beb2e9c03fb3353c1d8b91ff22
 usr/lib/.build-id/c2/a83d7049dbcb141558aa8b5f52c6c2c321203b
 usr/lib/.build-id/c2/acc4c92e65a9c39e113465b878ddadf6098d16
-usr/lib/.build-id/c2/d4979da1818acd6ecb293178b6dff2981a4033
-usr/lib/.build-id/c3/1636558409e04130592ed2995a640918657e75
-usr/lib/.build-id/c3/5337b71bed48a3d00dd18b702f32b902ec7ea3
-usr/lib/.build-id/c3/b98afc9319e261a63b136cb3e6f390d9c961c8
+usr/lib/.build-id/c2/c48405609a4928984382e4eb00b27038cc4e5a
+usr/lib/.build-id/c3/45029a807e88ac202d8f16ca0e7846e75444af
 usr/lib/.build-id/c3/bf62dd9df37f84cac5e00335ac6034ec5b112a
-usr/lib/.build-id/c3/c6787256bb89b236f995e5e832a0f359385ea1
-usr/lib/.build-id/c3/e46522b7d3af6818ae63fd63c43c297ea1b662
-usr/lib/.build-id/c4/1265d5887eebe0e58b64069868fc431ba6a003
+usr/lib/.build-id/c3/caacb8df730e5a1b1bf9bd58a7db4fa559f05c
 usr/lib/.build-id/c4/1fd647d5f4a9067b287a1d88bd51d4c0a08b24
 usr/lib/.build-id/c4/384405c11f65665446337e271d1af591b07f87
-usr/lib/.build-id/c4/464cca186c4b981eb3fd1d0f590e2006f4d9a8
+usr/lib/.build-id/c4/42279bde281cf21c8283fa45a7abde17d018b9
+usr/lib/.build-id/c4/6699f3851553bd6aa181321cbd03b9e0addfa3
 usr/lib/.build-id/c4/78c694afccd3fb0f2831f5a61c40025eba23e9
-usr/lib/.build-id/c4/cf7d59fd91f56d82f139e528ac467fd31cd498
+usr/lib/.build-id/c4/e0a7a4f18e3fa222d3664e39e85a0f0b984291
 usr/lib/.build-id/c5/042c4086cce02570e41e355dee7dd79ccce20f
 usr/lib/.build-id/c5/2d447faca8e767ebe181b78a85c09ea0b45d6b
 usr/lib/.build-id/c5/2d447faca8e767ebe181b78a85c09ea0b45d6b.1
 usr/lib/.build-id/c5/2d447faca8e767ebe181b78a85c09ea0b45d6b.2
 usr/lib/.build-id/c5/2d447faca8e767ebe181b78a85c09ea0b45d6b.3
-usr/lib/.build-id/c5/ce2a58ecd8396567f316ca119b06d2118de7c4
+usr/lib/.build-id/c5/9c9728a1768bd0d9a21557844b42159b83bd67
+usr/lib/.build-id/c5/e5e8e5ffa97ac3889c352b0789d28df4cb318d
 usr/lib/.build-id/c6/3d118c87bc148a5585d8981bc1b275e130a707
 usr/lib/.build-id/c6/558c073e0b206524d4b3583ed070e93fc446db
 usr/lib/.build-id/c6/a6f4af2c27466c51cbc9586ce005158b304b12
+usr/lib/.build-id/c6/c1fdbeb663ef2774f5eff886fba860bf33f3ec
+usr/lib/.build-id/c6/eb823d1c459cb6287ecae08b8ab05b47c3953d
 usr/lib/.build-id/c7/1428b2f746916f8cd2ed58e1ae17de9640cdc7
 usr/lib/.build-id/c7/4af666d3e2be27f503f53e08e8d2dc07ff9b11
 usr/lib/.build-id/c7/8470aa2713df4416fcc65a174ea0f745eb6404
-usr/lib/.build-id/c7/8516f81d0c8620eeeea287557aa5cdcfbcdfde
-usr/lib/.build-id/c7/897b5562d46bd5e04f3ed28a3f3adf8b64030c
 usr/lib/.build-id/c7/8b941c6cb4b6790887e430352b82a0c045e6a4
+usr/lib/.build-id/c7/8fc9ac5675480831d2e5481f4c92ac40d60c34
 usr/lib/.build-id/c7/919c5fe2a8b32eb1a3d5422912707020f3b67b
 usr/lib/.build-id/c7/abc241a6b77797795d381ba7c765fbd7545f26
-usr/lib/.build-id/c7/bbe3eb07066fe1b27dc4c35baf6ecbda6e69df
 usr/lib/.build-id/c8/1ba8b365aa6cc85dbc556c0427a9f18568ade2
 usr/lib/.build-id/c8/44f4d9260557c08f121d5c00c199a5bc2bebe1
-usr/lib/.build-id/c8/6547fe5011376fe0ab6f7e6662955eefa68a79
 usr/lib/.build-id/c8/7bb1b9128020dd181400e84d1c2d074a49bb60
+usr/lib/.build-id/c8/7f0478fa7dd2348ae45909be7666a10ac41a6b
 usr/lib/.build-id/c8/97e3670070b285a54252317839653e52ba3095
-usr/lib/.build-id/c9/21fa56f24ed3999f2f5a14bc35f5a5d056375e
+usr/lib/.build-id/c8/abe211cc9f1e9c85f3a56b785233dbc1da3b41
+usr/lib/.build-id/c8/c917976f665d3faaf4bbe9dc97ffa56219cf3b
 usr/lib/.build-id/c9/951de227dac88cc52c83ad7248b8efb4a0c593
 usr/lib/.build-id/c9/c56b7879a31732674b426d2e1ff9c7459a7e3a
 usr/lib/.build-id/ca/353d90367ce99faf3c73891ecd318b6011e908
+usr/lib/.build-id/ca/4d6962ee588d4cfc6059aba80546f1bfb1a6c9
+usr/lib/.build-id/ca/4fc53db044ceb422a140eb3435360e233587eb
+usr/lib/.build-id/ca/c5eb79ac5312d867b249928aa4ff6c5c31c3dc
 usr/lib/.build-id/ca/e6bf871dd800a2b67bca723dfe8a31e95865c2
-usr/lib/.build-id/cc/2c09bf6dc8f91afe2c9c0ed34eb5bed82bcd2b
-usr/lib/.build-id/cc/302bb94fb8438236b69d0c16767dce981698d3
-usr/lib/.build-id/cc/323ca46f7269504aa3b281a3013697eb92b86c
-usr/lib/.build-id/cc/4794e04a935ea223cf6d754b20d6994bb8edf8
-usr/lib/.build-id/cc/5a3047fcc55bf3c3fe8d6a5d63ea3f3a5bbec4
-usr/lib/.build-id/cc/e8940438fd378cf125a6f2f843d59227b42c10
-usr/lib/.build-id/cc/fa188d19f45e944a8c7cc370de2c3d201768cb
+usr/lib/.build-id/cb/780ab7145146941ebc192fb56855b860a7f0db
+usr/lib/.build-id/cb/ddd352a6ecf2f3409ba9e24fa1c7635db2c8d7
+usr/lib/.build-id/cc/10b69b1b0fc6a42c83cfa91d47bc01d9fae6a3
+usr/lib/.build-id/cc/a875d625c2dfbe293f76d20507edc4885fd175
+usr/lib/.build-id/cc/ae9dde72c2b19bb4177be8ae3af0b2d560c123
+usr/lib/.build-id/cd/4b8582a529ed5c9aaf4c7b1eb2087355607e27
+usr/lib/.build-id/cd/75bb36337773313710b38baeac9f9efa3abd1d
+usr/lib/.build-id/cd/7934b890b08e2eca890bae05e649dc67b2a869
+usr/lib/.build-id/cd/8ebe30acca7cb8c052b4fcd85858fff5325101
 usr/lib/.build-id/cd/c742ccdc79dd24dc5826263c5a15a8c4cde22a
-usr/lib/.build-id/cd/e4a1de715ce0637bbab0a88b5b39741536c441
-usr/lib/.build-id/cd/e5e2b91f74d14980ac2375443aa9ebc81b50a6
+usr/lib/.build-id/ce/0dea7d34046f965fcda9b83e55aa18c0561a7d
 usr/lib/.build-id/ce/27d457e75aa31d1dc467e28f8b8c6fb1e33918
+usr/lib/.build-id/ce/8af4bddc4303bc352403c04db4fb520a139f0c
 usr/lib/.build-id/ce/bc6febb40d126807e80ee76e88c0f905da346d
-usr/lib/.build-id/cf/2aa4b19e9597c634063287552803e802ff4a21
-usr/lib/.build-id/cf/2eb34ead4e03e5a10dd6ba9abfc85ffb1a3c51
-usr/lib/.build-id/cf/53e9273bfa46a4f669427bcf27d2b40affe4de
-usr/lib/.build-id/cf/868245bc31eb07d2ff39a0c54b374c58341cf3
-usr/lib/.build-id/cf/af9f1b5bcb1e56f7584e84361af2313af46d39
+usr/lib/.build-id/cf/2734ac59ed72afa2e7aaa4bfe15bb5ecf50dab
+usr/lib/.build-id/cf/459a4a048d181047eb8e7802261b9d7064fc13
 usr/lib/.build-id/cf/c0e1c2c0133d96cbb42c2b26d36468e6e1e3f0
 usr/lib/.build-id/cf/efb65631635284352ed39afa4de671707fe35e
-usr/lib/.build-id/d0/3d3b7f0e673ed11db071dc1a5f617c7b4571f7
-usr/lib/.build-id/d0/51209abe1bbd03fa14457d11a75470e952561a
-usr/lib/.build-id/d0/60d614fbfa8a0dafeb229c1b261c51a5ffd10f
-usr/lib/.build-id/d0/8b6603a1139eb36cd40c58582e8f773482e6fc
+usr/lib/.build-id/d0/9a307b6443cbf9a8d19e4aa8699c57008de8c4
 usr/lib/.build-id/d0/b2ab66a180f4f3732f9578382211d99d6864cf
 usr/lib/.build-id/d0/b3a2311328fcb22f693d7c80935f307b0d8e0e
-usr/lib/.build-id/d0/ec462042e89cbe1cdc48a11a619cc6ffcdfd49
 usr/lib/.build-id/d1/19b63d031946f6e72e9ab0ca3e41e54e2ee0bf
 usr/lib/.build-id/d1/23a489b5bd39195aa6982148894799f28d5864
 usr/lib/.build-id/d1/2587a6d9633158cbc7001b3062a416305387ca
-usr/lib/.build-id/d1/2f8e202710cc6767a49fb7ebfc04b3786ca2be
 usr/lib/.build-id/d1/3dfd185cc351a3261ccbc6de2cd87150c51422
 usr/lib/.build-id/d1/50bd51a517b543151d4f93fe21c2c6e63666a9
 usr/lib/.build-id/d1/6bbee941dfd932f0c5a2c7afbaec80b4b4b400
-usr/lib/.build-id/d1/97afc4b4626b4a16169d9290238e13991e8dfd
-usr/lib/.build-id/d1/bdd3c6de76806f50e845055bc265fb93f0c37d
-usr/lib/.build-id/d2/5736f08c6d421a04a3bf85ba8c603d32af7c4a
+usr/lib/.build-id/d1/81662b61979d8c371d1e9ae65540b536cb7fa2
+usr/lib/.build-id/d1/dcb91f301e68ce76818145c9701bb72238f01d
+usr/lib/.build-id/d2/30e6e431149812ee80c2821a400f7a31407cbb
 usr/lib/.build-id/d2/952d9403697ce8b6888a7436d6e2e3eb1a6ce6
 usr/lib/.build-id/d2/a4b635d755e4deacdae3535e3e48604750f9da
-usr/lib/.build-id/d2/bf0b656d5a9d43c085356d918a09183ae4c344
+usr/lib/.build-id/d2/c21314cde1b8d1b1dc3d756904138e3e73faf5
+usr/lib/.build-id/d2/c97657d76d8b34d612efdc73b129b3b18c7e81
+usr/lib/.build-id/d2/ced3581682f0b3dd188028290922a953e9c53f
 usr/lib/.build-id/d2/cf01578d8bc2a0f7d3cb1a3cdb4ed5b765b719
-usr/lib/.build-id/d3/184c23eff692a7411cade7d765cebf4906b14f
-usr/lib/.build-id/d3/3c889b5f0bb4e0a555c087546503b7a3fb494d
-usr/lib/.build-id/d3/77b1de658c621e2b2e028faf0f9ca5082a8781
+usr/lib/.build-id/d3/5722ad8fdc3431f5d9b46aa5687c4f8925805b
+usr/lib/.build-id/d3/7138f364076671b8f2f2c47b5b5d2e8d0cb7fd
+usr/lib/.build-id/d3/775deee4fad681c5a91e459229a79c7ecea17e
+usr/lib/.build-id/d3/81ab70a09508e5c72c18fd107595f53bd6aaa7
 usr/lib/.build-id/d3/9e4e10709bd393ac465b8813b66971e762ec75
+usr/lib/.build-id/d4/1b8af3544284872a8b4ae37dfb72d5633901fe
 usr/lib/.build-id/d4/20048a580b8891fb3a7449576b918b98fe2aa0
-usr/lib/.build-id/d4/3954ff7401e80f61eb20cdfc74a28779934173
-usr/lib/.build-id/d4/63c182909bc2ca83ae0a081e4119da75f44680
+usr/lib/.build-id/d4/2114ee3accab3597ec06b21cf2c2dae272be33
 usr/lib/.build-id/d4/7cc9c57c67e32b21c1836472c52947e7e4a1b0
 usr/lib/.build-id/d4/9eb72d1a52b3db0f0b57f92433eba15dcd41e5
-usr/lib/.build-id/d5/01c06035698c7b406eb0bc3129cf23a6d62329
-usr/lib/.build-id/d5/2f845ba749cc478408b027bd646d8b15ba55ee
-usr/lib/.build-id/d6/48acacdcab70244189a5afc366d2b2e08f565d
-usr/lib/.build-id/d6/55f2566dfb09297a3f77779086f74c0408ed99
+usr/lib/.build-id/d5/cb36cf68a112a6157bb98652678d125b609e24
 usr/lib/.build-id/d6/9767645c25e0ffec0cad6bbc4798dc3c6a1cb8
-usr/lib/.build-id/d6/b26f137efbbbd27c9171d8af86c6e9fe8c730e
-usr/lib/.build-id/d7/05bcc2a6bad2fa563d84ecfae40d611d6e1d2c
+usr/lib/.build-id/d6/adc564042c9e89b0c00cf3c89202998b604dbe
+usr/lib/.build-id/d6/f9af2fd60fdbc5f427c301833969b8c9e1675f
+usr/lib/.build-id/d7/355fc24a072f82751059753e402ad560198a60
 usr/lib/.build-id/d7/64d0b14f543b32c631502d022d31dc73605b99
+usr/lib/.build-id/d7/70497826bad0b9e8e5179274010291b044d9e5
 usr/lib/.build-id/d7/9f6e7527270cd0db13e99d96a2d19b37d3d609
-usr/lib/.build-id/d7/a31d8f56024cef6413a5f45a9d98c384b7736b
-usr/lib/.build-id/d7/b69b9e8fda127898fb3dfc6fd11d182913c6eb
-usr/lib/.build-id/d7/e573d9f529fd75b095d5c6d927e299ebc2fa1f
+usr/lib/.build-id/d7/d74c354ae09a3b9f6d092a569c0db3b6198d18
+usr/lib/.build-id/d7/eef20ca6dc50d5b7592c336ca0b4a780f35202
 usr/lib/.build-id/d8/214e54fbc4a7bc6533fdd2eee362feb850e32e
-usr/lib/.build-id/d8/2391d77de6fd5aff25077ae0ff5b4c2542a0a2
-usr/lib/.build-id/d8/5993c5f762ad4e00a11f14c5916f3236486b76
 usr/lib/.build-id/d8/642dae30f14fb46fe2eaab75ea3afb58821062
-usr/lib/.build-id/d8/6fbdea00227cee2914623c3fa4055ba9b9ba2a
-usr/lib/.build-id/d9/1e944525bec1663885f4173f2a3d43feb9c136
-usr/lib/.build-id/d9/23b03eb9ef52d1bd5e869bdce29ec0bedce4ee
-usr/lib/.build-id/d9/e67fa408add23fa094599947f0f4aa1d58a186
-usr/lib/.build-id/da/4868115a6bf6633ef6e93ccb39f8d0ca14b944
+usr/lib/.build-id/d8/b21e63ecd8f6b4a606b34ac79dd6c0d01cc6e5
+usr/lib/.build-id/d8/d8a4ed14c07fb2e6ed716401f0ae63f6a0501d
+usr/lib/.build-id/d8/dbf71e3e7037680297831da366676c4ca09d7f
+usr/lib/.build-id/d9/49b804415bbcf9e70e533417f7dd8f626307a2
+usr/lib/.build-id/d9/ca8c58c171f665c894ff48ef2c0d81d036c700
+usr/lib/.build-id/d9/f65a51abb58e67bee19e8c833c0d32fec78da2
 usr/lib/.build-id/da/94bcc8b3bbec0a4c190cdf82913f8c678542bc
+usr/lib/.build-id/da/ed8218dfe6c6839d3f5fc1a34903ab35802a89
 usr/lib/.build-id/db/0fb0cc9ac7495365c9e665d9d562dc909e92a4
-usr/lib/.build-id/db/5bb78fdbefc39214f9570a283db17dce1efb73
 usr/lib/.build-id/db/6cefd53bb91e9a5e82cf17a8c0edd792ab57ac
+usr/lib/.build-id/dc/3aac56c3c2a8b6378eaed0f07ea40a6af30768
 usr/lib/.build-id/dc/6c919a45d4cdcc1e9aa671ba513dfc1350d776
-usr/lib/.build-id/dc/7f1272993ebf066dcc77189dad2aab7f8e08f6
 usr/lib/.build-id/dc/8fb4bc44b44001849568ea8fbb43644780747b
+usr/lib/.build-id/dc/b62c90f48e0feafcfc72f2e8153cd4fafbb1ed
+usr/lib/.build-id/dc/c8f48f61fb1089fe044441df31e0faa1c1185a
 usr/lib/.build-id/dc/e36e3728dda8894bcae875a31705f9694401bc
-usr/lib/.build-id/dc/ffa2358aa009068bb3d3d8f81f71069740a964
+usr/lib/.build-id/dc/e969f26b418b3ee4a099d207a7b3f4a3fe566c
+usr/lib/.build-id/dc/f85620eeb3cb37337c2523e0f8fa69f0001f12
 usr/lib/.build-id/dd/0e01313179969d8991222d262c4fb98775937a
-usr/lib/.build-id/dd/0e06177d03ec7d54603763d3695203f8c62468
-usr/lib/.build-id/dd/1de41fd0981d474051f0bddc641334a211a9a5
-usr/lib/.build-id/dd/96151685ebd0d118da86ab83982894485dd981
-usr/lib/.build-id/dd/d37e8ff74f5d9e2f80dddae00fbcf733c28e9a
-usr/lib/.build-id/dd/dcb75f411654391e1736b77e826017deb082e2
+usr/lib/.build-id/dd/5df23d7cef85d580a84f3c9b6968101ab55ac7
+usr/lib/.build-id/de/09cf9415ff2b70670451aa53d155a314eab054
+usr/lib/.build-id/de/5042b23edb0b522033a9a71226262f26231c36
 usr/lib/.build-id/de/58f30b81f953639fc9e83b50b9c19ae2c64cba
-usr/lib/.build-id/de/69db9687e590d0bb6866373895cd202d90c647
-usr/lib/.build-id/de/aa3b37b63aa82699143571a133a49d96500dea
 usr/lib/.build-id/de/b23dd76d8c542d2e73e29d68b3439d3f8640dd
-usr/lib/.build-id/de/bf06da82f10f1e69974e99e8267230a5460fbe
+usr/lib/.build-id/de/b65148f5599f0310157f4259fb34321d776219
 usr/lib/.build-id/de/eb18792181b16453f40666d03f9bc4afc133c6
+usr/lib/.build-id/df/1a1e7738925d227c99bc6ccaa0d74937664e50
+usr/lib/.build-id/df/4f40111340999be168e8bc178af67b710b2871
+usr/lib/.build-id/df/fd700871bf2393e634f8b0b10af086a0b73c3b
 usr/lib/.build-id/e0/022df89ba27bc2c23c880594c280cef7314441
-usr/lib/.build-id/e0/20a3d201fcfbfc86d2a93d5a5b99acec93a7f6
-usr/lib/.build-id/e0/6cb0a82bac98d71b4b8cacb6cb02a14d847d51
-usr/lib/.build-id/e0/7322da594f0c16ae4e3aca78f30d9c17622544
-usr/lib/.build-id/e0/976dfa19dae32bc5baa2785200470d962f8742
+usr/lib/.build-id/e0/a1dc5d2edbafb443e1717a6ec62e98f274ddcc
 usr/lib/.build-id/e0/e8e0f1076aa84d34d8aad21d85e932216ba64e
-usr/lib/.build-id/e1/279e9aad070e96cd981e9c68f4685e4d123531
-usr/lib/.build-id/e1/4e5a7fab4f49cfaf6f3a8738f25c6a6ac3ec64
-usr/lib/.build-id/e1/6a7bcebfca76a2de690938efc077ae5fdae123
+usr/lib/.build-id/e1/238f104b7c387d75de3fda0889d105c1fa1cba
 usr/lib/.build-id/e1/8749e5654dd37408b1fdc84adb24a443b9d10c
 usr/lib/.build-id/e1/ace2b0b8c0e1214c1f3d2fa11a4d8d93078e5a
+usr/lib/.build-id/e2/035980162a13d606e1bdf93c778eb6312209d9
 usr/lib/.build-id/e2/0c01c431383a8c53534996f54e25724517d2ca
-usr/lib/.build-id/e2/1cb8f7a5718174f21fc6616ec5b2f88d5f11cb
-usr/lib/.build-id/e2/2cc16c5e72bde75f8e899876a5b30b5102eadf
 usr/lib/.build-id/e2/4098c207c166ee8a07cd50704df6f984018d75
-usr/lib/.build-id/e2/4d4ef158e4d72a11d64f10aa6424e0d0126ee3
-usr/lib/.build-id/e2/73a3259047300c22ad7ac816c0a727cbe93d34
+usr/lib/.build-id/e2/72ed553c94d586c58d66066aab6670fddfe1d7
 usr/lib/.build-id/e2/a16fef2908a8017ca5366f03b359275d7cc5dd
-usr/lib/.build-id/e2/b96a5290bd07227ecc3bb51219d72b53c29eee
-usr/lib/.build-id/e2/d00fc3e2f04c48d6bc2e07227a352a1f32e40c
+usr/lib/.build-id/e2/d0dafcb37ade303866148cf0ecefbda0096b67
+usr/lib/.build-id/e2/d235919399bc6615db6e1e08dd44592281c942
 usr/lib/.build-id/e2/f5cc13be512ec5e730cc4b5fc4475dda1c6558
 usr/lib/.build-id/e2/fd492bc7ae4663e6abc70165afdbfbfab1528f
-usr/lib/.build-id/e3/168d3b6ef133681321b9f7151460c1c9ceb348
-usr/lib/.build-id/e3/1f40d6f9f4dea23e9ce32d79fe7f8c05e71f8f
-usr/lib/.build-id/e3/576452cb794608e3b8db0834a792b060e6f329
+usr/lib/.build-id/e3/328a2c11dc330644928bacdc5896b1461664da
 usr/lib/.build-id/e3/7ac603fbbf2bb2fca7adbc2da46e01f2a85812
-usr/lib/.build-id/e3/99af6cf067969c891e7003a9796536a120f6ef
-usr/lib/.build-id/e3/9f549d4a189683ac37d17f2a08e9f456b410fc
 usr/lib/.build-id/e3/b32800823baad56d37784c59b9306eca1b9cf1
 usr/lib/.build-id/e4/2decc13c8548363d23ce48d1a99620e08b7102
-usr/lib/.build-id/e4/4998b47087bfa2f19fd48cbd705138f952a3db
 usr/lib/.build-id/e4/83e20f8388f8984e6b151781838d7d7fe360dc
+usr/lib/.build-id/e4/9e9d3b68f0940f57e97cbac261d21f59b601aa
+usr/lib/.build-id/e4/a0247e832a7a033b8da09da9e99cf6d64fe566
 usr/lib/.build-id/e4/e2e94fabd274944aff51cbb268b7eb12779d52
-usr/lib/.build-id/e5/2d450b70bf19954435d997e92facba035ede20
-usr/lib/.build-id/e5/302dc391b0ee508a7cc0e54b5ff2251cd0a735
+usr/lib/.build-id/e4/ed426d5a87a427827dafaf8e51e39fcadbd05b
+usr/lib/.build-id/e5/054774f999b03e59f5fa18480142b4bd445534
 usr/lib/.build-id/e5/65571ac985cb0f3eda66c755d93033112924be
 usr/lib/.build-id/e5/ed05ccb272002e79e69c717f5f32f5e00bfd15
 usr/lib/.build-id/e6/0daf16a76f895097072f10feb286638bdfb392
-usr/lib/.build-id/e6/430525f9ac012ff87677eaf7152c4dbda6a5cb
+usr/lib/.build-id/e6/294450e099a384e6094333e0881bac019800b1
+usr/lib/.build-id/e6/2ac6fdb82a54f40b51b65a3ed8c47004b1a260
 usr/lib/.build-id/e6/ae2a78a7ec4b56ada56bef67fa34ff70390f67
+usr/lib/.build-id/e7/16b845f49e39e752f68f666ebb0aa131f721d2
 usr/lib/.build-id/e7/278e39a80eac13e9d97a6feccb428cc1a848a8
-usr/lib/.build-id/e7/6babcea89734cad728f5103c788c4b9afd9741
-usr/lib/.build-id/e7/6d05fbffb47eda1cc21b6a1591eb646c721d26
-usr/lib/.build-id/e7/6f4cb2c77af91e8d32d402bbf269969b232422
-usr/lib/.build-id/e7/ff95e455e52bdfcc2f9853c88e0402aab7e16c
+usr/lib/.build-id/e7/49493a0b93a34e1bfc54680e256a152314d4b2
+usr/lib/.build-id/e7/ef3e58b665690735e628cf0d4a55f3726a995c
 usr/lib/.build-id/e8/3990cd4d77efef26c7b77d5b9bc9cfff9d74d5
-usr/lib/.build-id/e8/3b6ed6d423ee8dfb50c8b52fc842c157a48fbe
+usr/lib/.build-id/e8/3aaf70ea62fc4206c5ee4fc9bcfa98b72e578a
+usr/lib/.build-id/e8/4082689c7b23eed0a36c5a48fe85359eaea48d
 usr/lib/.build-id/e8/549c431b288e2c35ab282c3374c29ebd300f53
-usr/lib/.build-id/e9/008dc8f350798b418de935bd1f9b41b9bbd18e
+usr/lib/.build-id/e8/5cf228e9f4d13ac6b036c17f5020a4558373e5
+usr/lib/.build-id/e8/9895d97390926da1c925f1b0e3dc00cdcbe89b
+usr/lib/.build-id/e8/d012b5add013f7d0647a78c8c2f759996aea4a
+usr/lib/.build-id/e9/09c9f3c001f6d1e06f822e7b82cf524d171f32
 usr/lib/.build-id/e9/3c3d4fb7bb7a922cbb8040129c54b8f9a2a642
-usr/lib/.build-id/e9/616e08040a1d2c0441a8018226621f3b78c022
+usr/lib/.build-id/e9/52641ef7d21809955a14873002f047b85952ed
+usr/lib/.build-id/e9/79fc7b5be61e327368385f4db3f5a3df98ef28
+usr/lib/.build-id/e9/9b83df5a8e1443c376dcdebee69cf08e29617e
 usr/lib/.build-id/e9/c3e366752d07406d46cbccb22b27ed97dde3a7
+usr/lib/.build-id/ea/055dd368ec90891c293c0288718af02a8aac84
+usr/lib/.build-id/ea/0fa5eb2d08dacb3e00e5531393d545ccd4a91c
+usr/lib/.build-id/ea/34dd0b6efe116e87162890440d2b9b9df879ff
 usr/lib/.build-id/ea/a2faf8e6b92caf63ac7f3b1f104a76c6d3d17c
-usr/lib/.build-id/ea/e1eeeb95f996e1452e346eb759e5b7ae32fb33
-usr/lib/.build-id/eb/016bf5d9d7963cb2c029a2314098848fd99fdf
-usr/lib/.build-id/eb/4c02552ec5bbc9b0502d77da8cd5ce01d8490c
+usr/lib/.build-id/ea/b169baa518fe6dcf517252ef2ea4ed02543578
+usr/lib/.build-id/eb/92030a526c1206cad525804fb04ef87de5e69f
+usr/lib/.build-id/eb/b244b565262029f0272813afe4b16b2b7133a3
+usr/lib/.build-id/eb/b8de6c9ad08c136734936fc49cc51779f61b08
 usr/lib/.build-id/eb/cca458e7129367895ec62cf42750b9a533000a
-usr/lib/.build-id/eb/d51f7ad711aaaf4dba2f192c5b1c539b5e2295
+usr/lib/.build-id/eb/d1a5d2180df97ba2863d4c5026f3c0f9c342e3
 usr/lib/.build-id/eb/fd75a34e643ef8b64cc1f5225486681e214b4e
-usr/lib/.build-id/ec/244253222aede6670b0b39511da7c47c574024
+usr/lib/.build-id/ec/6587d9214bf908dd5d5ee3c95ae5e3be7330db
+usr/lib/.build-id/ec/673f7c63e58dc60e5aac6aca90a9e2d064c10f
+usr/lib/.build-id/ec/81712cd61ee36d7f4a28675b921fb40d855500
+usr/lib/.build-id/ec/9ac6b6351319335a2327260490d9b0b176ca19
+usr/lib/.build-id/ed/3e7dc9521e003840c63d3495620242d9d7ed53
 usr/lib/.build-id/ed/51ad6a5882c6f2a73240bf5a901326347bebbc
-usr/lib/.build-id/ed/8edc696e5aa421c82734ed1f3ef5656d537584
-usr/lib/.build-id/ed/9c7fe9d3bc3ca2a88ff3074ba5dd88e2fe763b
-usr/lib/.build-id/ed/ae0c473e5d4af07d7cc08ace0241b6511577f4
-usr/lib/.build-id/ed/c8ca3f0646dac6905a89fb78488a9990999d52
+usr/lib/.build-id/ed/76fd5c01115f708b20aa4286513c889e707143
+usr/lib/.build-id/ed/83cc97d4c1a7a03302c6da3bc8252dd6052936
+usr/lib/.build-id/ed/e4ce6a9a3abfb2c8808b20c451f1d41443a2cc
 usr/lib/.build-id/ed/fb93f83d981c2581055e50d31b8c6725259bca
-usr/lib/.build-id/ee/2d25c17cfa8577b7b12d8016aaad98e8a78565
-usr/lib/.build-id/ee/9ab84af531c4f73d23f547a81d4abd54f422f8
 usr/lib/.build-id/ee/a905ae972073934f747f732891abb38da6596a
-usr/lib/.build-id/ee/c9c11d9b1200d35e0d0039ae7d11c7335f956d
-usr/lib/.build-id/ef/1f0d9d4d7f8e1f10e169bfba0d6286e023779a
+usr/lib/.build-id/ee/aa4758ab678957f348c482bf1e4b1cd8dae956
+usr/lib/.build-id/ee/f801abd3cb9aebb971ebebfaea48424e705428
 usr/lib/.build-id/ef/345ecf247e01022dc8ce4ee0f02d1b8432f0fd
+usr/lib/.build-id/ef/36913c69ac46042e073f45b2a25461a580686d
 usr/lib/.build-id/ef/55a1e1729fd6ac859ca7c25898e3314e1cb69c
 usr/lib/.build-id/ef/892035f0f947ac78c4ef86ce9f30687fedc936
 usr/lib/.build-id/ef/8ef837eafca150b87e55412b4d330cd29c293c
-usr/lib/.build-id/f0/6e4fc578c094d49e186a0b98952d59b4d9e291
 usr/lib/.build-id/f0/a4107f43bb9c15e94c53f77b4d4c5dfcf1b27a
-usr/lib/.build-id/f0/df5276edb5dff6db8ada22d686583dec4f85b7
+usr/lib/.build-id/f0/e2cb92583b02ea8de5b1452d9ba4efac2a12cb
+usr/lib/.build-id/f1/726e7069560ee3cdd5241ace1793c250e7e95e
 usr/lib/.build-id/f1/79a154c8664be4575fa61bdaaa050893519abe
+usr/lib/.build-id/f1/90910a69fc724163c73b1d40eb59f516bb72b5
 usr/lib/.build-id/f1/f9015ba756067068369afe4e996ced0f86a534
 usr/lib/.build-id/f2/388b491804c1bc6e9bc1fc3eaf29c41839cd7c
 usr/lib/.build-id/f2/914d2d66a063d3105b0176b74d43b699922809
-usr/lib/.build-id/f2/debcd3a078d04f4baa409cc33882cfe6073cb4
-usr/lib/.build-id/f2/f5c7bb9d56df0c82d259d35fd5d2a3e5e1c0f2
+usr/lib/.build-id/f2/d7fa0533d029e04f9cc4a2348d6c4e102fe1ab
+usr/lib/.build-id/f3/4f78d0e6a8b73976834cdb59da1e8d507446b9
+usr/lib/.build-id/f3/6a7ca383bc94d566210be98905026ce99876c5
 usr/lib/.build-id/f3/9056d30357891f9ba337bcdcbc1068b483d235
+usr/lib/.build-id/f3/925fc1a485ae1780f78e4237402bbbfd018258
+usr/lib/.build-id/f5/08944db00d93f12c97a44925881ef73683fdc2
 usr/lib/.build-id/f5/17ce9229f80341efd5c61a6512ca8ad03ecf1f
 usr/lib/.build-id/f5/341a851208b4777e733b437721402a915afdd1
 usr/lib/.build-id/f5/52533ba8e8aead6e3112b3e7c8239d09a777fc
-usr/lib/.build-id/f6/17008a329391d4db49b0c404b5bf428be089c8
-usr/lib/.build-id/f7/2ebbc075133c156b00cd4a1bee0e63930176e0
-usr/lib/.build-id/f8/544ad90e1187bfefe756af2e1d3caf9d0d52a5
+usr/lib/.build-id/f5/ee9abfcc54928242b3c39ddff3d7efd9521be8
+usr/lib/.build-id/f6/e885e08d6f84009205cb1ce05df58cbcea8f9b
+usr/lib/.build-id/f7/645895047cb787dbc752fc370baa8ea0a34b9d
+usr/lib/.build-id/f7/846f2d4dbdb690a70d8bcd1f391f4a6257b490
+usr/lib/.build-id/f7/d649d46e7c7697be446f1d5700a4b2af70855f
+usr/lib/.build-id/f8/55dca56f03d5fd212c041db38d8a1474c4964f
+usr/lib/.build-id/f8/dbf760a337a5a2795b652311abd64b0c42aafa
 usr/lib/.build-id/f8/f7c2a36257162faada68d4ff33d04873c17de2
 usr/lib/.build-id/f8/f7c2a36257162faada68d4ff33d04873c17de2.1
 usr/lib/.build-id/f8/f7c2a36257162faada68d4ff33d04873c17de2.2
 usr/lib/.build-id/f8/f7c2a36257162faada68d4ff33d04873c17de2.3
+usr/lib/.build-id/f9/2f6282678e59a4c7415e69d91b74ada971586e
+usr/lib/.build-id/f9/4c94e14da8c451744360bc650700dc61514069
 usr/lib/.build-id/f9/5ff3c13355fa8366502fcf3b084afcc58c1d69
 usr/lib/.build-id/f9/97c75976df0d4202ab874fcc7e3058723b570a
 usr/lib/.build-id/f9/aaacf08c459641b1e24abeab8564120e07d819
+usr/lib/.build-id/f9/da100606a9d100aac0427b1058d2393f83d2ba
+usr/lib/.build-id/f9/e024d01a5c7087fe71b7193c25f26d06860b36
+usr/lib/.build-id/f9/ee92f2c778d6bcfa3a4af28d752c153efc61c8
+usr/lib/.build-id/fa/4c021ec8cfeb7c8dcaa85ab4f0f7577a44102b
 usr/lib/.build-id/fa/576b2c31e2e135022c36787ca19a4df9e3556e
-usr/lib/.build-id/fa/d020766d1328e90357b4dc32a153ab0424b347
-usr/lib/.build-id/fb/7d1c6013f9f0e5809a64e6b04768bfb4168a4b
-usr/lib/.build-id/fb/8550340f308c0dcad482277fbe39075d6b245d
-usr/lib/.build-id/fb/8b85fb90721f32014106dc613314414c8d2da8
+usr/lib/.build-id/fa/5795a6dcf5de2bf3bf684eb72c9346883de159
+usr/lib/.build-id/fa/7a291c8b5fbed49e1755d77d27432e82d5ad0b
+usr/lib/.build-id/fa/864a993490e7615df0010f3a2a59eea18c27c4
+usr/lib/.build-id/fa/88cf5fdc9637c4ba3655774d1e73c3c8eb91f5
+usr/lib/.build-id/fb/5e8db26cddcb34abbb961838fcd97dd62ff2fb
+usr/lib/.build-id/fb/8fbdf48342b351bdeac167161806e44ae711fc
 usr/lib/.build-id/fb/ae37bf50cf95a279b809d54ed7e78de6ab860b
 usr/lib/.build-id/fb/dd2cd0c0f13215c41be0569cee27a522de896d
 usr/lib/.build-id/fc/23007c5ed2db91aa9c11730e154f683517ba69
 usr/lib/.build-id/fc/2b1c316fe57d2dcae9651ee61287357d4f4fe8
-usr/lib/.build-id/fc/dd2d59bc1e0fb5fe51f6fb64de80365fe441db
+usr/lib/.build-id/fc/351d39140bf9912b654cdd6cb58df71d149b61
+usr/lib/.build-id/fc/46bc419367003d0e4e399cbe22aade4a1ee7be
+usr/lib/.build-id/fc/bec24a27da2c1022ed92f3448c6bbd5e0831db
+usr/lib/.build-id/fc/d288d8ac4bc587f5b05a2c87d6fb62b02ddcb3
+usr/lib/.build-id/fc/d75217e2740c5f63d748f87369ca66342109b2
 usr/lib/.build-id/fc/e9182f29619841dbfa010140c23a0821ab56a9
-usr/lib/.build-id/fc/fb08b4b98eb19bb00ac69c9c01b21ab7d49b0b
-usr/lib/.build-id/fd/07a00220c65e0f525a9dc40f3f580087bb75d4
-usr/lib/.build-id/fd/1678da0eb72c664529440301e0a524ed230160
-usr/lib/.build-id/fd/4729a7fd24028bc7c8f5b4b1f34e3c7b8ba0f0
 usr/lib/.build-id/fd/56b043ce47cb4f41be9f3bed51dffbe36f6a24
-usr/lib/.build-id/fd/5f0e1996407631f820849fdf00710f7ca5a485
 usr/lib/.build-id/fd/7d5cb1e4753bc54cacc836c4619af447db8b70
 usr/lib/.build-id/fd/838ec0d77e8b6d206c62045352af83ed7f5df5
 usr/lib/.build-id/fd/8d1f5ff969c9fd4bfc1011fd1d199c4fa933dd
 usr/lib/.build-id/fd/a968165e7057412c25aac6a072e0c79c60ffdf
 usr/lib/.build-id/fd/e30e7b72e074322e253308b1510e7fc30f3a95
-usr/lib/.build-id/fd/e38d64ef2bec9a8fc2f6f149dc8be89d27a306
+usr/lib/.build-id/fd/eb44dab416cb9bb521da086ebc8d1a7a24793a
 usr/lib/.build-id/fd/ee3cb0a79105f9aee6e8f5cbcb3b97fe227c26
+usr/lib/.build-id/fe/0727eb33f51a6b2a505984938dc862b561f387
 usr/lib/.build-id/fe/3365699995eb323d015d38abb79135902bb4c6
-usr/lib/.build-id/fe/3945a8ae7883a598f3a342280ba47864a72df0
-usr/lib/.build-id/fe/3a3817bb61e8f3532fda8ba485fe3013e40410
 usr/lib/.build-id/fe/84cf66af8f613d10cf5aef3dcaf96f182cf3b3
 usr/lib/.build-id/fe/8903ee76261ccca26c0f75daa1da637a93f37b
+usr/lib/.build-id/fe/9d372cc4bd5146afb2c70ab9bed7af43b1a118
+usr/lib/.build-id/fe/b4086af6091e61dc75e4ede3c28058d2ac8e63
 usr/lib/.build-id/fe/d1b1f776bdea5a954e065e9d120b2f483da3c8
 usr/lib/.build-id/fe/e136153b4475983e66c5b56561d4ffb17e9e92
 usr/lib/.build-id/ff/4e6a6a9dff6649d9d98a79ce2a2ba5bea74c35
 usr/lib/.build-id/ff/5ce98065bd719acf94b749c1d7ce08cef7f954
-usr/lib/.build-id/ff/88d78159bf42bc79d48b83f7211d50cc236ccd
+usr/lib/.build-id/ff/7f83ad7098ce78fa7b5b11dfafd3ca39e6bd7d
 usr/lib/.build-id/ff/c6ae65e93b1b44c35c34dcfa80e69bc9515b53
 usr/lib/.build-id/ff/fedf745ffddf06d62b2d322d1bffaa3a8a30d1
 usr/lib/.libgmp.so.10.4.0.hmac
@@ -1355,6 +1359,8 @@ usr/lib/engines-3/afalg.so
 usr/lib/engines-3/capi.so
 usr/lib/engines-3/loader_attic.so
 usr/lib/engines-3/padlock.so
+usr/lib/fipscheck/libcrypt.so.2.0.0.hmac
+usr/lib/fipscheck/libcrypt.so.2.hmac
 usr/lib/fipscheck/libgmp.so.10.4.0.hmac
 usr/lib/fipscheck/libgmp.so.10.hmac
 usr/lib/gconv/ANSI_X3.110.so
@@ -1639,6 +1645,8 @@ usr/lib/libcap.so.2
 usr/lib/libcap.so.2.48
 usr/lib/libcom_err.so.2
 usr/lib/libcom_err.so.2.1
+usr/lib/libcrypt.so.2
+usr/lib/libcrypt.so.2.0.0
 usr/lib/libcrypto.so.3
 usr/lib/libcrypto.so.3.2.2
 usr/lib/libdatrie.so.1
@@ -1724,6 +1732,7 @@ usr/lib/libncurses.so.6
 usr/lib/libncurses.so.6.2
 usr/lib/libncursesw.so.6
 usr/lib/libncursesw.so.6.2
+usr/lib/libnsl.so.1
 usr/lib/libnss_compat.so.2
 usr/lib/libnss_dns.so.2
 usr/lib/libnss_files.so.2
@@ -1826,6 +1835,8 @@ usr/lib64/engines-3/afalg.so
 usr/lib64/engines-3/capi.so
 usr/lib64/engines-3/loader_attic.so
 usr/lib64/engines-3/padlock.so
+usr/lib64/fipscheck/libcrypt.so.2.0.0.hmac
+usr/lib64/fipscheck/libcrypt.so.2.hmac
 usr/lib64/fipscheck/libgmp.so.10.4.0.hmac
 usr/lib64/fipscheck/libgmp.so.10.hmac
 usr/lib64/gawk/filefuncs.so
@@ -2123,6 +2134,8 @@ usr/lib64/libcap.so.2
 usr/lib64/libcap.so.2.48
 usr/lib64/libcom_err.so.2
 usr/lib64/libcom_err.so.2.1
+usr/lib64/libcrypt.so.2
+usr/lib64/libcrypt.so.2.0.0
 usr/lib64/libcrypto.so.3
 usr/lib64/libcrypto.so.3.2.2
 usr/lib64/libdatrie.so.1
@@ -2209,6 +2222,7 @@ usr/lib64/libncurses.so.6
 usr/lib64/libncurses.so.6.2
 usr/lib64/libncursesw.so.6
 usr/lib64/libncursesw.so.6.2
+usr/lib64/libnsl.so.1
 usr/lib64/libnss_compat.so.2
 usr/lib64/libnss_dns.so.2
 usr/lib64/libnss_files.so.2
@@ -2548,6 +2562,10 @@ usr/share/dbus-1/services/org.gtk.GLib.PACRunner.service
 %%PORTDOCS%%usr/share/doc/libverto/ChangeLog
 %%PORTDOCS%%usr/share/doc/libverto/NEWS
 %%PORTDOCS%%usr/share/doc/libverto/README
+%%PORTDOCS%%usr/share/doc/libxcrypt/NEWS
+%%PORTDOCS%%usr/share/doc/libxcrypt/README
+%%PORTDOCS%%usr/share/doc/libxcrypt/README.rhel
+%%PORTDOCS%%usr/share/doc/libxcrypt/THANKS
 %%PORTDOCS%%usr/share/doc/mpfr/BUGS
 %%PORTDOCS%%usr/share/doc/mpfr/NEWS
 %%PORTDOCS%%usr/share/doc/mpfr/PATCHES
@@ -2685,6 +2703,9 @@ usr/share/licenses/libsmartcols/COPYING.LGPL-2.1-or-later
 usr/share/licenses/libuuid/COPYING
 usr/share/licenses/libuuid/COPYING.BSD-3-Clause
 usr/share/licenses/libverto/COPYING
+usr/share/licenses/libxcrypt/AUTHORS
+usr/share/licenses/libxcrypt/COPYING.LIB
+usr/share/licenses/libxcrypt/LICENSING
 usr/share/licenses/libzstd/COPYING
 usr/share/licenses/libzstd/LICENSE
 usr/share/licenses/mpfr/COPYING
@@ -3420,6 +3441,7 @@ usr/share/man/man3/time.3am.gz
 usr/share/man/man5/.k5identity.5.gz
 usr/share/man/man5/.k5login.5.gz
 usr/share/man/man5/adjtime_config.5.gz
+usr/share/man/man5/crypt.5.gz
 usr/share/man/man5/e2fsck.conf.5.gz
 usr/share/man/man5/editrc.5.gz
 usr/share/man/man5/ext2.5.gz
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 5cd8453f3fbf..ca1aa00f307e 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	qemu
-DISTVERSION=	9.1.0.20241231
-PORTREVISION=	1
+DISTVERSION=	9.1.0.20250228
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -24,11 +23,11 @@ USES=		bison compiler:c11 cpe gmake gnome iconv:wchar_t localbase:ldflags \
 		ninja perl5 pkgconfig python:build shebangfix tar:xz xorg
 USE_GITLAB=	yes
 GL_ACCOUNT=	qemu-project
-GL_TAGNAME=	c6f59e3b68abefc1f6942d4b4e3063d96d903b27
+GL_TAGNAME=	6b7521818b26134726b3494cd06f04e30659ce2c
 GL_TUPLE=	qemu-project:keycodemapdb:f5772a62ec52591ff6870b7e8ef32482371f22c6:keycodemapdb/subprojects/keycodemapdb \
 		qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/subprojects/dtc \
 		qemu-project:libvfio-user:0b28d205572c80b568a1003db2c8f37ca333e4d7:libvfio/subprojects/libvfio-user \
-		qemu-project:meson:631cce71db8dbae9f2330d48cb429a7ccec77135:meson/meson \
+		qemu-project:meson:be6540e6fdcf1ee88939a74521caa3813b039199:meson/meson \
 		qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/subprojects/berkeley-softfloat-3 \
 		qemu-project:berkeley-testfloat-3:e7af9751d9f9fd3b47911f51a5cfd08af256a9ab:berkeleytestfloat3/subprojects/berkeley-testfloat-3
 USE_GNOME=	cairo glib20
@@ -52,8 +51,9 @@ WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 PORTDOCS=	.buildinfo _static/* about/* dbus-dbusindex.html devel/* \
-			docs genindex.html index.html interop/* objects.inv \
-			search.html searchindex.js specs/* system/* tools/* user/*
+			docs genindex.html glossary.html index.html interop/* \
+			objects.inv search.html searchindex.js specs/* system/* \
+			tools/* user/*
 
 OPTIONS_DEFINE=	SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL VDE \
 		CDROM_DMA USBREDIR X86_TARGETS STATIC_LINK DOCS CAPSTONE
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 12889b053d05..3c3133309fcb 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1745742957
-SHA256 (qemu/9.1.0.20241231/qemu-project-qemu-c6f59e3b68abefc1f6942d4b4e3063d96d903b27_GL0.tar.gz) = 5a7fe7177d2ce22450ac18439cb13efb80bfd4dd2d850456a8beabdc2c8b9152
-SIZE (qemu/9.1.0.20241231/qemu-project-qemu-c6f59e3b68abefc1f6942d4b4e3063d96d903b27_GL0.tar.gz) = 39928113
-SHA256 (qemu/9.1.0.20241231/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
-SIZE (qemu/9.1.0.20241231/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
-SHA256 (qemu/9.1.0.20241231/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
-SIZE (qemu/9.1.0.20241231/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
-SHA256 (qemu/9.1.0.20241231/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
-SIZE (qemu/9.1.0.20241231/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
-SHA256 (qemu/9.1.0.20241231/qemu-project-meson-631cce71db8dbae9f2330d48cb429a7ccec77135_GL0.tar.gz) = 2c65be52a6c2575d1c6932d5a0b79edb440582db2dda5ce5fd0597d98dc2b4e0
-SIZE (qemu/9.1.0.20241231/qemu-project-meson-631cce71db8dbae9f2330d48cb429a7ccec77135_GL0.tar.gz) = 4845255
-SHA256 (qemu/9.1.0.20241231/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
-SIZE (qemu/9.1.0.20241231/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
-SHA256 (qemu/9.1.0.20241231/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df
-SIZE (qemu/9.1.0.20241231/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308
+TIMESTAMP = 1746449997
+SHA256 (qemu/9.1.0.20250228/qemu-project-qemu-6b7521818b26134726b3494cd06f04e30659ce2c_GL0.tar.gz) = cdd568112f9ab1c28ee441de27c6eb9e665f16ff736163ccca6e65c7a76b91ed
+SIZE (qemu/9.1.0.20250228/qemu-project-qemu-6b7521818b26134726b3494cd06f04e30659ce2c_GL0.tar.gz) = 39568586
+SHA256 (qemu/9.1.0.20250228/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
+SIZE (qemu/9.1.0.20250228/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
+SHA256 (qemu/9.1.0.20250228/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
+SIZE (qemu/9.1.0.20250228/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
+SHA256 (qemu/9.1.0.20250228/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
+SIZE (qemu/9.1.0.20250228/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
+SHA256 (qemu/9.1.0.20250228/qemu-project-meson-be6540e6fdcf1ee88939a74521caa3813b039199_GL0.tar.gz) = c6f49660af00e0af025986e64ef6c87d3173b3d5f3d9cc66e72888a674de3c56
+SIZE (qemu/9.1.0.20250228/qemu-project-meson-be6540e6fdcf1ee88939a74521caa3813b039199_GL0.tar.gz) = 4875985
+SHA256 (qemu/9.1.0.20250228/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
+SIZE (qemu/9.1.0.20250228/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
+SHA256 (qemu/9.1.0.20250228/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df
+SIZE (qemu/9.1.0.20250228/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index 7641657e2e62..5a657b24cbc2 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -132,6 +132,7 @@ share/man/man7/qemu-storage-daemon-qmp-ref.7.gz
 %%DATADIR%%/multiboot_dma.bin
 %%DATADIR%%/multiboot.bin
 %%DATADIR%%/npcm7xx_bootrom.bin
+%%DATADIR%%/npcm8xx_bootrom.bin
 %%DATADIR%%/openbios-ppc
 %%DATADIR%%/openbios-sparc32
 %%DATADIR%%/openbios-sparc64
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 92d6c04c7012..6dce4eb92909 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	qemu
-DISTVERSION=	9.2.2
+DISTVERSION=	10.0.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -125,8 +126,9 @@ WITHOUT_CPU_CFLAGS=	yes #to avoid problems with register allocation
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 PORTDOCS=	.buildinfo _static/* about/* dbus-dbusindex.html devel/* docs \
-		genindex.html index.html interop/* objects.inv search.html \
-		searchindex.js specs/* system/* tools/* user/*
+		genindex.html glossary.html index.html interop/* objects.inv \
+		qapi-qga-index.html qapi-qmp-index.html qapi-qsd-index.html \
+		search.html searchindex.js specs/* system/* tools/* user/*
 
 OPTIONS_DEFINE=			CAPSTONE CDROM_DMA CURL DEBUG DOCS GNUTLS GTK3 \
 				ISCSI JPEG OPENGL PNG SAMBA SASL STATIC_LINK \
@@ -210,7 +212,8 @@ X11_USE=			GNOME=gdkpixbuf \
 X11_CONFIGURE_ENABLE=		sdl
 .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \
 	(${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent")
-X86_TARGETS_LIB_DEPENDS_OFF=	libdw.so:devel/elfutils
+X86_TARGETS_LIB_DEPENDS_OFF=	libdw.so:devel/elfutils \
+	liblzo2.so:archivers/lzo2
 X86_TARGETS_USES_OFF=		xorg
 X86_TARGETS_USE_OFF=		XORG=pixman,x11
 X86_TARGETS_CONFIGURE_ON=	--target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user'
@@ -219,7 +222,7 @@ X86_TARGETS_CONFIGURE_ON=	--target-list='i386-softmmu i386-bsd-user x86_64-softm
 .include <bsd.port.options.mk>
 
 .if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent
-.if ${ARCH} == "i386" || ${ARCH} == "powerpc"
+.if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH:Marmv?}
 PLIST_SUB+=	NO_I386="@comment "
 .else
 PLIST_SUB+=	NO_I386=""
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 3c4c176f1875..275a61eeb6ef 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745742982
-SHA256 (qemu/9.2.2/qemu-9.2.2.tar.xz) = 752eaeeb772923a73d536b231e05bcc09c9b1f51690a41ad9973d900e4ec9fbf
-SIZE (qemu/9.2.2/qemu-9.2.2.tar.xz) = 134756816
+TIMESTAMP = 1746448259
+SHA256 (qemu/10.0.0/qemu-10.0.0.tar.xz) = 22c075601fdcf8c7b2671a839ebdcef1d4f2973eb6735254fd2e1bd0f30b3896
+SIZE (qemu/10.0.0/qemu-10.0.0.tar.xz) = 135618260
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index cfb483cb75d3..0622304d8a65 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -127,6 +127,7 @@ include/qemu-plugin.h
 %%DATADIR%%/multiboot.bin
 %%DATADIR%%/multiboot_dma.bin
 %%DATADIR%%/npcm7xx_bootrom.bin
+%%DATADIR%%/npcm8xx_bootrom.bin
 %%DATADIR%%/openbios-ppc
 %%DATADIR%%/openbios-sparc32
 %%DATADIR%%/openbios-sparc64
@@ -134,6 +135,7 @@ include/qemu-plugin.h
 %%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.bin
 %%DATADIR%%/palcode-clipper
 %%DATADIR%%/petalogix-ml605.dtb
+%%DATADIR%%/pnv-pnor.bin
 %%DATADIR%%/pxe-e1000.rom
 %%DATADIR%%/pxe-eepro100.rom
 %%DATADIR%%/pxe-ne2k_pci.rom
diff --git a/emulators/qemu8/Makefile b/emulators/qemu8/Makefile
index a59731dfb6e1..13f6e2a4ac07 100644
--- a/emulators/qemu8/Makefile
+++ b/emulators/qemu8/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qemu
 DISTVERSION=	8.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 3b6d42bb3b9f..ff1b40c63c64 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uae
 PORTVERSION=	0.8.29
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/grembo
 
@@ -16,19 +16,13 @@ USES=		gmake gnome pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD
-USES+=	llvm:max=15
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|build68kc|build68k|' \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|struct socketbase {|extern &|' \
-		${WRKSRC}/src/include/bsdsocket.h
+pre-patch:
 	@${LN} -sf ../md-ppc/support.c ${WRKSRC}/src/md-ppc-gcc/support.c
 
 do-install:
diff --git a/emulators/uae/files/patch-src_Makefile.in b/emulators/uae/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..9fce0c548a90
--- /dev/null
+++ b/emulators/uae/files/patch-src_Makefile.in
@@ -0,0 +1,21 @@
+--- src/Makefile.in.orig	2025-05-05 16:21:46 UTC
++++ src/Makefile.in
+@@ -9,7 +9,8 @@ CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ \
+ LDFLAGS   = @LDFLAGS@
+ CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ \
+ 		-DSYSTEM_ROMDIR=\"$(datadir)/uae/roms\" \
+-		-DSYSTEM_CFGDIR=\"$(datadir)/uae/configs\"
++		-DSYSTEM_CFGDIR=\"$(datadir)/uae/configs\" \
++		-Wno-error=incompatible-function-pointer-types
+ X_CFLAGS  = @X_CFLAGS@ @GTK_CFLAGS@ -DSHM_SUPPORT_LINKS=@SHM_SUPPORT_LINKS@
+ TARGET    = @TARGET@
+ LIBRARIES = @LIBRARIES@ @LIBS@ @GTK_LIBS@
+@@ -112,7 +113,7 @@ tools/build68k:
+ tools/genblitter:
+ 	$(MAKE) -C tools genblitter
+ tools/build68k:
+-	$(MAKE) -C tools build68kc
++	$(MAKE) -C tools build68k
+ tools/gencpu: 
+ 	$(MAKE) -C tools gencpu
+ 
diff --git a/emulators/uae/files/patch-src_include_bsdsocket.h b/emulators/uae/files/patch-src_include_bsdsocket.h
new file mode 100644
index 000000000000..02e8c1fc284d
--- /dev/null
+++ b/emulators/uae/files/patch-src_include_bsdsocket.h
@@ -0,0 +1,11 @@
+--- src/include/bsdsocket.h.orig	2025-05-05 16:22:22 UTC
++++ src/include/bsdsocket.h
+@@ -29,7 +29,7 @@ extern void deinit_socket_layer (void);
+ #define MAXADDRLEN 256
+ 
+ /* allocated and maintained on a per-task basis */
+-struct socketbase {
++extern struct socketbase {
+     struct socketbase *next;
+     struct socketbase *nextsig;	/* queue for tasks to signal */
+ 
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index fb45645dbec5..42173a71f552 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wine
-DISTVERSION=	10.5
+DISTVERSION=	10.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/10.x/
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index c4e407761e2a..71d09994e6f0 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745652916
-SHA256 (wine-10.5.tar.xz) = c036ec1ef47674774a5f994583022e9e2eb68fe8fc18b3a8c79e685b3bec89bc
-SIZE (wine-10.5.tar.xz) = 32353760
+TIMESTAMP = 1746303351
+SHA256 (wine-10.6.tar.xz) = 2af8809a3e987363752c8f7640efa72a7c9d3213d332437db87ce1d0d98e9061
+SIZE (wine-10.6.tar.xz) = 32380968
diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_signal_x86_64.c b/emulators/wine-devel/files/patch-dlls_ntdll_signal_x86_64.c
deleted file mode 100644
index 662ffc968b55..000000000000
--- a/emulators/wine-devel/files/patch-dlls_ntdll_signal_x86_64.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- UTC
-commit 52cb060f41e96dfd2140a32b4ef70b1098f4b449
-Author: Gerald Pfeifer <gerald@pfeifer.com>
-Date:   Sun Apr 6 23:19:45 2025 +0200
-
-    ntdll: Fix build on platforms without getauxval.
-    
-    Commit b1b5105ceb moved the following block
-    
-        #ifdef AT_HWCAP2
-                 if (getauxval( AT_HWCAP2 ) & 2) syscall_flags |= SYSCALL_HAVE_WRFSGSBASE;
-        #endif
-    
-    out of an #ifdef __linux__ block and it now causes failures on FreeBSD
-    and others which do not have getauxval.
-
---- dlls/ntdll/unix/signal_x86_64.c
-+++ dlls/ntdll/unix/signal_x86_64.c
-@@ -2504,11 +2504,11 @@ void signal_init_process(void)
- 
-     if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) syscall_flags |= SYSCALL_HAVE_XSAVE;
-     if (xstate_compaction_enabled) syscall_flags |= SYSCALL_HAVE_XSAVEC;
-+
-+#ifdef __linux__
- #ifdef AT_HWCAP2
-     if (getauxval( AT_HWCAP2 ) & 2) syscall_flags |= SYSCALL_HAVE_WRFSGSBASE;
- #endif
--
--#ifdef __linux__
-     if (wow_teb)
-     {
-         int sel;
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 90ac42601e40..005c41812e6e 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -2721,10 +2721,10 @@ lib/wine/%%WINEARCH%%-windows/xolehlp.dll
 lib/wine/%%WINEARCH%%-windows/xpsprint.dll
 lib/wine/%%WINEARCH%%-windows/xpssvcs.dll
 share/applications/wine.desktop
-%%WINE32%%share/man/de.UTF-8/man1/wine.1.gz
+share/man/de.UTF-8/man1/wine.1.gz
 share/man/de.UTF-8/man1/winemaker.1.gz
 share/man/de.UTF-8/man1/wineserver.1.gz
-%%WINE32%%share/man/fr.UTF-8/man1/wine.1.gz
+share/man/fr.UTF-8/man1/wine.1.gz
 share/man/fr.UTF-8/man1/winemaker.1.gz
 share/man/fr.UTF-8/man1/wineserver.1.gz
 share/man/man1/msiexec.1.gz
@@ -2732,7 +2732,7 @@ share/man/man1/notepad.1.gz
 share/man/man1/regedit.1.gz
 share/man/man1/regsvr32.1.gz
 share/man/man1/widl.1.gz
-%%WINE32%%share/man/man1/wine.1.gz
+share/man/man1/wine.1.gz
 share/man/man1/wineboot.1.gz
 share/man/man1/winebuild.1.gz
 share/man/man1/winecfg.1.gz
@@ -2749,7 +2749,7 @@ share/man/man1/winepath.1.gz
 share/man/man1/wineserver.1.gz
 share/man/man1/wmc.1.gz
 share/man/man1/wrc.1.gz
-%%WINE32%%share/man/pl.UTF-8/man1/wine.1.gz
+share/man/pl.UTF-8/man1/wine.1.gz
 %%DATADIR%%/nls/c_037.nls
 %%DATADIR%%/nls/c_10000.nls
 %%DATADIR%%/nls/c_10001.nls
diff --git a/emulators/winetricks/Makefile b/emulators/winetricks/Makefile
index ca1ff3d4d7a8..fda4cbe4929b 100644
--- a/emulators/winetricks/Makefile
+++ b/emulators/winetricks/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	winetricks
-DISTVERSION=	20250102
+DISTVERSION=	20250212
 CATEGORIES=	emulators
 
 MAINTAINER=	Alexander88207@protonmail.com
@@ -18,6 +18,7 @@ USES=		perl5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Winetricks
+GH_TAGNAME=	e73c4d8
 USE_PERL5=	run
 
 NO_ARCH=	yes
diff --git a/emulators/winetricks/distinfo b/emulators/winetricks/distinfo
index cdb81b0bd06a..97dbf8b10324 100644
--- a/emulators/winetricks/distinfo
+++ b/emulators/winetricks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735937454
-SHA256 (Winetricks-winetricks-20250102_GH0.tar.gz) = 24d339806e3309274ee70743d76ff7b965fef5a534c001916d387c924eebe42e
-SIZE (Winetricks-winetricks-20250102_GH0.tar.gz) = 669468
+TIMESTAMP = 1746309460
+SHA256 (Winetricks-winetricks-20250212-e73c4d8_GH0.tar.gz) = 8c80de3b1a8982f78994443d669c17cbbd2438118b358fdbff79e6e179f8fe48
+SIZE (Winetricks-winetricks-20250212-e73c4d8_GH0.tar.gz) = 669762
diff --git a/emulators/winetricks/files/patch-src_winetricks b/emulators/winetricks/files/patch-src_winetricks
new file mode 100644
index 000000000000..08854bf3badd
--- /dev/null
+++ b/emulators/winetricks/files/patch-src_winetricks
@@ -0,0 +1,20 @@
+--- src/winetricks.orig	2025-02-12 05:00:41 UTC
++++ src/winetricks
+@@ -4462,7 +4462,7 @@ winetricks_set_wineprefix()
+             fi
+         fi
+         if [ -z "${_W_wine_binary_arch}" ]; then
+-            w_warn "Unknown file arch of ${WINE_BIN}."
++            true
+         fi
+ 
+         # determine wow64 type (new/old)
+@@ -4569,7 +4569,7 @@ winetricks_set_wineprefix()
+             if [ "${_W_wow64_style}" = "new" ]; then
+                 w_warn "You appear to be using Wine's new wow64 mode. Note that this is EXPERIMENTAL and not yet fully supported. If reporting an issue, be sure to mention this."
+             elif [ "${_W_wow64_style}" = "unknown" ]; then
+-                w_warn "WoW64 type could not be detected."
++                true
+             fi
+         fi
+ 
diff --git a/filesystems/nbt/Makefile b/filesystems/nbt/Makefile
index b7f9c57a61dc..ae706dc35e0b 100644
--- a/filesystems/nbt/Makefile
+++ b/filesystems/nbt/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	nbt
-PORTVERSION=	${REVISION_DATE}
-PORTREVISION=	1
+DISTVERSION=	${REVISION_DATE}
 CATEGORIES=	filesystems
 MASTER_SITES=	SF/nbtfsutils
 PKGNAMEPREFIX=	fusefs-
@@ -20,17 +19,14 @@ LICENSE_TEXT_BEERWARE=	Lukas Niederbremer <webmaster@flippeh.de> and Clark Gaebe
 LICENSE_FILE_MPL20=	${WRKSRC}/MPL-2.0
 LICENSE_PERMS_BEERWARE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		fuse tar:bz2
+USES=		fuse localbase:ldflags tar:bz2
 USE_LDCONFIG=	yes
 
-REVISION_DATE=	20231114
-REVISION_HASH=	7683255
+REVISION_DATE=	20250506
+REVISION_HASH=	dbd559a
 
 MAKE_ENV=	MANDIR=\${PREFIX}/share/man
 INSTALL_TARGET=	install-commands install-dev
-CFLAGS+=	${CPPFLAGS}
-CPPFLAGS+=	-I ${LOCALBASE}/include
-LDFLAGS+=	-L ${LOCALBASE}/lib
 NO_WRKSUBDIR=	yes
 
 do-build:
diff --git a/filesystems/nbt/distinfo b/filesystems/nbt/distinfo
index ea368f58e177..e0c9f4297389 100644
--- a/filesystems/nbt/distinfo
+++ b/filesystems/nbt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699967468
-SHA256 (nbtfsutils-20231114-7683255-src.tar.bz2) = 5d2db44859b39269c8b59188c99a04a9fc0932ef83634c06f37907aa09becd78
-SIZE (nbtfsutils-20231114-7683255-src.tar.bz2) = 44255
+TIMESTAMP = 1746582713
+SHA256 (nbtfsutils-20250506-dbd559a-src.tar.bz2) = 0c872da400bfd7cdd06632b2d8aaa7bfac881433a5152f45b93eaf861e7b6ab5
+SIZE (nbtfsutils-20250506-dbd559a-src.tar.bz2) = 44437
diff --git a/filesystems/openzfs-kmod/Makefile b/filesystems/openzfs-kmod/Makefile
index bda6240d01bd..ab7dc7c854b0 100644
--- a/filesystems/openzfs-kmod/Makefile
+++ b/filesystems/openzfs-kmod/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 PORTEPOCH=	1
 CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/
diff --git a/filesystems/openzfs-kmod/distinfo b/filesystems/openzfs-kmod/distinfo
index 2a6804bb1826..85cc41a1f8f4 100644
--- a/filesystems/openzfs-kmod/distinfo
+++ b/filesystems/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743064954
-SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
-SIZE (zfs-2.3.1.tar.gz) = 34048716
+TIMESTAMP = 1746395184
+SHA256 (zfs-2.3.2.tar.gz) = 80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
+SIZE (zfs-2.3.2.tar.gz) = 34344259
diff --git a/filesystems/openzfs-kmod/files/patch-Makefile.bsd b/filesystems/openzfs-kmod/files/patch-Makefile.bsd
deleted file mode 100644
index 4b4d727ff7e4..000000000000
--- a/filesystems/openzfs-kmod/files/patch-Makefile.bsd
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.bsd.orig	2025-03-10 22:54:55 UTC
-+++ Makefile.bsd
-@@ -90,19 +90,25 @@ SRCS+=	blake3.c \
- 	blake3_generic.c \
- 	blake3_impl.c
- 
-+.if ${MACHINE_ARCH} == "aarch64"
- #icp/asm-aarch64/blake3
- SRCS+=	b3_aarch64_sse2.S \
- 	b3_aarch64_sse41.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "powerpc64le"
- #icp/asm-ppc64/blake3
- SRCS+=	b3_ppc64le_sse2.S \
- 	b3_ppc64le_sse41.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
- #icp/asm-x86_64/blake3
- SRCS+=	blake3_avx2.S \
- 	blake3_avx512.S \
- 	blake3_sse2.S \
- 	blake3_sse41.S
-+.endif
- 
- #icp/algs/edonr
- SRCS+=	edonr.c
-@@ -112,23 +118,31 @@ SRCS+=	sha256_impl.c \
- 	sha2_generic.c \
- 	sha512_impl.c
- 
-+.if ${MACHINE_ARCH} == "armv7"
- #icp/asm-arm/sha2
- SRCS+=	sha256-armv7.S \
- 	sha512-armv7.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "aarch64"
- #icp/asm-aarch64/sha2
- SRCS+=	sha256-armv8.S \
- 	sha512-armv8.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le"
- #icp/asm-ppc64/sha2
- SRCS+=	sha256-p8.S \
- 	sha256-ppc.S \
- 	sha512-p8.S \
- 	sha512-ppc.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
- #icp/asm-x86_64/sha2
- SRCS+=	sha256-x86_64.S \
- 	sha512-x86_64.S
-+.endif
- 
- #lua
- SRCS+=	lapi.c \
-@@ -506,7 +520,7 @@ CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_
- CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
- CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
- 
--.if ${MACHINE_CPUARCH} == "aarch64"
-+.if ${MACHINE_ARCH} == "aarch64"
- __ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h
- CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
- CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
diff --git a/filesystems/openzfs/Makefile b/filesystems/openzfs/Makefile
index 455a9cdd076b..f2fbe1fa8194 100644
--- a/filesystems/openzfs/Makefile
+++ b/filesystems/openzfs/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 PORTEPOCH=	1
 CATEGORIES=	filesystems sysutils
 MASTER_SITES=   https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/
diff --git a/filesystems/openzfs/distinfo b/filesystems/openzfs/distinfo
index 98479a288312..b2d849cea4b8 100644
--- a/filesystems/openzfs/distinfo
+++ b/filesystems/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743065095
-SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
-SIZE (zfs-2.3.1.tar.gz) = 34048716
+TIMESTAMP = 1746395334
+SHA256 (zfs-2.3.2.tar.gz) = 80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
+SIZE (zfs-2.3.2.tar.gz) = 34344259
diff --git a/filesystems/openzfs/files/patch-cmd_zinject_zinject.c b/filesystems/openzfs/files/patch-cmd_zinject_zinject.c
deleted file mode 100644
index a817c794e5b7..000000000000
--- a/filesystems/openzfs/files/patch-cmd_zinject_zinject.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- cmd/zinject/zinject.c.orig	2025-03-29 23:43:40 UTC
-+++ cmd/zinject/zinject.c
-@@ -453,7 +453,8 @@ print_data_handler(int id, const char *pool, zinject_r
- 
- 
- 	(void) printf("%3d  %-15s  %-6llu  %-6llu  %-8s  %-3d  0x%02x  %-15s  "
--	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_objset,
-+	    "%6" PRIu64 "  %6" PRIu64 "\n", id, pool,
-+	    (u_longlong_t)record->zi_objset,
- 	    (u_longlong_t)record->zi_object, type_to_name(record->zi_type),
- 	    record->zi_level, record->zi_dvas, rangebuf,
- 	    record->zi_match_count, record->zi_inject_count);
-@@ -490,7 +491,8 @@ print_device_handler(int id, const char *pool, zinject
- 	    (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
- 
- 	(void) printf("%3d  %-15s  %llx  %-5s  %-10s  %8.4f%%  "
--	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-+	    "%6" PRIu64 "  %6" PRIu64 "\n", id, pool,
-+	    (u_longlong_t)record->zi_guid,
- 	    iotype_to_str(record->zi_iotype), err_to_str(record->zi_error),
- 	    freq, record->zi_match_count, record->zi_inject_count);
- 
-@@ -525,7 +527,8 @@ print_delay_handler(int id, const char *pool, zinject_
- 	    (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
- 
- 	(void) printf("%3d  %-15s  %llx  %10llu  %5llu  %8.4f%%  "
--	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-+	    "%6" PRIu64 "  %6" PRIu64 "\n", id, pool,
-+	    (u_longlong_t)record->zi_guid,
- 	    (u_longlong_t)NSEC2MSEC(record->zi_timer),
- 	    (u_longlong_t)record->zi_nlanes,
- 	    freq, record->zi_match_count, record->zi_inject_count);
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c
deleted file mode 100644
index 5448993d1e7f..000000000000
--- a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- tests/zfs-tests/cmd/clonefile.c.orig	2025-03-10 22:42:59 UTC
-+++ tests/zfs-tests/cmd/clonefile.c
-@@ -205,6 +205,7 @@ main(int argc, char **argv)
- 
- 	loff_t soff = 0, doff = 0;
- 	size_t len = SSIZE_MAX;
-+	unsigned long long len2;
- 	if ((argc-optind) == 5) {
- 		soff = strtoull(argv[optind+2], NULL, 10);
- 		if (soff == ULLONG_MAX) {
-@@ -220,8 +221,8 @@ main(int argc, char **argv)
- 		    strcmp(argv[optind+4], "all") == 0) {
- 			len = SSIZE_MAX;
- 		} else {
--			len = strtoull(argv[optind+4], NULL, 10);
--			if (len == ULLONG_MAX) {
-+			len2 = strtoull(argv[optind+4], NULL, 10);
-+			if (len2 == ULLONG_MAX) {
- 				fprintf(stderr, "invalid length");
- 				return (1);
- 			}
-@@ -268,7 +269,7 @@ main(int argc, char **argv)
- 		off_t dpos = lseek(dfd, 0, SEEK_CUR);
- 		off_t dlen = lseek(dfd, 0, SEEK_END);
- 
--		fprintf(stderr, "file offsets: src=%lu/%lu; dst=%lu/%lu\n",
-+		fprintf(stderr, "file offsets: src=%jd/%jd; dst=%jd/%jd\n",
- 		    spos, slen, dpos, dlen);
- 	}
- 
-@@ -331,7 +332,7 @@ do_copyfilerange(int sfd, int dfd, loff_t soff, loff_t
- 	}
- 	if (copied != len) {
- 		fprintf(stderr, "copy_file_range: copied less than requested: "
--		    "requested=%lu; copied=%lu\n", len, copied);
-+		    "requested=%zu; copied=%zd\n", len, copied);
- 		return (1);
- 	}
- 	return (0);
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_crypto__test.c b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_crypto__test.c
new file mode 100644
index 000000000000..408802f20a63
--- /dev/null
+++ b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_crypto__test.c
@@ -0,0 +1,11 @@
+--- tests/zfs-tests/cmd/crypto_test.c.orig	2025-05-06 18:18:44 UTC
++++ tests/zfs-tests/cmd/crypto_test.c
+@@ -861,7 +861,7 @@ test_result(const crypto_test_t *test, int encrypt_rv,
+ 		return (pass);
+ 
+ 	/* print summary of test result */
+-	printf("%s[%lu]: encrypt=%s decrypt=%s\n", test->fileloc, test->id,
++	printf("%s[%" PRIu64 "]: encrypt=%s decrypt=%s\n", test->fileloc, test->id,
+ 	    encrypt_pass ? "PASS" : "FAIL",
+ 	    decrypt_pass ? "PASS" : "FAIL");
+ 
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c b/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c
deleted file mode 100644
index 3a78abbb89d2..000000000000
--- a/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c.orig	2025-03-30 00:02:54 UTC
-+++ tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c
-@@ -420,14 +420,14 @@ run_test(const page_test_t *test, bool verbose)
- 		size_t take = MIN(rem, len);
- 
- 		if (verbose)
--			printf("  page %d [off %lx len %lx], "
--			    "rem %lx, take %lx\n",
-+			printf("  page %d [off %zx len %zx], "
-+			    "rem %zx, take %zx\n",
- 			    i, off, len, rem, take);
- 
- 		if (vdev_disk_check_alignment_cb(NULL, off, take, &s)) {
- 			if (verbose)
- 				printf("  ABORT: misalignment detected, "
--				    "rem %lx\n", rem);
-+				    "rem %zx\n", rem);
- 			return (false);
- 		}
- 
-@@ -438,7 +438,7 @@ run_test(const page_test_t *test, bool verbose)
- 
- 	if (rem > 0) {
- 		if (verbose)
--			printf("  ABORT: ran out of pages, rem %lx\n", rem);
-+			printf("  ABORT: ran out of pages, rem %zx\n", rem);
- 		return (false);
- 	}
- 
diff --git a/filesystems/openzfs/pkg-plist b/filesystems/openzfs/pkg-plist
index c61f6ba63967..ca56ba618f7d 100644
--- a/filesystems/openzfs/pkg-plist
+++ b/filesystems/openzfs/pkg-plist
@@ -576,6 +576,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/bin/clone_mmap_write
 %%TESTS%%share/zfs/zfs-tests/bin/clonefile
 %%TESTS%%share/zfs/zfs-tests/bin/cp_files
+%%TESTS%%share/zfs/zfs-tests/bin/crypto_test
 %%TESTS%%share/zfs/zfs-tests/bin/ctime
 %%TESTS%%share/zfs/zfs-tests/bin/dir_rd_update
 %%TESTS%%share/zfs/zfs-tests/bin/dosmode_readonly_write
@@ -1591,6 +1592,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_ashift.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_clear_userprop.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_features.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_split/cleanup.ksh
@@ -1831,6 +1833,12 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_stress.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/seekflood
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_ccm_test.json
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_ccm_test.txt
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_gcm_test.json
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_gcm_test.txt
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/icp_aes_ccm.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/icp_aes_gcm.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/crtime_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/setup.ksh
@@ -1848,7 +1856,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_mixed.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_upgrade.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_import.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_prune.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_quota.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_zap_shrink.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/delegate.cfg
@@ -2586,6 +2596,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/stat/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/stat/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/stat/stat_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/statx_dioalign.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/suid/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/suid/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_none.ksh
diff --git a/filesystems/sandboxfs/Makefile b/filesystems/sandboxfs/Makefile
index 26a4dcf61b1b..e5b235774668 100644
--- a/filesystems/sandboxfs/Makefile
+++ b/filesystems/sandboxfs/Makefile
@@ -5,7 +5,7 @@ PORTREVISION=	47
 CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Virtual file system for sandboxing
 WWW=		https://github.com/bazelbuild/sandboxfs
 
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 9f9a3f15a8d8..6348fdea94b6 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -1,12 +1,14 @@
 PORTNAME=	curl
 PORTVERSION=	8.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.se/download/ \
 		https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
 
 PATCH_SITES=	https://github.com/curl/curl/commit/
-PATCHFILES=	5caba3bd97a14b64d906ece77bc0e2b339161a1f.patch:-p1
+PATCHFILES=	7e0eea7d7b34b81ca02ffb995ebea22c02cb92d2.patch:-p1 \
+		5caba3bd97a14b64d906ece77bc0e2b339161a1f.patch:-p1 \
+		fbdb1e1dbe824a72f41a104fa26e555cb0b6b45a.patch:-p1
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Command line tool and library for transferring data with URLs
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 1e1beeb0955c..a48dc8a55b33 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,5 +1,9 @@
-TIMESTAMP = 1745950326
+TIMESTAMP = 1746358359
 SHA256 (curl-8.13.0.tar.xz) = 4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025
 SIZE (curl-8.13.0.tar.xz) = 2773628
+SHA256 (7e0eea7d7b34b81ca02ffb995ebea22c02cb92d2.patch) = 12c5e0d1e0f60ef2e5fde1053320b299a06874e076f01ef33894752f8b9ec0c1
+SIZE (7e0eea7d7b34b81ca02ffb995ebea22c02cb92d2.patch) = 5532
 SHA256 (5caba3bd97a14b64d906ece77bc0e2b339161a1f.patch) = ac5dbaeae9c2e8f68e876c1fd10e04e4b5d668e34038e61004bb5662d2089207
 SIZE (5caba3bd97a14b64d906ece77bc0e2b339161a1f.patch) = 842
+SHA256 (fbdb1e1dbe824a72f41a104fa26e555cb0b6b45a.patch) = bb163701d54ef1e6c489d5e4e272c12371680a263f7d902d8886c63a93b6921a
+SIZE (fbdb1e1dbe824a72f41a104fa26e555cb0b6b45a.patch) = 2258
diff --git a/ftp/linux-rl9-curl/Makefile b/ftp/linux-rl9-curl/Makefile
index 15ec3caad67e..7bb51e50d881 100644
--- a/ftp/linux-rl9-curl/Makefile
+++ b/ftp/linux-rl9-curl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	curl
 DISTVERSION=	7.76.1
 DISTVERSIONSUFFIX=	-31.el9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	ftp linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE=	MIT
 
 USES=		cpe linux:rl9
 USE_LDCONFIG=	yes
-USE_LINUX=	libidn2 libnghttp2 libpsl libssh libxcrypt nspr nss openldap
+USE_LINUX=	libidn2 libnghttp2 libpsl libssh nspr nss openldap
 USE_LINUX_RPM=	yes
 WANT_LINUX32=	yes
 
diff --git a/ftp/proftpd-mod_vroot/distinfo b/ftp/proftpd-mod_vroot/distinfo
index 78c16eec8682..07eabc0132a9 100644
--- a/ftp/proftpd-mod_vroot/distinfo
+++ b/ftp/proftpd-mod_vroot/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1704671206
-SHA256 (proftpd-1.3.8b.tar.gz) = 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0
-SIZE (proftpd-1.3.8b.tar.gz) = 19752808
+TIMESTAMP = 1746517835
+SHA256 (proftpd-1.3.8c.tar.gz) = 2a48f2ca338456e750d2373bf671025ed799e04e0baa16c7bb8dbfd67d8734d2
+SIZE (proftpd-1.3.8c.tar.gz) = 19751847
 SHA256 (proftpd-mod_vroot-0.9.5.tar.gz) = 148384a33ee388bbb5dda36a09a944b2c528e1d46dc47e4d3aaedc37b14439be
 SIZE (proftpd-mod_vroot-0.9.5.tar.gz) = 95664
diff --git a/games/Makefile b/games/Makefile
index 95977cfa1868..0a3b17ec3601 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -947,7 +947,6 @@
     SUBDIR += stonesoup
     SUBDIR += stormbaancoureur
     SUBDIR += stratagus
-    SUBDIR += stuntrally
     SUBDIR += sudsol
     SUBDIR += sulis
     SUBDIR += supertux
@@ -1103,7 +1102,6 @@
     SUBDIR += xinvaders
     SUBDIR += xinvaders3d
     SUBDIR += xisola
-    SUBDIR += xjewel
     SUBDIR += xjig
     SUBDIR += xjump
     SUBDIR += xjumpx
diff --git a/games/easyrpg-player/Makefile b/games/easyrpg-player/Makefile
index 1f9af9729ec8..1a559f255924 100644
--- a/games/easyrpg-player/Makefile
+++ b/games/easyrpg-player/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	easyrpg-player
-PORTVERSION=	0.8
-PORTREVISION=	3
+PORTVERSION=	0.8.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -26,11 +25,14 @@ LIB_DEPENDS=	liblcf.so:games/liblcf \
 		libxmp.so:audio/libxmp \
 		libfmt.so:devel/libfmt \
 		libasound.so:audio/alsa-lib \
-		libfluidsynth.so:audio/fluidsynth
+		libfluidsynth.so:audio/fluidsynth \
+		liblhasa.so:archivers/lhasa
 # these come from liblcf
 LIB_DEPENDS+=	libicui18n.so:devel/icu \
-		libexpat.so:textproc/expat2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+		libexpat.so:textproc/expat2 \
+		libinih.so:devel/inih
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
+		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	EasyRPG
diff --git a/games/easyrpg-player/distinfo b/games/easyrpg-player/distinfo
index 4bf54b92887f..c2a9c84b9634 100644
--- a/games/easyrpg-player/distinfo
+++ b/games/easyrpg-player/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683028073
-SHA256 (EasyRPG-Player-0.8_GH0.tar.gz) = 93e225e28f5636b76ce84555b19285a429e116b5c6bc479e5bfcc268069601ac
-SIZE (EasyRPG-Player-0.8_GH0.tar.gz) = 6584685
+TIMESTAMP = 1744034578
+SHA256 (EasyRPG-Player-0.8.1_GH0.tar.gz) = b6e1c09bae859c3403d408ac1d0e6947a910e9b5cbe4b1cfdf76e98f17b69517
+SIZE (EasyRPG-Player-0.8.1_GH0.tar.gz) = 6803504
diff --git a/games/easyrpg-player/files/patch-fmt10 b/games/easyrpg-player/files/patch-fmt10
deleted file mode 100644
index 7c643d41a99f..000000000000
--- a/games/easyrpg-player/files/patch-fmt10
+++ /dev/null
@@ -1,218 +0,0 @@
-From a4672d2e30db4e4918c8f3580236faed3c9d04c1 Mon Sep 17 00:00:00 2001
-From: Ghabry <gabriel+github@mastergk.de>
-Date: Sun, 14 May 2023 14:41:13 +0200
-Subject: [PATCH] Fix building with fmtlib 10
-
-to_string_view is a private API since fmt10.
-
-The new API only works properly since fmt8.
-
-Added casts to enum formating as they are not converted automatically anymore.
-
-Fix #3002
----
- CMakeLists.txt               |  1 +
- Makefile.am                  |  1 +
- src/game_interpreter.cpp     |  6 +++---
- src/game_interpreter_map.cpp |  2 +-
- src/output.h                 |  9 ---------
- src/player.cpp               |  2 +-
- src/string_view.cpp          | 34 ++++++++++++++++++++++++++++++++++
- src/string_view.h            | 27 ++++++++++++++++++++++++---
- 8 files changed, 65 insertions(+), 17 deletions(-)
- create mode 100644 src/string_view.cpp
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8507e5d103..28d595a214 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -345,6 +345,7 @@ add_library(${PROJECT_NAME} OBJECT
- 	src/state.cpp
- 	src/state.h
- 	src/std_clock.h
-+	src/string_view.cpp
- 	src/string_view.h
- 	src/system.h
- 	src/teleport_target.h
-diff --git a/Makefile.am b/Makefile.am
-index bed1b21941..4c4774892c 100644
---- Makefile.am
-+++ Makefile.am
-@@ -327,6 +327,7 @@ libeasyrpg_player_a_SOURCES = \
- 	src/state.cpp \
- 	src/state.h \
- 	src/std_clock.h \
-+	src/string_view.cpp \
- 	src/string_view.h \
- 	src/system.h \
- 	src/teleport_target.h \
-diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
-index 7877d77ff4..7ae056ccfb 100644
---- src/game_interpreter.cpp
-+++ src/game_interpreter.cpp
-@@ -2187,7 +2187,7 @@ bool Game_Interpreter::CommandChangeVehicleGraphic(lcf::rpg::EventCommand const&
- 	Game_Vehicle* vehicle = Game_Map::GetVehicle(vehicle_id);
- 
- 	if (!vehicle) {
--		Output::Warning("ChangeVehicleGraphic: Invalid vehicle ID {}", vehicle_id);
-+		Output::Warning("ChangeVehicleGraphic: Invalid vehicle ID {}", static_cast<int>(vehicle_id));
- 		return true;
- 	}
- 
-@@ -2261,7 +2261,7 @@ bool Game_Interpreter::CommandSetVehicleLocation(lcf::rpg::EventCommand const& c
- 			// 0 because we adjust all vehicle IDs by +1 to match the lcf values
- 			Output::Debug("SetVehicleLocation: Party referenced");
- 		} else {
--			Output::Warning("SetVehicleLocation: Invalid vehicle ID {}", vehicle_id);
-+			Output::Warning("SetVehicleLocation: Invalid vehicle ID {}", static_cast<int>(vehicle_id));
- 			return true;
- 		}
- 	}
-@@ -3494,7 +3494,7 @@ bool Game_Interpreter::CommandConditionalBranch(lcf::rpg::EventCommand const& co
- 		Game_Vehicle* vehicle = Game_Map::GetVehicle(vehicle_id);
- 
- 		if (!vehicle) {
--			Output::Warning("ConditionalBranch: Invalid vehicle ID {}", vehicle_id);
-+			Output::Warning("ConditionalBranch: Invalid vehicle ID {}", static_cast<int>(vehicle_id));
- 			return true;
- 		}
- 
-diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
-index 6c193c2f31..0b47a3db61 100644
---- src/game_interpreter_map.cpp
-+++ src/game_interpreter_map.cpp
-@@ -345,7 +345,7 @@ bool Game_Interpreter_Map::CommandEndShop(lcf::rpg::EventCommand const& /* com *
- 
- bool Game_Interpreter_Map::CommandShowInn(lcf::rpg::EventCommand const& com) { // code 10730
- 	int inn_type = com.parameters[0];
--	auto inn_price = com.parameters[1];
-+	int inn_price = com.parameters[1];
- 	// Not used, but left here for documentation purposes
- 	// bool has_inn_handlers = com.parameters[2] != 0;
- 
-diff --git a/src/output.h b/src/output.h
-index 90e1118958..78ff3c0cad 100644
---- src/output.h
-+++ src/output.h
-@@ -22,17 +22,8 @@
- #include <string>
- #include <iosfwd>
- #include <fmt/core.h>
--#include <lcf/dbstring.h>
--
- #include "filesystem_stream.h"
- 
--namespace lcf {
--// FIXME: liblcf doesn't depend on fmt, so we need to add this here to enable fmtlib support for lcf::DBString
--inline fmt::basic_string_view<char> to_string_view(const lcf::DBString& s) {
--	return to_string_view(StringView(s));
--}
--}
--
- enum class LogLevel {
- 	Error,
- 	Warning,
-diff --git a/src/player.cpp b/src/player.cpp
-index 0ed6bbb657..654d31e0dc 100644
---- src/player.cpp
-+++ src/player.cpp
-@@ -1240,7 +1240,7 @@ void Player::SetupBattleTest() {
- 		}
- 
- 		Output::Debug("BattleTest Mode 2k3 troop=({}) background=({}) formation=({}) condition=({}) terrain=({})",
--				args.troop_id, args.background.c_str(), args.formation, args.condition, args.terrain_id);
-+				args.troop_id, args.background, static_cast<int>(args.formation), static_cast<int>(args.condition), args.terrain_id);
- 	} else {
- 		Output::Debug("BattleTest Mode 2k troop=({}) background=({})", args.troop_id, args.background);
- 	}
-diff --git a/src/string_view.cpp b/src/string_view.cpp
-new file mode 100644
-index 0000000000..13a526504d
---- /dev/null
-+++ src/string_view.cpp
-@@ -0,0 +1,34 @@
-+/*
-+ * This file is part of EasyRPG Player.
-+ *
-+ * EasyRPG Player is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * EasyRPG Player is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "string_view.h"
-+
-+#if FMT_VERSION >= EP_FMT_MODERN_VERSION
-+
-+#include <fmt/format.h>
-+
-+auto fmt::formatter<lcf::DBString>::format(const lcf::DBString& s, format_context& ctx) const -> decltype(ctx.out()) {
-+	string_view sv(s.data(), s.size());
-+	return formatter<string_view>::format(sv, ctx);
-+}
-+
-+auto fmt::formatter<lcf::StringView>::format(const lcf::StringView& s, format_context& ctx) const -> decltype(ctx.out()) {
-+	string_view sv(s.data(), s.size());
-+	return formatter<string_view>::format(sv, ctx);
-+}
-+
-+#endif
-diff --git a/src/string_view.h b/src/string_view.h
-index 11e3550d5f..030bb09a10 100644
---- src/string_view.h
-+++ src/string_view.h
-@@ -22,9 +22,9 @@
- #include <lcf/dbstring.h>
- #include <fmt/core.h>
- 
--// FIXME: needed to allow building with fmt 5, older versions are untested.
-+// Needed to allow building with fmt 5, older versions are untested.
- #if FMT_VERSION < 60000
--#include <fmt/ostream.h>
-+#  include <fmt/ostream.h>
- #endif
- 
- using StringView = lcf::StringView;
-@@ -33,12 +33,33 @@ using U32StringView = lcf::U32StringView;
- using lcf::ToString;
- using lcf::ToStringView;
- 
-+// Version required to use the new formatting API
-+#define EP_FMT_MODERN_VERSION 80000
-+
- // FIXME: liblcf doesn't depend on fmt, so we need to add this here to enable fmtlib support for our StringView.
-+#if FMT_VERSION >= EP_FMT_MODERN_VERSION
-+template<>
-+struct fmt::formatter<lcf::StringView> : fmt::formatter<fmt::string_view> {
-+	auto format(const lcf::StringView& s, format_context& ctx) const -> decltype(ctx.out());
-+};
-+
-+template<>
-+struct fmt::formatter<lcf::DBString> : formatter<string_view> {
-+	auto format(const lcf::DBString& s, format_context& ctx) const -> decltype(ctx.out());
-+};
-+#else
- namespace nonstd { namespace sv_lite {
- template <typename C, typename T>
- inline fmt::basic_string_view<C> to_string_view(basic_string_view<C,T> s) {
--    return fmt::basic_string_view<C>(s.data(), s.size());
-+	return fmt::basic_string_view<C>(s.data(), s.size());
- }
- } }
- 
-+namespace lcf {
-+inline fmt::basic_string_view<char> to_string_view(const lcf::DBString& s) {
-+	return to_string_view(StringView(s));
-+}
-+}
-+#endif
-+
- #endif
diff --git a/games/fheroes2/Makefile b/games/fheroes2/Makefile
index 14a563ee8eea..660fa880457b 100644
--- a/games/fheroes2/Makefile
+++ b/games/fheroes2/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	fheroes2
-PORTVERSION=	1.1.7
+PORTVERSION=	1.1.8
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
diff --git a/games/fheroes2/distinfo b/games/fheroes2/distinfo
index 9e5d8b2d814b..5533b381ef49 100644
--- a/games/fheroes2/distinfo
+++ b/games/fheroes2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742746433
-SHA256 (ihhub-fheroes2-1.1.7_GH0.tar.gz) = 6419ad0bd0f1f684a9256c39fb6c02a026fc76581b0bc9632a597fbc8443fc03
-SIZE (ihhub-fheroes2-1.1.7_GH0.tar.gz) = 12146595
+TIMESTAMP = 1746353702
+SHA256 (ihhub-fheroes2-1.1.8_GH0.tar.gz) = a1a0fd0289f7a95a65ca15b967056ecfaec574621ad288f05fceb52d237e49d4
+SIZE (ihhub-fheroes2-1.1.8_GH0.tar.gz) = 12293726
diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile
index 05fe1ec22c60..f4b2b20ecb41 100644
--- a/games/liblcf/Makefile
+++ b/games/liblcf/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	liblcf
-PORTVERSION=	0.8
-PORTREVISION=	2
+PORTVERSION=	0.8.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -12,7 +11,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
-		libexpat.so:textproc/expat2
+		libexpat.so:textproc/expat2 \
+		libinih.so:devel/inih
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	EasyRPG
diff --git a/games/liblcf/distinfo b/games/liblcf/distinfo
index 304bda9b64fb..4f62675ad298 100644
--- a/games/liblcf/distinfo
+++ b/games/liblcf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683027953
-SHA256 (EasyRPG-liblcf-0.8_GH0.tar.gz) = aa5664145842a39442e9bbf178273e91816d6d6bf6db7347196bde518dfb431e
-SIZE (EasyRPG-liblcf-0.8_GH0.tar.gz) = 305885
+TIMESTAMP = 1744034573
+SHA256 (EasyRPG-liblcf-0.8.1_GH0.tar.gz) = 5ec89082d54f1a29d23fed54de70acab4375036d57828ff0fc7a88b81833d40f
+SIZE (EasyRPG-liblcf-0.8.1_GH0.tar.gz) = 310671
diff --git a/games/liblcf/files/patch-CMakeLists.txt b/games/liblcf/files/patch-CMakeLists.txt
deleted file mode 100644
index 2bedc9ae689c..000000000000
--- a/games/liblcf/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2023-04-29 15:40:07 UTC
-+++ CMakeLists.txt
-@@ -21,7 +21,7 @@ include(ConfigureWindows)
- include(ConfigureWindows)
- 
- # C++14 is required
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_EXTENSIONS ON)
- 
diff --git a/games/liblcf/files/patch-src_reader__util.cpp b/games/liblcf/files/patch-src_reader__util.cpp
deleted file mode 100644
index ce8c058ca3b2..000000000000
--- a/games/liblcf/files/patch-src_reader__util.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/reader_util.cpp.orig	2015-09-14 08:49:23 UTC
-+++ src/reader_util.cpp
-@@ -310,11 +310,7 @@ std::string ReaderUtil::Recode(const std
- 	size_t dst_size = str_to_encode.size() * 5 + 10;
- 	char *dst = new char[dst_size];
- 	size_t dst_left = dst_size;
--#    ifdef ICONV_CONST
--	char ICONV_CONST *p = src;
--#    else
--	char *p = src;
--#    endif
-+	char const *p = src;
- 	char *q = dst;
- 	size_t status = iconv(cd, &p, &src_left, &q, &dst_left);
- 	iconv_close(cd);
diff --git a/games/liblcf/pkg-plist b/games/liblcf/pkg-plist
index 5b6c0259e40e..31c1739204b4 100644
--- a/games/liblcf/pkg-plist
+++ b/games/liblcf/pkg-plist
@@ -9,7 +9,6 @@ include/lcf/dbstring.h
 include/lcf/encoder.h
 include/lcf/enum_tags.h
 include/lcf/flag_set.h
-include/lcf/ini.h
 include/lcf/inireader.h
 include/lcf/ldb/chunks.h
 include/lcf/ldb/reader.h
@@ -17,6 +16,7 @@ include/lcf/lmt/chunks.h
 include/lcf/lmt/reader.h
 include/lcf/lmu/chunks.h
 include/lcf/lmu/reader.h
+include/lcf/log_handler.h
 include/lcf/lsd/chunks.h
 include/lcf/lsd/reader.h
 include/lcf/reader_lcf.h
@@ -80,6 +80,7 @@ include/lcf/rpg/skill.h
 include/lcf/rpg/sound.h
 include/lcf/rpg/start.h
 include/lcf/rpg/state.h
+include/lcf/rpg/stringvariable.h
 include/lcf/rpg/switch.h
 include/lcf/rpg/system.h
 include/lcf/rpg/terms.h
@@ -96,9 +97,9 @@ include/lcf/scope_guard.h
 include/lcf/span.h
 include/lcf/string_view.h
 include/lcf/third_party/span.h
-include/lcf/third_party/string_view.h
 include/lcf/writer_lcf.h
 include/lcf/writer_xml.h
+lib/cmake/liblcf/Findinih.cmake
 lib/cmake/liblcf/liblcf-config-version.cmake
 lib/cmake/liblcf/liblcf-config.cmake
 lib/cmake/liblcf/liblcf-targets-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index cbae498b769a..790eb5213604 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mahjong
-PORTVERSION=	1.16
-PORTREVISION=	2
+PORTVERSION=	1.17
 CATEGORIES=	games net
 MASTER_SITES=	http://mahjong.julianbradfield.org/Source/%SUBDIR%/
 DISTNAME=	mj-${PORTVERSION}-src
diff --git a/games/mahjong/distinfo b/games/mahjong/distinfo
index 3059b6b88546..06c90c96b96f 100644
--- a/games/mahjong/distinfo
+++ b/games/mahjong/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602058895
-SHA256 (mj-1.16-src.tar.gz) = c25e9848f49f70635e5e3ba0cb59799e5bc149a95f786621b99696b66787a29d
-SIZE (mj-1.16-src.tar.gz) = 403981
+TIMESTAMP = 1746406650
+SHA256 (mj-1.17-src.tar.gz) = ec21fb35715130ee647c18e64b9b030a089265fdf03ba141f09701b3be6889d9
+SIZE (mj-1.17-src.tar.gz) = 414805
diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 72fd6480a34c..2d8adaa92378 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pioneer
-DISTVERSION=	20250203
+DISTVERSION=	20250501
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo
index ad6f611f14fc..2c86705619dd 100644
--- a/games/pioneer/distinfo
+++ b/games/pioneer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738670143
-SHA256 (pioneerspacesim-pioneer-20250203_GH0.tar.gz) = 5b2814ad63b9b7f995fd6a1b913f97d00b450663d07cfbae59c88cccb97d5604
-SIZE (pioneerspacesim-pioneer-20250203_GH0.tar.gz) = 624337457
+TIMESTAMP = 1746101331
+SHA256 (pioneerspacesim-pioneer-20250501_GH0.tar.gz) = 959902d98a79536bd44f25bd7b29e48da94aeac597228776b0f91635877f362e
+SIZE (pioneerspacesim-pioneer-20250501_GH0.tar.gz) = 624394151
diff --git a/games/pioneer/files/patch-cmake_TargetArchitecture.cmake b/games/pioneer/files/patch-cmake_TargetArchitecture.cmake
deleted file mode 100644
index 7835d45ecf73..000000000000
--- a/games/pioneer/files/patch-cmake_TargetArchitecture.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/TargetArchitecture.cmake.orig	2025-02-03 19:33:59 UTC
-+++ cmake/TargetArchitecture.cmake
-@@ -1,7 +1,7 @@
- # This script detects supported target architectures and configures test flags
- # accordingly
- 
--if (${CMAKE_SYSTEM_PROCESSOR} MATCHES x86|x64)
-+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES x86|x64|amd64)
- 	set(PIONEER_TARGET_INTEL ON)
- endif()
- 
diff --git a/games/pioneer/files/patch-src_editor_CMakeLists.txt b/games/pioneer/files/patch-src_editor_CMakeLists.txt
index 59c63edaaf2d..467cb1c56696 100644
--- a/games/pioneer/files/patch-src_editor_CMakeLists.txt
+++ b/games/pioneer/files/patch-src_editor_CMakeLists.txt
@@ -1,7 +1,15 @@
---- src/editor/CMakeLists.txt.orig	2024-03-14 20:05:43 UTC
+--- src/editor/CMakeLists.txt.orig	2025-05-01 11:22:38 UTC
 +++ src/editor/CMakeLists.txt
-@@ -29,3 +29,4 @@ set_target_properties(editor PROPERTIES RUNTIME_OUTPUT
+@@ -28,9 +28,10 @@ target_link_libraries(editor LINK_PRIVATE ${EDITOR_LIB
+ add_executable(editor WIN32 editormain.cpp ${RESOURCES})
  set_cxx_properties(editor)
  target_link_libraries(editor LINK_PRIVATE ${EDITOR_LIBRARIES} ${pioneerLibs} ${winLibs})
- set_target_properties(editor PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 +set_target_properties(editor PROPERTIES OUTPUT_NAME pioneer-editor)
+ if (MSVC)
+ 	# Put the output into the root dir so it can be run from Visual Studio
+ 	set_target_properties(editor PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
+ else()
+ 	set_target_properties(editor PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+-endif (MSVC)
+\ No newline at end of file
++endif (MSVC)
diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index e4d15ae0cf48..c4b6f7aa8d1b 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	simutrans
-DISTVERSION=	124.3
-PORTREVISION=	1
+DISTVERSION=	124.3.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo
index 7471cf0d0c64..5c1528836ffe 100644
--- a/games/simutrans/distinfo
+++ b/games/simutrans/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738763106
-SHA256 (simutrans-simutrans-124.3_GH0.tar.gz) = ecc1abe6d1f99216718301c0c95c02bb9f4718edaf2272c77760e60b7c282e27
-SIZE (simutrans-simutrans-124.3_GH0.tar.gz) = 4555274
+TIMESTAMP = 1744026985
+SHA256 (simutrans-simutrans-124.3.1_GH0.tar.gz) = 185bf3571c1552109f9c2db5aff45a94be8f9fb09c82940884fb15ebbf1d95fe
+SIZE (simutrans-simutrans-124.3.1_GH0.tar.gz) = 4570037
diff --git a/games/simutrans/files/patch-CMakeLists.txt b/games/simutrans/files/patch-CMakeLists.txt
deleted file mode 100644
index df68ec5a9071..000000000000
--- a/games/simutrans/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixed upstream in https://github.com/simutrans/simutrans/commit/81d5165874303edcdbe81ba07df1fea8d5e03f4b
-
-Remove this patch with next update
---- CMakeLists.txt.orig	2025-01-11 14:40:58 UTC
-+++ CMakeLists.txt
-@@ -95,6 +95,9 @@ if (${SIMUTRANS_USE_REVISION})
- if (${SIMUTRANS_USE_REVISION})
- 	file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/src/simutrans/revision.h "#define REVISION ${SIMUTRANS_USE_REVISION}\n")
- 	message(STATUS "Compiling Simutrans with manually specified revision ${SIMUTRANS_USE_REVISION}")
-+	set(SIMUTRANS_WC_REVISION ${SIMUTRANS_USE_REVISION})
-+	set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-+	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/SimutransRevision.cmake)
- else ()
- 	string(FIND ${CMAKE_GENERATOR} "Visual Studio" VS )
- 	if (${VS} EQUAL 0)
diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile
deleted file mode 100644
index 091f15d1f1b6..000000000000
--- a/games/stuntrally/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-PORTNAME=	stuntrally
-PORTVERSION=	2.7
-PORTREVISION=	5
-CATEGORIES=	games
-
-MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	3D racing game based on VDrift and OGRE with track editor
-WWW=		https://stuntrally.tuxfamily.org/ \
-		https://github.com/stuntrally/stuntrally/
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/License.txt
-
-BROKEN=		fails to build with boost-1.85+
-DEPRECATED=	Broken for months and outdated
-EXPIRATION_DATE=2025-04-30
-
-LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
-		libOgreMain.so:graphics/ogre3d \
-		libBulletDynamics.so:devel/bullet \
-		libMyGUIEngine.so:x11-toolkits/mygui \
-		libogg.so:audio/libogg \
-		libvorbisfile.so:audio/libvorbis \
-		libenet.so:net/enet \
-		libtinyxml.so:textproc/tinyxml \
-		libtinyxml2.so:textproc/tinyxml2
-BUILD_DEPENDS=	${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre
-
-USES=		compiler:c++14-lang cmake pkgconfig sdl
-USE_SDL=	sdl2
-USE_GITHUB=	yes
-GH_TUPLE=	stuntrally:tracks:${PORTVERSION}:tracks/data/tracks
-CMAKE_ARGS=	-DSHARE_INSTALL="${DATADIR_REL}" \
-		-DBULLET_ROOT="${LOCALBASE}"
-CMAKE_ON=	SR_FORCE_SYSTEM_DEPENDENCIES
-
-LDFLAGS_i386=	-Wl,-znotext
-
-PORTDOCS=	*
-PORTDATA=	*
-
-OPTIONS_DEFINE=	GAME EDITOR TRANSLATOR MASTER_SERVER DOCS
-OPTIONS_DEFAULT=GAME EDITOR TRANSLATOR
-OPTIONS_SUB=	yes
-
-GAME_DESC=		Build the game binary
-GAME_CMAKE_BOOL=	BUILD_GAME
-GAME_USES=		openal
-
-EDITOR_DESC=		Build the track editor
-EDITOR_CMAKE_BOOL=	BUILD_EDITOR
-EDITOR_USES=		openal
-
-TRANSLATOR_DESC=	Build translation tool
-TRANSLATOR_CMAKE_BOOL=	BUILD_TRANSL_TOOL
-
-MASTER_SERVER_CMAKE_BOOL=	BUILD_MASTER_SERVER
-MASTER_SERVER_DESC=		Build the master server
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Readme.md ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
diff --git a/games/stuntrally/distinfo b/games/stuntrally/distinfo
deleted file mode 100644
index 31782b9579c0..000000000000
--- a/games/stuntrally/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1668431328
-SHA256 (stuntrally-stuntrally-2.7_GH0.tar.gz) = 462711306ec33e2dad1a729d7dbf0da2a8bfec2c36d582cc4c192c2e6f2de12c
-SIZE (stuntrally-stuntrally-2.7_GH0.tar.gz) = 770702361
-SHA256 (stuntrally-tracks-2.7_GH0.tar.gz) = fe7ba531fbdb3c5ba9b25f0748c2aac465c6aad33e957f722e2316a3129bd472
-SIZE (stuntrally-tracks-2.7_GH0.tar.gz) = 445486760
diff --git a/games/stuntrally/files/patch-cmake_DependenciesConfig.cmake b/games/stuntrally/files/patch-cmake_DependenciesConfig.cmake
deleted file mode 100644
index 62c3725f1e37..000000000000
--- a/games/stuntrally/files/patch-cmake_DependenciesConfig.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
---- cmake/DependenciesConfig.cmake.orig	2022-11-11 19:35:22 UTC
-+++ cmake/DependenciesConfig.cmake
-@@ -79,13 +79,14 @@ add_external_lib(
-         FIND_PACKAGE
- )
- 
--add_external_lib(
--        tinyxml
--        tinyxml/2.6.2
--        REQUIRED
--        PKG_CONFIG "tinyxml >= 2.6"
--        FIND_PACKAGE
--)
-+find_path(TINYXML_INCLUDE_DIR tinyxml.h)
-+find_library(TINYXML_LIBRARY tinyxml)
-+
-+add_library(tinyxml::tinyxml INTERFACE IMPORTED GLOBAL)
-+target_include_directories(tinyxml::tinyxml INTERFACE ${TINYXML_INCLUDE_DIR})
-+target_link_libraries(tinyxml::tinyxml INTERFACE ${TINYXML_LIBRARY})
-+
-+message(STATUS "Added inteface tinyxml ${TINYXML_INCLUDE_DIR} ${TINYXML_LIBRARY}")
- 
- add_external_lib(
-         tinyxml2
diff --git a/games/stuntrally/files/patch-source_editor_BaseApp__Create.cpp b/games/stuntrally/files/patch-source_editor_BaseApp__Create.cpp
deleted file mode 100644
index b2b3cf1c5bdb..000000000000
--- a/games/stuntrally/files/patch-source_editor_BaseApp__Create.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/editor/BaseApp_Create.cpp.orig	2022-11-11 19:35:22 UTC
-+++ source/editor/BaseApp_Create.cpp
-@@ -240,7 +240,7 @@ bool BaseApp::setup()

- 		#endif

- 	}

- 	#ifdef _DEBUG

--	Ogre::LogManager::getSingleton().setMinLogLevel(LML_TRIVIAL);  // all

-+	//Ogre::LogManager::getSingleton().setMinLogLevel(LML_TRIVIAL);  // all

- 	#endif

- 

- 	#ifdef _DEBUG

diff --git a/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp b/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp
deleted file mode 100644
index 5f17ead24e2b..000000000000
--- a/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- source/ogre/BaseApp_Create.cpp.orig	2022-11-11 19:35:22 UTC
-+++ source/ogre/BaseApp_Create.cpp
-@@ -177,12 +177,16 @@ BaseApp::~BaseApp()

- 		mPlatform->shutdown();  delete mPlatform;  mPlatform = 0;  }

- 

- 	//  save inputs

--	mInputCtrl->save(PATHMANAGER::UserConfigDir() + "/input.xml");

--	delete mInputCtrl;

-+	if (mInputCtrl) {

-+		mInputCtrl->save(PATHMANAGER::UserConfigDir() + "/input.xml");

-+		delete mInputCtrl;

-+	}

- 	for (int i=0; i<4; ++i)

- 	{

--		mInputCtrlPlayer[i]->save(PATHMANAGER::UserConfigDir() + "/input_p" + toStr(i) + ".xml");

--		delete mInputCtrlPlayer[i];

-+		if (mInputCtrlPlayer[i]) {

-+			mInputCtrlPlayer[i]->save(PATHMANAGER::UserConfigDir() + "/input_p" + toStr(i) + ".xml");

-+			delete mInputCtrlPlayer[i];

-+		}

- 	}

- 

- 	delete mInputWrapper;

-@@ -326,7 +330,7 @@ bool BaseApp::setup()

- #endif

- 

- 	#ifdef _DEBUG

--	LogManager::getSingleton().setMinLogLevel(LML_TRIVIAL);  // all

-+	//LogManager::getSingleton().setMinLogLevel(LML_TRIVIAL);  // all

- 	#endif

- 

- 	setupResources();

diff --git a/games/stuntrally/files/patch-source_ogre_common_Terrain.cpp b/games/stuntrally/files/patch-source_ogre_common_Terrain.cpp
deleted file mode 100644
index 4854584effda..000000000000
--- a/games/stuntrally/files/patch-source_ogre_common_Terrain.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- source/ogre/common/Terrain.cpp.orig	2022-11-11 19:35:22 UTC
-+++ source/ogre/common/Terrain.cpp
-@@ -202,8 +202,12 @@ if (bTer)

- 		//  sync load since we want everything in place when we start

- 		mTerrainGroup->loadAllTerrains(true);

- 

--		auto tsm = mTerrainGroup->getTerrainSlots();

--		terrain = tsm[0]->instance;

-+		TerrainGroup::TerrainIterator ti = mTerrainGroup->getTerrainIterator();

-+		while (ti.hasMoreElements())

-+		{

-+			terrain = ti.getNext()->instance;

-+			terrain->setVisibilityFlags(RV_Terrain);

-+		}

- 

- 		mTerrainGroup->freeTemporaryResources();

- 	}

diff --git a/games/stuntrally/files/patch-source_shiny_Platforms_Ogre_OgreMaterialSerializer.cpp b/games/stuntrally/files/patch-source_shiny_Platforms_Ogre_OgreMaterialSerializer.cpp
deleted file mode 100644
index 2a84476b0a83..000000000000
--- a/games/stuntrally/files/patch-source_shiny_Platforms_Ogre_OgreMaterialSerializer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/shiny/Platforms/Ogre/OgreMaterialSerializer.cpp.orig	2022-11-11 19:35:22 UTC
-+++ source/shiny/Platforms/Ogre/OgreMaterialSerializer.cpp
-@@ -7,7 +7,7 @@
- #include <OgreLogManager.h>
- 
- //#if 0  // for Ogre 1.9 only
--#if OGRE_VERSION >= MYGUI_DEFINE_VERSION(1, 12, 0)
-+#if 1
- namespace Ogre
- {
-     template <typename T> class MapIterator;
diff --git a/games/stuntrally/pkg-descr b/games/stuntrally/pkg-descr
deleted file mode 100644
index 2a3c70b35c33..000000000000
--- a/games/stuntrally/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Stunt Rally is a racing game with rally style of driving, mostly
-on gravel.
-
-It features a rich variety of 172 tracks in 34 sceneries also on
-other planets.
-
-Track difficulty ranges from short and easy to very difficult stunt
-tracks including jumps, skewed loops, pipes winding in 3D, obstacles
-or all at once.
-
-There are 20 cars to choose, 1 motorbike, 3 hovering spaceships and
-1 bouncing sphere.
-The latter provide a fast and easier gameplay on flat tracks.
-
-Game modes include:
-Single Race, Tutorials, Championships, Challenges, Multiplayer and
-Split Screen. Also Replays and Ghost drive are present.
-
-The Track Editor allows creating and modifying tracks. It uses a
-3D spline generated road.
diff --git a/games/stuntrally/pkg-plist b/games/stuntrally/pkg-plist
deleted file mode 100644
index 114249b33a8e..000000000000
--- a/games/stuntrally/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%EDITOR%%bin/sr-editor
-%%TRANSLATOR%%bin/sr-translator
-%%MASTER_SERVER%%bin/sr-masterserver
-%%GAME%%bin/stuntrally
-%%EDITOR%%share/applications/sr-editor.desktop
-%%GAME%%share/applications/stuntrally.desktop
-%%EDITOR%%share/icons/hicolor/512x512/apps/sr-editor.png
-%%GAME%%share/icons/hicolor/512x512/apps/stuntrally.png
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index d01b53c9ceef..84a15ca49dbb 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tuxpaint-config
-PORTVERSION=	0.0.24
+PORTVERSION=	0.0.25
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxpaint/${PORTNAME}/${PORTVERSION}
 
diff --git a/games/tuxpaint-config/distinfo b/games/tuxpaint-config/distinfo
index 751597f21295..c3c3709ddd08 100644
--- a/games/tuxpaint-config/distinfo
+++ b/games/tuxpaint-config/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721975027
-SHA256 (tuxpaint-config-0.0.24.tar.gz) = 21c2bbe43b96e7851e4ad3cfdd3cfc3d441df1378b328bc9b0c7a14b2e37f08f
-SIZE (tuxpaint-config-0.0.24.tar.gz) = 888432
+TIMESTAMP = 1746602129
+SHA256 (tuxpaint-config-0.0.25.tar.gz) = 8d46ac80ff962b3a962bc2979926e7564065df0ce08bcc0bd8c671913b975c99
+SIZE (tuxpaint-config-0.0.25.tar.gz) = 893708
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 87bc8d18ba00..2669f39552fb 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	veloren
-PORTVERSION=	s20250501
+PORTVERSION=	s20250507
 CATEGORIES=	games wayland
 PKGNAMESUFFIX=	-weekly
 
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
 USES=		cargo xorg
 USE_XORG=	xcb
 USE_GITLAB=	yes
-GL_TAGNAME=	v0.17.0-725-g428a1b332e # git describe --match='v[0-9]*' weekly
+GL_TAGNAME=	v0.17.0-745-g8c44357c9d # git describe --match='v[0-9]*' weekly
 CARGO_ENV=	VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib"
 PLIST_FILES=	bin/${PORTNAME}-server-cli \
 		bin/${PORTNAME}-voxygen \
diff --git a/games/veloren-weekly/Makefile.crates b/games/veloren-weekly/Makefile.crates
index 2e718abead84..f603a2ec79ed 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -6,7 +6,7 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		ahash-0.4.8 \
 		ahash-0.8.11 \
 		aho-corasick-1.1.3 \
-		allocator-api2-0.2.18 \
+		allocator-api2-0.2.21 \
 		alsa-0.9.1 \
 		alsa-sys-0.3.1 \
 		ambient-authority-0.0.2 \
@@ -19,8 +19,8 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		anstyle-1.0.10 \
 		anstyle-parse-0.2.6 \
 		anstyle-query-1.1.2 \
-		anstyle-wincon-3.0.6 \
-		anyhow-1.0.95 \
+		anstyle-wincon-3.0.7 \
+		anyhow-1.0.98 \
 		anymap2-0.13.0 \
 		app_dirs2-2.5.5 \
 		approx-0.3.2 \
@@ -34,15 +34,15 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		as-raw-xcb-connection-1.0.1 \
 		ascii-1.1.0 \
 		ash-0.37.3+1.3.251 \
-		assets_manager-0.12.4 \
+		assets_manager-0.12.5 \
 		async-channel-2.3.1 \
-		async-trait-0.1.83 \
+		async-trait-0.1.88 \
 		atomic-arena-0.1.2 \
 		atomic_refcell-0.1.13 \
 		atomicwrites-0.4.4 \
 		autocfg-1.4.0 \
-		axum-0.8.1 \
-		axum-core-0.5.0 \
+		axum-0.8.4 \
+		axum-core-0.5.2 \
 		az-1.2.1 \
 		backtrace-0.3.74 \
 		base64-0.21.7 \
@@ -52,34 +52,35 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
-		bitflags-2.8.0 \
+		bitflags-2.9.0 \
 		bitvec-1.0.1 \
-		blake2b_simd-1.0.2 \
+		blake2b_simd-1.0.3 \
 		block-0.1.6 \
 		block-buffer-0.10.4 \
 		block-sys-0.1.0-beta.1 \
 		block2-0.2.0-alpha.6 \
 		block2-0.5.1 \
+		block2-0.6.1 \
 		bumpalo-3.17.0 \
-		bytemuck-1.21.0 \
-		bytemuck_derive-1.7.1 \
+		bytemuck-1.23.0 \
+		bytemuck_derive-1.9.3 \
 		byteorder-1.5.0 \
 		byteorder-lite-0.1.0 \
-		bytes-1.9.0 \
+		bytes-1.10.1 \
 		calloop-0.10.6 \
 		calloop-0.13.0 \
 		calloop-wayland-source-0.3.0 \
 		cansi-2.2.1 \
-		cap-fs-ext-3.4.2 \
-		cap-net-ext-3.4.2 \
-		cap-primitives-3.4.2 \
-		cap-rand-3.4.2 \
-		cap-std-3.4.2 \
-		cap-time-ext-3.4.2 \
+		cap-fs-ext-3.4.4 \
+		cap-net-ext-3.4.4 \
+		cap-primitives-3.4.4 \
+		cap-rand-3.4.4 \
+		cap-std-3.4.4 \
+		cap-time-ext-3.4.4 \
 		cassowary-0.3.0 \
 		cast-0.3.0 \
 		castaway-0.2.3 \
-		cc-1.2.10 \
+		cc-1.2.21 \
 		censor-0.3.0 \
 		cesu8-1.1.0 \
 		cexpr-0.6.0 \
@@ -87,17 +88,17 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.1.1 \
 		cfg_aliases-0.2.1 \
-		chrono-0.4.39 \
-		chrono-tz-0.10.1 \
-		chrono-tz-build-0.4.0 \
+		chrono-0.4.41 \
+		chrono-tz-0.10.3 \
+		chrono-tz-build-0.4.1 \
 		chumsky-0.9.3 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
 		ciborium-ll-0.2.2 \
 		clang-sys-1.8.1 \
-		clap-4.5.27 \
-		clap_builder-4.5.27 \
-		clap_derive-4.5.24 \
+		clap-4.5.37 \
+		clap_builder-4.5.37 \
+		clap_derive-4.5.32 \
 		clap_lex-0.7.4 \
 		clipboard-win-3.1.1 \
 		clipboard-win-4.5.0 \
@@ -105,17 +106,15 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		clipboard_macos-0.1.1 \
 		clipboard_wayland-0.2.2 \
 		clipboard_x11-0.4.2 \
-		cmake-0.1.53 \
+		cmake-0.1.54 \
 		cobs-0.2.3 \
-		cocoa-0.25.0 \
-		cocoa-foundation-0.1.2 \
 		codespan-reporting-0.11.1 \
 		colorchoice-1.0.3 \
 		com-rs-0.2.1 \
 		combine-4.6.7 \
 		compact_str-0.8.1 \
 		concurrent-queue-2.5.0 \
-		console-0.15.10 \
+		console-0.15.11 \
 		console_error_panic_hook-0.1.7 \
 		constant_time_eq-0.3.1 \
 		copypasta-0.8.2 \
@@ -123,7 +122,6 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		core-foundation-0.10.0 \
 		core-foundation-sys-0.8.7 \
 		core-graphics-0.22.3 \
-		core-graphics-0.23.2 \
 		core-graphics-types-0.1.3 \
 		coreaudio-rs-0.11.3 \
 		coreaudio-sys-0.2.16 \
@@ -156,30 +154,30 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		crunchy-0.2.3 \
 		crypto-common-0.1.6 \
 		csv-1.3.1 \
-		csv-core-0.1.11 \
+		csv-core-0.1.12 \
 		culpa-1.0.2 \
 		culpa-macros-1.0.2 \
 		cursor-icon-1.1.0 \
 		d3d12-0.7.0 \
 		daggy-0.5.0 \
-		darling-0.20.10 \
-		darling_core-0.20.10 \
-		darling_macro-0.20.10 \
+		darling-0.20.11 \
+		darling_core-0.20.11 \
+		darling_macro-0.20.11 \
 		dasp_sample-0.11.0 \
-		data-encoding-2.6.0 \
+		data-encoding-2.9.0 \
 		debugid-0.8.0 \
 		deflate-1.0.0 \
-		deranged-0.3.11 \
+		deranged-0.4.0 \
 		digest-0.10.7 \
 		directories-next-2.0.0 \
 		dirs-4.0.0 \
-		dirs-5.0.1 \
-		dirs-next-2.0.0 \
+		dirs-6.0.0 \
 		dirs-sys-0.3.7 \
-		dirs-sys-0.4.1 \
+		dirs-sys-0.5.0 \
 		dirs-sys-next-0.1.2 \
 		discord-sdk-0.4.0 \
 		dispatch-0.2.0 \
+		dispatch2-0.3.0 \
 		displaydoc-0.2.5 \
 		divrem-1.0.0 \
 		dlib-0.5.2 \
@@ -191,7 +189,7 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		egui-0.23.0 \
 		egui_plot-0.23.0 \
 		egui_winit_platform-0.20.0 \
-		either-1.13.0 \
+		either-1.15.0 \
 		elapsed-0.1.2 \
 		emath-0.23.0 \
 		embedded-io-0.4.0 \
@@ -202,45 +200,47 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		enum-as-inner-0.6.1 \
 		enum-map-2.7.3 \
 		enum-map-derive-0.17.0 \
-		enumset-1.1.5 \
-		enumset_derive-0.10.0 \
+		enumset-1.1.6 \
+		enumset_derive-0.11.0 \
+		env_home-0.1.0 \
 		epaint-0.23.0 \
-		equivalent-1.0.1 \
-		errno-0.3.10 \
+		equivalent-1.0.2 \
+		errno-0.3.11 \
 		error-chain-0.12.4 \
 		error-code-2.3.1 \
 		error-code-3.3.1 \
 		euc-0.5.3 \
 		euclid-0.22.11 \
-		event-listener-5.3.1 \
-		event-listener-strategy-0.5.2 \
+		event-listener-5.4.0 \
+		event-listener-strategy-0.5.4 \
 		fallible-iterator-0.3.0 \
 		fallible-streaming-iterator-0.1.9 \
-		fastrand-2.1.1 \
-		fd-lock-4.0.2 \
-		fdeflate-0.3.5 \
+		fastrand-2.3.0 \
+		fd-lock-4.0.4 \
+		fdeflate-0.3.7 \
 		filetime-0.2.25 \
 		find_folder-0.3.0 \
-		fixed-1.28.0 \
+		fixed-1.29.0 \
 		fixedbitset-0.1.9 \
 		fixedbitset-0.4.2 \
 		fixedbitset-0.5.7 \
-		flate2-1.0.35 \
+		flate2-1.1.1 \
 		float-cmp-0.10.0 \
 		fluent-0.16.1 \
 		fluent-bundle-0.15.3 \
 		fluent-langneg-0.13.0 \
 		fluent-syntax-0.11.1 \
-		flume-0.11.0 \
+		flume-0.11.1 \
 		fnv-1.0.7 \
-		foldhash-0.1.4 \
+		foldhash-0.1.5 \
 		foreign-types-0.3.2 \
 		foreign-types-0.5.0 \
 		foreign-types-macros-0.2.3 \
 		foreign-types-shared-0.1.1 \
 		foreign-types-shared-0.3.1 \
 		form_urlencoded-1.2.1 \
-		fs-set-times-0.20.1 \
+		formatx-0.2.4 \
+		fs-set-times-0.20.3 \
 		fsevent-sys-4.1.0 \
 		funty-2.0.0 \
 		futures-0.3.31 \
@@ -259,17 +259,18 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		generic-array-0.14.7 \
 		gethostname-0.2.3 \
 		gethostname-0.4.3 \
-		getrandom-0.2.15 \
+		getrandom-0.2.16 \
+		getrandom-0.3.2 \
 		gilrs-0.10.2 \
 		gilrs-core-0.5.7 \
 		gimli-0.31.1 \
 		gl_generator-0.14.0 \
 		glam-0.10.2 \
-		glam-0.30.1 \
-		glob-0.3.1 \
+		glam-0.30.3 \
+		glob-0.3.2 \
 		glow-0.13.1 \
 		glutin_wgl_sys-0.5.0 \
-		glyph_brush-0.7.10 \
+		glyph_brush-0.7.12 \
 		glyph_brush_draw_cache-0.1.6 \
 		glyph_brush_layout-0.2.4 \
 		gpu-alloc-0.6.0 \
@@ -278,60 +279,59 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		gpu-descriptor-0.2.4 \
 		gpu-descriptor-types-0.1.2 \
 		guillotiere-0.6.2 \
-		half-2.4.1 \
+		half-2.6.0 \
 		hash32-0.3.1 \
 		hashbrown-0.9.1 \
 		hashbrown-0.12.3 \
 		hashbrown-0.13.2 \
 		hashbrown-0.14.5 \
-		hashbrown-0.15.1 \
+		hashbrown-0.15.3 \
 		hashlink-0.9.1 \
 		hassle-rs-0.10.0 \
 		heapless-0.8.0 \
-		heck-0.4.1 \
 		heck-0.5.0 \
 		hermit-abi-0.3.9 \
 		hermit-abi-0.4.0 \
+		hermit-abi-0.5.0 \
 		hex-0.4.3 \
 		hexf-parse-0.2.1 \
 		hibitset-0.6.4 \
-		hickory-proto-0.24.3 \
-		hickory-resolver-0.24.1 \
+		hickory-proto-0.24.4 \
+		hickory-resolver-0.24.4 \
 		home-0.5.11 \
-		hostname-0.3.1 \
-		http-1.2.0 \
+		http-1.3.1 \
 		http-body-1.0.1 \
-		http-body-util-0.1.2 \
-		httparse-1.10.0 \
+		http-body-util-0.1.3 \
+		httparse-1.10.1 \
 		httpdate-1.0.3 \
-		humantime-2.1.0 \
+		humantime-2.2.0 \
 		hyper-1.6.0 \
 		hyper-rustls-0.27.5 \
-		hyper-util-0.1.10 \
-		iana-time-zone-0.1.61 \
+		hyper-util-0.1.11 \
+		iana-time-zone-0.1.63 \
 		iana-time-zone-haiku-0.1.2 \
 		icu_collections-1.5.0 \
 		icu_locid-1.5.0 \
 		icu_locid_transform-1.5.0 \
-		icu_locid_transform_data-1.5.0 \
+		icu_locid_transform_data-1.5.1 \
 		icu_normalizer-1.5.0 \
-		icu_normalizer_data-1.5.0 \
+		icu_normalizer_data-1.5.1 \
 		icu_properties-1.5.1 \
-		icu_properties_data-1.5.0 \
+		icu_properties_data-1.5.1 \
 		icu_provider-1.5.0 \
 		icu_provider_macros-1.5.0 \
 		id-arena-2.2.1 \
 		ident_case-1.0.1 \
 		idna-1.0.3 \
 		idna_adapter-1.2.0 \
-		image-0.25.5 \
+		image-0.25.6 \
 		indexmap-1.9.3 \
-		indexmap-2.7.1 \
-		indicatif-0.17.8 \
-		indoc-2.0.5 \
+		indexmap-2.9.0 \
+		indicatif-0.17.11 \
+		indoc-2.0.6 \
 		init_with-1.1.0 \
-		inline_tweak-1.1.1 \
-		inline_tweak_derive-3.0.0 \
+		inline_tweak-1.2.2 \
+		inline_tweak_derive-4.0.0 \
 		inotify-0.9.6 \
 		inotify-0.11.0 \
 		inotify-sys-0.1.5 \
@@ -339,28 +339,26 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		instant-0.1.13 \
 		intl-memoizer-0.5.2 \
 		intl_pluralrules-7.0.2 \
-		io-extras-0.18.3 \
+		io-extras-0.18.4 \
 		io-kit-sys-0.3.0 \
-		io-lifetimes-2.0.3 \
+		io-lifetimes-2.0.4 \
 		ipconfig-0.3.2 \
 		ipnet-2.11.0 \
 		is-docker-0.2.0 \
-		is-terminal-0.4.13 \
+		is-terminal-0.4.16 \
 		is-wsl-0.4.0 \
 		is_terminal_polyfill-1.70.1 \
 		itertools-0.10.5 \
-		itertools-0.11.0 \
 		itertools-0.12.1 \
 		itertools-0.13.0 \
 		itertools-0.14.0 \
-		itoa-1.0.14 \
+		itoa-1.0.15 \
 		ittapi-0.4.0 \
 		ittapi-sys-0.4.0 \
-		jni-0.19.0 \
 		jni-0.21.1 \
 		jni-sys-0.3.0 \
-		jobserver-0.1.32 \
-		js-sys-0.3.70 \
+		jobserver-0.1.33 \
+		js-sys-0.3.77 \
 		khronos-egl-6.0.0 \
 		khronos_api-3.1.0 \
 		kiddo-4.2.0 \
@@ -369,30 +367,30 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		lazy-bytes-cast-5.0.1 \
 		lazy_static-1.5.0 \
 		leb128-0.2.5 \
+		leb128fmt-0.1.0 \
 		levenshtein-1.0.5 \
-		libc-0.2.169 \
+		libc-0.2.172 \
 		libloading-0.7.4 \
 		libloading-0.8.6 \
-		libm-0.2.11 \
-		libmimalloc-sys-0.1.39 \
-		libredox-0.0.2 \
+		libm-0.2.14 \
+		libmimalloc-sys-0.1.42 \
 		libredox-0.1.3 \
 		libsqlite3-sys-0.28.0 \
 		libudev-sys-0.1.4 \
 		linked-hash-map-0.5.6 \
-		linux-raw-sys-0.4.14 \
-		litemap-0.7.4 \
+		linux-raw-sys-0.4.15 \
+		linux-raw-sys-0.9.4 \
+		litemap-0.7.5 \
 		lock_api-0.4.12 \
-		log-0.4.25 \
+		log-0.4.27 \
 		loom-0.7.2 \
-		lru-0.12.4 \
+		lru-0.12.5 \
 		lru-cache-0.1.2 \
 		lz-fear-0.2.0 \
 		mach2-0.4.2 \
 		macro_rules_attribute-0.1.3 \
 		macro_rules_attribute-proc_macro-0.1.3 \
 		malloc_buf-0.0.6 \
-		match_cfg-0.1.0 \
 		matchers-0.1.0 \
 		matchit-0.8.4 \
 		maybe-owned-0.3.4 \
@@ -405,17 +403,17 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		memoffset-0.5.6 \
 		memoffset-0.6.5 \
 		metal-0.27.0 \
-		mimalloc-0.1.43 \
+		mimalloc-0.1.46 \
 		mime-0.3.17 \
 		minifb-0.28.0 \
 		minimal-lexical-0.2.1 \
-		miniz_oxide-0.8.3 \
+		miniz_oxide-0.8.8 \
 		mint-0.5.9 \
 		mio-0.8.11 \
 		mio-1.0.3 \
 		mumble-link-0.2.0 \
 		nanorand-0.7.0 \
-		native-dialog-0.7.0 \
+		native-dialog-0.9.0 \
 		ndk-0.7.0 \
 		ndk-0.8.0 \
 		ndk-context-0.1.1 \
@@ -429,6 +427,7 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		nohash-hasher-0.2.0 \
 		noise-0.9.0 \
 		nom-7.1.3 \
+		nom-8.0.0 \
 		notify-6.1.1 \
 		notify-8.0.0 \
 		notify-types-2.0.0 \
@@ -462,27 +461,39 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		objc-sys-0.3.5 \
 		objc2-0.3.0-beta.3.patch-leaks.3 \
 		objc2-0.5.2 \
+		objc2-0.6.1 \
 		objc2-app-kit-0.2.2 \
+		objc2-app-kit-0.3.1 \
+		objc2-cloud-kit-0.3.1 \
 		objc2-core-data-0.2.2 \
+		objc2-core-data-0.3.1 \
+		objc2-core-foundation-0.3.1 \
+		objc2-core-graphics-0.3.1 \
 		objc2-core-image-0.2.2 \
+		objc2-core-image-0.3.1 \
 		objc2-encode-2.0.0-pre.2 \
-		objc2-encode-4.0.3 \
+		objc2-encode-4.1.0 \
 		objc2-foundation-0.2.2 \
+		objc2-foundation-0.3.1 \
+		objc2-io-surface-0.3.1 \
 		objc2-metal-0.2.2 \
+		objc2-metal-0.3.1 \
 		objc2-quartz-core-0.2.2 \
+		objc2-quartz-core-0.3.1 \
 		objc_exception-0.1.2 \
 		objc_id-0.1.1 \
 		object-0.36.7 \
 		oboe-0.6.1 \
 		oboe-sys-0.6.1 \
-		once_cell-1.20.2 \
-		oorandom-11.1.4 \
+		once_cell-1.21.3 \
+		oorandom-11.1.5 \
 		open-5.3.2 \
-		openssl-probe-0.1.5 \
+		openssl-probe-0.1.6 \
 		option-ext-0.2.0 \
-		orbclient-0.3.47 \
+		orbclient-0.3.48 \
 		ordered-float-1.1.1 \
 		ordered-float-4.6.0 \
+		ordered-float-5.0.0 \
 		overload-0.1.1 \
 		owned_ttf_parser-0.25.0 \
 		parking-2.2.1 \
@@ -491,79 +502,83 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		parse-zoneinfo-0.3.1 \
 		paste-1.0.15 \
 		pathdiff-0.2.3 \
-		pem-3.0.4 \
+		pem-3.0.5 \
 		percent-encoding-2.3.1 \
 		petgraph-0.4.13 \
 		petgraph-0.6.5 \
-		petgraph-0.7.1 \
-		phf-0.11.2 \
-		phf_codegen-0.11.2 \
-		phf_generator-0.11.2 \
-		phf_shared-0.11.2 \
-		pin-project-lite-0.2.14 \
+		petgraph-0.8.1 \
+		phf-0.11.3 \
+		phf_codegen-0.11.3 \
+		phf_generator-0.11.3 \
+		phf_shared-0.11.3 \
+		pin-project-lite-0.2.16 \
 		pin-utils-0.1.0 \
 		piston-float-0.3.0 \
 		piston-viewport-0.5.0 \
 		pistoncore-input-0.24.0 \
-		pkg-config-0.3.31 \
-		png-0.17.14 \
-		polling-3.7.3 \
-		portable-atomic-1.9.0 \
-		postcard-1.0.10 \
+		pkg-config-0.3.32 \
+		png-0.17.16 \
+		polling-3.7.4 \
+		portable-atomic-1.11.0 \
+		postcard-1.1.1 \
 		powerfmt-0.2.0 \
 		pp-rs-0.2.1 \
-		ppv-lite86-0.2.20 \
+		ppv-lite86-0.2.21 \
 		presser-0.3.1 \
 		proc-macro-crate-1.3.1 \
+		proc-macro-crate-3.3.0 \
 		proc-macro-hack-0.5.20+deprecated \
 		proc-macro-nested-0.1.7 \
 		proc-macro2-0.4.30 \
-		proc-macro2-1.0.93 \
+		proc-macro2-1.0.95 \
 		profiling-1.0.16 \
 		profiling-procmacros-1.0.16 \
-		prometheus-0.13.4 \
-		prometheus-hyper-0.2.0 \
+		prometheus-0.14.0 \
+		prometheus-hyper-0.2.1 \
 		protocol-3.4.0 \
 		protocol-derive-3.4.0 \
-		psm-0.1.23 \
+		psm-0.1.26 \
 		pulley-interpreter-29.0.1 \
-		quick-error-1.2.3 \
 		quick-xml-0.30.0 \
-		quick-xml-0.36.2 \
-		quinn-0.11.6 \
-		quinn-proto-0.11.9 \
-		quinn-udp-0.5.9 \
+		quick-xml-0.37.5 \
+		quinn-0.11.7 \
+		quinn-proto-0.11.11 \
+		quinn-udp-0.5.12 \
 		quote-0.6.13 \
-		quote-1.0.38 \
+		quote-1.0.40 \
+		r-efi-5.2.0 \
 		radium-0.7.0 \
 		radix_trie-0.2.1 \
 		rand-0.8.5 \
+		rand-0.9.1 \
 		rand_chacha-0.3.1 \
+		rand_chacha-0.9.0 \
 		rand_core-0.6.4 \
+		rand_core-0.9.3 \
 		rand_xorshift-0.3.0 \
-		range-alloc-0.1.3 \
+		range-alloc-0.1.4 \
 		ratatui-0.29.0 \
 		raw-window-handle-0.5.2 \
 		raw-window-handle-0.6.2 \
 		rayon-1.10.0 \
 		rayon-core-1.12.1 \
-		rcgen-0.13.1 \
+		rcgen-0.13.2 \
 		redox_syscall-0.3.5 \
-		redox_syscall-0.4.1 \
-		redox_syscall-0.5.6 \
+		redox_syscall-0.5.12 \
 		redox_users-0.4.6 \
-		refinery-0.8.14 \
-		refinery-core-0.8.14 \
-		refinery-macros-0.8.14 \
-		regalloc2-0.11.1 \
+		redox_users-0.5.0 \
+		refinery-0.8.16 \
+		refinery-core-0.8.16 \
+		refinery-macros-0.8.16 \
+		regalloc2-0.11.2 \
 		regex-1.11.1 \
 		regex-automata-0.1.10 \
-		regex-automata-0.4.8 \
+		regex-automata-0.4.9 \
 		regex-syntax-0.6.29 \
 		regex-syntax-0.8.5 \
 		renderdoc-sys-1.1.0 \
-		resolv-conf-0.7.0 \
-		ring-0.17.13 \
+		resolv-conf-0.7.3 \
+		ring-0.17.14 \
 		rmp-0.8.14 \
 		rmp-serde-1.3.0 \
 		ron-0.8.1 \
@@ -575,23 +590,24 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		rust-argon2-2.1.0 \
 		rustc-demangle-0.1.24 \
 		rustc-hash-1.1.0 \
-		rustc-hash-2.1.0 \
+		rustc-hash-2.1.1 \
 		rustc_version-0.2.3 \
 		rustc_version-0.4.1 \
 		rustix-0.38.44 \
-		rustls-0.23.21 \
-		rustls-native-certs-0.7.3 \
+		rustix-1.0.7 \
+		rustix-linux-procfs-0.1.1 \
+		rustls-0.23.26 \
 		rustls-native-certs-0.8.1 \
 		rustls-pemfile-2.2.0 \
 		rustls-pki-types-1.11.0 \
-		rustls-platform-verifier-0.4.0 \
+		rustls-platform-verifier-0.5.2 \
 		rustls-platform-verifier-android-0.1.1 \
-		rustls-webpki-0.102.8 \
+		rustls-webpki-0.103.1 \
 		rusttype-0.7.9 \
 		rusttype-0.8.3 \
-		rustversion-1.0.17 \
+		rustversion-1.0.20 \
 		rustyline-15.0.0 \
-		ryu-1.0.19 \
+		ryu-1.0.20 \
 		same-file-1.0.6 \
 		schannel-0.1.27 \
 		schnellru-0.2.4 \
@@ -600,56 +616,54 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		sctk-adwaita-0.5.4 \
 		sdl2-0.35.2 \
 		sdl2-sys-0.35.2 \
-		security-framework-2.11.1 \
 		security-framework-3.2.0 \
 		security-framework-sys-2.14.0 \
 		self_cell-0.10.3 \
-		self_cell-1.1.0 \
+		self_cell-1.2.0 \
 		semver-0.9.0 \
-		semver-1.0.25 \
+		semver-1.0.26 \
 		semver-parser-0.7.0 \
 		send_wrapper-0.6.0 \
-		serde-1.0.217 \
-		serde_derive-1.0.217 \
-		serde_json-1.0.138 \
-		serde_path_to_error-0.1.16 \
-		serde_repr-0.1.19 \
+		serde-1.0.219 \
+		serde_derive-1.0.219 \
+		serde_json-1.0.140 \
+		serde_path_to_error-0.1.17 \
+		serde_repr-0.1.20 \
 		serde_spanned-0.6.8 \
 		serde_urlencoded-0.7.1 \
 		serde_with-3.12.0 \
 		serde_with_macros-3.12.0 \
-		sha2-0.10.8 \
+		sha2-0.10.9 \
 		shaderc-0.8.3 \
 		shaderc-sys-0.8.3 \
 		sharded-slab-0.1.7 \
 		shell-words-1.1.0 \
 		shellexpand-2.1.2 \
-		shellexpand-3.1.0 \
+		shellexpand-3.1.1 \
 		shlex-1.3.0 \
 		shred-0.16.1 \
 		shred-derive-0.7.0 \
 		shrev-1.1.3 \
 		signal-hook-0.3.17 \
 		signal-hook-mio-0.2.4 \
-		signal-hook-registry-1.4.2 \
+		signal-hook-registry-1.4.5 \
 		simd-adler32-0.3.7 \
-		siphasher-0.3.11 \
 		siphasher-1.0.1 \
 		slab-0.4.9 \
 		slotmap-1.0.7 \
-		smallvec-1.13.2 \
+		smallvec-1.15.0 \
 		smithay-client-toolkit-0.16.1 \
 		smithay-client-toolkit-0.19.2 \
 		smithay-clipboard-0.6.6 \
 		smithay-clipboard-0.7.2 \
-		socket2-0.5.8 \
+		socket2-0.5.9 \
 		sorted-vec-0.8.6 \
 		spin-0.9.8 \
-		spin_sleep-1.2.1 \
+		spin_sleep-1.3.1 \
 		spirv-0.2.0+1.5.4 \
 		sptr-0.3.2 \
 		stable_deref_trait-1.2.0 \
-		stacker-0.1.17 \
+		stacker-0.1.21 \
 		static_assertions-1.1.0 \
 		stb_truetype-0.3.1 \
 		str-buf-1.0.6 \
@@ -659,7 +673,7 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		strum_macros-0.26.4 \
 		subtle-2.6.1 \
 		sum_type-0.2.0 \
-		svg_fmt-0.4.4 \
+		svg_fmt-0.4.5 \
 		symphonia-0.5.4 \
 		symphonia-codec-vorbis-0.5.4 \
 		symphonia-core-0.5.4 \
@@ -668,41 +682,42 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		symphonia-utils-xiph-0.5.4 \
 		syn-0.15.44 \
 		syn-1.0.109 \
-		syn-2.0.96 \
+		syn-2.0.101 \
 		sync_file-0.2.9 \
-		sync_wrapper-1.0.1 \
-		synstructure-0.13.1 \
-		system-interface-0.27.2 \
+		sync_wrapper-1.0.2 \
+		synstructure-0.13.2 \
+		system-interface-0.27.3 \
 		take-once-0.1.2 \
 		tap-1.0.1 \
-		tar-0.4.43 \
-		target-lexicon-0.13.1 \
-		tempfile-3.13.0 \
+		tar-0.4.44 \
+		target-lexicon-0.13.2 \
+		tempfile-3.19.1 \
 		termcolor-1.4.1 \
 		thiserror-1.0.69 \
-		thiserror-2.0.11 \
+		thiserror-2.0.12 \
 		thiserror-impl-1.0.69 \
-		thiserror-impl-2.0.11 \
+		thiserror-impl-2.0.12 \
 		thread_local-1.1.8 \
-		time-0.3.37 \
-		time-core-0.1.2 \
-		time-macros-0.2.19 \
+		time-0.3.41 \
+		time-core-0.1.4 \
+		time-macros-0.2.22 \
 		timer-queue-0.1.0 \
 		tiny-skia-0.8.4 \
 		tiny-skia-path-0.8.4 \
 		tinystr-0.7.6 \
 		tinytemplate-1.2.1 \
-		tinyvec-1.8.1 \
+		tinyvec-1.9.0 \
 		tinyvec_macros-0.1.1 \
 		tokio-1.44.2 \
 		tokio-macros-2.5.0 \
-		tokio-rustls-0.26.0 \
-		tokio-stream-0.1.16 \
+		tokio-rustls-0.26.2 \
+		tokio-stream-0.1.17 \
 		toml-0.5.11 \
-		toml-0.8.19 \
-		toml_datetime-0.6.8 \
+		toml-0.8.22 \
+		toml_datetime-0.6.9 \
 		toml_edit-0.19.15 \
-		toml_edit-0.22.22 \
+		toml_edit-0.22.26 \
+		toml_write-0.1.1 \
 		tower-0.5.2 \
 		tower-layer-0.3.3 \
 		tower-service-0.3.3 \
@@ -717,18 +732,19 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		tracy-client-sys-0.24.3 \
 		trait-variant-0.1.2 \
 		treeculler-0.4.0 \
-		triple_buffer-8.1.0 \
+		triple_buffer-8.1.1 \
 		try-lock-0.2.5 \
 		ttf-parser-0.25.1 \
 		tuple_utils-0.4.0 \
 		twox-hash-1.6.3 \
+		twox-hash-2.1.0 \
 		tynm-0.1.10 \
 		type-map-0.5.0 \
-		typenum-1.17.0 \
+		typenum-1.18.0 \
 		ubyte-0.10.4 \
 		unic-langid-0.9.5 \
 		unic-langid-impl-0.9.5 \
-		unicode-ident-1.0.13 \
+		unicode-ident-1.0.18 \
 		unicode-segmentation-1.12.0 \
 		unicode-truncate-1.1.0 \
 		unicode-width-0.1.14 \
@@ -740,29 +756,30 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		utf16_iter-1.0.5 \
 		utf8_iter-1.0.4 \
 		utf8parse-0.2.2 \
-		uuid-1.12.1 \
-		valuable-0.1.0 \
+		uuid-1.16.0 \
+		valuable-0.1.1 \
 		vcpkg-0.2.15 \
 		vec_map-0.8.2 \
 		vek-0.14.1 \
 		vek-0.17.1 \
 		version-compare-0.1.1 \
 		version_check-0.9.5 \
-		versions-5.0.1 \
+		versions-7.0.0 \
 		walkdir-2.5.0 \
 		want-0.3.1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.93 \
-		wasm-bindgen-backend-0.2.93 \
-		wasm-bindgen-futures-0.4.43 \
-		wasm-bindgen-macro-0.2.93 \
-		wasm-bindgen-macro-support-0.2.93 \
-		wasm-bindgen-shared-0.2.93 \
-		wasm-encoder-0.221.2 \
-		wasm-encoder-0.224.0 \
+		wasi-0.14.2+wasi-0.2.4 \
+		wasm-bindgen-0.2.100 \
+		wasm-bindgen-backend-0.2.100 \
+		wasm-bindgen-futures-0.4.45 \
+		wasm-bindgen-macro-0.2.100 \
+		wasm-bindgen-macro-support-0.2.100 \
+		wasm-bindgen-shared-0.2.100 \
+		wasm-encoder-0.221.3 \
+		wasm-encoder-0.229.0 \
 		wasmparser-0.221.3 \
-		wasmparser-0.224.0 \
-		wasmprinter-0.221.2 \
+		wasmparser-0.229.0 \
+		wasmprinter-0.221.3 \
 		wasmtime-29.0.1 \
 		wasmtime-asm-macros-29.0.1 \
 		wasmtime-cache-29.0.1 \
@@ -780,30 +797,30 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		wasmtime-winch-29.0.1 \
 		wasmtime-wit-bindgen-29.0.1 \
 		wast-35.0.2 \
-		wast-224.0.0 \
-		wat-1.224.0 \
+		wast-229.0.0 \
+		wat-1.229.0 \
 		wavefront-0.2.3 \
-		wayland-backend-0.3.7 \
+		wayland-backend-0.3.10 \
 		wayland-client-0.29.5 \
-		wayland-client-0.31.6 \
+		wayland-client-0.31.10 \
 		wayland-commons-0.29.5 \
 		wayland-csd-frame-0.3.0 \
 		wayland-cursor-0.29.5 \
-		wayland-cursor-0.31.6 \
+		wayland-cursor-0.31.10 \
 		wayland-protocols-0.29.5 \
-		wayland-protocols-0.32.4 \
-		wayland-protocols-wlr-0.3.4 \
+		wayland-protocols-0.32.8 \
+		wayland-protocols-wlr-0.3.8 \
 		wayland-scanner-0.29.5 \
-		wayland-scanner-0.31.5 \
+		wayland-scanner-0.31.6 \
 		wayland-sys-0.29.5 \
-		wayland-sys-0.31.5 \
-		web-sys-0.3.70 \
+		wayland-sys-0.31.6 \
+		web-sys-0.3.72 \
 		web-time-1.1.0 \
-		webpki-root-certs-0.26.7 \
+		webpki-root-certs-0.26.10 \
 		wfd-0.1.7 \
 		wgpu-profiler-0.15.0 \
-		which-4.4.2 \
-		widestring-1.1.0 \
+		which-7.0.3 \
+		widestring-1.2.0 \
 		wiggle-29.0.1 \
 		wiggle-generate-29.0.1 \
 		wiggle-macro-29.0.1 \
@@ -821,11 +838,17 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		windows-core-0.51.1 \
 		windows-core-0.54.0 \
 		windows-core-0.58.0 \
+		windows-core-0.61.0 \
 		windows-implement-0.58.0 \
+		windows-implement-0.60.0 \
 		windows-interface-0.58.0 \
+		windows-interface-0.59.1 \
+		windows-link-0.1.1 \
 		windows-result-0.1.2 \
 		windows-result-0.2.0 \
+		windows-result-0.3.2 \
 		windows-strings-0.1.0 \
+		windows-strings-0.4.0 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
@@ -857,11 +880,13 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		windows_x86_64_msvc-0.52.6 \
 		winit-0.28.7 \
 		winnow-0.5.40 \
-		winnow-0.6.20 \
+		winnow-0.7.9 \
 		winreg-0.50.0 \
 		winreg-0.52.0 \
 		winres-0.1.12 \
-		winx-0.36.3 \
+		winsafe-0.0.19 \
+		winx-0.36.4 \
+		wit-bindgen-rt-0.39.0 \
 		wit-parser-0.221.3 \
 		witx-0.9.1 \
 		write16-1.0.0 \
@@ -873,30 +898,32 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		x11rb-0.13.1 \
 		x11rb-protocol-0.10.0 \
 		x11rb-protocol-0.13.1 \
-		xattr-1.3.1 \
-		xcb-1.4.0 \
+		xattr-1.5.0 \
+		xcb-1.5.0 \
 		xcursor-0.3.8 \
 		xdg-2.5.2 \
 		xi-unicode-0.3.0 \
 		xkbcommon-0.5.1 \
 		xkeysym-0.2.1 \
-		xml-rs-0.8.22 \
+		xml-rs-0.8.26 \
 		xmlparser-0.13.6 \
 		yasna-0.5.2 \
 		yoke-0.7.5 \
 		yoke-derive-0.7.5 \
 		zerocopy-0.7.35 \
+		zerocopy-0.8.25 \
 		zerocopy-derive-0.7.35 \
-		zerofrom-0.1.5 \
-		zerofrom-derive-0.1.5 \
+		zerocopy-derive-0.8.25 \
+		zerofrom-0.1.6 \
+		zerofrom-derive-0.1.6 \
 		zeroize-1.8.1 \
 		zerovec-0.10.4 \
 		zerovec-derive-0.10.3 \
-		zstd-0.13.2 \
-		zstd-safe-7.2.1 \
-		zstd-sys-2.0.13+zstd.1.5.6 \
+		zstd-0.13.3 \
+		zstd-safe-7.2.4 \
+		zstd-sys-2.0.15+zstd.1.5.7 \
 		zune-core-0.4.12 \
-		zune-jpeg-0.4.13 \
+		zune-jpeg-0.4.14 \
 		keyboard-keynames@git+https://gitlab.com/Imbris/keyboard-keynames.git?tag=veloren-winit-0.28\#fca4bbdfa51bf054b155a455935b3792975c989d \
 		kira@git+https://github.com/DaforLynx/kira.git?tag=v0.10.6-with-config\#f1516a8d9599834787adae8bebf78e975d1b73e5 \
 		specs,specs-derive@git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27\#4e2da1df29ee840baa9b936593c45592b7c9ae27 \
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 3e4e5af1f97d..1709b6e575d2 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1746063045
+TIMESTAMP = 1746620641
 SHA256 (rust/crates/ab_glyph-0.2.29.crate) = ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0
 SIZE (rust/crates/ab_glyph-0.2.29.crate) = 20011
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -15,8 +15,8 @@ SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa
 SIZE (rust/crates/ahash-0.8.11.crate) = 43607
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
-SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
-SIZE (rust/crates/allocator-api2-0.2.18.crate) = 62504
+SHA256 (rust/crates/allocator-api2-0.2.21.crate) = 683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923
+SIZE (rust/crates/allocator-api2-0.2.21.crate) = 63622
 SHA256 (rust/crates/alsa-0.9.1.crate) = ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43
 SIZE (rust/crates/alsa-0.9.1.crate) = 72824
 SHA256 (rust/crates/alsa-sys-0.3.1.crate) = db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527
@@ -41,10 +41,10 @@ SHA256 (rust/crates/anstyle-parse-0.2.6.crate) = 3b2d16507662817a6a20a9ea92df665
 SIZE (rust/crates/anstyle-parse-0.2.6.crate) = 22343
 SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c
 SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
-SHA256 (rust/crates/anstyle-wincon-3.0.6.crate) = 2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125
-SIZE (rust/crates/anstyle-wincon-3.0.6.crate) = 12271
-SHA256 (rust/crates/anyhow-1.0.95.crate) = 34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04
-SIZE (rust/crates/anyhow-1.0.95.crate) = 52155
+SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e
+SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400
+SHA256 (rust/crates/anyhow-1.0.98.crate) = e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487
+SIZE (rust/crates/anyhow-1.0.98.crate) = 53334
 SHA256 (rust/crates/anymap2-0.13.0.crate) = d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c
 SIZE (rust/crates/anymap2-0.13.0.crate) = 17337
 SHA256 (rust/crates/app_dirs2-2.5.5.crate) = a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e
@@ -71,12 +71,12 @@ SHA256 (rust/crates/ascii-1.1.0.crate) = d92bec98840b8f03a5ff5413de5293bfcd8bf96
 SIZE (rust/crates/ascii-1.1.0.crate) = 36075
 SHA256 (rust/crates/ash-0.37.3+1.3.251.crate) = 39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a
 SIZE (rust/crates/ash-0.37.3+1.3.251.crate) = 449524
-SHA256 (rust/crates/assets_manager-0.12.4.crate) = ace748e030e290ec2f9b634f65f77089b7c552265ebc8be9236ec382e2ae71e9
-SIZE (rust/crates/assets_manager-0.12.4.crate) = 68687
+SHA256 (rust/crates/assets_manager-0.12.5.crate) = 017916aa0241c9944e5e7483d74e9d053edea690a77a36f3bf342c75ad23f7cb
+SIZE (rust/crates/assets_manager-0.12.5.crate) = 68736
 SHA256 (rust/crates/async-channel-2.3.1.crate) = 89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a
 SIZE (rust/crates/async-channel-2.3.1.crate) = 14576
-SHA256 (rust/crates/async-trait-0.1.83.crate) = 721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd
-SIZE (rust/crates/async-trait-0.1.83.crate) = 29054
+SHA256 (rust/crates/async-trait-0.1.88.crate) = e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5
+SIZE (rust/crates/async-trait-0.1.88.crate) = 32084
 SHA256 (rust/crates/atomic-arena-0.1.2.crate) = 73e8ed45f88ed32e6827a96b62d8fd4086d72defc754c5c6bd08470c1aaf648e
 SIZE (rust/crates/atomic-arena-0.1.2.crate) = 12495
 SHA256 (rust/crates/atomic_refcell-0.1.13.crate) = 41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c
@@ -85,10 +85,10 @@ SHA256 (rust/crates/atomicwrites-0.4.4.crate) = 3ef1bb8d1b645fe38d51dfc331d720fb
 SIZE (rust/crates/atomicwrites-0.4.4.crate) = 6598
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
-SHA256 (rust/crates/axum-0.8.1.crate) = 6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8
-SIZE (rust/crates/axum-0.8.1.crate) = 172586
-SHA256 (rust/crates/axum-core-0.5.0.crate) = df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733
-SIZE (rust/crates/axum-core-0.5.0.crate) = 26187
+SHA256 (rust/crates/axum-0.8.4.crate) = 021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5
+SIZE (rust/crates/axum-0.8.4.crate) = 175159
+SHA256 (rust/crates/axum-core-0.5.2.crate) = 68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6
+SIZE (rust/crates/axum-core-0.5.2.crate) = 26212
 SHA256 (rust/crates/az-1.2.1.crate) = 7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973
 SIZE (rust/crates/az-1.2.1.crate) = 27842
 SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
@@ -107,12 +107,12 @@ SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41a
 SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.8.0.crate) = 8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36
-SIZE (rust/crates/bitflags-2.8.0.crate) = 47482
+SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd
+SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
 SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
 SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
-SHA256 (rust/crates/blake2b_simd-1.0.2.crate) = 23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780
-SIZE (rust/crates/blake2b_simd-1.0.2.crate) = 34165
+SHA256 (rust/crates/blake2b_simd-1.0.3.crate) = 06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99
+SIZE (rust/crates/blake2b_simd-1.0.3.crate) = 34528
 SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a
 SIZE (rust/crates/block-0.1.6.crate) = 4077
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
@@ -123,18 +123,20 @@ SHA256 (rust/crates/block2-0.2.0-alpha.6.crate) = 8dd9e63c1744f755c2f60332b88de3
 SIZE (rust/crates/block2-0.2.0-alpha.6.crate) = 10639
 SHA256 (rust/crates/block2-0.5.1.crate) = 2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f
 SIZE (rust/crates/block2-0.5.1.crate) = 24191
+SHA256 (rust/crates/block2-0.6.1.crate) = 340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2
+SIZE (rust/crates/block2-0.6.1.crate) = 34311
 SHA256 (rust/crates/bumpalo-3.17.0.crate) = 1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf
 SIZE (rust/crates/bumpalo-3.17.0.crate) = 91975
-SHA256 (rust/crates/bytemuck-1.21.0.crate) = ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3
-SIZE (rust/crates/bytemuck-1.21.0.crate) = 51553
-SHA256 (rust/crates/bytemuck_derive-1.7.1.crate) = 0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26
-SIZE (rust/crates/bytemuck_derive-1.7.1.crate) = 21712
+SHA256 (rust/crates/bytemuck-1.23.0.crate) = 9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c
+SIZE (rust/crates/bytemuck-1.23.0.crate) = 52534
+SHA256 (rust/crates/bytemuck_derive-1.9.3.crate) = 7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1
+SIZE (rust/crates/bytemuck_derive-1.9.3.crate) = 23555
 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
 SHA256 (rust/crates/byteorder-lite-0.1.0.crate) = 8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495
 SIZE (rust/crates/byteorder-lite-0.1.0.crate) = 15909
-SHA256 (rust/crates/bytes-1.9.0.crate) = 325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b
-SIZE (rust/crates/bytes-1.9.0.crate) = 67320
+SHA256 (rust/crates/bytes-1.10.1.crate) = d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a
+SIZE (rust/crates/bytes-1.10.1.crate) = 76779
 SHA256 (rust/crates/calloop-0.10.6.crate) = 52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8
 SIZE (rust/crates/calloop-0.10.6.crate) = 53711
 SHA256 (rust/crates/calloop-0.13.0.crate) = b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec
@@ -143,26 +145,26 @@ SHA256 (rust/crates/calloop-wayland-source-0.3.0.crate) = 95a66a987056935f7efce4
 SIZE (rust/crates/calloop-wayland-source-0.3.0.crate) = 11300
 SHA256 (rust/crates/cansi-2.2.1.crate) = 4bdcae87153686017415ce77e48c53e6818a0a058f0e21b56640d1e944967ef8
 SIZE (rust/crates/cansi-2.2.1.crate) = 14442
-SHA256 (rust/crates/cap-fs-ext-3.4.2.crate) = 7f78efdd7378980d79c0f36b519e51191742d2c9f91ffa5e228fba9f3806d2e1
-SIZE (rust/crates/cap-fs-ext-3.4.2.crate) = 15910
-SHA256 (rust/crates/cap-net-ext-3.4.2.crate) = 4ac68674a6042af2bcee1adad9f6abd432642cf03444ce3a5b36c3f39f23baf8
-SIZE (rust/crates/cap-net-ext-3.4.2.crate) = 12257
-SHA256 (rust/crates/cap-primitives-3.4.2.crate) = 8fc15faeed2223d8b8e8cc1857f5861935a06d06713c4ac106b722ae9ce3c369
-SIZE (rust/crates/cap-primitives-3.4.2.crate) = 90406
-SHA256 (rust/crates/cap-rand-3.4.2.crate) = dea13372b49df066d1ae654e5c6e41799c1efd9f6b36794b921e877ea4037977
-SIZE (rust/crates/cap-rand-3.4.2.crate) = 8480
-SHA256 (rust/crates/cap-std-3.4.2.crate) = c3dbd3e8e8d093d6ccb4b512264869e1281cdb032f7940bd50b2894f96f25609
-SIZE (rust/crates/cap-std-3.4.2.crate) = 34170
-SHA256 (rust/crates/cap-time-ext-3.4.2.crate) = bd736b20fc033f564a1995fb82fc349146de43aabba19c7368b4cb17d8f9ea53
-SIZE (rust/crates/cap-time-ext-3.4.2.crate) = 8631
+SHA256 (rust/crates/cap-fs-ext-3.4.4.crate) = e41cc18551193fe8fa6f15c1e3c799bc5ec9e2cfbfaa8ed46f37013e3e6c173c
+SIZE (rust/crates/cap-fs-ext-3.4.4.crate) = 21719
+SHA256 (rust/crates/cap-net-ext-3.4.4.crate) = 9f83833816c66c986e913b22ac887cec216ea09301802054316fc5301809702c
+SIZE (rust/crates/cap-net-ext-3.4.4.crate) = 14227
+SHA256 (rust/crates/cap-primitives-3.4.4.crate) = 0a1e394ed14f39f8bc26f59d4c0c010dbe7f0a1b9bafff451b1f98b67c8af62a
+SIZE (rust/crates/cap-primitives-3.4.4.crate) = 93076
+SHA256 (rust/crates/cap-rand-3.4.4.crate) = 0acb89ccf798a28683f00089d0630dfaceec087234eae0d308c05ddeaa941b40
+SIZE (rust/crates/cap-rand-3.4.4.crate) = 9691
+SHA256 (rust/crates/cap-std-3.4.4.crate) = 07c0355ca583dd58f176c3c12489d684163861ede3c9efa6fd8bba314c984189
+SIZE (rust/crates/cap-std-3.4.4.crate) = 36231
+SHA256 (rust/crates/cap-time-ext-3.4.4.crate) = 491af520b8770085daa0466978c75db90368c71896523f2464214e38359b1a5b
+SIZE (rust/crates/cap-time-ext-3.4.4.crate) = 12204
 SHA256 (rust/crates/cassowary-0.3.0.crate) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
 SIZE (rust/crates/cassowary-0.3.0.crate) = 22876
 SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
 SIZE (rust/crates/cast-0.3.0.crate) = 11452
 SHA256 (rust/crates/castaway-0.2.3.crate) = 0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5
 SIZE (rust/crates/castaway-0.2.3.crate) = 11509
-SHA256 (rust/crates/cc-1.2.10.crate) = 13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229
-SIZE (rust/crates/cc-1.2.10.crate) = 101251
+SHA256 (rust/crates/cc-1.2.21.crate) = 8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0
+SIZE (rust/crates/cc-1.2.21.crate) = 106117
 SHA256 (rust/crates/censor-0.3.0.crate) = d41e3b9fdbb9b3edc10dc66a06dc255822f699c432e19403fb966e6d60e0dec4
 SIZE (rust/crates/censor-0.3.0.crate) = 5627
 SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
@@ -177,12 +179,12 @@ SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438
 SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
 SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
 SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
-SHA256 (rust/crates/chrono-0.4.39.crate) = 7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825
-SIZE (rust/crates/chrono-0.4.39.crate) = 222248
-SHA256 (rust/crates/chrono-tz-0.10.1.crate) = 9c6ac4f2c0bf0f44e9161aec9675e1050aa4a530663c4a9e37e108fa948bca9f
-SIZE (rust/crates/chrono-tz-0.10.1.crate) = 378405
-SHA256 (rust/crates/chrono-tz-build-0.4.0.crate) = e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7
-SIZE (rust/crates/chrono-tz-build-0.4.0.crate) = 10660
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
+SHA256 (rust/crates/chrono-tz-0.10.3.crate) = efdce149c370f133a071ca8ef6ea340b7b88748ab0810097a9e2976eaa34b4f3
+SIZE (rust/crates/chrono-tz-0.10.3.crate) = 380709
+SHA256 (rust/crates/chrono-tz-build-0.4.1.crate) = 8f10f8c9340e31fc120ff885fcdb54a0b48e474bbd77cab557f0c30a3e569402
+SIZE (rust/crates/chrono-tz-build-0.4.1.crate) = 11798
 SHA256 (rust/crates/chumsky-0.9.3.crate) = 8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9
 SIZE (rust/crates/chumsky-0.9.3.crate) = 75112
 SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
@@ -193,12 +195,12 @@ SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5f
 SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695
 SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4
 SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009
-SHA256 (rust/crates/clap-4.5.27.crate) = 769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796
-SIZE (rust/crates/clap-4.5.27.crate) = 55737
-SHA256 (rust/crates/clap_builder-4.5.27.crate) = 1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7
-SIZE (rust/crates/clap_builder-4.5.27.crate) = 168024
-SHA256 (rust/crates/clap_derive-4.5.24.crate) = 54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c
-SIZE (rust/crates/clap_derive-4.5.24.crate) = 30669
+SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071
+SIZE (rust/crates/clap-4.5.37.crate) = 56962
+SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2
+SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761
+SHA256 (rust/crates/clap_derive-4.5.32.crate) = 09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7
+SIZE (rust/crates/clap_derive-4.5.32.crate) = 33441
 SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6
 SIZE (rust/crates/clap_lex-0.7.4.crate) = 12858
 SHA256 (rust/crates/clipboard-win-3.1.1.crate) = 9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342
@@ -213,14 +215,10 @@ SHA256 (rust/crates/clipboard_wayland-0.2.2.crate) = 003f886bc4e2987729d10c1db34
 SIZE (rust/crates/clipboard_wayland-0.2.2.crate) = 5214
 SHA256 (rust/crates/clipboard_x11-0.4.2.crate) = 4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c
 SIZE (rust/crates/clipboard_x11-0.4.2.crate) = 4912
-SHA256 (rust/crates/cmake-0.1.53.crate) = e24a03c8b52922d68a1589ad61032f2c1aa5a8158d2aa0d93c6e9534944bbad6
-SIZE (rust/crates/cmake-0.1.53.crate) = 18789
+SHA256 (rust/crates/cmake-0.1.54.crate) = e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0
+SIZE (rust/crates/cmake-0.1.54.crate) = 18955
 SHA256 (rust/crates/cobs-0.2.3.crate) = 67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15
 SIZE (rust/crates/cobs-0.2.3.crate) = 12576
-SHA256 (rust/crates/cocoa-0.25.0.crate) = f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c
-SIZE (rust/crates/cocoa-0.25.0.crate) = 42163
-SHA256 (rust/crates/cocoa-foundation-0.1.2.crate) = 8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7
-SIZE (rust/crates/cocoa-foundation-0.1.2.crate) = 15028
 SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
 SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
 SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990
@@ -233,8 +231,8 @@ SHA256 (rust/crates/compact_str-0.8.1.crate) = 3b79c4069c6cad78e2e0cdfcbd2627577
 SIZE (rust/crates/compact_str-0.8.1.crate) = 71371
 SHA256 (rust/crates/concurrent-queue-2.5.0.crate) = 4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973
 SIZE (rust/crates/concurrent-queue-2.5.0.crate) = 22654
-SHA256 (rust/crates/console-0.15.10.crate) = ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b
-SIZE (rust/crates/console-0.15.10.crate) = 36449
+SHA256 (rust/crates/console-0.15.11.crate) = 054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8
+SIZE (rust/crates/console-0.15.11.crate) = 37822
 SHA256 (rust/crates/console_error_panic_hook-0.1.7.crate) = a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc
 SIZE (rust/crates/console_error_panic_hook-0.1.7.crate) = 507196
 SHA256 (rust/crates/constant_time_eq-0.3.1.crate) = 7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6
@@ -249,8 +247,6 @@ SHA256 (rust/crates/core-foundation-sys-0.8.7.crate) = 773648b94d0e5d620f64f2807
 SIZE (rust/crates/core-foundation-sys-0.8.7.crate) = 37712
 SHA256 (rust/crates/core-graphics-0.22.3.crate) = 2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb
 SIZE (rust/crates/core-graphics-0.22.3.crate) = 29514
-SHA256 (rust/crates/core-graphics-0.23.2.crate) = c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081
-SIZE (rust/crates/core-graphics-0.23.2.crate) = 30763
 SHA256 (rust/crates/core-graphics-types-0.1.3.crate) = 45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf
 SIZE (rust/crates/core-graphics-types-0.1.3.crate) = 7063
 SHA256 (rust/crates/coreaudio-rs-0.11.3.crate) = 321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace
@@ -315,8 +311,8 @@ SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
 SHA256 (rust/crates/csv-1.3.1.crate) = acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf
 SIZE (rust/crates/csv-1.3.1.crate) = 888542
-SHA256 (rust/crates/csv-core-0.1.11.crate) = 5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70
-SIZE (rust/crates/csv-core-0.1.11.crate) = 25852
+SHA256 (rust/crates/csv-core-0.1.12.crate) = 7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d
+SIZE (rust/crates/csv-core-0.1.12.crate) = 26298
 SHA256 (rust/crates/culpa-1.0.2.crate) = 5ae0bfe9317b1cb4ff5a56d766ee4b157b3e1f47f11979253570e88d10fd1fd3
 SIZE (rust/crates/culpa-1.0.2.crate) = 10733
 SHA256 (rust/crates/culpa-macros-1.0.2.crate) = 1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279
@@ -327,42 +323,42 @@ SHA256 (rust/crates/d3d12-0.7.0.crate) = e16e44ab292b1dddfdaf7be62cfd8877df52f2f
 SIZE (rust/crates/d3d12-0.7.0.crate) = 17319
 SHA256 (rust/crates/daggy-0.5.0.crate) = 9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2
 SIZE (rust/crates/daggy-0.5.0.crate) = 17832
-SHA256 (rust/crates/darling-0.20.10.crate) = 6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989
-SIZE (rust/crates/darling-0.20.10.crate) = 32031
-SHA256 (rust/crates/darling_core-0.20.10.crate) = 95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5
-SIZE (rust/crates/darling_core-0.20.10.crate) = 65015
-SHA256 (rust/crates/darling_macro-0.20.10.crate) = d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806
-SIZE (rust/crates/darling_macro-0.20.10.crate) = 1874
+SHA256 (rust/crates/darling-0.20.11.crate) = fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee
+SIZE (rust/crates/darling-0.20.11.crate) = 37614
+SHA256 (rust/crates/darling_core-0.20.11.crate) = 0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e
+SIZE (rust/crates/darling_core-0.20.11.crate) = 68006
+SHA256 (rust/crates/darling_macro-0.20.11.crate) = fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead
+SIZE (rust/crates/darling_macro-0.20.11.crate) = 2532
 SHA256 (rust/crates/dasp_sample-0.11.0.crate) = 0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f
 SIZE (rust/crates/dasp_sample-0.11.0.crate) = 11617
-SHA256 (rust/crates/data-encoding-2.6.0.crate) = e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2
-SIZE (rust/crates/data-encoding-2.6.0.crate) = 20769
+SHA256 (rust/crates/data-encoding-2.9.0.crate) = 2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476
+SIZE (rust/crates/data-encoding-2.9.0.crate) = 21564
 SHA256 (rust/crates/debugid-0.8.0.crate) = bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d
 SIZE (rust/crates/debugid-0.8.0.crate) = 12757
 SHA256 (rust/crates/deflate-1.0.0.crate) = c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f
 SIZE (rust/crates/deflate-1.0.0.crate) = 62722
-SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4
-SIZE (rust/crates/deranged-0.3.11.crate) = 18043
+SHA256 (rust/crates/deranged-0.4.0.crate) = 9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e
+SIZE (rust/crates/deranged-0.4.0.crate) = 23235
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
 SHA256 (rust/crates/directories-next-2.0.0.crate) = 339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc
 SIZE (rust/crates/directories-next-2.0.0.crate) = 15153
 SHA256 (rust/crates/dirs-4.0.0.crate) = ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059
 SIZE (rust/crates/dirs-4.0.0.crate) = 12503
-SHA256 (rust/crates/dirs-5.0.1.crate) = 44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225
-SIZE (rust/crates/dirs-5.0.1.crate) = 12255
-SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
-SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
+SHA256 (rust/crates/dirs-6.0.0.crate) = c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e
+SIZE (rust/crates/dirs-6.0.0.crate) = 14190
 SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6
 SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597
-SHA256 (rust/crates/dirs-sys-0.4.1.crate) = 520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c
-SIZE (rust/crates/dirs-sys-0.4.1.crate) = 10719
+SHA256 (rust/crates/dirs-sys-0.5.0.crate) = e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab
+SIZE (rust/crates/dirs-sys-0.5.0.crate) = 10157
 SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
 SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
 SHA256 (rust/crates/discord-sdk-0.4.0.crate) = de8f587263d1c13696fb47e885ba81ad3c07412069f66850e7730413f40af2ef
 SIZE (rust/crates/discord-sdk-0.4.0.crate) = 48847
 SHA256 (rust/crates/dispatch-0.2.0.crate) = bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b
 SIZE (rust/crates/dispatch-0.2.0.crate) = 10229
+SHA256 (rust/crates/dispatch2-0.3.0.crate) = 89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec
+SIZE (rust/crates/dispatch2-0.3.0.crate) = 54606
 SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
 SIZE (rust/crates/displaydoc-0.2.5.crate) = 24219
 SHA256 (rust/crates/divrem-1.0.0.crate) = 69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82
@@ -385,8 +381,8 @@ SHA256 (rust/crates/egui_plot-0.23.0.crate) = c7f33a00fe8eb1ba56535b3dbacdecc7a1
 SIZE (rust/crates/egui_plot-0.23.0.crate) = 38292
 SHA256 (rust/crates/egui_winit_platform-0.20.0.crate) = cff2b0729f7c0ae1d7fb4a95aa4c3432d1a1d03476b22b2946247504a012cea4
 SIZE (rust/crates/egui_winit_platform-0.20.0.crate) = 11420
-SHA256 (rust/crates/either-1.13.0.crate) = 60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0
-SIZE (rust/crates/either-1.13.0.crate) = 19169
+SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719
+SIZE (rust/crates/either-1.15.0.crate) = 20114
 SHA256 (rust/crates/elapsed-0.1.2.crate) = 6f4e5af126dafd0741c2ad62d47f68b28602550102e5f0dd45c8a97fc8b49c29
 SIZE (rust/crates/elapsed-0.1.2.crate) = 2377
 SHA256 (rust/crates/emath-0.23.0.crate) = 1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0
@@ -407,16 +403,18 @@ SHA256 (rust/crates/enum-map-2.7.3.crate) = 6866f3bfdf8207509a033af1a75a7b08abda
 SIZE (rust/crates/enum-map-2.7.3.crate) = 21792
 SHA256 (rust/crates/enum-map-derive-0.17.0.crate) = f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb
 SIZE (rust/crates/enum-map-derive-0.17.0.crate) = 10781
-SHA256 (rust/crates/enumset-1.1.5.crate) = d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293
-SIZE (rust/crates/enumset-1.1.5.crate) = 26442
-SHA256 (rust/crates/enumset_derive-0.10.0.crate) = 59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242
-SIZE (rust/crates/enumset_derive-0.10.0.crate) = 13211
+SHA256 (rust/crates/enumset-1.1.6.crate) = 11a6b7c3d347de0a9f7bfd2f853be43fe32fa6fac30c70f6d6d67a1e936b87ee
+SIZE (rust/crates/enumset-1.1.6.crate) = 29044
+SHA256 (rust/crates/enumset_derive-0.11.0.crate) = 6da3ea9e1d1a3b1593e15781f930120e72aa7501610b2f82e5b6739c72e8eac5
+SIZE (rust/crates/enumset_derive-0.11.0.crate) = 14602
+SHA256 (rust/crates/env_home-0.1.0.crate) = c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe
+SIZE (rust/crates/env_home-0.1.0.crate) = 9006
 SHA256 (rust/crates/epaint-0.23.0.crate) = 58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e
 SIZE (rust/crates/epaint-0.23.0.crate) = 853244
-SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
-SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.10.crate) = 33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d
-SIZE (rust/crates/errno-0.3.10.crate) = 11824
+SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
+SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
+SHA256 (rust/crates/errno-0.3.11.crate) = 976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e
+SIZE (rust/crates/errno-0.3.11.crate) = 12048
 SHA256 (rust/crates/error-chain-0.12.4.crate) = 2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc
 SIZE (rust/crates/error-chain-0.12.4.crate) = 29274
 SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21
@@ -427,34 +425,34 @@ SHA256 (rust/crates/euc-0.5.3.crate) = 0947d06646d28a4ac2862ac5eadc1062704d61ee3
 SIZE (rust/crates/euc-0.5.3.crate) = 70369
 SHA256 (rust/crates/euclid-0.22.11.crate) = ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48
 SIZE (rust/crates/euclid-0.22.11.crate) = 79261
-SHA256 (rust/crates/event-listener-5.3.1.crate) = 6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba
-SIZE (rust/crates/event-listener-5.3.1.crate) = 42576
-SHA256 (rust/crates/event-listener-strategy-0.5.2.crate) = 0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1
-SIZE (rust/crates/event-listener-strategy-0.5.2.crate) = 10697
+SHA256 (rust/crates/event-listener-5.4.0.crate) = 3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae
+SIZE (rust/crates/event-listener-5.4.0.crate) = 43452
+SHA256 (rust/crates/event-listener-strategy-0.5.4.crate) = 8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93
+SIZE (rust/crates/event-listener-strategy-0.5.4.crate) = 16179
 SHA256 (rust/crates/fallible-iterator-0.3.0.crate) = 2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649
 SIZE (rust/crates/fallible-iterator-0.3.0.crate) = 19639
 SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a
 SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
-SHA256 (rust/crates/fastrand-2.1.1.crate) = e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6
-SIZE (rust/crates/fastrand-2.1.1.crate) = 14983
-SHA256 (rust/crates/fd-lock-4.0.2.crate) = 7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947
-SIZE (rust/crates/fd-lock-4.0.2.crate) = 13675
-SHA256 (rust/crates/fdeflate-0.3.5.crate) = d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab
-SIZE (rust/crates/fdeflate-0.3.5.crate) = 26834
+SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be
+SIZE (rust/crates/fastrand-2.3.0.crate) = 15076
+SHA256 (rust/crates/fd-lock-4.0.4.crate) = 0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78
+SIZE (rust/crates/fd-lock-4.0.4.crate) = 15522
+SHA256 (rust/crates/fdeflate-0.3.7.crate) = 1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c
+SIZE (rust/crates/fdeflate-0.3.7.crate) = 27188
 SHA256 (rust/crates/filetime-0.2.25.crate) = 35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586
 SIZE (rust/crates/filetime-0.2.25.crate) = 14940
 SHA256 (rust/crates/find_folder-0.3.0.crate) = 9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b
 SIZE (rust/crates/find_folder-0.3.0.crate) = 2617
-SHA256 (rust/crates/fixed-1.28.0.crate) = 85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a
-SIZE (rust/crates/fixed-1.28.0.crate) = 253413
+SHA256 (rust/crates/fixed-1.29.0.crate) = 707070ccf8c4173548210893a0186e29c266901b71ed20cd9e2ca0193dfe95c3
+SIZE (rust/crates/fixed-1.29.0.crate) = 259231
 SHA256 (rust/crates/fixedbitset-0.1.9.crate) = 86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33
 SIZE (rust/crates/fixedbitset-0.1.9.crate) = 11974
 SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
 SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
 SHA256 (rust/crates/fixedbitset-0.5.7.crate) = 1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99
 SIZE (rust/crates/fixedbitset-0.5.7.crate) = 26537
-SHA256 (rust/crates/flate2-1.0.35.crate) = c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c
-SIZE (rust/crates/flate2-1.0.35.crate) = 109188
+SHA256 (rust/crates/flate2-1.1.1.crate) = 7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece
+SIZE (rust/crates/flate2-1.1.1.crate) = 77224
 SHA256 (rust/crates/float-cmp-0.10.0.crate) = b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8
 SIZE (rust/crates/float-cmp-0.10.0.crate) = 10702
 SHA256 (rust/crates/fluent-0.16.1.crate) = bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a
@@ -465,12 +463,12 @@ SHA256 (rust/crates/fluent-langneg-0.13.0.crate) = 2c4ad0989667548f06ccd0e306ed5
 SIZE (rust/crates/fluent-langneg-0.13.0.crate) = 11723
 SHA256 (rust/crates/fluent-syntax-0.11.1.crate) = 2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d
 SIZE (rust/crates/fluent-syntax-0.11.1.crate) = 32297
-SHA256 (rust/crates/flume-0.11.0.crate) = 55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181
-SIZE (rust/crates/flume-0.11.0.crate) = 67502
+SHA256 (rust/crates/flume-0.11.1.crate) = da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095
+SIZE (rust/crates/flume-0.11.1.crate) = 67947
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
-SHA256 (rust/crates/foldhash-0.1.4.crate) = a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f
-SIZE (rust/crates/foldhash-0.1.4.crate) = 13764
+SHA256 (rust/crates/foldhash-0.1.5.crate) = d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2
+SIZE (rust/crates/foldhash-0.1.5.crate) = 21901
 SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
 SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
 SHA256 (rust/crates/foreign-types-0.5.0.crate) = d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965
@@ -483,8 +481,10 @@ SHA256 (rust/crates/foreign-types-shared-0.3.1.crate) = aa9a19cbb55df58761df49b2
 SIZE (rust/crates/foreign-types-shared-0.3.1.crate) = 6006
 SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
 SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
-SHA256 (rust/crates/fs-set-times-0.20.1.crate) = 033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb
-SIZE (rust/crates/fs-set-times-0.20.1.crate) = 14607
+SHA256 (rust/crates/formatx-0.2.4.crate) = d8866fac38f53fc87fa3ae1b09ddd723e0482f8fa74323518b4c59df2c55a00a
+SIZE (rust/crates/formatx-0.2.4.crate) = 15119
+SHA256 (rust/crates/fs-set-times-0.20.3.crate) = 94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a
+SIZE (rust/crates/fs-set-times-0.20.3.crate) = 15964
 SHA256 (rust/crates/fsevent-sys-4.1.0.crate) = 76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2
 SIZE (rust/crates/fsevent-sys-4.1.0.crate) = 4620
 SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c
@@ -521,8 +521,10 @@ SHA256 (rust/crates/gethostname-0.2.3.crate) = c1ebd34e35c46e00bb73e81363248d627
 SIZE (rust/crates/gethostname-0.2.3.crate) = 8174
 SHA256 (rust/crates/gethostname-0.4.3.crate) = 0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818
 SIZE (rust/crates/gethostname-0.4.3.crate) = 9336
-SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
-SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592
+SIZE (rust/crates/getrandom-0.2.16.crate) = 40163
+SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0
+SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
 SHA256 (rust/crates/gilrs-0.10.2.crate) = 62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a
 SIZE (rust/crates/gilrs-0.10.2.crate) = 122308
 SHA256 (rust/crates/gilrs-core-0.5.7.crate) = 5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d
@@ -533,16 +535,16 @@ SHA256 (rust/crates/gl_generator-0.14.0.crate) = 1a95dfc23a2b4a9a2f5ab41d194f8bf
 SIZE (rust/crates/gl_generator-0.14.0.crate) = 22330
 SHA256 (rust/crates/glam-0.10.2.crate) = 579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15
 SIZE (rust/crates/glam-0.10.2.crate) = 91890
-SHA256 (rust/crates/glam-0.30.1.crate) = bf3aa70d918d2b234126ff4f850f628f172542bf0603ded26b8ee36e5e22d5f9
-SIZE (rust/crates/glam-0.30.1.crate) = 678416
-SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
-SIZE (rust/crates/glob-0.3.1.crate) = 18880
+SHA256 (rust/crates/glam-0.30.3.crate) = 6b46b9ca4690308844c644e7c634d68792467260e051c8543e0c7871662b3ba7
+SIZE (rust/crates/glam-0.30.3.crate) = 687669
+SHA256 (rust/crates/glob-0.3.2.crate) = a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2
+SIZE (rust/crates/glob-0.3.2.crate) = 22359
 SHA256 (rust/crates/glow-0.13.1.crate) = bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1
 SIZE (rust/crates/glow-0.13.1.crate) = 150940
 SHA256 (rust/crates/glutin_wgl_sys-0.5.0.crate) = 6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead
 SIZE (rust/crates/glutin_wgl_sys-0.5.0.crate) = 5469
-SHA256 (rust/crates/glyph_brush-0.7.10.crate) = d6ecddedd5c29ef90a66bdd02558a9f9832403aeb6c31a44292aeceba9865288
-SIZE (rust/crates/glyph_brush-0.7.10.crate) = 66474
+SHA256 (rust/crates/glyph_brush-0.7.12.crate) = 0060f4ed4ef64a5876d9836d7d6c9ed43a463f3ca431682bec1c326064c8c93e
+SIZE (rust/crates/glyph_brush-0.7.12.crate) = 66552
 SHA256 (rust/crates/glyph_brush_draw_cache-0.1.6.crate) = 4bb6c910def52365fef3f439a6b50a4d5c11b28eec4cf6c191f6dfea18e88d7f
 SIZE (rust/crates/glyph_brush_draw_cache-0.1.6.crate) = 64216
 SHA256 (rust/crates/glyph_brush_layout-0.2.4.crate) = 7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992
@@ -559,8 +561,8 @@ SHA256 (rust/crates/gpu-descriptor-types-0.1.2.crate) = 6bf0b36e6f090b7e1d8a4b49
 SIZE (rust/crates/gpu-descriptor-types-0.1.2.crate) = 1928
 SHA256 (rust/crates/guillotiere-0.6.2.crate) = b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782
 SIZE (rust/crates/guillotiere-0.6.2.crate) = 18116
-SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
-SIZE (rust/crates/half-2.4.1.crate) = 50892
+SHA256 (rust/crates/half-2.6.0.crate) = 459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9
+SIZE (rust/crates/half-2.6.0.crate) = 59507
 SHA256 (rust/crates/hash32-0.3.1.crate) = 47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606
 SIZE (rust/crates/hash32-0.3.1.crate) = 10273
 SHA256 (rust/crates/hashbrown-0.9.1.crate) = d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04
@@ -571,56 +573,54 @@ SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b2
 SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265
 SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
 SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
-SHA256 (rust/crates/hashbrown-0.15.1.crate) = 3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3
-SIZE (rust/crates/hashbrown-0.15.1.crate) = 135873
+SHA256 (rust/crates/hashbrown-0.15.3.crate) = 84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3
+SIZE (rust/crates/hashbrown-0.15.3.crate) = 140413
 SHA256 (rust/crates/hashlink-0.9.1.crate) = 6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af
 SIZE (rust/crates/hashlink-0.9.1.crate) = 28928
 SHA256 (rust/crates/hassle-rs-0.10.0.crate) = 1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0
 SIZE (rust/crates/hassle-rs-0.10.0.crate) = 25867
 SHA256 (rust/crates/heapless-0.8.0.crate) = 0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad
 SIZE (rust/crates/heapless-0.8.0.crate) = 77802
-SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
-SIZE (rust/crates/heck-0.4.1.crate) = 11567
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
 SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
 SHA256 (rust/crates/hermit-abi-0.4.0.crate) = fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc
 SIZE (rust/crates/hermit-abi-0.4.0.crate) = 16310
+SHA256 (rust/crates/hermit-abi-0.5.0.crate) = fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e
+SIZE (rust/crates/hermit-abi-0.5.0.crate) = 17480
 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
 SIZE (rust/crates/hex-0.4.3.crate) = 13299
 SHA256 (rust/crates/hexf-parse-0.2.1.crate) = dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df
 SIZE (rust/crates/hexf-parse-0.2.1.crate) = 4662
 SHA256 (rust/crates/hibitset-0.6.4.crate) = f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121
 SIZE (rust/crates/hibitset-0.6.4.crate) = 23698
-SHA256 (rust/crates/hickory-proto-0.24.3.crate) = 2ad3d6d98c648ed628df039541a5577bee1a7c83e9e16fe3dbedeea4cdfeb971
-SIZE (rust/crates/hickory-proto-0.24.3.crate) = 383451
-SHA256 (rust/crates/hickory-resolver-0.24.1.crate) = 28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243
-SIZE (rust/crates/hickory-resolver-0.24.1.crate) = 91134
+SHA256 (rust/crates/hickory-proto-0.24.4.crate) = 92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248
+SIZE (rust/crates/hickory-proto-0.24.4.crate) = 383461
+SHA256 (rust/crates/hickory-resolver-0.24.4.crate) = cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e
+SIZE (rust/crates/hickory-resolver-0.24.4.crate) = 89596
 SHA256 (rust/crates/home-0.5.11.crate) = 589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf
 SIZE (rust/crates/home-0.5.11.crate) = 9926
-SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
-SIZE (rust/crates/hostname-0.3.1.crate) = 9272
-SHA256 (rust/crates/http-1.2.0.crate) = f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea
-SIZE (rust/crates/http-1.2.0.crate) = 105932
+SHA256 (rust/crates/http-1.3.1.crate) = f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565
+SIZE (rust/crates/http-1.3.1.crate) = 106063
 SHA256 (rust/crates/http-body-1.0.1.crate) = 1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184
 SIZE (rust/crates/http-body-1.0.1.crate) = 6125
-SHA256 (rust/crates/http-body-util-0.1.2.crate) = 793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f
-SIZE (rust/crates/http-body-util-0.1.2.crate) = 12821
-SHA256 (rust/crates/httparse-1.10.0.crate) = f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a
-SIZE (rust/crates/httparse-1.10.0.crate) = 44882
+SHA256 (rust/crates/http-body-util-0.1.3.crate) = b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a
+SIZE (rust/crates/http-body-util-0.1.3.crate) = 16975
+SHA256 (rust/crates/httparse-1.10.1.crate) = 6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87
+SIZE (rust/crates/httparse-1.10.1.crate) = 45190
 SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
 SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
-SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
-SIZE (rust/crates/humantime-2.1.0.crate) = 16749
+SHA256 (rust/crates/humantime-2.2.0.crate) = 9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f
+SIZE (rust/crates/humantime-2.2.0.crate) = 20646
 SHA256 (rust/crates/hyper-1.6.0.crate) = cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80
 SIZE (rust/crates/hyper-1.6.0.crate) = 153923
 SHA256 (rust/crates/hyper-rustls-0.27.5.crate) = 2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2
 SIZE (rust/crates/hyper-rustls-0.27.5.crate) = 34660
-SHA256 (rust/crates/hyper-util-0.1.10.crate) = df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4
-SIZE (rust/crates/hyper-util-0.1.10.crate) = 72887
-SHA256 (rust/crates/iana-time-zone-0.1.61.crate) = 235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220
-SIZE (rust/crates/iana-time-zone-0.1.61.crate) = 27685
+SHA256 (rust/crates/hyper-util-0.1.11.crate) = 497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2
+SIZE (rust/crates/hyper-util-0.1.11.crate) = 75973
+SHA256 (rust/crates/iana-time-zone-0.1.63.crate) = b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8
+SIZE (rust/crates/iana-time-zone-0.1.63.crate) = 32919
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
 SHA256 (rust/crates/icu_collections-1.5.0.crate) = db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526
@@ -629,16 +629,16 @@ SHA256 (rust/crates/icu_locid-1.5.0.crate) = 13acbb8371917fc971be86fc8057c41a64b
 SIZE (rust/crates/icu_locid-1.5.0.crate) = 55131
 SHA256 (rust/crates/icu_locid_transform-1.5.0.crate) = 01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e
 SIZE (rust/crates/icu_locid_transform-1.5.0.crate) = 29094
-SHA256 (rust/crates/icu_locid_transform_data-1.5.0.crate) = fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e
-SIZE (rust/crates/icu_locid_transform_data-1.5.0.crate) = 44727
+SHA256 (rust/crates/icu_locid_transform_data-1.5.1.crate) = 7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d
+SIZE (rust/crates/icu_locid_transform_data-1.5.1.crate) = 42937
 SHA256 (rust/crates/icu_normalizer-1.5.0.crate) = 19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f
 SIZE (rust/crates/icu_normalizer-1.5.0.crate) = 53113
-SHA256 (rust/crates/icu_normalizer_data-1.5.0.crate) = f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516
-SIZE (rust/crates/icu_normalizer_data-1.5.0.crate) = 50561
+SHA256 (rust/crates/icu_normalizer_data-1.5.1.crate) = c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7
+SIZE (rust/crates/icu_normalizer_data-1.5.1.crate) = 50737
 SHA256 (rust/crates/icu_properties-1.5.1.crate) = 93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5
 SIZE (rust/crates/icu_properties-1.5.1.crate) = 64479
-SHA256 (rust/crates/icu_properties_data-1.5.0.crate) = 67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569
-SIZE (rust/crates/icu_properties_data-1.5.0.crate) = 227993
+SHA256 (rust/crates/icu_properties_data-1.5.1.crate) = 85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2
+SIZE (rust/crates/icu_properties_data-1.5.1.crate) = 229231
 SHA256 (rust/crates/icu_provider-1.5.0.crate) = 6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9
 SIZE (rust/crates/icu_provider-1.5.0.crate) = 52722
 SHA256 (rust/crates/icu_provider_macros-1.5.0.crate) = 1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6
@@ -651,22 +651,22 @@ SHA256 (rust/crates/idna-1.0.3.crate) = 686f825264d630750a544639377bae737628043f
 SIZE (rust/crates/idna-1.0.3.crate) = 142515
 SHA256 (rust/crates/idna_adapter-1.2.0.crate) = daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71
 SIZE (rust/crates/idna_adapter-1.2.0.crate) = 8206
-SHA256 (rust/crates/image-0.25.5.crate) = cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b
-SIZE (rust/crates/image-0.25.5.crate) = 241073
+SHA256 (rust/crates/image-0.25.6.crate) = db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a
+SIZE (rust/crates/image-0.25.6.crate) = 242367
 SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
 SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
-SHA256 (rust/crates/indexmap-2.7.1.crate) = 8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652
-SIZE (rust/crates/indexmap-2.7.1.crate) = 88644
-SHA256 (rust/crates/indicatif-0.17.8.crate) = 763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3
-SIZE (rust/crates/indicatif-0.17.8.crate) = 64869
-SHA256 (rust/crates/indoc-2.0.5.crate) = b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5
-SIZE (rust/crates/indoc-2.0.5.crate) = 14396
+SHA256 (rust/crates/indexmap-2.9.0.crate) = cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e
+SIZE (rust/crates/indexmap-2.9.0.crate) = 91214
+SHA256 (rust/crates/indicatif-0.17.11.crate) = 183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235
+SIZE (rust/crates/indicatif-0.17.11.crate) = 66577
+SHA256 (rust/crates/indoc-2.0.6.crate) = f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd
+SIZE (rust/crates/indoc-2.0.6.crate) = 17164
 SHA256 (rust/crates/init_with-1.1.0.crate) = 0175f63815ce00183bf755155ad0cb48c65226c5d17a724e369c25418d2b7699
 SIZE (rust/crates/init_with-1.1.0.crate) = 3929
-SHA256 (rust/crates/inline_tweak-1.1.1.crate) = c6acddbefae08bfba73e27f55513f491f35c365d84bf3002bf85ba9b916c5e5f
-SIZE (rust/crates/inline_tweak-1.1.1.crate) = 12226
-SHA256 (rust/crates/inline_tweak_derive-3.0.0.crate) = 46d62a0a3b6af04d4eee8e7251cd758ce74b0ed86253d3e4ac8a1b297a75f4a0
-SIZE (rust/crates/inline_tweak_derive-3.0.0.crate) = 2406
+SHA256 (rust/crates/inline_tweak-1.2.2.crate) = e09cc2491a8419aa3d0b03b92297cfaf059385b230843cba249ca4cf08c627f8
+SIZE (rust/crates/inline_tweak-1.2.2.crate) = 15843
+SHA256 (rust/crates/inline_tweak_derive-4.0.0.crate) = 6864ad6962b49a8fc7ce8cfa60ee0725aa543f15fc7e5f34753ccfa881dd6759
+SIZE (rust/crates/inline_tweak_derive-4.0.0.crate) = 2535
 SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff
 SIZE (rust/crates/inotify-0.9.6.crate) = 22971
 SHA256 (rust/crates/inotify-0.11.0.crate) = f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3
@@ -681,50 +681,46 @@ SHA256 (rust/crates/intl-memoizer-0.5.2.crate) = fe22e020fce238ae18a6d5d8c502ee7
 SIZE (rust/crates/intl-memoizer-0.5.2.crate) = 11708
 SHA256 (rust/crates/intl_pluralrules-7.0.2.crate) = 078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972
 SIZE (rust/crates/intl_pluralrules-7.0.2.crate) = 9201
-SHA256 (rust/crates/io-extras-0.18.3.crate) = 7d45fd7584f9b67ac37bc041212d06bfac0700b36456b05890d36a3b626260eb
-SIZE (rust/crates/io-extras-0.18.3.crate) = 34322
+SHA256 (rust/crates/io-extras-0.18.4.crate) = 2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65
+SIZE (rust/crates/io-extras-0.18.4.crate) = 34254
 SHA256 (rust/crates/io-kit-sys-0.3.0.crate) = 9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de
 SIZE (rust/crates/io-kit-sys-0.3.0.crate) = 38799
-SHA256 (rust/crates/io-lifetimes-2.0.3.crate) = 5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c
-SIZE (rust/crates/io-lifetimes-2.0.3.crate) = 29216
+SHA256 (rust/crates/io-lifetimes-2.0.4.crate) = 06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983
+SIZE (rust/crates/io-lifetimes-2.0.4.crate) = 28501
 SHA256 (rust/crates/ipconfig-0.3.2.crate) = b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f
 SIZE (rust/crates/ipconfig-0.3.2.crate) = 24468
 SHA256 (rust/crates/ipnet-2.11.0.crate) = 469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130
 SIZE (rust/crates/ipnet-2.11.0.crate) = 29718
 SHA256 (rust/crates/is-docker-0.2.0.crate) = 928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3
 SIZE (rust/crates/is-docker-0.2.0.crate) = 2664
-SHA256 (rust/crates/is-terminal-0.4.13.crate) = 261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b
-SIZE (rust/crates/is-terminal-0.4.13.crate) = 7665
+SHA256 (rust/crates/is-terminal-0.4.16.crate) = e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9
+SIZE (rust/crates/is-terminal-0.4.16.crate) = 7811
 SHA256 (rust/crates/is-wsl-0.4.0.crate) = 173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5
 SIZE (rust/crates/is-wsl-0.4.0.crate) = 3264
 SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
 SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
 SIZE (rust/crates/itertools-0.10.5.crate) = 115354
-SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
-SIZE (rust/crates/itertools-0.11.0.crate) = 125074
 SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
 SIZE (rust/crates/itertools-0.12.1.crate) = 137761
 SHA256 (rust/crates/itertools-0.13.0.crate) = 413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186
 SIZE (rust/crates/itertools-0.13.0.crate) = 146261
 SHA256 (rust/crates/itertools-0.14.0.crate) = 2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285
 SIZE (rust/crates/itertools-0.14.0.crate) = 152715
-SHA256 (rust/crates/itoa-1.0.14.crate) = d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674
-SIZE (rust/crates/itoa-1.0.14.crate) = 11210
+SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
+SIZE (rust/crates/itoa-1.0.15.crate) = 11231
 SHA256 (rust/crates/ittapi-0.4.0.crate) = 6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1
 SIZE (rust/crates/ittapi-0.4.0.crate) = 7446
 SHA256 (rust/crates/ittapi-sys-0.4.0.crate) = 52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc
 SIZE (rust/crates/ittapi-sys-0.4.0.crate) = 144943
-SHA256 (rust/crates/jni-0.19.0.crate) = c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec
-SIZE (rust/crates/jni-0.19.0.crate) = 65890
 SHA256 (rust/crates/jni-0.21.1.crate) = 1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97
 SIZE (rust/crates/jni-0.21.1.crate) = 105028
 SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
 SIZE (rust/crates/jni-sys-0.3.0.crate) = 10232
-SHA256 (rust/crates/jobserver-0.1.32.crate) = 48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0
-SIZE (rust/crates/jobserver-0.1.32.crate) = 27549
-SHA256 (rust/crates/js-sys-0.3.70.crate) = 1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a
-SIZE (rust/crates/js-sys-0.3.70.crate) = 53863
+SHA256 (rust/crates/jobserver-0.1.33.crate) = 38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a
+SIZE (rust/crates/jobserver-0.1.33.crate) = 29136
+SHA256 (rust/crates/js-sys-0.3.77.crate) = 1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f
+SIZE (rust/crates/js-sys-0.3.77.crate) = 55538
 SHA256 (rust/crates/khronos-egl-6.0.0.crate) = 6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76
 SIZE (rust/crates/khronos-egl-6.0.0.crate) = 29315
 SHA256 (rust/crates/khronos_api-3.1.0.crate) = e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc
@@ -741,20 +737,20 @@ SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591
 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
 SHA256 (rust/crates/leb128-0.2.5.crate) = 884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67
 SIZE (rust/crates/leb128-0.2.5.crate) = 11843
+SHA256 (rust/crates/leb128fmt-0.1.0.crate) = 09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2
+SIZE (rust/crates/leb128fmt-0.1.0.crate) = 14138
 SHA256 (rust/crates/levenshtein-1.0.5.crate) = db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760
 SIZE (rust/crates/levenshtein-1.0.5.crate) = 1389
-SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a
-SIZE (rust/crates/libc-0.2.169.crate) = 757901
+SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa
+SIZE (rust/crates/libc-0.2.172.crate) = 791646
 SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
 SIZE (rust/crates/libloading-0.7.4.crate) = 27580
 SHA256 (rust/crates/libloading-0.8.6.crate) = fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34
 SIZE (rust/crates/libloading-0.8.6.crate) = 28922
-SHA256 (rust/crates/libm-0.2.11.crate) = 8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa
-SIZE (rust/crates/libm-0.2.11.crate) = 111477
-SHA256 (rust/crates/libmimalloc-sys-0.1.39.crate) = 23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44
-SIZE (rust/crates/libmimalloc-sys-0.1.39.crate) = 198523
-SHA256 (rust/crates/libredox-0.0.2.crate) = 3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607
-SIZE (rust/crates/libredox-0.0.2.crate) = 4538
+SHA256 (rust/crates/libm-0.2.14.crate) = a25169bd5913a4b437588a7e3d127cd6e90127b60e0ffbd834a38f1599e016b8
+SIZE (rust/crates/libm-0.2.14.crate) = 155948
+SHA256 (rust/crates/libmimalloc-sys-0.1.42.crate) = ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4
+SIZE (rust/crates/libmimalloc-sys-0.1.42.crate) = 224614
 SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
 SIZE (rust/crates/libredox-0.1.3.crate) = 6068
 SHA256 (rust/crates/libsqlite3-sys-0.28.0.crate) = 0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f
@@ -763,18 +759,20 @@ SHA256 (rust/crates/libudev-sys-0.1.4.crate) = 3c8469b4a23b962c1396b9b451dda50ef
 SIZE (rust/crates/libudev-sys-0.1.4.crate) = 6177
 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
-SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
-SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
-SHA256 (rust/crates/litemap-0.7.4.crate) = 4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104
-SIZE (rust/crates/litemap-0.7.4.crate) = 28257
+SHA256 (rust/crates/linux-raw-sys-0.4.15.crate) = d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab
+SIZE (rust/crates/linux-raw-sys-0.4.15.crate) = 2150898
+SHA256 (rust/crates/linux-raw-sys-0.9.4.crate) = cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12
+SIZE (rust/crates/linux-raw-sys-0.9.4.crate) = 2311088
+SHA256 (rust/crates/litemap-0.7.5.crate) = 23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856
+SIZE (rust/crates/litemap-0.7.5.crate) = 29962
 SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
 SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
-SHA256 (rust/crates/log-0.4.25.crate) = 04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f
-SIZE (rust/crates/log-0.4.25.crate) = 44876
+SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
+SIZE (rust/crates/log-0.4.27.crate) = 48120
 SHA256 (rust/crates/loom-0.7.2.crate) = 419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca
 SIZE (rust/crates/loom-0.7.2.crate) = 73989
-SHA256 (rust/crates/lru-0.12.4.crate) = 37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904
-SIZE (rust/crates/lru-0.12.4.crate) = 16032
+SHA256 (rust/crates/lru-0.12.5.crate) = 234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38
+SIZE (rust/crates/lru-0.12.5.crate) = 16047
 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
 SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
 SHA256 (rust/crates/lz-fear-0.2.0.crate) = 26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d
@@ -787,8 +785,6 @@ SHA256 (rust/crates/macro_rules_attribute-proc_macro-0.1.3.crate) = 58093314a45e
 SIZE (rust/crates/macro_rules_attribute-proc_macro-0.1.3.crate) = 8249
 SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb
 SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
-SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4
-SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153
 SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
 SIZE (rust/crates/matchers-0.1.0.crate) = 6948
 SHA256 (rust/crates/matchit-0.8.4.crate) = 47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3
@@ -813,16 +809,16 @@ SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1
 SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
 SHA256 (rust/crates/metal-0.27.0.crate) = c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25
 SIZE (rust/crates/metal-0.27.0.crate) = 3028990
-SHA256 (rust/crates/mimalloc-0.1.43.crate) = 68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633
-SIZE (rust/crates/mimalloc-0.1.43.crate) = 4075
+SHA256 (rust/crates/mimalloc-0.1.46.crate) = 995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af
+SIZE (rust/crates/mimalloc-0.1.46.crate) = 4601
 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
 SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/minifb-0.28.0.crate) = d1a093126f2ed9012fc0b146934c97eb0273e54983680a8bf5309b6b4a365b32
 SIZE (rust/crates/minifb-0.28.0.crate) = 99664
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/miniz_oxide-0.8.3.crate) = b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924
-SIZE (rust/crates/miniz_oxide-0.8.3.crate) = 61827
+SHA256 (rust/crates/miniz_oxide-0.8.8.crate) = 3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a
+SIZE (rust/crates/miniz_oxide-0.8.8.crate) = 67065
 SHA256 (rust/crates/mint-0.5.9.crate) = e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff
 SIZE (rust/crates/mint-0.5.9.crate) = 8399
 SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
@@ -833,8 +829,8 @@ SHA256 (rust/crates/mumble-link-0.2.0.crate) = c7f4c53745d4e7afd0faaf6ee46c0c311
 SIZE (rust/crates/mumble-link-0.2.0.crate) = 11204
 SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
 SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
-SHA256 (rust/crates/native-dialog-0.7.0.crate) = 84e7038885d2aeab236bd60da9e159a5967b47cde3292da3b15ff1bec27c039f
-SIZE (rust/crates/native-dialog-0.7.0.crate) = 20554
+SHA256 (rust/crates/native-dialog-0.9.0.crate) = 8f006431cea71a83e6668378cb5abc2d52af299cbac6dca1780c6eeca90822df
+SIZE (rust/crates/native-dialog-0.9.0.crate) = 27203
 SHA256 (rust/crates/ndk-0.7.0.crate) = 451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0
 SIZE (rust/crates/ndk-0.7.0.crate) = 54683
 SHA256 (rust/crates/ndk-0.8.0.crate) = 2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7
@@ -861,6 +857,8 @@ SHA256 (rust/crates/noise-0.9.0.crate) = 6da45c8333f2e152fc665d78a380be060eb84fa
 SIZE (rust/crates/noise-0.9.0.crate) = 82369
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/nom-8.0.0.crate) = df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405
+SIZE (rust/crates/nom-8.0.0.crate) = 135590
 SHA256 (rust/crates/notify-6.1.1.crate) = 6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d
 SIZE (rust/crates/notify-6.1.1.crate) = 40117
 SHA256 (rust/crates/notify-8.0.0.crate) = 2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943
@@ -927,22 +925,44 @@ SHA256 (rust/crates/objc2-0.3.0-beta.3.patch-leaks.3.crate) = 7e01640f9f2cb1220b
 SIZE (rust/crates/objc2-0.3.0-beta.3.patch-leaks.3.crate) = 156792
 SHA256 (rust/crates/objc2-0.5.2.crate) = 46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804
 SIZE (rust/crates/objc2-0.5.2.crate) = 199204
+SHA256 (rust/crates/objc2-0.6.1.crate) = 88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551
+SIZE (rust/crates/objc2-0.6.1.crate) = 270980
 SHA256 (rust/crates/objc2-app-kit-0.2.2.crate) = e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff
 SIZE (rust/crates/objc2-app-kit-0.2.2.crate) = 337435
+SHA256 (rust/crates/objc2-app-kit-0.3.1.crate) = e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc
+SIZE (rust/crates/objc2-app-kit-0.3.1.crate) = 495884
+SHA256 (rust/crates/objc2-cloud-kit-0.3.1.crate) = 17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d
+SIZE (rust/crates/objc2-cloud-kit-0.3.1.crate) = 62156
 SHA256 (rust/crates/objc2-core-data-0.2.2.crate) = 617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef
 SIZE (rust/crates/objc2-core-data-0.2.2.crate) = 30575
+SHA256 (rust/crates/objc2-core-data-0.3.1.crate) = 291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d
+SIZE (rust/crates/objc2-core-data-0.3.1.crate) = 36462
+SHA256 (rust/crates/objc2-core-foundation-0.3.1.crate) = 1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166
+SIZE (rust/crates/objc2-core-foundation-0.3.1.crate) = 178121
+SHA256 (rust/crates/objc2-core-graphics-0.3.1.crate) = 989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4
+SIZE (rust/crates/objc2-core-graphics-0.3.1.crate) = 72294
 SHA256 (rust/crates/objc2-core-image-0.2.2.crate) = 55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80
 SIZE (rust/crates/objc2-core-image-0.2.2.crate) = 20050
+SHA256 (rust/crates/objc2-core-image-0.3.1.crate) = 79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e
+SIZE (rust/crates/objc2-core-image-0.3.1.crate) = 54660
 SHA256 (rust/crates/objc2-encode-2.0.0-pre.2.crate) = abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512
 SIZE (rust/crates/objc2-encode-2.0.0-pre.2.crate) = 20836
-SHA256 (rust/crates/objc2-encode-4.0.3.crate) = 7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8
-SIZE (rust/crates/objc2-encode-4.0.3.crate) = 19478
+SHA256 (rust/crates/objc2-encode-4.1.0.crate) = ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33
+SIZE (rust/crates/objc2-encode-4.1.0.crate) = 21004
 SHA256 (rust/crates/objc2-foundation-0.2.2.crate) = 0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8
 SIZE (rust/crates/objc2-foundation-0.2.2.crate) = 249330
+SHA256 (rust/crates/objc2-foundation-0.3.1.crate) = 900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c
+SIZE (rust/crates/objc2-foundation-0.3.1.crate) = 324572
+SHA256 (rust/crates/objc2-io-surface-0.3.1.crate) = 7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c
+SIZE (rust/crates/objc2-io-surface-0.3.1.crate) = 11724
 SHA256 (rust/crates/objc2-metal-0.2.2.crate) = dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6
 SIZE (rust/crates/objc2-metal-0.2.2.crate) = 75276
+SHA256 (rust/crates/objc2-metal-0.3.1.crate) = 7f246c183239540aab1782457b35ab2040d4259175bd1d0c58e46ada7b47a874
+SIZE (rust/crates/objc2-metal-0.3.1.crate) = 145972
 SHA256 (rust/crates/objc2-quartz-core-0.2.2.crate) = e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a
 SIZE (rust/crates/objc2-quartz-core-0.2.2.crate) = 21306
+SHA256 (rust/crates/objc2-quartz-core-0.3.1.crate) = 90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5
+SIZE (rust/crates/objc2-quartz-core-0.3.1.crate) = 28828
 SHA256 (rust/crates/objc_exception-0.1.2.crate) = ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4
 SIZE (rust/crates/objc_exception-0.1.2.crate) = 2251
 SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b
@@ -953,22 +973,24 @@ SHA256 (rust/crates/oboe-0.6.1.crate) = e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7
 SIZE (rust/crates/oboe-0.6.1.crate) = 24588
 SHA256 (rust/crates/oboe-sys-0.6.1.crate) = 6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d
 SIZE (rust/crates/oboe-sys-0.6.1.crate) = 169091
-SHA256 (rust/crates/once_cell-1.20.2.crate) = 1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775
-SIZE (rust/crates/once_cell-1.20.2.crate) = 33394
-SHA256 (rust/crates/oorandom-11.1.4.crate) = b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9
-SIZE (rust/crates/oorandom-11.1.4.crate) = 10201
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
+SHA256 (rust/crates/oorandom-11.1.5.crate) = d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e
+SIZE (rust/crates/oorandom-11.1.5.crate) = 23750
 SHA256 (rust/crates/open-5.3.2.crate) = e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95
 SIZE (rust/crates/open-5.3.2.crate) = 26342
-SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
-SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
+SHA256 (rust/crates/openssl-probe-0.1.6.crate) = d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e
+SIZE (rust/crates/openssl-probe-0.1.6.crate) = 8128
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
 SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
-SHA256 (rust/crates/orbclient-0.3.47.crate) = 52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166
-SIZE (rust/crates/orbclient-0.3.47.crate) = 1324509
+SHA256 (rust/crates/orbclient-0.3.48.crate) = ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43
+SIZE (rust/crates/orbclient-0.3.48.crate) = 1324601
 SHA256 (rust/crates/ordered-float-1.1.1.crate) = 3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7
 SIZE (rust/crates/ordered-float-1.1.1.crate) = 9983
 SHA256 (rust/crates/ordered-float-4.6.0.crate) = 7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951
 SIZE (rust/crates/ordered-float-4.6.0.crate) = 23633
+SHA256 (rust/crates/ordered-float-5.0.0.crate) = e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01
+SIZE (rust/crates/ordered-float-5.0.0.crate) = 23364
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
 SHA256 (rust/crates/owned_ttf_parser-0.25.0.crate) = 22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4
@@ -985,26 +1007,26 @@ SHA256 (rust/crates/paste-1.0.15.crate) = 57c0d7b74b563b49d38dae00a0c37d4d6de9b4
 SIZE (rust/crates/paste-1.0.15.crate) = 18374
 SHA256 (rust/crates/pathdiff-0.2.3.crate) = df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3
 SIZE (rust/crates/pathdiff-0.2.3.crate) = 7495
-SHA256 (rust/crates/pem-3.0.4.crate) = 8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae
-SIZE (rust/crates/pem-3.0.4.crate) = 13040
+SHA256 (rust/crates/pem-3.0.5.crate) = 38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3
+SIZE (rust/crates/pem-3.0.5.crate) = 18140
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
 SHA256 (rust/crates/petgraph-0.4.13.crate) = 9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f
 SIZE (rust/crates/petgraph-0.4.13.crate) = 111936
 SHA256 (rust/crates/petgraph-0.6.5.crate) = b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db
 SIZE (rust/crates/petgraph-0.6.5.crate) = 710970
-SHA256 (rust/crates/petgraph-0.7.1.crate) = 3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772
-SIZE (rust/crates/petgraph-0.7.1.crate) = 736025
-SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
-SIZE (rust/crates/phf-0.11.2.crate) = 21569
-SHA256 (rust/crates/phf_codegen-0.11.2.crate) = e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a
-SIZE (rust/crates/phf_codegen-0.11.2.crate) = 12977
-SHA256 (rust/crates/phf_generator-0.11.2.crate) = 48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0
-SIZE (rust/crates/phf_generator-0.11.2.crate) = 14190
-SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
-SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
-SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
-SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
+SHA256 (rust/crates/petgraph-0.8.1.crate) = 7a98c6720655620a521dcc722d0ad66cd8afd5d86e34a89ef691c50b7b24de06
+SIZE (rust/crates/petgraph-0.8.1.crate) = 763960
+SHA256 (rust/crates/phf-0.11.3.crate) = 1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078
+SIZE (rust/crates/phf-0.11.3.crate) = 23231
+SHA256 (rust/crates/phf_codegen-0.11.3.crate) = aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a
+SIZE (rust/crates/phf_codegen-0.11.3.crate) = 13741
+SHA256 (rust/crates/phf_generator-0.11.3.crate) = 3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d
+SIZE (rust/crates/phf_generator-0.11.3.crate) = 15431
+SHA256 (rust/crates/phf_shared-0.11.3.crate) = 67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5
+SIZE (rust/crates/phf_shared-0.11.3.crate) = 15199
+SHA256 (rust/crates/pin-project-lite-0.2.16.crate) = 3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b
+SIZE (rust/crates/pin-project-lite-0.2.16.crate) = 30504
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
 SHA256 (rust/crates/piston-float-0.3.0.crate) = b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199
@@ -1013,80 +1035,88 @@ SHA256 (rust/crates/piston-viewport-0.5.0.crate) = 7d96dd995f7dabe6d57cda668ec0f
 SIZE (rust/crates/piston-viewport-0.5.0.crate) = 2747
 SHA256 (rust/crates/pistoncore-input-0.24.0.crate) = 0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f
 SIZE (rust/crates/pistoncore-input-0.24.0.crate) = 17859
-SHA256 (rust/crates/pkg-config-0.3.31.crate) = 953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2
-SIZE (rust/crates/pkg-config-0.3.31.crate) = 20880
-SHA256 (rust/crates/png-0.17.14.crate) = 52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0
-SIZE (rust/crates/png-0.17.14.crate) = 108098
-SHA256 (rust/crates/polling-3.7.3.crate) = cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511
-SIZE (rust/crates/polling-3.7.3.crate) = 58276
-SHA256 (rust/crates/portable-atomic-1.9.0.crate) = cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2
-SIZE (rust/crates/portable-atomic-1.9.0.crate) = 166365
-SHA256 (rust/crates/postcard-1.0.10.crate) = 5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e
-SIZE (rust/crates/postcard-1.0.10.crate) = 37834
+SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c
+SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370
+SHA256 (rust/crates/png-0.17.16.crate) = 82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526
+SIZE (rust/crates/png-0.17.16.crate) = 117975
+SHA256 (rust/crates/polling-3.7.4.crate) = a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f
+SIZE (rust/crates/polling-3.7.4.crate) = 58239
+SHA256 (rust/crates/portable-atomic-1.11.0.crate) = 350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e
+SIZE (rust/crates/portable-atomic-1.11.0.crate) = 181258
+SHA256 (rust/crates/postcard-1.1.1.crate) = 170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8
+SIZE (rust/crates/postcard-1.1.1.crate) = 35639
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
 SHA256 (rust/crates/pp-rs-0.2.1.crate) = bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee
 SIZE (rust/crates/pp-rs-0.2.1.crate) = 25905
-SHA256 (rust/crates/ppv-lite86-0.2.20.crate) = 77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04
-SIZE (rust/crates/ppv-lite86-0.2.20.crate) = 22478
+SHA256 (rust/crates/ppv-lite86-0.2.21.crate) = 85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9
+SIZE (rust/crates/ppv-lite86-0.2.21.crate) = 22522
 SHA256 (rust/crates/presser-0.3.1.crate) = e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa
 SIZE (rust/crates/presser-0.3.1.crate) = 20946
 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
+SHA256 (rust/crates/proc-macro-crate-3.3.0.crate) = edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35
+SIZE (rust/crates/proc-macro-crate-3.3.0.crate) = 12432
 SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068
 SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045
 SHA256 (rust/crates/proc-macro-nested-0.1.7.crate) = bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086
 SIZE (rust/crates/proc-macro-nested-0.1.7.crate) = 6495
 SHA256 (rust/crates/proc-macro2-0.4.30.crate) = cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759
 SIZE (rust/crates/proc-macro2-0.4.30.crate) = 34731
-SHA256 (rust/crates/proc-macro2-1.0.93.crate) = 60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99
-SIZE (rust/crates/proc-macro2-1.0.93.crate) = 52388
+SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
+SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
 SHA256 (rust/crates/profiling-1.0.16.crate) = afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d
 SIZE (rust/crates/profiling-1.0.16.crate) = 12588
 SHA256 (rust/crates/profiling-procmacros-1.0.16.crate) = a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30
 SIZE (rust/crates/profiling-procmacros-1.0.16.crate) = 5893
-SHA256 (rust/crates/prometheus-0.13.4.crate) = 3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1
-SIZE (rust/crates/prometheus-0.13.4.crate) = 84650
-SHA256 (rust/crates/prometheus-hyper-0.2.0.crate) = 4599cd06b4c85ba573bf2edf4e5ca5c3f32505ead7fb1f0c7d9a4b90195e1ab1
-SIZE (rust/crates/prometheus-hyper-0.2.0.crate) = 15520
+SHA256 (rust/crates/prometheus-0.14.0.crate) = 3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a
+SIZE (rust/crates/prometheus-0.14.0.crate) = 90035
+SHA256 (rust/crates/prometheus-hyper-0.2.1.crate) = 60d6eeac44b972d6f552e8aaec7f869200aef42f14ddffdddde308b94d0c066e
+SIZE (rust/crates/prometheus-hyper-0.2.1.crate) = 16657
 SHA256 (rust/crates/protocol-3.4.0.crate) = 13cfa9ba37e0183f87fb14b82f23fc76494c458c72469d95b8a8eec75ad5f191
 SIZE (rust/crates/protocol-3.4.0.crate) = 24174
 SHA256 (rust/crates/protocol-derive-3.4.0.crate) = 28647f30298898ead966b51e9aee5c74e4ac709ce5ca554378fde187fd3f7e47
 SIZE (rust/crates/protocol-derive-3.4.0.crate) = 8347
-SHA256 (rust/crates/psm-0.1.23.crate) = aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205
-SIZE (rust/crates/psm-0.1.23.crate) = 23318
+SHA256 (rust/crates/psm-0.1.26.crate) = 6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f
+SIZE (rust/crates/psm-0.1.26.crate) = 23541
 SHA256 (rust/crates/pulley-interpreter-29.0.1.crate) = 62d95f8575df49a2708398182f49a888cf9dc30210fb1fd2df87c889edcee75d
 SIZE (rust/crates/pulley-interpreter-29.0.1.crate) = 55917
-SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
-SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
 SHA256 (rust/crates/quick-xml-0.30.0.crate) = eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956
 SIZE (rust/crates/quick-xml-0.30.0.crate) = 161923
-SHA256 (rust/crates/quick-xml-0.36.2.crate) = f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe
-SIZE (rust/crates/quick-xml-0.36.2.crate) = 185201
-SHA256 (rust/crates/quinn-0.11.6.crate) = 62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef
-SIZE (rust/crates/quinn-0.11.6.crate) = 78222
-SHA256 (rust/crates/quinn-proto-0.11.9.crate) = a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d
-SIZE (rust/crates/quinn-proto-0.11.9.crate) = 209286
-SHA256 (rust/crates/quinn-udp-0.5.9.crate) = 1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904
-SIZE (rust/crates/quinn-udp-0.5.9.crate) = 25342
+SHA256 (rust/crates/quick-xml-0.37.5.crate) = 331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb
+SIZE (rust/crates/quick-xml-0.37.5.crate) = 190481
+SHA256 (rust/crates/quinn-0.11.7.crate) = c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012
+SIZE (rust/crates/quinn-0.11.7.crate) = 79387
+SHA256 (rust/crates/quinn-proto-0.11.11.crate) = bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b
+SIZE (rust/crates/quinn-proto-0.11.11.crate) = 229381
+SHA256 (rust/crates/quinn-udp-0.5.12.crate) = ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842
+SIZE (rust/crates/quinn-udp-0.5.12.crate) = 31825
 SHA256 (rust/crates/quote-0.6.13.crate) = 6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1
 SIZE (rust/crates/quote-0.6.13.crate) = 17475
-SHA256 (rust/crates/quote-1.0.38.crate) = 0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc
-SIZE (rust/crates/quote-1.0.38.crate) = 31252
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
+SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
+SIZE (rust/crates/r-efi-5.2.0.crate) = 64764
 SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
 SIZE (rust/crates/radium-0.7.0.crate) = 10906
 SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd
 SIZE (rust/crates/radix_trie-0.2.1.crate) = 251366
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand-0.9.1.crate) = 9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97
+SIZE (rust/crates/rand-0.9.1.crate) = 97986
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_chacha-0.9.0.crate) = d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb
+SIZE (rust/crates/rand_chacha-0.9.0.crate) = 18258
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rand_core-0.9.3.crate) = 99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38
+SIZE (rust/crates/rand_core-0.9.3.crate) = 24543
 SHA256 (rust/crates/rand_xorshift-0.3.0.crate) = d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f
 SIZE (rust/crates/rand_xorshift-0.3.0.crate) = 9121
-SHA256 (rust/crates/range-alloc-0.1.3.crate) = 9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab
-SIZE (rust/crates/range-alloc-0.1.3.crate) = 7664
+SHA256 (rust/crates/range-alloc-0.1.4.crate) = c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde
+SIZE (rust/crates/range-alloc-0.1.4.crate) = 7924
 SHA256 (rust/crates/ratatui-0.29.0.crate) = eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b
 SIZE (rust/crates/ratatui-0.29.0.crate) = 543514
 SHA256 (rust/crates/raw-window-handle-0.5.2.crate) = f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9
@@ -1097,40 +1127,40 @@ SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4
 SIZE (rust/crates/rayon-1.10.0.crate) = 180155
 SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
 SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
-SHA256 (rust/crates/rcgen-0.13.1.crate) = 54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779
-SIZE (rust/crates/rcgen-0.13.1.crate) = 74432
+SHA256 (rust/crates/rcgen-0.13.2.crate) = 75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2
+SIZE (rust/crates/rcgen-0.13.2.crate) = 77836
 SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29
 SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404
-SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
-SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
-SHA256 (rust/crates/redox_syscall-0.5.6.crate) = 355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b
-SIZE (rust/crates/redox_syscall-0.5.6.crate) = 26186
+SHA256 (rust/crates/redox_syscall-0.5.12.crate) = 928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af
+SIZE (rust/crates/redox_syscall-0.5.12.crate) = 29544
 SHA256 (rust/crates/redox_users-0.4.6.crate) = ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43
 SIZE (rust/crates/redox_users-0.4.6.crate) = 15585
-SHA256 (rust/crates/refinery-0.8.14.crate) = 0904191f0566c3d3e0091d5cc8dec22e663d77def2d247b16e7a438b188bf75d
-SIZE (rust/crates/refinery-0.8.14.crate) = 15542
-SHA256 (rust/crates/refinery-core-0.8.14.crate) = 9bf253999e1899ae476c910b994959e341d84c4389ba9533d3dacbe06df04825
-SIZE (rust/crates/refinery-core-0.8.14.crate) = 18604
-SHA256 (rust/crates/refinery-macros-0.8.14.crate) = bd81f69687fe8a1fa10995108b3ffc7cdbd63e682a4f8fbfd1020130780d7e17
-SIZE (rust/crates/refinery-macros-0.8.14.crate) = 3382
-SHA256 (rust/crates/regalloc2-0.11.1.crate) = 145c1c267e14f20fb0f88aa76a1c5ffec42d592c1d28b3cd9148ae35916158d3
-SIZE (rust/crates/regalloc2-0.11.1.crate) = 138308
+SHA256 (rust/crates/redox_users-0.5.0.crate) = dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b
+SIZE (rust/crates/redox_users-0.5.0.crate) = 15586
+SHA256 (rust/crates/refinery-0.8.16.crate) = 7ba5d693abf62492c37268512ff35b77655d2e957ca53dab85bf993fe9172d15
+SIZE (rust/crates/refinery-0.8.16.crate) = 31584
+SHA256 (rust/crates/refinery-core-0.8.16.crate) = 8a83581f18c1a4c3a6ebd7a174bdc665f17f618d79f7edccb6a0ac67e660b319
+SIZE (rust/crates/refinery-core-0.8.16.crate) = 33647
+SHA256 (rust/crates/refinery-macros-0.8.16.crate) = 72c225407d8e52ef8cf094393781ecda9a99d6544ec28d90a6915751de259264
+SIZE (rust/crates/refinery-macros-0.8.16.crate) = 8591
+SHA256 (rust/crates/regalloc2-0.11.2.crate) = dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a
+SIZE (rust/crates/regalloc2-0.11.2.crate) = 139677
 SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191
 SIZE (rust/crates/regex-1.11.1.crate) = 254170
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
-SHA256 (rust/crates/regex-automata-0.4.8.crate) = 368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3
-SIZE (rust/crates/regex-automata-0.4.8.crate) = 617784
+SHA256 (rust/crates/regex-automata-0.4.9.crate) = 809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908
+SIZE (rust/crates/regex-automata-0.4.9.crate) = 618525
 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
 SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c
 SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
 SHA256 (rust/crates/renderdoc-sys-1.1.0.crate) = 19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832
 SIZE (rust/crates/renderdoc-sys-1.1.0.crate) = 10366
-SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
-SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352
-SHA256 (rust/crates/ring-0.17.13.crate) = 70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee
-SIZE (rust/crates/ring-0.17.13.crate) = 1501917
+SHA256 (rust/crates/resolv-conf-0.7.3.crate) = fc7c8f7f733062b66dc1c63f9db168ac0b97a9210e247fa90fdc9ad08f51b302
+SIZE (rust/crates/resolv-conf-0.7.3.crate) = 16929
+SHA256 (rust/crates/ring-0.17.14.crate) = a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7
+SIZE (rust/crates/ring-0.17.14.crate) = 1502610
 SHA256 (rust/crates/rmp-0.8.14.crate) = 228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4
 SIZE (rust/crates/rmp-0.8.14.crate) = 29687
 SHA256 (rust/crates/rmp-serde-1.3.0.crate) = 52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db
@@ -1153,40 +1183,42 @@ SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
-SHA256 (rust/crates/rustc-hash-2.1.0.crate) = c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497
-SIZE (rust/crates/rustc-hash-2.1.0.crate) = 13316
+SHA256 (rust/crates/rustc-hash-2.1.1.crate) = 357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d
+SIZE (rust/crates/rustc-hash-2.1.1.crate) = 14154
 SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
 SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210
 SHA256 (rust/crates/rustc_version-0.4.1.crate) = cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92
 SIZE (rust/crates/rustc_version-0.4.1.crate) = 12245
 SHA256 (rust/crates/rustix-0.38.44.crate) = fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154
 SIZE (rust/crates/rustix-0.38.44.crate) = 379347
-SHA256 (rust/crates/rustls-0.23.21.crate) = 8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8
-SIZE (rust/crates/rustls-0.23.21.crate) = 337106
-SHA256 (rust/crates/rustls-native-certs-0.7.3.crate) = e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5
-SIZE (rust/crates/rustls-native-certs-0.7.3.crate) = 31564
+SHA256 (rust/crates/rustix-1.0.7.crate) = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+SIZE (rust/crates/rustix-1.0.7.crate) = 414500
+SHA256 (rust/crates/rustix-linux-procfs-0.1.1.crate) = 2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056
+SIZE (rust/crates/rustix-linux-procfs-0.1.1.crate) = 17465
+SHA256 (rust/crates/rustls-0.23.26.crate) = df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0
+SIZE (rust/crates/rustls-0.23.26.crate) = 347849
 SHA256 (rust/crates/rustls-native-certs-0.8.1.crate) = 7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3
 SIZE (rust/crates/rustls-native-certs-0.8.1.crate) = 31129
 SHA256 (rust/crates/rustls-pemfile-2.2.0.crate) = dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50
 SIZE (rust/crates/rustls-pemfile-2.2.0.crate) = 25849
 SHA256 (rust/crates/rustls-pki-types-1.11.0.crate) = 917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c
 SIZE (rust/crates/rustls-pki-types-1.11.0.crate) = 63933
-SHA256 (rust/crates/rustls-platform-verifier-0.4.0.crate) = a4c7dc240fec5517e6c4eab3310438636cfe6391dfc345ba013109909a90d136
-SIZE (rust/crates/rustls-platform-verifier-0.4.0.crate) = 56463
+SHA256 (rust/crates/rustls-platform-verifier-0.5.2.crate) = 4937d110d34408e9e5ad30ba0b0ca3b6a8a390f8db3636db60144ac4fa792750
+SIZE (rust/crates/rustls-platform-verifier-0.5.2.crate) = 61002
 SHA256 (rust/crates/rustls-platform-verifier-android-0.1.1.crate) = f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f
 SIZE (rust/crates/rustls-platform-verifier-android-0.1.1.crate) = 13919
-SHA256 (rust/crates/rustls-webpki-0.102.8.crate) = 64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9
-SIZE (rust/crates/rustls-webpki-0.102.8.crate) = 204327
+SHA256 (rust/crates/rustls-webpki-0.103.1.crate) = fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03
+SIZE (rust/crates/rustls-webpki-0.103.1.crate) = 820273
 SHA256 (rust/crates/rusttype-0.7.9.crate) = 310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5
 SIZE (rust/crates/rusttype-0.7.9.crate) = 42732
 SHA256 (rust/crates/rusttype-0.8.3.crate) = 9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0
 SIZE (rust/crates/rusttype-0.8.3.crate) = 37327
-SHA256 (rust/crates/rustversion-1.0.17.crate) = 955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6
-SIZE (rust/crates/rustversion-1.0.17.crate) = 17621
+SHA256 (rust/crates/rustversion-1.0.20.crate) = eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2
+SIZE (rust/crates/rustversion-1.0.20.crate) = 20666
 SHA256 (rust/crates/rustyline-15.0.0.crate) = 2ee1e066dc922e513bda599c6ccb5f3bb2b0ea5870a579448f2622993f0a9a2f
 SIZE (rust/crates/rustyline-15.0.0.crate) = 116346
-SHA256 (rust/crates/ryu-1.0.19.crate) = 6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd
-SIZE (rust/crates/ryu-1.0.19.crate) = 48770
+SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f
+SIZE (rust/crates/ryu-1.0.20.crate) = 48738
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/schannel-0.1.27.crate) = 1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d
@@ -1203,34 +1235,32 @@ SHA256 (rust/crates/sdl2-0.35.2.crate) = f7959277b623f1fb9e04aea73686c3ca52f01b2
 SIZE (rust/crates/sdl2-0.35.2.crate) = 177570
 SHA256 (rust/crates/sdl2-sys-0.35.2.crate) = e3586be2cf6c0a8099a79a12b4084357aa9b3e0b0d7980e3b67aaf7a9d55f9f0
 SIZE (rust/crates/sdl2-sys-0.35.2.crate) = 7425816
-SHA256 (rust/crates/security-framework-2.11.1.crate) = 897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02
-SIZE (rust/crates/security-framework-2.11.1.crate) = 80188
 SHA256 (rust/crates/security-framework-3.2.0.crate) = 271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316
 SIZE (rust/crates/security-framework-3.2.0.crate) = 86095
 SHA256 (rust/crates/security-framework-sys-2.14.0.crate) = 49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32
 SIZE (rust/crates/security-framework-sys-2.14.0.crate) = 20537
 SHA256 (rust/crates/self_cell-0.10.3.crate) = e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d
 SIZE (rust/crates/self_cell-0.10.3.crate) = 7308
-SHA256 (rust/crates/self_cell-1.1.0.crate) = c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe
-SIZE (rust/crates/self_cell-1.1.0.crate) = 16636
+SHA256 (rust/crates/self_cell-1.2.0.crate) = 0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749
+SIZE (rust/crates/self_cell-1.2.0.crate) = 16883
 SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
 SIZE (rust/crates/semver-0.9.0.crate) = 17344
-SHA256 (rust/crates/semver-1.0.25.crate) = f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03
-SIZE (rust/crates/semver-1.0.25.crate) = 31291
+SHA256 (rust/crates/semver-1.0.26.crate) = 56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0
+SIZE (rust/crates/semver-1.0.26.crate) = 31303
 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
 SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268
 SHA256 (rust/crates/send_wrapper-0.6.0.crate) = cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73
 SIZE (rust/crates/send_wrapper-0.6.0.crate) = 10519
-SHA256 (rust/crates/serde-1.0.217.crate) = 02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70
-SIZE (rust/crates/serde-1.0.217.crate) = 79019
-SHA256 (rust/crates/serde_derive-1.0.217.crate) = 5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0
-SIZE (rust/crates/serde_derive-1.0.217.crate) = 57749
-SHA256 (rust/crates/serde_json-1.0.138.crate) = d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949
-SIZE (rust/crates/serde_json-1.0.138.crate) = 154769
-SHA256 (rust/crates/serde_path_to_error-0.1.16.crate) = af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6
-SIZE (rust/crates/serde_path_to_error-0.1.16.crate) = 16657
-SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9
-SIZE (rust/crates/serde_repr-0.1.19.crate) = 9997
+SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
+SIZE (rust/crates/serde-1.0.219.crate) = 78983
+SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
+SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798
+SHA256 (rust/crates/serde_json-1.0.140.crate) = 20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373
+SIZE (rust/crates/serde_json-1.0.140.crate) = 154852
+SHA256 (rust/crates/serde_path_to_error-0.1.17.crate) = 59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a
+SIZE (rust/crates/serde_path_to_error-0.1.17.crate) = 17662
+SHA256 (rust/crates/serde_repr-0.1.20.crate) = 175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c
+SIZE (rust/crates/serde_repr-0.1.20.crate) = 12627
 SHA256 (rust/crates/serde_spanned-0.6.8.crate) = 87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1
 SIZE (rust/crates/serde_spanned-0.6.8.crate) = 9330
 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
@@ -1239,8 +1269,8 @@ SHA256 (rust/crates/serde_with-3.12.0.crate) = d6b6f7f2fcb69f747921f79f3926bd1e2
 SIZE (rust/crates/serde_with-3.12.0.crate) = 148666
 SHA256 (rust/crates/serde_with_macros-3.12.0.crate) = 8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e
 SIZE (rust/crates/serde_with_macros-3.12.0.crate) = 32089
-SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
-SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sha2-0.10.9.crate) = a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283
+SIZE (rust/crates/sha2-0.10.9.crate) = 29271
 SHA256 (rust/crates/shaderc-0.8.3.crate) = 27e07913ada18607bb60d12431cbe3358d3bbebbe95948e1618851dc01e63b7b
 SIZE (rust/crates/shaderc-0.8.3.crate) = 16536
 SHA256 (rust/crates/shaderc-sys-0.8.3.crate) = 73120d240fe22196300f39ca8547ca2d014960f27b19b47b21288b396272f7f7
@@ -1251,8 +1281,8 @@ SHA256 (rust/crates/shell-words-1.1.0.crate) = 24188a676b6ae68c3b2cb3a01be17fbf7
 SIZE (rust/crates/shell-words-1.1.0.crate) = 9871
 SHA256 (rust/crates/shellexpand-2.1.2.crate) = 7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4
 SIZE (rust/crates/shellexpand-2.1.2.crate) = 16884
-SHA256 (rust/crates/shellexpand-3.1.0.crate) = da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b
-SIZE (rust/crates/shellexpand-3.1.0.crate) = 25591
+SHA256 (rust/crates/shellexpand-3.1.1.crate) = 8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb
+SIZE (rust/crates/shellexpand-3.1.1.crate) = 25904
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
 SHA256 (rust/crates/shred-0.16.1.crate) = 656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e
@@ -1265,20 +1295,18 @@ SHA256 (rust/crates/signal-hook-0.3.17.crate) = 8621587d4798caf8eb44879d42e56b9a
 SIZE (rust/crates/signal-hook-0.3.17.crate) = 50296
 SHA256 (rust/crates/signal-hook-mio-0.2.4.crate) = 34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd
 SIZE (rust/crates/signal-hook-mio-0.2.4.crate) = 9314
-SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
-SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
+SHA256 (rust/crates/signal-hook-registry-1.4.5.crate) = 9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410
+SIZE (rust/crates/signal-hook-registry-1.4.5.crate) = 19004
 SHA256 (rust/crates/simd-adler32-0.3.7.crate) = d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe
 SIZE (rust/crates/simd-adler32-0.3.7.crate) = 12086
-SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
-SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
 SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
 SIZE (rust/crates/siphasher-1.0.1.crate) = 10351
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
 SHA256 (rust/crates/slotmap-1.0.7.crate) = dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a
 SIZE (rust/crates/slotmap-1.0.7.crate) = 61390
-SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
-SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
+SHA256 (rust/crates/smallvec-1.15.0.crate) = 8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9
+SIZE (rust/crates/smallvec-1.15.0.crate) = 38113
 SHA256 (rust/crates/smithay-client-toolkit-0.16.1.crate) = 870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9
 SIZE (rust/crates/smithay-client-toolkit-0.16.1.crate) = 131081
 SHA256 (rust/crates/smithay-client-toolkit-0.19.2.crate) = 3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016
@@ -1287,22 +1315,22 @@ SHA256 (rust/crates/smithay-clipboard-0.6.6.crate) = 0a345c870a1fae0b1b779085e81
 SIZE (rust/crates/smithay-clipboard-0.6.6.crate) = 16797
 SHA256 (rust/crates/smithay-clipboard-0.7.2.crate) = cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846
 SIZE (rust/crates/smithay-clipboard-0.7.2.crate) = 17877
-SHA256 (rust/crates/socket2-0.5.8.crate) = c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8
-SIZE (rust/crates/socket2-0.5.8.crate) = 56309
+SHA256 (rust/crates/socket2-0.5.9.crate) = 4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef
+SIZE (rust/crates/socket2-0.5.9.crate) = 57432
 SHA256 (rust/crates/sorted-vec-0.8.6.crate) = d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d
 SIZE (rust/crates/sorted-vec-0.8.6.crate) = 12172
 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
 SIZE (rust/crates/spin-0.9.8.crate) = 38958
-SHA256 (rust/crates/spin_sleep-1.2.1.crate) = 64bd7227d85bfd1b8df51e0d83da36d9baaee85eb75730386ef8e3ab6f2a2ea3
-SIZE (rust/crates/spin_sleep-1.2.1.crate) = 12102
+SHA256 (rust/crates/spin_sleep-1.3.1.crate) = 17db5ecef7e0bebeb8bf8bc4c4b554e05e0205d7008f10bb37787892e7a6507b
+SIZE (rust/crates/spin_sleep-1.3.1.crate) = 13308
 SHA256 (rust/crates/spirv-0.2.0+1.5.4.crate) = 246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830
 SIZE (rust/crates/spirv-0.2.0+1.5.4.crate) = 30491
 SHA256 (rust/crates/sptr-0.3.2.crate) = 3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a
 SIZE (rust/crates/sptr-0.3.2.crate) = 14598
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
-SHA256 (rust/crates/stacker-0.1.17.crate) = 799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b
-SIZE (rust/crates/stacker-0.1.17.crate) = 14699
+SHA256 (rust/crates/stacker-0.1.21.crate) = cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b
+SIZE (rust/crates/stacker-0.1.21.crate) = 17009
 SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
 SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
 SHA256 (rust/crates/stb_truetype-0.3.1.crate) = f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51
@@ -1321,8 +1349,8 @@ SHA256 (rust/crates/subtle-2.6.1.crate) = 13c2bddecc57b384dee18652358fb23172facb
 SIZE (rust/crates/subtle-2.6.1.crate) = 14562
 SHA256 (rust/crates/sum_type-0.2.0.crate) = da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15
 SIZE (rust/crates/sum_type-0.2.0.crate) = 5586
-SHA256 (rust/crates/svg_fmt-0.4.4.crate) = ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa
-SIZE (rust/crates/svg_fmt-0.4.4.crate) = 4339
+SHA256 (rust/crates/svg_fmt-0.4.5.crate) = 0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb
+SIZE (rust/crates/svg_fmt-0.4.5.crate) = 4534
 SHA256 (rust/crates/symphonia-0.5.4.crate) = 815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9
 SIZE (rust/crates/symphonia-0.5.4.crate) = 12039
 SHA256 (rust/crates/symphonia-codec-vorbis-0.5.4.crate) = 5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30
@@ -1339,44 +1367,44 @@ SHA256 (rust/crates/syn-0.15.44.crate) = 9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a
 SIZE (rust/crates/syn-0.15.44.crate) = 184212
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.96.crate) = d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80
-SIZE (rust/crates/syn-2.0.96.crate) = 297497
+SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf
+SIZE (rust/crates/syn-2.0.101.crate) = 299250
 SHA256 (rust/crates/sync_file-0.2.9.crate) = 9cfc24238213e42ffb35314aad7a7f5d46649c5fbba3ea95ef24f7debb95874e
 SIZE (rust/crates/sync_file-0.2.9.crate) = 8996
-SHA256 (rust/crates/sync_wrapper-1.0.1.crate) = a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394
-SIZE (rust/crates/sync_wrapper-1.0.1.crate) = 6939
-SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
-SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
-SHA256 (rust/crates/system-interface-0.27.2.crate) = b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6
-SIZE (rust/crates/system-interface-0.27.2.crate) = 32251
+SHA256 (rust/crates/sync_wrapper-1.0.2.crate) = 0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263
+SIZE (rust/crates/sync_wrapper-1.0.2.crate) = 6958
+SHA256 (rust/crates/synstructure-0.13.2.crate) = 728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2
+SIZE (rust/crates/synstructure-0.13.2.crate) = 18950
+SHA256 (rust/crates/system-interface-0.27.3.crate) = cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745
+SIZE (rust/crates/system-interface-0.27.3.crate) = 32567
 SHA256 (rust/crates/take-once-0.1.2.crate) = ae3e30fcd6e30346aff75e3bd38834ebc8ca2ed8925884bc867f77213bf3f714
 SIZE (rust/crates/take-once-0.1.2.crate) = 4285
 SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
 SIZE (rust/crates/tap-1.0.1.crate) = 11316
-SHA256 (rust/crates/tar-0.4.43.crate) = c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6
-SIZE (rust/crates/tar-0.4.43.crate) = 60181
-SHA256 (rust/crates/target-lexicon-0.13.1.crate) = dc12939a1c9b9d391e0b7135f72fd30508b73450753e28341fed159317582a77
-SIZE (rust/crates/target-lexicon-0.13.1.crate) = 27925
-SHA256 (rust/crates/tempfile-3.13.0.crate) = f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b
-SIZE (rust/crates/tempfile-3.13.0.crate) = 34910
+SHA256 (rust/crates/tar-0.4.44.crate) = 1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a
+SIZE (rust/crates/tar-0.4.44.crate) = 61020
+SHA256 (rust/crates/target-lexicon-0.13.2.crate) = e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a
+SIZE (rust/crates/target-lexicon-0.13.2.crate) = 27923
+SHA256 (rust/crates/tempfile-3.19.1.crate) = 7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf
+SIZE (rust/crates/tempfile-3.19.1.crate) = 39634
 SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
 SIZE (rust/crates/termcolor-1.4.1.crate) = 18773
 SHA256 (rust/crates/thiserror-1.0.69.crate) = b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52
 SIZE (rust/crates/thiserror-1.0.69.crate) = 22198
-SHA256 (rust/crates/thiserror-2.0.11.crate) = d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc
-SIZE (rust/crates/thiserror-2.0.11.crate) = 28648
+SHA256 (rust/crates/thiserror-2.0.12.crate) = 567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708
+SIZE (rust/crates/thiserror-2.0.12.crate) = 28693
 SHA256 (rust/crates/thiserror-impl-1.0.69.crate) = 4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1
 SIZE (rust/crates/thiserror-impl-1.0.69.crate) = 18365
-SHA256 (rust/crates/thiserror-impl-2.0.11.crate) = 26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2
-SIZE (rust/crates/thiserror-impl-2.0.11.crate) = 21067
+SHA256 (rust/crates/thiserror-impl-2.0.12.crate) = 7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d
+SIZE (rust/crates/thiserror-impl-2.0.12.crate) = 21141
 SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
 SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
-SHA256 (rust/crates/time-0.3.37.crate) = 35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21
-SIZE (rust/crates/time-0.3.37.crate) = 123257
-SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
-SIZE (rust/crates/time-core-0.1.2.crate) = 7191
-SHA256 (rust/crates/time-macros-0.2.19.crate) = 2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de
-SIZE (rust/crates/time-macros-0.2.19.crate) = 24268
+SHA256 (rust/crates/time-0.3.41.crate) = 8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40
+SIZE (rust/crates/time-0.3.41.crate) = 138369
+SHA256 (rust/crates/time-core-0.1.4.crate) = c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c
+SIZE (rust/crates/time-core-0.1.4.crate) = 8422
+SHA256 (rust/crates/time-macros-0.2.22.crate) = 3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49
+SIZE (rust/crates/time-macros-0.2.22.crate) = 24604
 SHA256 (rust/crates/timer-queue-0.1.0.crate) = 13756c29c43d836ff576221498bf4916b0d2f7ea24cd47d3531b70dc4341f038
 SIZE (rust/crates/timer-queue-0.1.0.crate) = 13344
 SHA256 (rust/crates/tiny-skia-0.8.4.crate) = df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67
@@ -1387,28 +1415,30 @@ SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1
 SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
 SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
 SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
-SHA256 (rust/crates/tinyvec-1.8.1.crate) = 022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8
-SIZE (rust/crates/tinyvec-1.8.1.crate) = 47269
+SHA256 (rust/crates/tinyvec-1.9.0.crate) = 09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71
+SIZE (rust/crates/tinyvec-1.9.0.crate) = 54137
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
 SHA256 (rust/crates/tokio-1.44.2.crate) = e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48
 SIZE (rust/crates/tokio-1.44.2.crate) = 841618
 SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
 SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
-SHA256 (rust/crates/tokio-rustls-0.26.0.crate) = 0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4
-SIZE (rust/crates/tokio-rustls-0.26.0.crate) = 34253
-SHA256 (rust/crates/tokio-stream-0.1.16.crate) = 4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1
-SIZE (rust/crates/tokio-stream-0.1.16.crate) = 38312
+SHA256 (rust/crates/tokio-rustls-0.26.2.crate) = 8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b
+SIZE (rust/crates/tokio-rustls-0.26.2.crate) = 31655
+SHA256 (rust/crates/tokio-stream-0.1.17.crate) = eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047
+SIZE (rust/crates/tokio-stream-0.1.17.crate) = 38477
 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
 SIZE (rust/crates/toml-0.5.11.crate) = 54910
-SHA256 (rust/crates/toml-0.8.19.crate) = a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e
-SIZE (rust/crates/toml-0.8.19.crate) = 50974
-SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
-SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
+SHA256 (rust/crates/toml-0.8.22.crate) = 05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae
+SIZE (rust/crates/toml-0.8.22.crate) = 76224
+SHA256 (rust/crates/toml_datetime-0.6.9.crate) = 3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3
+SIZE (rust/crates/toml_datetime-0.6.9.crate) = 12622
 SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
 SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
-SHA256 (rust/crates/toml_edit-0.22.22.crate) = 4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5
-SIZE (rust/crates/toml_edit-0.22.22.crate) = 106387
+SHA256 (rust/crates/toml_edit-0.22.26.crate) = 310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e
+SIZE (rust/crates/toml_edit-0.22.26.crate) = 121714
+SHA256 (rust/crates/toml_write-0.1.1.crate) = bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076
+SIZE (rust/crates/toml_write-0.1.1.crate) = 17467
 SHA256 (rust/crates/tower-0.5.2.crate) = d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9
 SIZE (rust/crates/tower-0.5.2.crate) = 109417
 SHA256 (rust/crates/tower-layer-0.3.3.crate) = 121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e
@@ -1437,8 +1467,8 @@ SHA256 (rust/crates/trait-variant-0.1.2.crate) = 70977707304198400eb4835a78f6a9f
 SIZE (rust/crates/trait-variant-0.1.2.crate) = 6008
 SHA256 (rust/crates/treeculler-0.4.0.crate) = c11fcf82651ce9a4550c82beb88a38951fdde004917817eba244359720d74c06
 SIZE (rust/crates/treeculler-0.4.0.crate) = 4577
-SHA256 (rust/crates/triple_buffer-8.1.0.crate) = de7a7d39da903eaef0d0fd14aae8c8c36cdd7dc1d5a251f88c84b676e8dc0a14
-SIZE (rust/crates/triple_buffer-8.1.0.crate) = 29417
+SHA256 (rust/crates/triple_buffer-8.1.1.crate) = 420466259f9fa5decc654c490b9ab538400e5420df8237f84ecbe20368bcf72b
+SIZE (rust/crates/triple_buffer-8.1.1.crate) = 29638
 SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
 SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
 SHA256 (rust/crates/ttf-parser-0.25.1.crate) = d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31
@@ -1447,20 +1477,22 @@ SHA256 (rust/crates/tuple_utils-0.4.0.crate) = cffaaf9392ef73cd30828797152476aaa
 SIZE (rust/crates/tuple_utils-0.4.0.crate) = 2893
 SHA256 (rust/crates/twox-hash-1.6.3.crate) = 97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675
 SIZE (rust/crates/twox-hash-1.6.3.crate) = 21842
+SHA256 (rust/crates/twox-hash-2.1.0.crate) = e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908
+SIZE (rust/crates/twox-hash-2.1.0.crate) = 35275
 SHA256 (rust/crates/tynm-0.1.10.crate) = bd30d05e69d1478e13fe3e7a853409cfec82cebc2cf9b8d613b3c6b0081781ed
 SIZE (rust/crates/tynm-0.1.10.crate) = 16394
 SHA256 (rust/crates/type-map-0.5.0.crate) = deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f
 SIZE (rust/crates/type-map-0.5.0.crate) = 3464
-SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
-SIZE (rust/crates/typenum-1.17.0.crate) = 42849
+SHA256 (rust/crates/typenum-1.18.0.crate) = 1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f
+SIZE (rust/crates/typenum-1.18.0.crate) = 74871
 SHA256 (rust/crates/ubyte-0.10.4.crate) = f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea
 SIZE (rust/crates/ubyte-0.10.4.crate) = 13965
 SHA256 (rust/crates/unic-langid-0.9.5.crate) = 23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44
 SIZE (rust/crates/unic-langid-0.9.5.crate) = 8898
 SHA256 (rust/crates/unic-langid-impl-0.9.5.crate) = 0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5
 SIZE (rust/crates/unic-langid-impl-0.9.5.crate) = 89659
-SHA256 (rust/crates/unicode-ident-1.0.13.crate) = e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe
-SIZE (rust/crates/unicode-ident-1.0.13.crate) = 43279
+SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
+SIZE (rust/crates/unicode-ident-1.0.18.crate) = 47743
 SHA256 (rust/crates/unicode-segmentation-1.12.0.crate) = f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493
 SIZE (rust/crates/unicode-segmentation-1.12.0.crate) = 106323
 SHA256 (rust/crates/unicode-truncate-1.1.0.crate) = b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf
@@ -1483,10 +1515,10 @@ SHA256 (rust/crates/utf8_iter-1.0.4.crate) = b6c140620e7ffbb22c2dee59cafe6084a59
 SIZE (rust/crates/utf8_iter-1.0.4.crate) = 10437
 SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
 SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
-SHA256 (rust/crates/uuid-1.12.1.crate) = b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b
-SIZE (rust/crates/uuid-1.12.1.crate) = 48851
-SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
-SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/uuid-1.16.0.crate) = 458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9
+SIZE (rust/crates/uuid-1.16.0.crate) = 58549
+SHA256 (rust/crates/valuable-0.1.1.crate) = ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65
+SIZE (rust/crates/valuable-0.1.1.crate) = 28679
 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
 SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
 SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
@@ -1499,36 +1531,38 @@ SHA256 (rust/crates/version-compare-0.1.1.crate) = 579a42fc0b8e0c63b76519a339be3
 SIZE (rust/crates/version-compare-0.1.1.crate) = 13224
 SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
 SIZE (rust/crates/version_check-0.9.5.crate) = 15554
-SHA256 (rust/crates/versions-5.0.1.crate) = c73a36bc44e3039f51fbee93e39f41225f6b17b380eb70cc2aab942df06b34dd
-SIZE (rust/crates/versions-5.0.1.crate) = 15850
+SHA256 (rust/crates/versions-7.0.0.crate) = 80a7e511ce1795821207a837b7b1c8d8aca0c648810966ad200446ae58f6667f
+SIZE (rust/crates/versions-7.0.0.crate) = 23307
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
 SIZE (rust/crates/want-0.3.1.crate) = 6398
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasm-bindgen-0.2.93.crate) = a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5
-SIZE (rust/crates/wasm-bindgen-0.2.93.crate) = 43769
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.93.crate) = 9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b
-SIZE (rust/crates/wasm-bindgen-backend-0.2.93.crate) = 30344
-SHA256 (rust/crates/wasm-bindgen-futures-0.4.43.crate) = 61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed
-SIZE (rust/crates/wasm-bindgen-futures-0.4.43.crate) = 14207
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.93.crate) = 585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf
-SIZE (rust/crates/wasm-bindgen-macro-0.2.93.crate) = 6822
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.93.crate) = afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.93.crate) = 20642
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.93.crate) = c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484
-SIZE (rust/crates/wasm-bindgen-shared-0.2.93.crate) = 7527
-SHA256 (rust/crates/wasm-encoder-0.221.2.crate) = c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5
-SIZE (rust/crates/wasm-encoder-0.221.2.crate) = 65262
-SHA256 (rust/crates/wasm-encoder-0.224.0.crate) = b7249cf8cb0c6b9cb42bce90c0a5feb276fbf963fa385ff3d818ab3d90818ed6
-SIZE (rust/crates/wasm-encoder-0.224.0.crate) = 70355
+SHA256 (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3
+SIZE (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 140921
+SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
+SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
+SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.45.crate) = cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b
+SIZE (rust/crates/wasm-bindgen-futures-0.4.45.crate) = 14329
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
+SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
+SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
+SHA256 (rust/crates/wasm-encoder-0.221.3.crate) = dc8444fe4920de80a4fe5ab564fff2ae58b6b73166b89751f8c6c93509da32e5
+SIZE (rust/crates/wasm-encoder-0.221.3.crate) = 67487
+SHA256 (rust/crates/wasm-encoder-0.229.0.crate) = 38ba1d491ecacb085a2552025c10a675a6fddcbd03b1fc9b36c536010ce265d2
+SIZE (rust/crates/wasm-encoder-0.229.0.crate) = 81299
 SHA256 (rust/crates/wasmparser-0.221.3.crate) = d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185
 SIZE (rust/crates/wasmparser-0.221.3.crate) = 242903
-SHA256 (rust/crates/wasmparser-0.224.0.crate) = 65881a664fdd43646b647bb27bf186ab09c05bf56779d40aed4c6dce47d423f5
-SIZE (rust/crates/wasmparser-0.224.0.crate) = 247038
-SHA256 (rust/crates/wasmprinter-0.221.2.crate) = a80742ff1b9e6d8c231ac7c7247782c6fc5bce503af760bca071811e5fc9ee56
-SIZE (rust/crates/wasmprinter-0.221.2.crate) = 38348
+SHA256 (rust/crates/wasmparser-0.229.0.crate) = 0cc3b1f053f5d41aa55640a1fa9b6d1b8a9e4418d118ce308d20e24ff3575a8c
+SIZE (rust/crates/wasmparser-0.229.0.crate) = 249693
+SHA256 (rust/crates/wasmprinter-0.221.3.crate) = 7343c42a97f2926c7819ff81b64012092ae954c5d83ddd30c9fcdefd97d0b283
+SIZE (rust/crates/wasmprinter-0.221.3.crate) = 39793
 SHA256 (rust/crates/wasmtime-29.0.1.crate) = 11976a250672556d1c4c04c6d5d7656ac9192ac9edc42a4587d6c21460010e69
 SIZE (rust/crates/wasmtime-29.0.1.crate) = 693309
 SHA256 (rust/crates/wasmtime-asm-macros-29.0.1.crate) = 1f178b0d125201fbe9f75beaf849bd3e511891f9e45ba216a5b620802ccf64f2
@@ -1563,54 +1597,54 @@ SHA256 (rust/crates/wasmtime-wit-bindgen-29.0.1.crate) = 8358319c2dd1e4db79e3c1c
 SIZE (rust/crates/wasmtime-wit-bindgen-29.0.1.crate) = 31902
 SHA256 (rust/crates/wast-35.0.2.crate) = 2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68
 SIZE (rust/crates/wast-35.0.2.crate) = 90940
-SHA256 (rust/crates/wast-224.0.0.crate) = d722a51e62b669d17e5a9f6bc8ec210178b37d869114355aa46989686c5c6391
-SIZE (rust/crates/wast-224.0.0.crate) = 154004
-SHA256 (rust/crates/wat-1.224.0.crate) = 71dece6a7dd5bcbcf8d256606c7fb3faa36286d46bf3f98185407719a5ceede2
-SIZE (rust/crates/wat-1.224.0.crate) = 8138
+SHA256 (rust/crates/wast-229.0.0.crate) = 63fcaff613c12225696bb163f79ca38ffb40e9300eff0ff4b8aa8b2f7eadf0d9
+SIZE (rust/crates/wast-229.0.0.crate) = 153934
+SHA256 (rust/crates/wat-1.229.0.crate) = 4189bad08b70455a9e9e67dc126d2dcf91fac143a80f1046747a5dde6d4c33e0
+SIZE (rust/crates/wat-1.229.0.crate) = 8132
 SHA256 (rust/crates/wavefront-0.2.3.crate) = 0162190f32ea78b07b7bc02b57a1c2a7c0874bc3da34f36eba41c86c4b03c4fb
 SIZE (rust/crates/wavefront-0.2.3.crate) = 13984
-SHA256 (rust/crates/wayland-backend-0.3.7.crate) = 056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6
-SIZE (rust/crates/wayland-backend-0.3.7.crate) = 71771
+SHA256 (rust/crates/wayland-backend-0.3.10.crate) = fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121
+SIZE (rust/crates/wayland-backend-0.3.10.crate) = 75632
 SHA256 (rust/crates/wayland-client-0.29.5.crate) = 3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715
 SIZE (rust/crates/wayland-client-0.29.5.crate) = 71041
-SHA256 (rust/crates/wayland-client-0.31.6.crate) = e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d
-SIZE (rust/crates/wayland-client-0.31.6.crate) = 63338
+SHA256 (rust/crates/wayland-client-0.31.10.crate) = 978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61
+SIZE (rust/crates/wayland-client-0.31.10.crate) = 64777
 SHA256 (rust/crates/wayland-commons-0.29.5.crate) = 8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902
 SIZE (rust/crates/wayland-commons-0.29.5.crate) = 20771
 SHA256 (rust/crates/wayland-csd-frame-0.3.0.crate) = 625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e
 SIZE (rust/crates/wayland-csd-frame-0.3.0.crate) = 5696
 SHA256 (rust/crates/wayland-cursor-0.29.5.crate) = 6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661
 SIZE (rust/crates/wayland-cursor-0.29.5.crate) = 6195
-SHA256 (rust/crates/wayland-cursor-0.31.6.crate) = 3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb
-SIZE (rust/crates/wayland-cursor-0.31.6.crate) = 7569
+SHA256 (rust/crates/wayland-cursor-0.31.10.crate) = a65317158dec28d00416cb16705934070aef4f8393353d41126c54264ae0f182
+SIZE (rust/crates/wayland-cursor-0.31.10.crate) = 9725
 SHA256 (rust/crates/wayland-protocols-0.29.5.crate) = b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6
 SIZE (rust/crates/wayland-protocols-0.29.5.crate) = 140859
-SHA256 (rust/crates/wayland-protocols-0.32.4.crate) = 2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0
-SIZE (rust/crates/wayland-protocols-0.32.4.crate) = 172409
-SHA256 (rust/crates/wayland-protocols-wlr-0.3.4.crate) = dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109
-SIZE (rust/crates/wayland-protocols-wlr-0.3.4.crate) = 26281
+SHA256 (rust/crates/wayland-protocols-0.32.8.crate) = 779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a
+SIZE (rust/crates/wayland-protocols-0.32.8.crate) = 210103
+SHA256 (rust/crates/wayland-protocols-wlr-0.3.8.crate) = 1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf
+SIZE (rust/crates/wayland-protocols-wlr-0.3.8.crate) = 28616
 SHA256 (rust/crates/wayland-scanner-0.29.5.crate) = 8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53
 SIZE (rust/crates/wayland-scanner-0.29.5.crate) = 17248
-SHA256 (rust/crates/wayland-scanner-0.31.5.crate) = 597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3
-SIZE (rust/crates/wayland-scanner-0.31.5.crate) = 35779
+SHA256 (rust/crates/wayland-scanner-0.31.6.crate) = 896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484
+SIZE (rust/crates/wayland-scanner-0.31.6.crate) = 36365
 SHA256 (rust/crates/wayland-sys-0.29.5.crate) = be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4
 SIZE (rust/crates/wayland-sys-0.29.5.crate) = 7926
-SHA256 (rust/crates/wayland-sys-0.31.5.crate) = efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09
-SIZE (rust/crates/wayland-sys-0.31.5.crate) = 8630
-SHA256 (rust/crates/web-sys-0.3.70.crate) = 26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0
-SIZE (rust/crates/web-sys-0.3.70.crate) = 615438
+SHA256 (rust/crates/wayland-sys-0.31.6.crate) = dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615
+SIZE (rust/crates/wayland-sys-0.31.6.crate) = 10049
+SHA256 (rust/crates/web-sys-0.3.72.crate) = f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112
+SIZE (rust/crates/web-sys-0.3.72.crate) = 629190
 SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
 SIZE (rust/crates/web-time-1.1.0.crate) = 18026
-SHA256 (rust/crates/webpki-root-certs-0.26.7.crate) = 9cd5da49bdf1f30054cfe0b8ce2958b8fbeb67c4d82c8967a598af481bef255c
-SIZE (rust/crates/webpki-root-certs-0.26.7.crate) = 171249
+SHA256 (rust/crates/webpki-root-certs-0.26.10.crate) = c99403924bc5f23afefc319b8ac67ed0e50669f6e52a413314cccb1fdbc93ba0
+SIZE (rust/crates/webpki-root-certs-0.26.10.crate) = 171116
 SHA256 (rust/crates/wfd-0.1.7.crate) = e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8
 SIZE (rust/crates/wfd-0.1.7.crate) = 8825
 SHA256 (rust/crates/wgpu-profiler-0.15.0.crate) = cbdc78911971a06b86a57a9a8e1c861fbc90c62dcbc96bff0b2831c1e853b7bd
 SIZE (rust/crates/wgpu-profiler-0.15.0.crate) = 37833
-SHA256 (rust/crates/which-4.4.2.crate) = 87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7
-SIZE (rust/crates/which-4.4.2.crate) = 15953
-SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311
-SIZE (rust/crates/widestring-1.1.0.crate) = 85046
+SHA256 (rust/crates/which-7.0.3.crate) = 24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762
+SIZE (rust/crates/which-7.0.3.crate) = 18872
+SHA256 (rust/crates/widestring-1.2.0.crate) = dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d
+SIZE (rust/crates/widestring-1.2.0.crate) = 89105
 SHA256 (rust/crates/wiggle-29.0.1.crate) = 4b9af35bc9629c52c261465320a9a07959164928b4241980ba1cf923b9e6751d
 SIZE (rust/crates/wiggle-29.0.1.crate) = 24153
 SHA256 (rust/crates/wiggle-generate-29.0.1.crate) = 2cf267dd05673912c8138f4b54acabe6bd53407d9d1536f0fadb6520dd16e101
@@ -1645,16 +1679,28 @@ SHA256 (rust/crates/windows-core-0.54.0.crate) = 12661b9c89351d684a50a8a643ce5f6
 SIZE (rust/crates/windows-core-0.54.0.crate) = 44015
 SHA256 (rust/crates/windows-core-0.58.0.crate) = 6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99
 SIZE (rust/crates/windows-core-0.58.0.crate) = 41022
+SHA256 (rust/crates/windows-core-0.61.0.crate) = 4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980
+SIZE (rust/crates/windows-core-0.61.0.crate) = 36707
 SHA256 (rust/crates/windows-implement-0.58.0.crate) = 2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b
 SIZE (rust/crates/windows-implement-0.58.0.crate) = 10491
+SHA256 (rust/crates/windows-implement-0.60.0.crate) = a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836
+SIZE (rust/crates/windows-implement-0.60.0.crate) = 15073
 SHA256 (rust/crates/windows-interface-0.58.0.crate) = 053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515
 SIZE (rust/crates/windows-interface-0.58.0.crate) = 11246
+SHA256 (rust/crates/windows-interface-0.59.1.crate) = bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8
+SIZE (rust/crates/windows-interface-0.59.1.crate) = 11735
+SHA256 (rust/crates/windows-link-0.1.1.crate) = 76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38
+SIZE (rust/crates/windows-link-0.1.1.crate) = 6154
 SHA256 (rust/crates/windows-result-0.1.2.crate) = 5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8
 SIZE (rust/crates/windows-result-0.1.2.crate) = 10601
 SHA256 (rust/crates/windows-result-0.2.0.crate) = 1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e
 SIZE (rust/crates/windows-result-0.2.0.crate) = 12756
+SHA256 (rust/crates/windows-result-0.3.2.crate) = c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252
+SIZE (rust/crates/windows-result-0.3.2.crate) = 13399
 SHA256 (rust/crates/windows-strings-0.1.0.crate) = 4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10
 SIZE (rust/crates/windows-strings-0.1.0.crate) = 13832
+SHA256 (rust/crates/windows-strings-0.4.0.crate) = 7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97
+SIZE (rust/crates/windows-strings-0.4.0.crate) = 13939
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
@@ -1717,16 +1763,20 @@ SHA256 (rust/crates/winit-0.28.7.crate) = 9596d90b45384f5281384ab204224876e8e8bf
 SIZE (rust/crates/winit-0.28.7.crate) = 407921
 SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
 SIZE (rust/crates/winnow-0.5.40.crate) = 159316
-SHA256 (rust/crates/winnow-0.6.20.crate) = 36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b
-SIZE (rust/crates/winnow-0.6.20.crate) = 163617
+SHA256 (rust/crates/winnow-0.7.9.crate) = d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3
+SIZE (rust/crates/winnow-0.7.9.crate) = 174763
 SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
 SIZE (rust/crates/winreg-0.50.0.crate) = 29703
 SHA256 (rust/crates/winreg-0.52.0.crate) = a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5
 SIZE (rust/crates/winreg-0.52.0.crate) = 30148
 SHA256 (rust/crates/winres-0.1.12.crate) = b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c
 SIZE (rust/crates/winres-0.1.12.crate) = 19772
-SHA256 (rust/crates/winx-0.36.3.crate) = f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346
-SIZE (rust/crates/winx-0.36.3.crate) = 13696
+SHA256 (rust/crates/winsafe-0.0.19.crate) = d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904
+SIZE (rust/crates/winsafe-0.0.19.crate) = 492820
+SHA256 (rust/crates/winx-0.36.4.crate) = 3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d
+SIZE (rust/crates/winx-0.36.4.crate) = 13838
+SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
+SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241
 SHA256 (rust/crates/wit-parser-0.221.3.crate) = 896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac
 SIZE (rust/crates/wit-parser-0.221.3.crate) = 142585
 SHA256 (rust/crates/witx-0.9.1.crate) = e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b
@@ -1749,10 +1799,10 @@ SHA256 (rust/crates/x11rb-protocol-0.10.0.crate) = 56b245751c0ac9db0e006dc812031
 SIZE (rust/crates/x11rb-protocol-0.10.0.crate) = 419025
 SHA256 (rust/crates/x11rb-protocol-0.13.1.crate) = ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d
 SIZE (rust/crates/x11rb-protocol-0.13.1.crate) = 508522
-SHA256 (rust/crates/xattr-1.3.1.crate) = 8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f
-SIZE (rust/crates/xattr-1.3.1.crate) = 12580
-SHA256 (rust/crates/xcb-1.4.0.crate) = 02e75181b5a62b6eeaa72f303d3cef7dbb841e22885bf6d3e66fe23e88c55dc6
-SIZE (rust/crates/xcb-1.4.0.crate) = 208769
+SHA256 (rust/crates/xattr-1.5.0.crate) = 0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e
+SIZE (rust/crates/xattr-1.5.0.crate) = 14694
+SHA256 (rust/crates/xcb-1.5.0.crate) = f1e2f212bb1a92cd8caac8051b829a6582ede155ccb60b5d5908b81b100952be
+SIZE (rust/crates/xcb-1.5.0.crate) = 209831
 SHA256 (rust/crates/xcursor-0.3.8.crate) = 0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61
 SIZE (rust/crates/xcursor-0.3.8.crate) = 7191
 SHA256 (rust/crates/xdg-2.5.2.crate) = 213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546
@@ -1763,8 +1813,8 @@ SHA256 (rust/crates/xkbcommon-0.5.1.crate) = 52db25b599e92bf6e3904134618728eeb7b
 SIZE (rust/crates/xkbcommon-0.5.1.crate) = 58659
 SHA256 (rust/crates/xkeysym-0.2.1.crate) = b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56
 SIZE (rust/crates/xkeysym-0.2.1.crate) = 103129
-SHA256 (rust/crates/xml-rs-0.8.22.crate) = af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26
-SIZE (rust/crates/xml-rs-0.8.22.crate) = 54737
+SHA256 (rust/crates/xml-rs-0.8.26.crate) = a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda
+SIZE (rust/crates/xml-rs-0.8.26.crate) = 55115
 SHA256 (rust/crates/xmlparser-0.13.6.crate) = 66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4
 SIZE (rust/crates/xmlparser-0.13.6.crate) = 26718
 SHA256 (rust/crates/yasna-0.5.2.crate) = e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd
@@ -1775,28 +1825,32 @@ SHA256 (rust/crates/yoke-derive-0.7.5.crate) = 2380878cad4ac9aac1e2435f3eb4020e8
 SIZE (rust/crates/yoke-derive-0.7.5.crate) = 7525
 SHA256 (rust/crates/zerocopy-0.7.35.crate) = 1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0
 SIZE (rust/crates/zerocopy-0.7.35.crate) = 152645
+SHA256 (rust/crates/zerocopy-0.8.25.crate) = a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb
+SIZE (rust/crates/zerocopy-0.8.25.crate) = 252714
 SHA256 (rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e
 SIZE (rust/crates/zerocopy-derive-0.7.35.crate) = 37829
-SHA256 (rust/crates/zerofrom-0.1.5.crate) = cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e
-SIZE (rust/crates/zerofrom-0.1.5.crate) = 5091
-SHA256 (rust/crates/zerofrom-derive-0.1.5.crate) = 595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808
-SIZE (rust/crates/zerofrom-derive-0.1.5.crate) = 8285
+SHA256 (rust/crates/zerocopy-derive-0.8.25.crate) = 28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef
+SIZE (rust/crates/zerocopy-derive-0.8.25.crate) = 87671
+SHA256 (rust/crates/zerofrom-0.1.6.crate) = 50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5
+SIZE (rust/crates/zerofrom-0.1.6.crate) = 5669
+SHA256 (rust/crates/zerofrom-derive-0.1.6.crate) = d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502
+SIZE (rust/crates/zerofrom-derive-0.1.6.crate) = 8305
 SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
 SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
 SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079
 SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
-SHA256 (rust/crates/zstd-0.13.2.crate) = fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9
-SIZE (rust/crates/zstd-0.13.2.crate) = 30251
-SHA256 (rust/crates/zstd-safe-7.2.1.crate) = 54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059
-SIZE (rust/crates/zstd-safe-7.2.1.crate) = 21122
-SHA256 (rust/crates/zstd-sys-2.0.13+zstd.1.5.6.crate) = 38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa
-SIZE (rust/crates/zstd-sys-2.0.13+zstd.1.5.6.crate) = 749090
+SHA256 (rust/crates/zstd-0.13.3.crate) = e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a
+SIZE (rust/crates/zstd-0.13.3.crate) = 30514
+SHA256 (rust/crates/zstd-safe-7.2.4.crate) = 8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d
+SIZE (rust/crates/zstd-safe-7.2.4.crate) = 29350
+SHA256 (rust/crates/zstd-sys-2.0.15+zstd.1.5.7.crate) = eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237
+SIZE (rust/crates/zstd-sys-2.0.15+zstd.1.5.7.crate) = 774847
 SHA256 (rust/crates/zune-core-0.4.12.crate) = 3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a
 SIZE (rust/crates/zune-core-0.4.12.crate) = 17355
-SHA256 (rust/crates/zune-jpeg-0.4.13.crate) = 16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768
-SIZE (rust/crates/zune-jpeg-0.4.13.crate) = 62999
+SHA256 (rust/crates/zune-jpeg-0.4.14.crate) = 99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028
+SIZE (rust/crates/zune-jpeg-0.4.14.crate) = 63388
 SHA256 (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = cc8baf32868d7c0d52a8c9dea7beaf5f3226433147a63e3a118a3cd710109263
 SIZE (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = 4886
 SHA256 (DaforLynx-kira-v0.10.6-with-config_GH0.tar.gz) = 64abdb203bbcf1c0f572cabcf09dce8417b2ecd10c9b0d23accc46b3aab38755
@@ -1815,5 +1869,5 @@ SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.g
 SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210
 SHA256 (veloren-conrod-c74446362371dc837b8b4b6d6ddcd7693b48d9b6_GL0.tar.gz) = 43f0faa196eb33341c8e9952da17876649dd3aade44fd357a3a098eaaeb78e9d
 SIZE (veloren-conrod-c74446362371dc837b8b4b6d6ddcd7693b48d9b6_GL0.tar.gz) = 808402
-SHA256 (veloren-v0.17.0-725-g428a1b332e.tar.bz2) = f9b55fef29ca23acdd41fc797e787428e4c27b3147d44791e0417c7a0386ffda
-SIZE (veloren-v0.17.0-725-g428a1b332e.tar.bz2) = 325860612
+SHA256 (veloren-v0.17.0-745-g8c44357c9d.tar.bz2) = 5f64699e7d5ed14c9b025fde2eb5216e15ce81fd4ed6e3daa9a42576ff914db6
+SIZE (veloren-v0.17.0-745-g8c44357c9d.tar.bz2) = 325793526
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index 6e9db2c2ec5a..afe17dcac92f 100644
--- a/games/veloren-weekly/files/patch-gilrs
+++ b/games/veloren-weekly/files/patch-gilrs
@@ -23,9 +23,9 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
    |                |      help: a similar name exists in the module: `event`
    |                no `epoll` in `sys`
 
---- Cargo.lock.orig	2025-02-13 06:43:28 UTC
+--- Cargo.lock.orig	2025-05-07 12:24:01 UTC
 +++ Cargo.lock
-@@ -2629,9 +2629,9 @@ dependencies = [
+@@ -2622,9 +2622,9 @@ dependencies = [
  
  [[package]]
  name = "gilrs"
@@ -37,14 +37,14 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "fnv",
   "gilrs-core",
-@@ -2643,18 +2643,17 @@ dependencies = [
+@@ -2636,24 +2636,23 @@ dependencies = [
  
  [[package]]
  name = "gilrs-core"
--version = "0.6.1"
+-version = "0.6.4"
 +version = "0.5.7"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0ed2326d21aa97752d41b2c195aee1d99cd84456ff4d5a7f5e6e1cdbd3dcb0b8"
+-checksum = "a6d95ae10ce5aa99543a28cf74e41c11f3b9e3c14f0452bbde46024753cd683e"
 +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
  dependencies = [
 - "core-foundation 0.10.0",
@@ -60,7 +60,14 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "serde",
   "uuid",
   "vec_map",
-@@ -3556,9 +3555,9 @@ dependencies = [
+  "wasm-bindgen",
+  "web-sys",
+- "windows 0.61.1",
++ "windows 0.51.1",
+ ]
+ 
+ [[package]]
+@@ -3539,9 +3538,9 @@ dependencies = [
  
  [[package]]
  name = "io-kit-sys"
@@ -72,7 +79,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "core-foundation-sys",
   "mach2",
-@@ -4388,6 +4387,17 @@ dependencies = [
+@@ -4364,6 +4363,17 @@ dependencies = [
   "memoffset 0.6.5",
  ]
  
@@ -90,6 +97,78 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  [[package]]
  name = "nix"
  version = "0.29.0"
+@@ -7560,7 +7570,7 @@ version = "1.6.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+ dependencies = [
+- "cfg-if 1.0.0",
++ "cfg-if 0.1.10",
+  "rand 0.8.5",
+  "static_assertions",
+ ]
+@@ -9342,28 +9352,6 @@ dependencies = [
+  "windows-targets 0.52.6",
+ ]
+ 
+-[[package]]
+-name = "windows"
+-version = "0.61.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
+-dependencies = [
+- "windows-collections",
+- "windows-core 0.61.0",
+- "windows-future",
+- "windows-link",
+- "windows-numerics",
+-]
+-
+-[[package]]
+-name = "windows-collections"
+-version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+-dependencies = [
+- "windows-core 0.61.0",
+-]
+-
+ [[package]]
+ name = "windows-core"
+ version = "0.51.1"
+@@ -9409,16 +9397,6 @@ dependencies = [
+  "windows-strings 0.4.0",
+ ]
+ 
+-[[package]]
+-name = "windows-future"
+-version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
+-dependencies = [
+- "windows-core 0.61.0",
+- "windows-link",
+-]
+-
+ [[package]]
+ name = "windows-implement"
+ version = "0.58.0"
+@@ -9469,16 +9447,6 @@ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+ 
+-[[package]]
+-name = "windows-numerics"
+-version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+-dependencies = [
+- "windows-core 0.61.0",
+- "windows-link",
+-]
+-
+ [[package]]
+ name = "windows-result"
+ version = "0.1.2"
 --- cargo-crates/gilrs-0.10.2/examples/ev.rs.orig	1970-01-01 00:00:00 UTC
 +++ cargo-crates/gilrs-0.10.2/examples/ev.rs
 @@ -9,6 +9,8 @@ use std::process;
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
deleted file mode 100644
index dd9aef8bb0ee..000000000000
--- a/games/xjewel/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-PORTNAME=	xjewel
-PORTVERSION=	1.6
-PORTREVISION=	8
-CATEGORIES=	games
-MASTER_SITES=	XCONTRIB/../R5contrib
-EXTRACT_SUFX=	.tar.z
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	X11 dropping jewels game
-
-LICENSE=	NONE
-
-DEPRECATED=	Unmaintained as last release was in 1994
-EXPIRATION_DATE=	2025-05-01
-
-BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
-		mkfontscale>=0:x11-fonts/mkfontscale
-
-USES=		fonts imake xorg
-USE_XORG=	x11 xext
-
-DESKTOP_ENTRIES="XJewel" "" "" "${PORTNAME}" "" ""
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	(cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} seven_seg.pcf.gz \
-		${STAGEDIR}${FONTSDIR})
-
-.include <bsd.port.post.mk>
diff --git a/games/xjewel/distinfo b/games/xjewel/distinfo
deleted file mode 100644
index bdfebb494bee..000000000000
--- a/games/xjewel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xjewel-1.6.tar.z) = 343cb7e92331c41052e0c594817fda9ef12637a8237bafbf4bdf84f362fce153
-SIZE (xjewel-1.6.tar.z) = 45439
diff --git a/games/xjewel/files/patch-aa b/games/xjewel/files/patch-aa
deleted file mode 100644
index f579820a6ad9..000000000000
--- a/games/xjewel/files/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
---- Imakefile.orig	Wed Feb 16 19:35:06 1994
-+++ Imakefile	Fri Feb 11 13:57:31 2000
-@@ -1,11 +1,12 @@
- # A little makeyfile edit up to the solid line...
- 
- # EDIT THE CDEBUGFLAGS IF -O GIVES A PROBLEM
--CDEBUGFLAGS = -O  
-+# CDEBUGFLAGS = -O  
- 
- # CHANGE HSCORE_FILE TO SUIT
- #HSCORE_FILE=/usr/local/lib/xjewel.scores
--HSCORE_FILE=xjewel.scores
-+HSCORE_DIR=$(LIBDIR)/xjewel
-+HSCORE_FILE=$(HSCORE_DIR)/xjewel.scores
- 
- # ADD YOUR ARCHITECTURE IF YOU USE SELECT INSTEAD OF POLL
- #if defined(HPArchitecture) || defined(ApolloArchitecture) || \
-@@ -21,10 +22,10 @@
- # DEFINE 'GETPWENT' if you dont have the cuserid ftn (hscore.c)
- # DEFINE 'SLOW_FONTS=n' if your server is overly fast on fonts
- # DEFINE 'SLOW_DRAW=n' if your server is overly fast on drawing
--USERDEFS = -DICON_WINDOW
-+USERDEFS = -DICON_WINDOW -DUSE_SELECT -DGETPWENT
- 
- # CHANGE FFILE TO REFLECT THE EXTENSION USED FOR COMPILED FONTS
--FFILE = snf
-+FFILE = pcf.gz
- 
- ##############################################################################
- # X-STUFF...
-@@ -40,6 +41,8 @@
- FONT   = bitmaps/seven_seg
- CFONT   = bitmaps/seven_seg.$(FFILE)
- 
-+MANDIR = $(MANPATH)/man6
-+MANSUFFIX = 6
- 
- # LETS GET TO IT...
- ComplexProgramTarget(xjewel)
-@@ -52,5 +55,6 @@
- all:: $(CFONT)
- 
- install::
--	touch  $(HSCORE_FILE)
--	chmod a+w $(HSCORE_FILE)
-+	MakeDir($(DESTDIR)$(HSCORE_DIR))
-+	touch  $(DESTDIR)$(HSCORE_FILE)
-+	chmod a+w $(DESTDIR)$(HSCORE_FILE)
diff --git a/games/xjewel/pkg-descr b/games/xjewel/pkg-descr
deleted file mode 100644
index 3cc431615cf7..000000000000
--- a/games/xjewel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Xjewel is a dropping block game akin to tetris.
-
-It is played by controlling the motion of blocks which continue to fall from
-the top of the screen.  One can move them left and right, as well as
-rotate the jewel segments.  The object is to get the most points before
-the grim reaper ends the fun.
-
-Death happens when the screen is no longer capable of holding any more
-blocks.  To make high scores more interesting, you are given but three
-attempts to get points -- use them wisely.
-
-As the game progresses, and more jewels are removed, the speed of the game
-will increase.  This is measured in seconds of delay between steps of
-block motion.
diff --git a/games/xjewel/pkg-plist b/games/xjewel/pkg-plist
deleted file mode 100644
index d5e7513d319c..000000000000
--- a/games/xjewel/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/xjewel
-lib/X11/xjewel/xjewel.scores
-share/man/man6/xjewel.6.gz
-%%FONTSDIR%%/seven_seg.pcf.gz
diff --git a/graphics/Makefile b/graphics/Makefile
index 597daa073dd3..6c47b3e8a4c7 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -43,7 +43,6 @@
     SUBDIR += a2png
     SUBDIR += aalib
     SUBDIR += aaphoto
-    SUBDIR += acidwarp-sdl
     SUBDIR += aeskulap
     SUBDIR += agg
     SUBDIR += airsaned
@@ -1018,6 +1017,7 @@
     SUBDIR += py-svg.path
     SUBDIR += py-svgelements
     SUBDIR += py-svgwrite
+    SUBDIR += py-term-image
     SUBDIR += py-termtosvg
     SUBDIR += py-tifffile
     SUBDIR += py-tkcolorpicker
@@ -1060,7 +1060,6 @@
     SUBDIR += qtpbfimageplugin
     SUBDIR += qtqr
     SUBDIR += quat
-    SUBDIR += quat-gui
     SUBDIR += quesa
     SUBDIR += quesoglc
     SUBDIR += quickqanava
diff --git a/graphics/acidwarp-sdl/Makefile b/graphics/acidwarp-sdl/Makefile
deleted file mode 100644
index bd745bf3f8ba..000000000000
--- a/graphics/acidwarp-sdl/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PORTNAME=	acidwarp-sdl
-PORTVERSION=	g2022112701
-PORTREVISION=	2
-CATEGORIES=	graphics
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Eye candy program which displays various patterns
-WWW=		https://github.com/dreamlayers/acidwarp
-
-DEPRECATED=		Unmaintained by upstream as last release was in 2022
-EXPIRATION_DATE=	2025-05-03
-
-USES=		cmake magick:7,build sdl
-USE_GITHUB=	yes
-GH_ACCOUNT=	dreamlayers
-GH_PROJECT=	acidwarp
-GH_TAGNAME=	c48e1e2
-USE_SDL=	sdl2
-
-# Fix build on recent current (clang11)
-CFLAGS+=	-fcommon
-
-PORTSCOUT=	skipv:svgalib-port,original,old-sdl-port
-
-PLIST_FILES=	bin/acidwarp \
-		share/applications/acidwarp.desktop \
-		share/pixmaps/acidwarp.png
-
-post-patch:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/acidwarp.desktop
-
-do-install:
-	${STRIP_CMD} ${WRKSRC}/bin/acidwarp
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/acidwarp ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/acidwarp.desktop ${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/acidwarp.png ${STAGEDIR}${PREFIX}/share/pixmaps
-
-.include <bsd.port.mk>
diff --git a/graphics/acidwarp-sdl/distinfo b/graphics/acidwarp-sdl/distinfo
deleted file mode 100644
index f86c09d1188c..000000000000
--- a/graphics/acidwarp-sdl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1681496904
-SHA256 (dreamlayers-acidwarp-g2022112701-c48e1e2_GH0.tar.gz) = 20c54400eda59c357358ce39a66fb047d463495e0afca96a91858d42e8a36444
-SIZE (dreamlayers-acidwarp-g2022112701-c48e1e2_GH0.tar.gz) = 65398
diff --git a/graphics/acidwarp-sdl/files/patch-acidwarp.desktop b/graphics/acidwarp-sdl/files/patch-acidwarp.desktop
deleted file mode 100644
index b99fb6741a82..000000000000
--- a/graphics/acidwarp-sdl/files/patch-acidwarp.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- acidwarp.desktop.orig	2017-05-13 15:07:16 UTC
-+++ acidwarp.desktop
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=Acidwarp
- GenericName=View color cycling patterns
--Icon=acidwarp
-+Icon=%%PREFIX%%/share/pixmaps/acidwarp.png
- Exec=acidwarp
- Terminal=false
- Type=Application
diff --git a/graphics/acidwarp-sdl/pkg-descr b/graphics/acidwarp-sdl/pkg-descr
deleted file mode 100644
index c2c69d3b0cf3..000000000000
--- a/graphics/acidwarp-sdl/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Acidwarp is an eye candy program which displays various patterns and animates
-them by changing the palette.
diff --git a/graphics/egl-wayland/Makefile b/graphics/egl-wayland/Makefile
index e0c2cd158f82..65275804f343 100644
--- a/graphics/egl-wayland/Makefile
+++ b/graphics/egl-wayland/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	egl-wayland
-DISTVERSION=	1.1.18
+DISTVERSION=	1.1.19
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/egl-wayland/distinfo b/graphics/egl-wayland/distinfo
index de0ee40aa336..2fd8302a4285 100644
--- a/graphics/egl-wayland/distinfo
+++ b/graphics/egl-wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741109035
-SHA256 (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = c561485ee65efb7ffb0dbedd6c7031f0be69c861efa63f831c8b6c3178a0f871
-SIZE (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = 75759
+TIMESTAMP = 1745359337
+SHA256 (NVIDIA-egl-wayland-1.1.19_GH0.tar.gz) = b9a63e59eb552ef925b9fda96e466457edfe4b7728dd861ee06152b064edccdf
+SIZE (NVIDIA-egl-wayland-1.1.19_GH0.tar.gz) = 76156
diff --git a/graphics/egl-wayland/pkg-plist b/graphics/egl-wayland/pkg-plist
index 3f84595de30a..dfd8b85772f4 100644
--- a/graphics/egl-wayland/pkg-plist
+++ b/graphics/egl-wayland/pkg-plist
@@ -1,6 +1,6 @@
 lib/libnvidia-egl-wayland.so
 lib/libnvidia-egl-wayland.so.1
-lib/libnvidia-egl-wayland.so.1.1.18
+lib/libnvidia-egl-wayland.so.1.1.19
 libdata/pkgconfig/wayland-eglstream-protocols.pc
 libdata/pkgconfig/wayland-eglstream.pc
 share/egl/egl_external_platform.d/10_nvidia_wayland.json
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index 6dca3bf2bbfc..d76064686499 100644
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libraw
-PORTVERSION=	0.21.3
+PORTVERSION=	0.21.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libraw.org/data/
 DISTNAME=	LibRaw-${PORTVERSION}
diff --git a/graphics/libraw/distinfo b/graphics/libraw/distinfo
index dd227a3f99eb..f1e292706193 100644
--- a/graphics/libraw/distinfo
+++ b/graphics/libraw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727596731
-SHA256 (LibRaw-0.21.3.tar.gz) = dba34b7fc1143503942fa32ad9db43e94f714e62a4a856e91617f8f3e1e0aa5c
-SIZE (LibRaw-0.21.3.tar.gz) = 1483982
+TIMESTAMP = 1746428534
+SHA256 (LibRaw-0.21.4.tar.gz) = 6be43f19397e43214ff56aab056bf3ff4925ca14012ce5a1538a172406a09e63
+SIZE (LibRaw-0.21.4.tar.gz) = 1383350
diff --git a/graphics/libspiro/Makefile b/graphics/libspiro/Makefile
index 28f7df6e2560..153be80010d5 100644
--- a/graphics/libspiro/Makefile
+++ b/graphics/libspiro/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libspiro
-DISTVERSION=	20221101
-PORTREVISION=	1
+DISTVERSION=	20240903
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/fontforge/${PORTNAME}/releases/download/${DISTVERSION}/
@@ -18,7 +17,6 @@ CPE_VENDOR=	libspiro_project
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 INSTALL_TARGET=	install-strip
 
diff --git a/graphics/libspiro/distinfo b/graphics/libspiro/distinfo
index 0803f6126290..61a91fd72043 100644
--- a/graphics/libspiro/distinfo
+++ b/graphics/libspiro/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669666198
-SHA256 (libspiro-dist-20221101.tar.gz) = 5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be
-SIZE (libspiro-dist-20221101.tar.gz) = 434906
+TIMESTAMP = 1746383693
+SHA256 (libspiro-dist-20240903.tar.gz) = 1412a21b943c6e1db834ee2d74145aad20b3f62b12152d475613b8241d9cde10
+SIZE (libspiro-dist-20240903.tar.gz) = 436645
diff --git a/graphics/libspiro/pkg-plist b/graphics/libspiro/pkg-plist
index 761cd0cb41e0..86560f0dab81 100644
--- a/graphics/libspiro/pkg-plist
+++ b/graphics/libspiro/pkg-plist
@@ -4,6 +4,6 @@ include/spiroentrypoints.h
 lib/libspiro.a
 lib/libspiro.so
 lib/libspiro.so.1
-lib/libspiro.so.1.0.3
+lib/libspiro.so.1.0.5
 libdata/pkgconfig/libspiro.pc
 share/man/man3/libspiro.3.gz
diff --git a/graphics/nvidia-drm-510-kmod/distinfo b/graphics/nvidia-drm-510-kmod/distinfo
index c8ed5dc3797c..636dc4e10eef 100644
--- a/graphics/nvidia-drm-510-kmod/distinfo
+++ b/graphics/nvidia-drm-510-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1740840763
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+TIMESTAMP = 1745331131
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
 SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa
 SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338
diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile
index 14b6e873c4e1..d5a90446b443 100644
--- a/graphics/nvidia-drm-515-kmod/Makefile
+++ b/graphics/nvidia-drm-515-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-drm-515-kmod
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 BUILD_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-515-kmod
diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo
index 1a7ac208c82f..852fb8a00713 100644
--- a/graphics/nvidia-drm-515-kmod/distinfo
+++ b/graphics/nvidia-drm-515-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1741856037
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+TIMESTAMP = 1745331417
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
 SHA256 (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 85914f9a39c6919d9a725a3252ea541d11394c3051a3600707fa6d865a082728
 SIZE (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 26098303
diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile
index dff6b8de6435..5911897de8d5 100644
--- a/graphics/nvidia-drm-61-kmod/Makefile
+++ b/graphics/nvidia-drm-61-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-drm-61-kmod
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 BUILD_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-61-kmod
diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo
index 02e09552a6e8..74832cec734b 100644
--- a/graphics/nvidia-drm-61-kmod/distinfo
+++ b/graphics/nvidia-drm-61-kmod/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1745474929
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
 SHA256 (freebsd-drm-kmod-drm_v6.1.128_2_GH0.tar.gz) = fe9d37f3b7c010c781b054a55b23b19b38eb3c5673234b186e0d392be2838c4d
 SIZE (freebsd-drm-kmod-drm_v6.1.128_2_GH0.tar.gz) = 37107528
diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile
index 07d0984a2fc5..8e54fc452836 100644
--- a/graphics/nvidia-drm-66-kmod/Makefile
+++ b/graphics/nvidia-drm-66-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-drm-66-kmod
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 BUILD_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-66-kmod
diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo
index 884a4673f367..5ea3aa0045ff 100644
--- a/graphics/nvidia-drm-66-kmod/distinfo
+++ b/graphics/nvidia-drm-66-kmod/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1745475021
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
 SHA256 (freebsd-drm-kmod-drm_v6.6.25_3_GH0.tar.gz) = b12d5375df0aae8804e869d9d30efbcffebe5848981700144719a9c86fa48409
 SIZE (freebsd-drm-kmod-drm_v6.6.25_3_GH0.tar.gz) = 38487651
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
index fa81b93fbaa2..7f87a3661b0b 100644
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -6,7 +6,7 @@ WWW=		https://www.nvidia.com/object/unix.html
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${NVIDIA_DISTVERSION}:nvidia \
 				https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_GH_TAGNAME}?dummy=/:drm
 DISTVERSION?=   ${NVIDIA_DISTVERSION}
-PORTREVISION=	1
+PORTREVISION?=	0
 DISTFILES=		NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}${EXTRACT_SUFX}:nvidia \
 				freebsd-drm-kmod-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm
 
@@ -59,6 +59,20 @@ post-patch:
 	${REINPLACE_CMD} -e 's:bool nv_drm_fbdev_module_param = true;:bool nv_drm_fbdev_module_param = false;:' \
 		${WRKSRC}/nvidia-drm-os-interface.c
 .endif
+	# Workaround for build failure on 575.51.02.
+	# --- nvidia-drm-drv.o ---
+	# nvidia-drm-drv.c:386:80: error: cast from 'const void *' to 'struct nv_drm_mst_display_info *' drops const qualifier [-Werror,-Wcast-qual]
+	#   386 |     struct nv_drm_mst_display_info *l_info = (struct nv_drm_mst_display_info *)l;
+	#       |                                                                                ^
+	# nvidia-drm-drv.c:387:80: error: cast from 'const void *' to 'struct nv_drm_mst_display_info *' drops const qualifier [-Werror,-Wcast-qual]
+	#   387 |     struct nv_drm_mst_display_info *r_info = (struct nv_drm_mst_display_info *)r;
+	#       |                                                                                ^
+.if ${NVVERSION} >= 575.00000
+	${REINPLACE_CMD} -e 's:struct nv_drm_mst_display_info \*l_info = (struct nv_drm_mst_display_info:const struct nv_drm_mst_display_info \*l_info = (const struct nv_drm_mst_display_info:' \
+		${WRKSRC}/nvidia-drm-drv.c
+	${REINPLACE_CMD} -e 's:struct nv_drm_mst_display_info \*r_info = (struct nv_drm_mst_display_info:const struct nv_drm_mst_display_info \*r_info = (const struct nv_drm_mst_display_info:' \
+		${WRKSRC}/nvidia-drm-drv.c
+.endif
 	# We should support -CURRENT: kill the check (first #if __FreeBSD_version)
 	linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
 			${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 928175de9077..15672e8a0bcb 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 TEST_DEPENDS=	googletest>0:devel/googletest
 #RUN_DEPENDS=	proj-data>=0:graphics/proj-data
 
-USES=		compiler:c++11-lang cmake:testing cpe pathfix pkgconfig sqlite
+USES=		compiler:c++17-lang cmake:testing cpe pathfix pkgconfig sqlite
 CPE_VENDOR=	proj_project
 USE_LDCONFIG=	yes
 
diff --git a/graphics/py-term-image/Makefile b/graphics/py-term-image/Makefile
new file mode 100644
index 000000000000..2c23c964d8c9
--- /dev/null
+++ b/graphics/py-term-image/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	term-image
+DISTVERSION=	0.7.2
+CATEGORIES=	graphics python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	term_image-${DISTVERSION}
+
+MAINTAINER=	nxjoseph@protonmail.com
+COMMENT=	Display images in the terminal with Python
+WWW=		https://github.com/AnonymouX47/term-image \
+		https://pypi.org/project/term-image
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=9.1:graphics/py-pillow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.23<3:www/py-requests@${PY_FLAVOR}
+
+USES=		python:3.7+
+USE_PYTHON=	autoplist distutils flavors
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/graphics/py-term-image/distinfo b/graphics/py-term-image/distinfo
new file mode 100644
index 000000000000..5aaf29ef068e
--- /dev/null
+++ b/graphics/py-term-image/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1741385726
+SHA256 (term_image-0.7.2.tar.gz) = 07320573baa667dcde145d55e94769cbaafeea43b61245245153ff5075b55ffb
+SIZE (term_image-0.7.2.tar.gz) = 63946
diff --git a/graphics/py-term-image/pkg-descr b/graphics/py-term-image/pkg-descr
new file mode 100644
index 000000000000..b55a590cef49
--- /dev/null
+++ b/graphics/py-term-image/pkg-descr
@@ -0,0 +1,5 @@
+term-image is a Python utility that enables the display of images directly
+within the terminal, providing a unique and innovative way to view images
+without leaving the command line interface. It supports various image
+formats and can be used in a range of applications, from simple image
+viewing to more complex terminal-based projects.
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
deleted file mode 100644
index 38e5ed31b5a2..000000000000
--- a/graphics/quat-gui/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-PORTNAME=	quat
-DISTVERSION=	1.20
-PORTREVISION=	18
-CATEGORIES=	graphics
-MASTER_SITES=	https://www.physcip.uni-stuttgart.de/pages/~phy11733/download/
-PKGNAMESUFFIX=	-gui
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Three-dimensional fractal creator (X11 GUI)
-WWW=		https://www.physcip.uni-stuttgart.de/pages/~phy11733/index_e.html
-
-LICENSE=	GPLv2+
-
-DEPRECATED=	Last upstream release was in 2003
-EXPIRATION_DATE=	2025-05-05
-
-LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
-
-USES=		gl localbase:ldflags xorg
-USE_GL=		gl glut
-USE_XORG=	xext
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/doc
-CONFIGURE_ENV=	FLUID="${LOCALBASE}/bin/fluid"
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-DESKTOP_ENTRIES="Quat" "3D Fractal Generator" "" "${PORTNAME}" "" ""
-
-PLIST_FILES=	bin/quat
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
-
-OPTIMIZED_CFLAGS_CFLAGS=	-O3 -ffast-math
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -E -e \
-		's,-(march=pentium|O3|ffast-math),,g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -E -e \
-		's|-I\.[[:space:]]+-I\$$\(srcdir\)[[:space:]]+||' \
-		${WRKSRC}/gui/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|<FL/fl_file_chooser.H>|<FL/Fl_File_Chooser.H>| ; \
-		 s|/doc/quat/|/doc/${PKGBASE}/|' \
-		${WRKSRC}/gui/MainWindow.cxx
-# disable data file installation since distfile does not do
-# The Right Thing(TM)
-	@${REINPLACE_CMD} -E -e \
-		's|^(install-data-am:).*$$|\1| ; \
-		 s|^(SUBDIRS.*)doc|\1|' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|@PACKAGE@|${PKGBASE}|' \
-		${WRKSRC}/doc/Makefile.in
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-
-.include <bsd.port.post.mk>
diff --git a/graphics/quat-gui/distinfo b/graphics/quat-gui/distinfo
deleted file mode 100644
index 5be1ea282bbe..000000000000
--- a/graphics/quat-gui/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (quat-1.20.tar.gz) = 0c18262944507559a91615c0e02e3560279817544fd596051d3f1ab452566331
-SIZE (quat-1.20.tar.gz) = 474448
diff --git a/graphics/quat-gui/pkg-descr b/graphics/quat-gui/pkg-descr
deleted file mode 100644
index c97d2cac9751..000000000000
--- a/graphics/quat-gui/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Idea and purpose of this program is the calculation of three-dimensional
-fractals. The calculated objects are twisted, freely in space
-floating (and - of course - fractal) "lumps" which look like made
-of dough - in contrast to what is normally called "three-dimensional"
-fractals (namely a simple reinterpretation of the two-dimensional
-data).
-
-Generation of a really three dimensional view is possible (3d
-stereo). The fractal can be seen three dimensional without any
-utilities like 3d glasses.
diff --git a/graphics/svgbob/Makefile b/graphics/svgbob/Makefile
index 473fb8f498d3..fbdf84d7d74a 100644
--- a/graphics/svgbob/Makefile
+++ b/graphics/svgbob/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	0.7.1
 PORTREVISION=	18
 CATEGORIES=	graphics
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert ASCII diagrams to SVG
 WWW=		https://github.com/ivanceras/svgbob
 
diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile
index 24a6409dd900..99d3206b2ff4 100644
--- a/graphics/vulkan-headers/Makefile
+++ b/graphics/vulkan-headers/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vulkan-headers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.313
+DISTVERSION=	1.4.314
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo
index 0b77723730c0..a72e1394269f 100644
--- a/graphics/vulkan-headers/distinfo
+++ b/graphics/vulkan-headers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744969034
-SHA256 (KhronosGroup-Vulkan-Headers-v1.4.313_GH0.tar.gz) = f3298b8dc620530493296759858a69b622f98ececa0e8c75488ad2000778148f
-SIZE (KhronosGroup-Vulkan-Headers-v1.4.313_GH0.tar.gz) = 2635494
+TIMESTAMP = 1746440236
+SHA256 (KhronosGroup-Vulkan-Headers-v1.4.314_GH0.tar.gz) = da32bccb312ddbc69519ee248ea222723083441e9d59bde4381c76bde8ad9dba
+SIZE (KhronosGroup-Vulkan-Headers-v1.4.314_GH0.tar.gz) = 2638206
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index 558a6cb1b7a6..138c9c26b30f 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	vulkan-loader
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.313
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index 223000208b8b..a7c41a78fe2e 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	vulkan-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.313
-PORTREVISION=	1
+DISTVERSION=	1.4.314
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -17,7 +16,6 @@ USES=		alias cmake compiler:c++11-lib pkgconfig python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Tools
-GH_TUPLE=	zeux:volk:1.4.304-33-g43c29e6:volk/volk
 CMAKE_OFF=	BUILD_ICD
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}"
 
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index 8e6a285dc9be..cf5bb9673502 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1745004285
-SHA256 (KhronosGroup-Vulkan-Tools-v1.4.313_GH0.tar.gz) = 930204695706d0f09075bbe26d935986fad3d63840254cecf751de5ad26ea155
-SIZE (KhronosGroup-Vulkan-Tools-v1.4.313_GH0.tar.gz) = 792944
-SHA256 (zeux-volk-1.4.304-33-g43c29e6_GH0.tar.gz) = f01b1d2c9f2cda0bddddc0449195b83b065abe0fb214c6062adb802b603d3c4b
-SIZE (zeux-volk-1.4.304-33-g43c29e6_GH0.tar.gz) = 69702
+TIMESTAMP = 1746478854
+SHA256 (KhronosGroup-Vulkan-Tools-v1.4.314_GH0.tar.gz) = 720f10e8e5a8a816e869ab120a094480ba64c5a025822e88c5766c7938a435e0
+SIZE (KhronosGroup-Vulkan-Tools-v1.4.314_GH0.tar.gz) = 799525
diff --git a/graphics/vulkan-tools/files/patch-CMakeLists.txt b/graphics/vulkan-tools/files/patch-CMakeLists.txt
deleted file mode 100644
index 15ce58b975b5..000000000000
--- a/graphics/vulkan-tools/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-CMake Error at cube/CMakeLists.txt:237 (target_link_libraries):
-  Target "vkcube" links to:
-
-    volk::volk_headers
-
-  but the target was not found.  Possible reasons include:
-
-    * There is a typo in the target name.
-    * A find_package call is missing for an IMPORTED target.
-    * An ALIAS target is missing.
-
---- CMakeLists.txt.orig	2024-07-12 20:26:06 UTC
-+++ CMakeLists.txt
-@@ -56,7 +56,10 @@ find_package(VulkanHeaders QUIET REQUIRED CONFIG)
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- 
- find_package(VulkanHeaders QUIET REQUIRED CONFIG)
--find_package(volk QUIET REQUIRED CONFIG)
-+find_package(volk QUIET CONFIG)
-+if (NOT TARGET volk::volk_headers)
-+    add_subdirectory(volk EXCLUDE_FROM_ALL SYSTEM)
-+endif()
- if ((APPLE OR BUILD_TESTS) AND NOT ANDROID)
-     find_package(VulkanLoader QUIET REQUIRED CONFIG)
- endif()
diff --git a/graphics/vulkan-utility-libraries/Makefile b/graphics/vulkan-utility-libraries/Makefile
index f77fd43fce10..7fcef30d4409 100644
--- a/graphics/vulkan-utility-libraries/Makefile
+++ b/graphics/vulkan-utility-libraries/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vulkan-utility-libraries
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.313
+DISTVERSION=	1.4.314
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-utility-libraries/distinfo b/graphics/vulkan-utility-libraries/distinfo
index 987cb6c73614..3affa11230fe 100644
--- a/graphics/vulkan-utility-libraries/distinfo
+++ b/graphics/vulkan-utility-libraries/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745001821
-SHA256 (KhronosGroup-Vulkan-Utility-Libraries-v1.4.313_GH0.tar.gz) = c6422e4b7940ffb71475a3490fef5d2bf24d1206dbcc1486fe8c7151a537d268
-SIZE (KhronosGroup-Vulkan-Utility-Libraries-v1.4.313_GH0.tar.gz) = 581153
+TIMESTAMP = 1746475257
+SHA256 (KhronosGroup-Vulkan-Utility-Libraries-v1.4.314_GH0.tar.gz) = aad807bfe8fe5b1a442204c9daf935be9e3b9973004b05e5df98ca94ea9f0882
+SIZE (KhronosGroup-Vulkan-Utility-Libraries-v1.4.314_GH0.tar.gz) = 581048
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index 64ebab79df82..919fa5bfffbe 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.313
-PORTREVISION=	1
+DISTVERSION=	1.4.314
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -19,7 +18,7 @@ USES=		alias cmake compiler:c++11-lib pkgconfig python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ValidationLayers
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-410-g7c2f533:headers/SPIRV-Headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-411-gaa6cef1:headers/SPIRV-Headers
 CMAKE_OFF=	BUILD_TESTS
 
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo
index b680ead4cc32..24536a174e4e 100644
--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745007820
-SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.4.313_GH0.tar.gz) = 5cc663032112630e058434305e2135d83d9e616a139d78e80c37921738a8566d
-SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.4.313_GH0.tar.gz) = 6347404
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-410-g7c2f533_GH0.tar.gz) = 5b7fb8f78d641ae2c896db07ebadab533704a352e9a5c1bbc668cc30cca85c2f
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-410-g7c2f533_GH0.tar.gz) = 546667
+TIMESTAMP = 1746485755
+SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.4.314_GH0.tar.gz) = 147e52f6782119170621b71c55e2ff72fc653f088b6ebc99e0ea27f7ebd89d04
+SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.4.314_GH0.tar.gz) = 6359689
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-411-gaa6cef1_GH0.tar.gz) = 3ac06fbcb63382f5dd2e24d45e8d2e93981858a07c38a4edf24f47f9d7fd254e
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-411-gaa6cef1_GH0.tar.gz) = 547604
diff --git a/graphics/waifu2x-ncnn-vulkan/Makefile b/graphics/waifu2x-ncnn-vulkan/Makefile
index bb7b4baea117..092c29497efe 100644
--- a/graphics/waifu2x-ncnn-vulkan/Makefile
+++ b/graphics/waifu2x-ncnn-vulkan/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	waifu2x-ncnn-vulkan
-DISTVERSION=	20220728
+DISTVERSION=	20250504
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -10,14 +10,14 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
-LIB_DEPENDS=	libwebp.so:graphics/webp \
-		libvulkan.so:graphics/vulkan-loader
+LIB_DEPENDS=	libwebp.so:graphics/webp
+RUN_DEPENDS=	${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
 
 USES=		cmake compiler:${OPENMP}c++11-lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	nihui
-GH_TUPLE=	KhronosGroup:glslang:11.9.0-19-g86ff4bca:glslang/src/ncnn/glslang \
-		Tencent:ncnn:20220721-10-gb4ba207c:ncnn/src/ncnn
+GH_TUPLE=	KhronosGroup:glslang:15.1.0-52-ga9ac7d5f:glslang/src/ncnn/glslang \
+		Tencent:ncnn:20250503:ncnn/src/ncnn
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 CMAKE_ON=	USE_SYSTEM_WEBP
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/graphics/waifu2x-ncnn-vulkan/distinfo b/graphics/waifu2x-ncnn-vulkan/distinfo
index cba4dc3d1520..eca8a880fe8f 100644
--- a/graphics/waifu2x-ncnn-vulkan/distinfo
+++ b/graphics/waifu2x-ncnn-vulkan/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1659015177
-SHA256 (nihui-waifu2x-ncnn-vulkan-20220728_GH0.tar.gz) = c3dcd3b4e3ebb7ac64ddfc0714c065432dbf385a1928fb95d6dea5cc307ced47
-SIZE (nihui-waifu2x-ncnn-vulkan-20220728_GH0.tar.gz) = 34076924
-SHA256 (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = f7a19b57af200feeba77a5cc010fc031ba47c32287cb1438440ad32628fb798a
-SIZE (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = 3535721
-SHA256 (Tencent-ncnn-20220721-10-gb4ba207c_GH0.tar.gz) = 30cf8c702d4805bbefc990d622293d3a93d36c8328977c2e28d6cc1846786396
-SIZE (Tencent-ncnn-20220721-10-gb4ba207c_GH0.tar.gz) = 12236168
+TIMESTAMP = 1746349882
+SHA256 (nihui-waifu2x-ncnn-vulkan-20250504_GH0.tar.gz) = ba67da5d6dc104c166c1048671d8b1db57458a1f00ef04ac3ce028f7975ecc04
+SIZE (nihui-waifu2x-ncnn-vulkan-20250504_GH0.tar.gz) = 34076915
+SHA256 (KhronosGroup-glslang-15.1.0-52-ga9ac7d5f_GH0.tar.gz) = 547e54be3867dcaa5fa8c9db38d6a67c45f4ce7a40bda5a7fe148db0f4949708
+SIZE (KhronosGroup-glslang-15.1.0-52-ga9ac7d5f_GH0.tar.gz) = 3952238
+SHA256 (Tencent-ncnn-20250503_GH0.tar.gz) = 3afea4cf092ce97d06305b72c6affbcfb3530f536ae8e81a4f22007d82b729e9
+SIZE (Tencent-ncnn-20250503_GH0.tar.gz) = 13200604
diff --git a/japanese/Makefile b/japanese/Makefile
index b03a3dc6ac45..1fe8c43ec8ee 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -183,7 +183,6 @@
     SUBDIR += mozc-tool
     SUBDIR += multiskkserv
     SUBDIR += mypaedia-fpw-package
-    SUBDIR += namazu
     SUBDIR += namazu2
     SUBDIR += navi2ch
     SUBDIR += ne
@@ -194,6 +193,7 @@
     SUBDIR += ng-devel
     SUBDIR += ngraph-fonts
     SUBDIR += nkf
+    SUBDIR += open_jtalk
     SUBDIR += p5-2chproxy
     SUBDIR += p5-Date-Japanese-Era
     SUBDIR += p5-Date-Japanese-Holiday
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index dc52258725ee..7c4f0838e183 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mozc
 PORTVERSION=	2.23.2815.102.01
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	28
+PORTREVISION?=	29
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
deleted file mode 100644
index 31bbcf77d601..000000000000
--- a/japanese/namazu/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-PORTNAME=	namazu
-PORTVERSION=	1.3.0.11
-PORTREVISION=	1
-CATEGORIES=	japanese textproc
-MASTER_SITES=	http://www.namazu.org/stable/ \
-		LOCAL/flathill
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Search engine software intended for easy use
-WWW=		http://www.namazu.org
-
-DEPRECATED=	Obsolete and superseded by namazu2, last release in 2000
-EXPIRATION_DATE=2025-04-30
-
-BUILD_DEPENDS=	kakasi:japanese/kakasi \
-		nkf:japanese/nkf
-RUN_DEPENDS=	kakasi:japanese/kakasi \
-		nkf:japanese/nkf
-
-USES=		cpe perl5 shebangfix
-SHEBANG_FILES=	../contrib/bnamazu
-GNU_CONFIGURE=	yes
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/namazu \
-		${STAGEDIR}${PREFIX}/namazu/bin/namazu
-
-post-patch:
-	@${REINPLACE_CMD} '/^int main/ s|uchar|char|' ${WRKSRC}/namazu.c
-
-.include <bsd.port.mk>
diff --git a/japanese/namazu/distinfo b/japanese/namazu/distinfo
deleted file mode 100644
index 593bb76b1bc9..000000000000
--- a/japanese/namazu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (namazu-1.3.0.11.tar.gz) = 629b80b5cbd13abdb085fd0a1941f2488460bb1d6a705f5b386cbf52c01238a6
-SIZE (namazu-1.3.0.11.tar.gz) = 343632
diff --git a/japanese/namazu/files/patch-Makefile.in b/japanese/namazu/files/patch-Makefile.in
deleted file mode 100644
index 8340f6f7d107..000000000000
--- a/japanese/namazu/files/patch-Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./Makefile.in.orig	2000-01-26 14:38:51.000000000 +0100
-+++ ./Makefile.in	2014-05-18 20:50:57.000000000 +0200
-@@ -292,34 +292,34 @@
- 	cp namazu.cgi $(CGIDIR)
- 
- install: all
--	if [ ! -d $(BINDIR) ]; then \
--	    mkdir -p $(BINDIR); \
-+	if [ ! -d $(DESTDIR)$(BINDIR) ]; then \
-+	    mkdir -p $(DESTDIR)$(BINDIR); \
- 	fi
--	if [ ! -d $(INDEXDIR) ]; then \
--	    mkdir -p $(INDEXDIR); \
-+	if [ ! -d $(DESTDIR)$(INDEXDIR) ]; then \
-+	    mkdir -p $(DESTDIR)$(INDEXDIR); \
- 	fi
--	if [ ! -d "$(DOCDIR)/ja" ]; then \
--	    mkdir -p "$(DOCDIR)/ja"; \
-+	if [ ! -d "$(DESTDIR)$(DOCDIR)/ja" ]; then \
-+	    mkdir -p "$(DESTDIR)$(DOCDIR)/ja"; \
- 	fi
--	if [ ! -d "$(DOCDIR)/en" ]; then \
--	    mkdir -p "$(DOCDIR)/en"; \
-+	if [ ! -d "$(DESTDIR)$(DOCDIR)/en" ]; then \
-+	    mkdir -p "$(DESTDIR)$(DOCDIR)/en"; \
- 	fi
--	if [ ! -d $(LIBDIR) ]; then \
--	    mkdir -p $(LIBDIR); \
-+	if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \
-+	    mkdir -p $(DESTDIR)$(LIBDIR); \
- 	fi
--	if [ ! -d $(CONTRIBDIR) ]; then \
--	    mkdir -p $(CONTRIBDIR); \
-+	if [ ! -d $(DESTDIR)$(CONTRIBDIR) ]; then \
-+	    mkdir -p $(DESTDIR)$(CONTRIBDIR); \
- 	fi
--	if [ ! -d $(BINDIR_SYS) ]; then \
--	    mkdir -p $(BINDIR_SYS); \
-+	if [ ! -d $(DESTDIR)$(BINDIR_SYS) ]; then \
-+	    mkdir -p $(DESTDIR)$(BINDIR_SYS); \
- 	fi
--	cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(BINDIR)
--	cp ../COPYING ../ToDo ../ChangeLog $(DOCDIR)
--	cp ../README.ja ../doc/ja/* "$(DOCDIR)/ja"
--	cp ../README.en ../doc/en/* "$(DOCDIR)/en"
--	cp ../lib/* $(LIBDIR)
--	cp ../contrib/* $(CONTRIBDIR)
--	cp namazu mknmz $(BINDIR_SYS)
-+	cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(DESTDIR)$(BINDIR)
-+	cp ../COPYING ../ToDo ../ChangeLog $(DESTDIR)$(DOCDIR)
-+	cp ../README.ja ../doc/ja/* "$(DESTDIR)$(DOCDIR)/ja"
-+	cp ../README.en ../doc/en/* "$(DESTDIR)$(DOCDIR)/en"
-+	cp ../lib/* $(DESTDIR)$(LIBDIR)
-+	cp ../contrib/* $(DESTDIR)$(CONTRIBDIR)
-+	cp namazu mknmz $(DESTDIR)$(BINDIR_SYS)
- 
- clean:
- 	$(RM) $(TARGET) *.o config.cache config.log config.status
diff --git a/japanese/namazu/files/patch-codeconv.c b/japanese/namazu/files/patch-codeconv.c
deleted file mode 100644
index b475b7abebed..000000000000
--- a/japanese/namazu/files/patch-codeconv.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./codeconv.c.orig	2000-01-26 14:38:51.000000000 +0100
-+++ ./codeconv.c	2014-05-18 20:48:26.000000000 +0200
-@@ -31,6 +31,7 @@
-  */
- 
- #include <stdio.h>
-+#include <string.h>
- #include "namazu.h"
- 
- uchar kanji2nd;
diff --git a/japanese/namazu/files/patch-configure b/japanese/namazu/files/patch-configure
deleted file mode 100644
index 89af67ef277b..000000000000
--- a/japanese/namazu/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	2000-01-26 14:38:51.000000000 +0100
-+++ ./configure	2014-05-18 20:48:26.000000000 +0200
-@@ -1702,6 +1702,8 @@
-     fi
-     if test "$CHASEN" != "not_found"; then
- 	WAKATI_DEFAULT=CHASEN
-+    else
-+	CHASEN=/usr/local/bin/chasen
-     fi
-     
- fi
diff --git a/japanese/namazu/pkg-descr b/japanese/namazu/pkg-descr
deleted file mode 100644
index 185ce62d786b..000000000000
--- a/japanese/namazu/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Namazu is a search engine software intended for easy use. Not only it
-works as a CGI program for the small or medium scale WWW search
-engine, but also works as a personal use such as search system for local
-HDDs. Currently, search clients for Mule, Tcl/Tk, JAVA and Win32 are
-available.
-
-(The Japanese word `Namazu' means `catfish' in English)
diff --git a/japanese/namazu/pkg-plist b/japanese/namazu/pkg-plist
deleted file mode 100644
index 5b8bb6641952..000000000000
--- a/japanese/namazu/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-bin/mknmz
-bin/namazu
-namazu/bin/clnmz
-namazu/bin/gcnmz
-namazu/bin/gtnmz
-namazu/bin/mailutime
-namazu/bin/mknmz
-namazu/bin/namazu
-namazu/bin/rvnmz
-namazu/bin/vfnmz
-namazu/bin/wdnmz
-namazu/contrib/MHonArc-Japanize-patch-1.6.gz
-namazu/contrib/NamazuJAVA.030.tar.gz
-namazu/contrib/bnamazu
-namazu/contrib/namazu.el-1999.05.10.gz
-namazu/contrib/pnamazu-98.12.16.tgz
-namazu/contrib/tknamazu-1.11.tar.gz
-namazu/doc/en/README.en
-namazu/doc/en/intro.html
-namazu/doc/en/manual.html
-namazu/doc/ja/FAQ.html
-namazu/doc/ja/README.ja
-namazu/doc/ja/history.html
-namazu/doc/ja/intro.html
-namazu/doc/ja/lynxcgi.html
-namazu/doc/ja/manual.html
-namazu/doc/ja/nmz_files.txt
-namazu/doc/ja/security.html
-namazu/doc/COPYING
-namazu/doc/ChangeLog
-namazu/doc/ToDo
-namazu/lib/NMZ.body.en
-namazu/lib/NMZ.body.ja
-namazu/lib/NMZ.foot.en
-namazu/lib/NMZ.foot.ja
-namazu/lib/NMZ.head.en
-namazu/lib/NMZ.head.ja
-namazu/lib/namazu.conf-dist
-@dir namazu/index
diff --git a/japanese/open_jtalk/Makefile b/japanese/open_jtalk/Makefile
new file mode 100644
index 000000000000..1b7c24d7b62a
--- /dev/null
+++ b/japanese/open_jtalk/Makefile
@@ -0,0 +1,31 @@
+PORTNAME=	open_jtalk
+PORTVERSION=	1.11
+CATEGORIES=	japanese audio
+MASTER_SITES=	SOURCEFORGE
+MASTER_SITE_SUBDIR=	open-jtalk/Open%20JTalk/open_jtalk-${PORTVERSION}
+PKGNAMEPREFIX=	ja-
+
+MAINTAINER=	kozos@kozos.jp
+COMMENT=	Japanese Text-to-speech system using HTS-engine and Mecab
+WWW=		http://open-jtalk.sourceforge.net/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	${PREFIX}/include/iconv.h:converters/libiconv \
+		${PREFIX}/lib/libHTSEngine.a:audio/hts_engine-API
+
+USE_GCC=	yes
+
+HAS_CONFIGURE=	yes
+
+post-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/AUTHORS   ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/COPYING   ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/INSTALL   ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/NEWS      ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README    ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/open_jtalk/distinfo b/japanese/open_jtalk/distinfo
new file mode 100644
index 000000000000..13437afffcf6
--- /dev/null
+++ b/japanese/open_jtalk/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1743046843
+SHA256 (open_jtalk-1.11.tar.gz) = 20fdc6aeb6c757866034abc175820573db43e4284707c866fcd02c8ec18de71f
+SIZE (open_jtalk-1.11.tar.gz) = 19464975
diff --git a/japanese/open_jtalk/files/patch-mecab-naist-jdic_Makefile.am b/japanese/open_jtalk/files/patch-mecab-naist-jdic_Makefile.am
new file mode 100644
index 000000000000..b79a4a6fad0b
--- /dev/null
+++ b/japanese/open_jtalk/files/patch-mecab-naist-jdic_Makefile.am
@@ -0,0 +1,11 @@
+--- mecab-naist-jdic/Makefile.am.orig	2018-12-25 06:09:00 UTC
++++ mecab-naist-jdic/Makefile.am
+@@ -5,7 +5,7 @@ DISTCLEANFILES = *.log *.out *~
+ 
+ MAINTAINERCLEANFILES = Makefile.in char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def
+ 
+-dicdir = @prefix@/dic
++dicdir = @prefix@/share/open_jtalk/dic
+ 
+ dic_DATA   = char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def
+ 
diff --git a/japanese/open_jtalk/files/patch-mecab-naist-jdic_Makefile.in b/japanese/open_jtalk/files/patch-mecab-naist-jdic_Makefile.in
new file mode 100644
index 000000000000..28cc579fa40b
--- /dev/null
+++ b/japanese/open_jtalk/files/patch-mecab-naist-jdic_Makefile.in
@@ -0,0 +1,11 @@
+--- mecab-naist-jdic/Makefile.in.orig	2018-12-25 06:39:01 UTC
++++ mecab-naist-jdic/Makefile.in
+@@ -265,7 +265,7 @@ top_srcdir = @top_srcdir@
+ EXTRA_DIST = COPYING Makefile.mak naist-jdic.csv matrix.def _left-id.def _pos-id.def _rewrite.def _right-id.def char.def unk.def feature.def unidic-csj.csv
+ DISTCLEANFILES = *.log *.out *~
+ MAINTAINERCLEANFILES = Makefile.in char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def
+-dicdir = @prefix@/dic
++dicdir = @prefix@/share/open_jtalk/dic
+ dic_DATA = char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def
+ all: all-am
+ 
diff --git a/japanese/open_jtalk/pkg-descr b/japanese/open_jtalk/pkg-descr
new file mode 100644
index 000000000000..5760a4142d5d
--- /dev/null
+++ b/japanese/open_jtalk/pkg-descr
@@ -0,0 +1,3 @@
+The Open JTalk is a Japanese TTS System.
+It has been being developed by HTS working group
+and some graduate students in Nagoya Institute of Technology
diff --git a/japanese/open_jtalk/pkg-plist b/japanese/open_jtalk/pkg-plist
new file mode 100644
index 000000000000..6bb81e740f3d
--- /dev/null
+++ b/japanese/open_jtalk/pkg-plist
@@ -0,0 +1,18 @@
+bin/open_jtalk
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DATADIR%%/dic/char.bin
+%%DATADIR%%/dic/matrix.bin
+%%DATADIR%%/dic/sys.dic
+%%DATADIR%%/dic/unk.dic
+%%DATADIR%%/dic/left-id.def
+%%DATADIR%%/dic/rewrite.def
+%%DATADIR%%/dic/pos-id.def
+%%DATADIR%%/dic/right-id.def
+@dir %%DATADIR%%/dic
+@dir %%DOCSDIR%%
+@dir share/licenses/ja-open_jtalk-1.11
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 6fc2af0c1cdf..6a9f974c39e7 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index 7e4ec75e4af2..8813a8bc0213 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	9
+PORTREVISION=	10
 PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index fcd4331801d3..b84514ab44ce 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.6.0
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index 00d939458131..f67f1fefe742 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -9,6 +9,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java library for accessing and manipulating XML documents
 WWW=		http://www.jdom.org/
 
+DEPRECATED=	Depends on exired java/jaxen
+EXPIRATION_DATE=2025-06-04
+
 RUN_DEPENDS=	${JAVALIBDIR}/jaxen-jdom.jar:java/jaxen
 
 USES=		java:ant,run
diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile
index 094cdd7aabfb..e382680ca7f8 100644
--- a/lang/chez-scheme/Makefile
+++ b/lang/chez-scheme/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chez-scheme
-PORTVERSION=	10.1.0
+PORTVERSION=	10.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/cisco/ChezScheme/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
diff --git a/lang/chez-scheme/distinfo b/lang/chez-scheme/distinfo
index e886a7eabc66..714481a643ab 100644
--- a/lang/chez-scheme/distinfo
+++ b/lang/chez-scheme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731619280
-SHA256 (csv10.1.0.tar.gz) = 9181a6c8c4ab5e5d32d879ff159d335a50d4f8b388611ae22a263e932c35398b
-SIZE (csv10.1.0.tar.gz) = 9123504
+TIMESTAMP = 1746612550
+SHA256 (csv10.2.0.tar.gz) = b795916d4cfed59240c5f44b1b507a8657efd28e62e72e134d03486e9f3e374a
+SIZE (csv10.2.0.tar.gz) = 9151451
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 5b61a79f7de4..b3f995dd1052 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ghc
 PORTVERSION=	${GHC_VERSION}
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES=	lang haskell
 MASTER_SITES=	https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		LOCAL/arrowd/:boot
@@ -75,21 +75,21 @@ GMP_VARS_OFF=		hadrian_gmp_arg=--bignum=native
 PROFILE_VARS=		enable_profile=YES hadrian_setting_profile=True
 PROFILE_VARS_OFF=	enable_profile=NO hadrian_setting_profile=False
 
-GHC_VERSION?=		9.6.6
+GHC_VERSION?=		9.6.7
 LLVM_VERSION?=		15
 BOOT_GHC_VERSION?=	9.2.8
 # LLVM version that bootstrap compiler uses
 BOOT_LLVM_VERSION?=	12
 
-BASE_PACKAGES?=		Cabal-3.10.3.0 array-0.5.6.0 base-4.18.2.1 binary-0.8.9.1 \
-			bytestring-0.11.5.3 containers-0.6.7 deepseq-1.4.8.1 \
-			directory-1.3.8.5 exceptions-0.10.7 filepath-1.4.300.1 \
+BASE_PACKAGES?=		Cabal-3.10.3.0 array-0.5.8.0 base-4.18.3.0 binary-0.8.9.1 \
+			bytestring-0.11.5.4 containers-0.6.7 deepseq-1.4.8.1 \
+			directory-1.3.8.5 exceptions-0.10.7 filepath-1.4.301.0 \
 			ghc-${GHC_VERSION} ghc-bignum-1.3 ghc-compact-0.1.0.0 \
 			ghc-prim-0.10.0 haskeline-0.8.2.1 hpc-0.6.2.0 \
 			integer-gmp-1.1 mtl-2.3.1 parsec-3.1.16.1 pretty-1.1.3.6 \
 			process-1.6.19.0 stm-2.5.1.0 template-haskell-2.20.0.0 \
 			terminfo-0.4.1.6 text-2.0.2 time-1.12.2 \
-			transformers-0.6.1.0 unix-2.8.4.0 xhtml-3000.2.2.1
+			transformers-0.6.1.0 unix-2.8.6.0 xhtml-3000.2.2.1
 
 .for pkg in ${BASE_PACKAGES}
 PLIST_SUB+=	${pkg:C/-([0-9.])+//:tu}_VERSION=${pkg:C/^([^\.]*-)+//}
@@ -260,10 +260,6 @@ RUNHASKELL?=	${BOOT_INSTALL_DIR}/bin/runhaskell
 RUNHASKELL?=	${LOCALBASE}/bin/runhaskell
 .endif
 
-.PHONY: fixup-plist
-fixup-plist:
-	${RUNHASKELL} ${PATCHDIR}/fixup-plist.hs ${.CURDIR}/pkg-plist
-
 # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail
 # Set all OPTIONS to OFF when generating bootstraps
 .PHONY: create-bootstrap
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index f15f3bc36ba3..1bf8de21de8b 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1720354511
-SHA256 (ghc-9.6.6-src.tar.xz) = 008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad
-SIZE (ghc-9.6.6-src.tar.xz) = 29443464
+TIMESTAMP = 1746281969
+SHA256 (ghc-9.6.7-src.tar.xz) = d053bf6ce1d588a75cfe8c9316269486e9d8fb89dcdf6fd92836fa2e3df61305
+SIZE (ghc-9.6.7-src.tar.xz) = 31770824
 SHA256 (ghc-9.4.8-src.tar.xz) = 0bf407eb67fe3e3c24b0f4c8dea8cb63e07f63ca0f76cf2058565143507ab85e
 SIZE (ghc-9.4.8-src.tar.xz) = 28655220
 SHA256 (ghc-9.2.8-src.tar.xz) = 5f13d1786bf4fd12f4b45faa37abedb5bb3f36d5e58f7da5307e8bfe88a567a1
 SIZE (ghc-9.2.8-src.tar.xz) = 24661260
 SHA256 (ghc-8.10.7-src.tar.xz) = e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 SIZE (ghc-8.10.7-src.tar.xz) = 19932668
-SHA256 (hadrian-9.6.6-boot.tar.gz) = a5a7e6721d693c0e004fecff5745e47b2ec0c703b8378ccc5144e20a76049f95
-SIZE (hadrian-9.6.6-boot.tar.gz) = 1495606
+SHA256 (hadrian-9.6.7-boot.tar.gz) = f81dc59b4aef59c62c645da7be0b1fb8720aba338c80004963a99bc1219d3a05
+SIZE (hadrian-9.6.7-boot.tar.gz) = 1495514
 SHA256 (hadrian-9.4.8-boot.tar.gz) = 5eb060655686921b086645dcbdd6268f09bc66baf8cc76fce74dea9b8b55ab5d
 SIZE (hadrian-9.4.8-boot.tar.gz) = 1495586
 SHA256 (hadrian-9.2.8-boot.tar.gz) = 730412e1c17309670075be8f76dbca9ebadedfa10b758e605f9e67804e9e8ac5
diff --git a/lang/ghc/files/fixup-plist.hs b/lang/ghc/files/fixup-plist.hs
deleted file mode 100644
index 9b6ade1d5aa0..000000000000
--- a/lang/ghc/files/fixup-plist.hs
+++ /dev/null
@@ -1,30 +0,0 @@
-import Data.List
-import System.Environment
-
-main = do
-  [pkgplist] <- getArgs
-  plistLines <- lines <$> readFile pkgplist
-  mapM (putStrLn . processLine2 . processLine1) plistLines
-
-processLine1 l
-  | "%%DYNAMIC%%" `isPrefixOf` l ||
-    "%%PROFILE%%" `isPrefixOf` l ||
-    "%%GMP%%" `isPrefixOf` l ||
-    "%%SIMPLE%%" `isPrefixOf` l = l
-
-  | ".dyn_hi" `isSuffixOf` l ||
-    "/ghc-iserv-dyn" `isSuffixOf` l ||
-    ".so" `isSuffixOf` l = "%%DYNAMIC%%" ++ l
-
-  | ".p_hi" `isSuffixOf` l ||
-    "/ghc-iserv-prof" `isSuffixOf` l ||
-    ".p_o" `isSuffixOf` l  ||
-    "_p.a" `isSuffixOf` l = "%%PROFILE%%" ++ l
-
-  | otherwise = l
-
-processLine2 l
-  | "%%GMP%%" `isPrefixOf` l ||
-    "%%SIMPLE%%" `isPrefixOf` l = l
-  | "/libCffi" `isInfixOf` l = "%%NODYNAMIC%%" ++ l
-  | otherwise = l
diff --git a/lang/ghc/files/patch-hadrian_hadrian.cabal b/lang/ghc/files/patch-hadrian_hadrian.cabal
new file mode 100644
index 000000000000..7994110951d4
--- /dev/null
+++ b/lang/ghc/files/patch-hadrian_hadrian.cabal
@@ -0,0 +1,15 @@
+Hack the bounds to avoid re-rolling the bootstrap compiler.
+The bound was added due to https://gitlab.haskell.org/ghc/ghc/-/issues/24382
+but we somehow doesn't seem to be affected by this
+
+--- hadrian/hadrian.cabal.orig	2025-03-02 13:05:33 UTC
++++ hadrian/hadrian.cabal
+@@ -155,7 +155,7 @@ executable hadrian
+                        , containers           >= 0.5     && < 0.7
+                          -- N.B. directory >=1.3.9 as earlier versions are
+                          -- afflicted by #24382.
+-                       , directory            >= 1.3.9.0 && < 1.4
++                       , directory            < 1.4
+                        , extra                >= 1.4.7
+                        , filepath
+                        , time
diff --git a/lang/ghc/files/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs b/lang/ghc/files/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs
index 1e59fb6d677e..528e592425f4 100644
--- a/lang/ghc/files/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs
+++ b/lang/ghc/files/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs
@@ -1,6 +1,6 @@
---- hadrian/src/Hadrian/Haskell/Cabal/Parse.hs.orig	2024-01-08 13:24:59 UTC
+--- hadrian/src/Hadrian/Haskell/Cabal/Parse.hs.orig	2025-03-02 13:05:33 UTC
 +++ hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
-@@ -320,8 +320,8 @@ write_inplace_conf pkg_path res_path pd lbi = do
+@@ -321,8 +321,8 @@ write_inplace_conf pkg_path res_path pd lbi = do
                    pkg_name = C.display (C.pkgName (CP.sourcePackageId installedPkgInfo))
                    final_ipi = installedPkgInfo {
                                   Installed.includeDirs = concatMap fixupIncludeDir (Installed.includeDirs installedPkgInfo),
diff --git a/lang/ghc/files/patch-libraries_base_GHC_Event_KQueue.hsc b/lang/ghc/files/patch-libraries_base_GHC_Event_KQueue.hsc
deleted file mode 100644
index 1413a39d9705..000000000000
--- a/lang/ghc/files/patch-libraries_base_GHC_Event_KQueue.hsc
+++ /dev/null
@@ -1,45 +0,0 @@
-https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13276
-
---- libraries/base/GHC/Event/KQueue.hsc.orig	2024-06-30 22:49:26 UTC
-+++ libraries/base/GHC/Event/KQueue.hsc
-@@ -44,8 +44,8 @@ import GHC.Event.Internal (Timeout(..))
- import GHC.Real (quotRem, fromIntegral)
- import GHC.Show (Show(show))
- import GHC.Event.Internal (Timeout(..))
--import System.Posix.Internals (c_close)
--import System.Posix.Types (Fd(..))
-+import System.Posix.Internals (c_close, c_getpid)
-+import System.Posix.Types (Fd(..), CPid)
- import qualified GHC.Event.Array as A
- 
- #if defined(netbsd_HOST_OS)
-@@ -73,19 +73,26 @@ data KQueue = KQueue {
- data KQueue = KQueue {
-       kqueueFd     :: {-# UNPACK #-} !KQueueFd
-     , kqueueEvents :: {-# UNPACK #-} !(A.Array Event)
-+    , kqueuePid    :: {-# UNPACK #-} !CPid -- ^ pid, used to detect forks
-     }
- 
- new :: IO E.Backend
- new = do
-   kqfd <- kqueue
-   events <- A.new 64
--  let !be = E.backend poll modifyFd modifyFdOnce delete (KQueue kqfd events)
-+  pid <- c_getpid
-+  let !be = E.backend poll modifyFd modifyFdOnce delete (KQueue kqfd events pid)
-   return be
- 
- delete :: KQueue -> IO ()
- delete kq = do
--  _ <- c_close . fromKQueueFd . kqueueFd $ kq
--  return ()
-+  -- detect forks: the queue isn't inherited by a child process created with
-+  -- fork. Hence we mustn't try to close the old fd or we might close a random
-+  -- one (e.g. the one used by timerfd, cf #24672).
-+  pid <- c_getpid
-+  when (pid == kqueuePid kq) $ do
-+    _ <- c_close . fromKQueueFd . kqueueFd $ kq
-+    return ()
- 
- modifyFd :: KQueue -> Fd -> E.Event -> E.Event -> IO Bool
- modifyFd kq fd oevt nevt = do
diff --git a/lang/ghc/pkg-plist.hadrian b/lang/ghc/pkg-plist.hadrian
index c022c2dc43b9..cacd6ae91bee 100644
--- a/lang/ghc/pkg-plist.hadrian
+++ b/lang/ghc/pkg-plist.hadrian
@@ -2853,6 +2853,27 @@ lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_V
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/UnionFind.dyn_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/UnionFind.hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/UnionFind.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Internal.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Internal.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Internal.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Lazy.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Lazy.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Lazy.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Strict.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Strict.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Strict.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Strict/Internal.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Strict/Internal.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Map/Strict/Internal.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Set.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Set.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Set.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Set/Internal.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Set/Internal.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Data/Word64Set/Internal.p_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Driver/Backend.dyn_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Driver/Backend.hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Driver/Backend.p_hi
@@ -4182,6 +4203,12 @@ lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_V
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Constants.dyn_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Constants.hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Constants.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Containers/Internal/BitUtil.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Containers/Internal/BitUtil.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Containers/Internal/BitUtil.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Containers/Internal/StrictPair.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Containers/Internal/StrictPair.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Containers/Internal/StrictPair.p_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Error.dyn_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Error.hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Error.p_hi
@@ -4239,6 +4266,12 @@ lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_V
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Trace.dyn_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Trace.hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Trace.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Unique.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Unique.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Unique.p_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Word64.dyn_hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Word64.hi
+lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Utils/Word64.p_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Wasm/ControlFlow.dyn_hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Wasm/ControlFlow.hi
 lib/ghc-%%GHC_VERSION%%/lib/%%GHC_ARCH%%-freebsd-ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/Wasm/ControlFlow.p_hi
diff --git a/lang/go124/Makefile b/lang/go124/Makefile
index b75789bcfa27..6c5877f0e501 100644
--- a/lang/go124/Makefile
+++ b/lang/go124/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION=	1.24.2
+DISTVERSION=	1.24.3
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
 PORTREVISION=	0
 MASTER_SITES=	https://golang.org/dl/
diff --git a/lang/go124/distinfo b/lang/go124/distinfo
index 8786b1bdd7d3..86f143a69842 100644
--- a/lang/go124/distinfo
+++ b/lang/go124/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1743558664
-SHA256 (go1.24.2.src.tar.gz) = 9dc77ffadc16d837a1bf32d99c624cb4df0647cee7b119edd9e7b1bcc05f2e00
-SIZE (go1.24.2.src.tar.gz) = 30787666
+TIMESTAMP = 1746623181
+SHA256 (go1.24.3.src.tar.gz) = 229c08b600b1446798109fae1f569228102c8473caba8104b6418cb5bc032878
+SIZE (go1.24.3.src.tar.gz) = 30789282
 SHA256 (go1.23.7.freebsd-arm64.tar.gz) = 2b51c940898fad6708609495b9a27b5869cf5195381fc4a31a013006aa4eb156
 SIZE (go1.23.7.freebsd-arm64.tar.gz) = 69903435
 SHA256 (go1.23.7.freebsd-amd64.tar.gz) = c0e7a5ff1875eb79d7c2acfa1616718ad892c0b2637d56594fdc3332e313efd4
diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index 529f181eef3b..a0c827ea4f5d 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	julia
 DISTVERSION=	1.10.3
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/
diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index 9dc636e707b5..0cdb6e211f9f 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nim
-DISTVERSION=	2.2.2
+DISTVERSION=	2.2.4
 CATEGORIES=	lang
 MASTER_SITES=	https://nim-lang.org/download/
 
diff --git a/lang/nim/distinfo b/lang/nim/distinfo
index be7564dd85ad..2d8bda469a9d 100644
--- a/lang/nim/distinfo
+++ b/lang/nim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739285871
-SHA256 (nim-2.2.2.tar.xz) = 7fcc9b87ac9c0ba5a489fdc26e2d8480ce96a3ca622100d6267ef92135fd8a1f
-SIZE (nim-2.2.2.tar.xz) = 8188616
+TIMESTAMP = 1746626689
+SHA256 (nim-2.2.4.tar.xz) = f82b419750fcce561f3f897a0486b180186845d76fb5d99f248ce166108189c7
+SIZE (nim-2.2.4.tar.xz) = 8168916
diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim
index d6e6ef39e3b3..dec5e472402e 100644
--- a/lang/nim/files/patch-koch.nim
+++ b/lang/nim/files/patch-koch.nim
@@ -1,6 +1,6 @@
---- koch.nim.orig	2025-02-06 01:49:40 UTC
+--- koch.nim.orig	2025-05-07 14:07:39 UTC
 +++ koch.nim
-@@ -150,31 +150,31 @@ proc csource(args: string) =
+@@ -150,38 +150,38 @@ proc csource(args: string) =
             "--main:compiler/nim.nim compiler/installer.ini $1") %
         [args, VersionAsString, compileNimInst])
  
@@ -39,7 +39,7 @@
 -  cloneDependency(distDir, "https://github.com/nim-lang/atlas.git",
 -                  commit = commit, allowBundled = true)
 -  cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git",
--                commit = SatStableCommit, allowBundled = true)
+-                  commit = SatStableCommit, allowBundled = true)
 -  # installer.ini expects it under $nim/bin
 -  nimCompile("dist/atlas/src/atlas.nim",
 -             options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args)
@@ -48,23 +48,26 @@
 +#  cloneDependency(distDir, "https://github.com/nim-lang/atlas.git",
 +#                  commit = commit, allowBundled = true)
 +#  cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git",
-+#                commit = SatStableCommit, allowBundled = true)
++#                  commit = SatStableCommit, allowBundled = true)
 +#  # installer.ini expects it under $nim/bin
 +#  nimCompile("dist/atlas/src/atlas.nim",
 +#             options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args)
  
- proc bundleNimsuggest(args: string) =
-   nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
-@@ -205,14 +205,14 @@ proc bundleWinTools(args: string) =
-     nimCompile(r"tools\downloader.nim",
-                options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args)
- 
 -proc bundleChecksums(latest: bool) =
 -  let commit = if latest: "HEAD" else: ChecksumsStableCommit
 -  cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled = true)
 +#proc bundleChecksums(latest: bool) =
 +#  let commit = if latest: "HEAD" else: ChecksumsStableCommit
-+#  cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled = true)
++#  cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled #= true)
+ 
+ proc bundleNimsuggest(args: string) =
+-  bundleChecksums(false)
++  #bundleChecksums(false)
+   nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
+                  options = "-d:danger " & args)
+ 
+@@ -211,9 +211,9 @@ proc zip(latest: bool; args: string) =
+                options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args)
  
  proc zip(latest: bool; args: string) =
 -  bundleChecksums(latest)
@@ -76,7 +79,7 @@
    bundleNimsuggest(args)
    bundleNimpretty(args)
    bundleWinTools(args)
-@@ -221,15 +221,15 @@ proc zip(latest: bool; args: string) =
+@@ -222,15 +222,15 @@ proc zip(latest: bool; args: string) =
    exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" %
         ["tools/niminst/niminst".exe, VersionAsString])
  
@@ -99,7 +102,7 @@
    nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" %
         [VersionAsString, compileNimInst])
    exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" %
-@@ -264,9 +264,9 @@ proc nsis(latest: bool; args: string) =
+@@ -265,9 +265,9 @@ proc nsis(latest: bool; args: string) =
    nimCompileFold("Compile testament", "testament/testament.nim", options = "-d:release " & args)
  
  proc nsis(latest: bool; args: string) =
@@ -112,7 +115,7 @@
    bundleNimsuggest(args)
    bundleWinTools(args)
    # make sure we have generated the niminst executables:
-@@ -286,21 +286,21 @@ proc install(args: string) =
+@@ -287,21 +287,21 @@ proc install(args: string) =
    geninstall()
    exec("sh ./install.sh $#" % args)
  
@@ -149,7 +152,7 @@
  
  # -------------- boot ---------------------------------------------------------
  
-@@ -344,11 +344,11 @@ proc boot(args: string, skipIntegrityCheck: bool) =
+@@ -345,11 +345,11 @@ proc boot(args: string, skipIntegrityCheck: bool) =
    let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") &
                        hostOS & "_" & hostCPU
  
@@ -164,7 +167,7 @@
  
    let nimStart = findStartNim().quoteShell()
    let times = 2 - ord(skipIntegrityCheck)
-@@ -507,7 +507,7 @@ proc temp(args: string) =
+@@ -508,7 +508,7 @@ proc temp(args: string) =
        result[1].add " " & quoteShell(args[i])
        inc i
  
@@ -173,7 +176,7 @@
  
    let d = getAppDir()
    let output = d / "compiler" / "nim".exe
-@@ -551,27 +551,27 @@ proc icTest(args: string) =
+@@ -552,27 +552,27 @@ proc icTest(args: string) =
      exec(cmd)
      inc i
  
@@ -222,7 +225,7 @@
  
  
  proc hostInfo(): string =
-@@ -619,14 +619,14 @@ proc runCI(cmd: string) =
+@@ -620,14 +620,14 @@ proc runCI(cmd: string) =
      # BUG: with initOptParser, `--batch:'' all` interprets `all` as the argument of --batch, pending bug #14343
      execFold("Run tester", "nim c -r --putenv:NIM_TESTAMENT_REMOTE_NETWORKING:1 -d:nimStrictMode testament/testament $# all -d:nimCoroutines" % batchParam)
  
@@ -245,7 +248,7 @@
  
      execFold("Run nimdoc tests", "nim r nimdoc/tester")
      execFold("Run rst2html tests", "nim r nimdoc/rsttester")
-@@ -698,18 +698,18 @@ proc showHelp(success: bool) =
+@@ -699,18 +699,18 @@ proc showHelp(success: bool) =
    quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)),
                     CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure)
  
@@ -271,7 +274,7 @@
      localDocsOut = ""
      skipIntegrityCheck = false
    while true:
-@@ -745,34 +745,34 @@ when isMainModule:
+@@ -746,34 +746,34 @@ when isMainModule:
        of "distrohelper": geninstall()
        of "install": install(op.cmdLineRest)
        of "testinstall": testUnixInstall(op.cmdLineRest)
diff --git a/lang/nim/files/patch-tools_deps.nim b/lang/nim/files/patch-tools_deps.nim
index ab6d46bf2e34..fb942d0e5c83 100644
--- a/lang/nim/files/patch-tools_deps.nim
+++ b/lang/nim/files/patch-tools_deps.nim
@@ -1,6 +1,6 @@
---- tools/deps.nim.orig	2025-02-06 01:49:40 UTC
+--- tools/deps.nim.orig	2025-05-07 14:22:20 UTC
 +++ tools/deps.nim
-@@ -20,28 +20,29 @@ proc cloneDependency*(destDirBase: string, url: string
+@@ -22,30 +22,31 @@ proc cloneDependency*(destDirBase: string, url: string
  
  proc cloneDependency*(destDirBase: string, url: string, commit = commitHead,
                        appendRepoName = true, allowBundled = false) =
@@ -25,8 +25,10 @@
 -    let oldDir = getCurrentDir()
 -    setCurrentDir(destDir)
 -    try:
--      execRetry "git fetch -q"
--      exec fmt"git checkout -q {commit}"
+-      let checkoutCmd = fmt"git checkout -q {commit}"
+-      if tryexec(checkoutCmd) != 0:
+-        execRetry "git fetch -q"
+-        exec checkoutCmd
 -    finally:
 -      setCurrentDir(oldDir)
 -  elif allowBundled:
@@ -38,15 +40,17 @@
 +  #  let oldDir = getCurrentDir()
 +  #  setCurrentDir(destDir)
 +  #  try:
-+  #    execRetry "git fetch -q"
-+  #    exec fmt"git checkout -q {commit}"
++  #    let checkoutCmd = fmt"git checkout -q {commit}"
++  #    if tryexec(checkoutCmd) != 0:
++  #      execRetry "git fetch -q"
++  #      exec checkoutCmd
 +  #  finally:
 +  #    setCurrentDir(oldDir)
 +  #elif allowBundled:
 +  #  discard "this dependency was bundled with Nim, don't do anything"
 +  #else:
 +  #  quit "FAILURE: " & destdir & " already exists but is not a git repo"
-+  quit "FAILURE: git operations now allowed!: " & destDirBase
++  quit "FAILURE: git operations not allowed in ports!: " & destDirBase
  
  proc updateSubmodules*(dir: string, allowBundled = false) =
    if isGitRepo(dir):
diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile
index 837c5db14e2d..e9cbfdcde9bf 100644
--- a/lang/pharo/Makefile
+++ b/lang/pharo/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pharo
 DISTVERSION=	10.2.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	f4c5e2a
 CATEGORIES=	lang
 MASTER_SITES=	http://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/
diff --git a/lang/quickjs-ng/Makefile b/lang/quickjs-ng/Makefile
index e1689f7f08a3..401c3af51810 100644
--- a/lang/quickjs-ng/Makefile
+++ b/lang/quickjs-ng/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	quickjs
-DISTVERSION=	0.9.0
+DISTVERSION=	0.10.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang devel
 PKGNAMESUFFIX=	-ng
diff --git a/lang/quickjs-ng/distinfo b/lang/quickjs-ng/distinfo
index 9c1178f5337b..c1ce7d5bc652 100644
--- a/lang/quickjs-ng/distinfo
+++ b/lang/quickjs-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746032333
-SHA256 (quickjs-ng-quickjs-v0.9.0_GH0.tar.gz) = 77f9e79b42e2e7cff9517bae612431af47e120730286cb1dcfad0753bc160f10
-SIZE (quickjs-ng-quickjs-v0.9.0_GH0.tar.gz) = 816194
+TIMESTAMP = 1746467397
+SHA256 (quickjs-ng-quickjs-v0.10.0_GH0.tar.gz) = c54007e6ce9893b0074d53feac47c64a362900df20493110800c9e1f5c43427b
+SIZE (quickjs-ng-quickjs-v0.10.0_GH0.tar.gz) = 783751
diff --git a/lang/quickjs-ng/files/patch-CMakeLists.txt b/lang/quickjs-ng/files/patch-CMakeLists.txt
index b8ce45e00734..72d0174b9d0e 100644
--- a/lang/quickjs-ng/files/patch-CMakeLists.txt
+++ b/lang/quickjs-ng/files/patch-CMakeLists.txt
@@ -1,11 +1,28 @@
---- CMakeLists.txt.orig	2025-01-28 23:42:03 UTC
+--- CMakeLists.txt.orig	2025-05-01 21:30:10 UTC
 +++ CMakeLists.txt
-@@ -28,8 +28,6 @@ if(NOT MSVC AND NOT IOS)
+@@ -39,8 +39,6 @@ if(NOT MSVC AND NOT IOS)
  
  xcheck_add_c_compiler_flag(-Wall)
  if(NOT MSVC AND NOT IOS)
 -    xcheck_add_c_compiler_flag(-Werror)
 -    xcheck_add_c_compiler_flag(-Wextra)
  endif()
+ xcheck_add_c_compiler_flag(-Wformat=2)
  xcheck_add_c_compiler_flag(-Wno-implicit-fallthrough)
- xcheck_add_c_compiler_flag(-Wno-sign-compare)
+@@ -418,10 +416,12 @@ if(NOT IOS)
+
+ if(NOT IOS)
+     file(STRINGS quickjs.h quickjs_h REGEX QJS_VERSION)
+-    string(REGEX MATCHALL "([0-9])" QJS_VERSION "${quickjs_h}")
+-    list(GET QJS_VERSION 0 QJS_VERSION_MAJOR)
+-    list(GET QJS_VERSION 1 QJS_VERSION_MINOR)
+-    list(GET QJS_VERSION 2 QJS_VERSION_PATCH)
++    string(REGEX MATCH "QJS_VERSION_MAJOR ([0-9]*)" _ "${quickjs_h}")
++    set(QJS_VERSION_MAJOR ${CMAKE_MATCH_1})
++    string(REGEX MATCH "QJS_VERSION_MINOR ([0-9]*)" _ "${quickjs_h}")
++    set(QJS_VERSION_MINOR ${CMAKE_MATCH_1})
++    string(REGEX MATCH "QJS_VERSION_PATCH ([0-9]*)" _ "${quickjs_h}")
++    set(QJS_VERSION_PATCH ${CMAKE_MATCH_1})
+     set_target_properties(qjs PROPERTIES
+         VERSION ${QJS_VERSION_MAJOR}.${QJS_VERSION_MINOR}.${QJS_VERSION_PATCH}
+         SOVERSION ${QJS_VERSION_MAJOR}
diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile
index 2a5783bc4440..0a382adc5215 100644
--- a/lang/quickjs/Makefile
+++ b/lang/quickjs/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	quickjs
-DISTVERSION=	2024.01.13-20240727
-PORTREVISION=	2
+DISTVERSION=	2025.04.26-20250426
 CATEGORIES=	lang devel
 #MASTER_SITES=	https://bellard.org/${PORTNAME}/
 #DISTNAME=	${PORTNAME}-${DISTVERSION:S/./-/g}
diff --git a/lang/quickjs/distinfo b/lang/quickjs/distinfo
index 68c3dc392c63..7637f8f4e79b 100644
--- a/lang/quickjs/distinfo
+++ b/lang/quickjs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739453157
-SHA256 (bellard-quickjs-2024.01.13-20240727-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 3ceab2edf529ffc4ed4111e613e6878c8ffa4ca792d66a989f6a05fa35f9ec59
-SIZE (bellard-quickjs-2024.01.13-20240727-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 628637
+TIMESTAMP = 1746485237
+SHA256 (bellard-quickjs-2025.04.26-20250426-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 3ceab2edf529ffc4ed4111e613e6878c8ffa4ca792d66a989f6a05fa35f9ec59
+SIZE (bellard-quickjs-2025.04.26-20250426-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 628637
diff --git a/lang/rizin/Makefile b/lang/rizin/Makefile
index bd391e2468ad..84ee28c04047 100644
--- a/lang/rizin/Makefile
+++ b/lang/rizin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rizin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.0
+DISTVERSION=	0.8.1
 CATEGORIES=	lang security shells
 
 MAINTAINER=	arrowd@FreeBSD.org
diff --git a/lang/rizin/distinfo b/lang/rizin/distinfo
index 69536203d5b9..689027e95966 100644
--- a/lang/rizin/distinfo
+++ b/lang/rizin/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1745908880
-SHA256 (rizinorg-rizin-v0.8.0_GH0.tar.gz) = aab8d392fa6d8af2e8b048bc98f66763bcbaaae55d374a95b03c2232a4dda859
-SIZE (rizinorg-rizin-v0.8.0_GH0.tar.gz) = 8254719
+TIMESTAMP = 1746430615
+SHA256 (rizinorg-rizin-v0.8.1_GH0.tar.gz) = 7dc451968f426e846c04430f7d6d45f1402db8eed1afa902f0631c03f19bc22e
+SIZE (rizinorg-rizin-v0.8.1_GH0.tar.gz) = 8255059
 SHA256 (rizinorg-rz-libdemangle-0031d1a_GH0.tar.gz) = 50ddfc40f2b6e80d2bedb56b0f29f796ab4384c2c2f5e84a867ab7bce8b58d66
 SIZE (rizinorg-rz-libdemangle-0031d1a_GH0.tar.gz) = 180562
 SHA256 (rizinorg-rizin-grammar-c-8158457_GH0.tar.gz) = 77f3a5ced05d6ac70d19d9ad783f04b412b8f61ae7a912f0d06884ff5e284df2
diff --git a/lang/rizin/files/patch-meson.build b/lang/rizin/files/patch-meson.build
deleted file mode 100644
index abea05cec04a..000000000000
--- a/lang/rizin/files/patch-meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig	2025-04-24 18:28:05 UTC
-+++ meson.build
-@@ -321,7 +321,7 @@ endif
-   error(subproject_clean_error_msg)
- endif
- 
--rizin_grammar_c_dep = dependency('rizin-grammar-c', required: get_option('use_sys_tree_sitter'), static: is_static_build, fallback: [])
-+rizin_grammar_c_dep = dependency('rizin-grammar-c', required: false, static: is_static_build, fallback: [])
- if not rizin_grammar_c_dep.found()
-   rizin_grammar_c_proj = subproject('rizin-grammar-c', default_options: ['default_library=static'])
-   rizin_grammar_c_dep = rizin_grammar_c_proj.get_variable('rizin_grammar_c_dep')
diff --git a/lang/ruby35/Makefile b/lang/ruby35/Makefile
index 564bb8fface9..cc5866718a21 100644
--- a/lang/ruby35/Makefile
+++ b/lang/ruby35/Makefile
@@ -26,7 +26,11 @@ CPE_UPDATE=	p0
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-# Bug?: With preview1 `./configure --with-ruby-version=minor` sets ruby version string to "3.5+0"
+# Upstream says "+0" is intentionally added to ruby version string
+# ("3.5+0" for example ) with pre-release version.
+# So use --with-ruby-version="${RUBY_VER}" rather than
+# --with-ruby-version=minor until 3.5.0 is released.
+# Reference; https://bugs.ruby-lang.org/issues/21278
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
 		--enable-install-static-library \
diff --git a/lang/s7/Makefile.master b/lang/s7/Makefile.master
index 019f8a0352bc..528bb554cb8b 100644
--- a/lang/s7/Makefile.master
+++ b/lang/s7/Makefile.master
@@ -1,7 +1,7 @@
 PORTNAME=	s7
 CATEGORIES=	lang lisp
 # S7_MAJOR_VERSION / S7_MINOR_VERSION / S7_DATE from s7.h
-PORTVERSION=	11.3.20250110
+PORTVERSION=	11.4.20250505
 
 MAINTAINER?=	fuz@FreeBSD.org
 WWW=		https://ccrma.stanford.edu/software/snd/snd/s7.html
@@ -12,7 +12,7 @@ USES=		localbase:ldflags
 USE_GITLAB=	yes
 GL_SITE=	https://cm-gitlab.stanford.edu
 GL_ACCOUNT=	bil
-GL_TAGNAME=	3cad48b9b7ae7f104cc3d0db689cf121a691628d
+GL_TAGNAME=	f9a99df1cb1470b7daa19daf7148e76363f7bceb
 
 CFLAGS+=	-DS7_LOAD_PATH=\"${DATADIR}\" \
 		-DHAVE_COMPLEX_NUMBERS \
diff --git a/lang/s7/distinfo b/lang/s7/distinfo
index aaac86dc5c09..f47e005d8ac9 100644
--- a/lang/s7/distinfo
+++ b/lang/s7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736525120
-SHA256 (bil-s7-3cad48b9b7ae7f104cc3d0db689cf121a691628d_GL0.tar.gz) = 6293759d657ce1a44f77b5f519f36b54f8f98847efccc7bfd219c78034437c59
-SIZE (bil-s7-3cad48b9b7ae7f104cc3d0db689cf121a691628d_GL0.tar.gz) = 2797386
+TIMESTAMP = 1746427498
+SHA256 (bil-s7-f9a99df1cb1470b7daa19daf7148e76363f7bceb_GL0.tar.gz) = 3833f0226fdeda4691189ee38702aec52ed98d67253a002c21fb671c109e2400
+SIZE (bil-s7-f9a99df1cb1470b7daa19daf7148e76363f7bceb_GL0.tar.gz) = 2818205
diff --git a/mail/mailpit/Makefile b/mail/mailpit/Makefile
index 2bab7d41ab14..738eb83f90dd 100644
--- a/mail/mailpit/Makefile
+++ b/mail/mailpit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mailpit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.24.1
+DISTVERSION=	1.24.2
 CATEGORIES=	mail devel
 MASTER_SITES=	https://www.madpilot.net/mailpit/:npmcache \
 		LOCAL/madpilot/mailpit:npmcache
diff --git a/mail/mailpit/distinfo b/mail/mailpit/distinfo
index 66ad490d96bb..4fc3efa4ecbf 100644
--- a/mail/mailpit/distinfo
+++ b/mail/mailpit/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1744446255
-SHA256 (go/mail_mailpit/mailpit-v1.24.1/mailpit-npm-cache-1.24.1.tar.zst) = ec6a3a70cfcffe3ecd13f65dd34d865b2a2c20a0a3d5839506976969d26adf89
-SIZE (go/mail_mailpit/mailpit-v1.24.1/mailpit-npm-cache-1.24.1.tar.zst) = 31934817
-SHA256 (go/mail_mailpit/mailpit-v1.24.1/v1.24.1.mod) = 2bb00e9dc5dcd36ddb8e854e3d93146ca4529b7daefbe4929c8754f602b1417e
-SIZE (go/mail_mailpit/mailpit-v1.24.1/v1.24.1.mod) = 2523
-SHA256 (go/mail_mailpit/mailpit-v1.24.1/v1.24.1.zip) = f5493afe35ffe3a5ea1295185ead0d554efa8550feeb0003e2cbec8d1a9e93d9
-SIZE (go/mail_mailpit/mailpit-v1.24.1/v1.24.1.zip) = 557500
+TIMESTAMP = 1746260229
+SHA256 (go/mail_mailpit/mailpit-v1.24.2/mailpit-npm-cache-1.24.2.tar.zst) = ac3df4305aa5abc9b3158651c882e2988f77cd21ec02cebc9581634ba79377da
+SIZE (go/mail_mailpit/mailpit-v1.24.2/mailpit-npm-cache-1.24.2.tar.zst) = 32045736
+SHA256 (go/mail_mailpit/mailpit-v1.24.2/v1.24.2.mod) = 8627d961f3c13b94e5de76829d1362c1786eeb94d93ae6657b699b702d31125a
+SIZE (go/mail_mailpit/mailpit-v1.24.2/v1.24.2.mod) = 2524
+SHA256 (go/mail_mailpit/mailpit-v1.24.2/v1.24.2.zip) = ffc3c4755d87237d3658c361fc95df01e03262528f32ee81e7707f6fa53d25de
+SIZE (go/mail_mailpit/mailpit-v1.24.2/v1.24.2.zip) = 559747
diff --git a/mail/mailpit/files/patch-package-lock.json b/mail/mailpit/files/patch-package-lock.json
index 36cdc6e7ee18..29f209fc93b7 100644
--- a/mail/mailpit/files/patch-package-lock.json
+++ b/mail/mailpit/files/patch-package-lock.json
@@ -12,7 +12,7 @@
        }
      },
      "node_modules/@apitools/openapi-parser": {
-@@ -103,439 +103,6 @@
+@@ -102,439 +102,6 @@
          "node": ">=6.9.0"
        }
      },
@@ -25,9 +25,9 @@
 -      "peer": true
 -    },
 -    "node_modules/@esbuild/aix-ppc64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
--      "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz",
+-      "integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==",
 -      "cpu": [
 -        "ppc64"
 -      ],
@@ -42,9 +42,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/android-arm": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
--      "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz",
+-      "integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==",
 -      "cpu": [
 -        "arm"
 -      ],
@@ -59,9 +59,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/android-arm64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
--      "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz",
+-      "integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -76,9 +76,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/android-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
--      "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz",
+-      "integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -93,9 +93,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/darwin-arm64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
--      "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz",
+-      "integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -110,9 +110,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/darwin-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
--      "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz",
+-      "integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -127,9 +127,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/freebsd-arm64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
--      "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz",
+-      "integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -144,9 +144,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/freebsd-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
--      "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz",
+-      "integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -161,9 +161,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-arm": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
--      "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz",
+-      "integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==",
 -      "cpu": [
 -        "arm"
 -      ],
@@ -178,9 +178,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-arm64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
--      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz",
+-      "integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -195,9 +195,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-ia32": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
--      "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz",
+-      "integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==",
 -      "cpu": [
 -        "ia32"
 -      ],
@@ -212,9 +212,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-loong64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
--      "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz",
+-      "integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==",
 -      "cpu": [
 -        "loong64"
 -      ],
@@ -229,9 +229,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-mips64el": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
--      "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz",
+-      "integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==",
 -      "cpu": [
 -        "mips64el"
 -      ],
@@ -246,9 +246,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-ppc64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
--      "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz",
+-      "integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==",
 -      "cpu": [
 -        "ppc64"
 -      ],
@@ -263,9 +263,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-riscv64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
--      "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz",
+-      "integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==",
 -      "cpu": [
 -        "riscv64"
 -      ],
@@ -280,9 +280,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-s390x": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
--      "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz",
+-      "integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==",
 -      "cpu": [
 -        "s390x"
 -      ],
@@ -297,9 +297,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/linux-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
--      "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz",
+-      "integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -314,9 +314,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/netbsd-arm64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz",
--      "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz",
+-      "integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -331,9 +331,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/netbsd-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
--      "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz",
+-      "integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -348,9 +348,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/openbsd-arm64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz",
--      "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz",
+-      "integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -365,9 +365,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/openbsd-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
--      "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz",
+-      "integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -382,9 +382,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/sunos-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
--      "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz",
+-      "integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -399,9 +399,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/win32-arm64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz",
--      "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz",
+-      "integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -416,9 +416,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/win32-ia32": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
--      "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz",
+-      "integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==",
 -      "cpu": [
 -        "ia32"
 -      ],
@@ -433,9 +433,9 @@
 -      }
 -    },
 -    "node_modules/@esbuild/win32-x64": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
--      "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz",
+-      "integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -452,7 +452,7 @@
      "node_modules/@jridgewell/sourcemap-codec": {
        "version": "1.5.0",
        "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-@@ -871,6 +438,7 @@
+@@ -870,6 +437,7 @@
        "version": "2.11.8",
        "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
        "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
@@ -460,7 +460,7 @@
        "license": "MIT",
        "funding": {
          "type": "opencollective",
-@@ -1752,14 +1320,6 @@
+@@ -1761,14 +1329,6 @@
          "ieee754": "^1.2.1"
        }
      },
@@ -475,7 +475,7 @@
      "node_modules/call-bind-apply-helpers": {
        "version": "1.0.2",
        "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-@@ -1795,14 +1355,6 @@
+@@ -1804,14 +1364,6 @@
        "integrity": "sha512-6exeENAqBTuIR1wIo36mR8xVVBv6l1hSLd7Qmvf6158Ld1L15/dbahR9VUOiX7GmGJBCnQyS0EY+I8x+wa7egg==",
        "license": "MIT"
      },
@@ -490,14 +490,14 @@
      "node_modules/combined-stream": {
        "version": "1.0.8",
        "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-@@ -1966,47 +1518,6 @@
+@@ -1975,47 +1527,6 @@
          "node": ">= 0.4"
        }
      },
 -    "node_modules/esbuild": {
--      "version": "0.25.2",
--      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
--      "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
+-      "version": "0.25.3",
+-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz",
+-      "integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==",
 -      "dev": true,
 -      "hasInstallScript": true,
 -      "license": "MIT",
@@ -508,44 +508,44 @@
 -        "node": ">=18"
 -      },
 -      "optionalDependencies": {
--        "@esbuild/aix-ppc64": "0.25.2",
--        "@esbuild/android-arm": "0.25.2",
--        "@esbuild/android-arm64": "0.25.2",
--        "@esbuild/android-x64": "0.25.2",
--        "@esbuild/darwin-arm64": "0.25.2",
--        "@esbuild/darwin-x64": "0.25.2",
--        "@esbuild/freebsd-arm64": "0.25.2",
--        "@esbuild/freebsd-x64": "0.25.2",
--        "@esbuild/linux-arm": "0.25.2",
--        "@esbuild/linux-arm64": "0.25.2",
--        "@esbuild/linux-ia32": "0.25.2",
--        "@esbuild/linux-loong64": "0.25.2",
--        "@esbuild/linux-mips64el": "0.25.2",
--        "@esbuild/linux-ppc64": "0.25.2",
--        "@esbuild/linux-riscv64": "0.25.2",
--        "@esbuild/linux-s390x": "0.25.2",
--        "@esbuild/linux-x64": "0.25.2",
--        "@esbuild/netbsd-arm64": "0.25.2",
--        "@esbuild/netbsd-x64": "0.25.2",
--        "@esbuild/openbsd-arm64": "0.25.2",
--        "@esbuild/openbsd-x64": "0.25.2",
--        "@esbuild/sunos-x64": "0.25.2",
--        "@esbuild/win32-arm64": "0.25.2",
--        "@esbuild/win32-ia32": "0.25.2",
--        "@esbuild/win32-x64": "0.25.2"
+-        "@esbuild/aix-ppc64": "0.25.3",
+-        "@esbuild/android-arm": "0.25.3",
+-        "@esbuild/android-arm64": "0.25.3",
+-        "@esbuild/android-x64": "0.25.3",
+-        "@esbuild/darwin-arm64": "0.25.3",
+-        "@esbuild/darwin-x64": "0.25.3",
+-        "@esbuild/freebsd-arm64": "0.25.3",
+-        "@esbuild/freebsd-x64": "0.25.3",
+-        "@esbuild/linux-arm": "0.25.3",
+-        "@esbuild/linux-arm64": "0.25.3",
+-        "@esbuild/linux-ia32": "0.25.3",
+-        "@esbuild/linux-loong64": "0.25.3",
+-        "@esbuild/linux-mips64el": "0.25.3",
+-        "@esbuild/linux-ppc64": "0.25.3",
+-        "@esbuild/linux-riscv64": "0.25.3",
+-        "@esbuild/linux-s390x": "0.25.3",
+-        "@esbuild/linux-x64": "0.25.3",
+-        "@esbuild/netbsd-arm64": "0.25.3",
+-        "@esbuild/netbsd-x64": "0.25.3",
+-        "@esbuild/openbsd-arm64": "0.25.3",
+-        "@esbuild/openbsd-x64": "0.25.3",
+-        "@esbuild/sunos-x64": "0.25.3",
+-        "@esbuild/win32-arm64": "0.25.3",
+-        "@esbuild/win32-ia32": "0.25.3",
+-        "@esbuild/win32-x64": "0.25.3"
 -      }
 -    },
      "node_modules/esbuild-plugin-vue-next": {
        "version": "0.1.4",
        "resolved": "https://registry.npmjs.org/esbuild-plugin-vue-next/-/esbuild-plugin-vue-next-0.1.4.tgz",
-@@ -2037,6 +1548,19 @@
+@@ -2046,6 +1557,19 @@
          "sass-embedded": "^1.71.1"
        }
      },
 +    "node_modules/esbuild-wasm": {
-+      "version": "0.25.2",
-+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.25.2.tgz",
-+      "integrity": "sha512-vL9PSK1YFGsvrlYPDxfRxpakIDTe1wCS/JO2D45muxwtd7GR/9+fYRU+K8tKs4ZDXaEy5jr6YqrGgDL/iyufyQ==",
++      "version": "0.25.3",
++      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.25.3.tgz",
++      "integrity": "sha512-60mFpAU4iQMVIP9tSd5EEbxZUDsqSKAjAJ7r1OK073lG/ctnVidThvbcU+M2B55jMFntCFJlqksubXMpYIcbfg==",
 +      "dev": true,
 +      "license": "MIT",
 +      "bin": {
@@ -558,7 +558,7 @@
      "node_modules/estree-walker": {
        "version": "2.0.2",
        "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-@@ -2156,17 +1680,6 @@
+@@ -2165,17 +1689,6 @@
          "url": "https://github.com/sponsors/ljharb"
        }
      },
@@ -576,7 +576,7 @@
      "node_modules/has-symbols": {
        "version": "1.1.0",
        "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-@@ -2770,17 +2283,6 @@
+@@ -2774,17 +2287,6 @@
          "node": ">=4"
        }
      },
@@ -594,14 +594,14 @@
      "node_modules/safe-identifier": {
        "version": "0.4.2",
        "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
-@@ -2809,412 +2311,6 @@
+@@ -2813,412 +2315,6 @@
          "@parcel/watcher": "^2.4.1"
        }
      },
 -    "node_modules/sass-embedded": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.86.3.tgz",
--      "integrity": "sha512-3pZSp24ibO1hdopj+W9DuiWsZOb2YY6AFRo/jjutKLBkqJGM1nJjXzhAYfzRV+Xn5BX1eTI4bBTE09P0XNHOZg==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.87.0.tgz",
+-      "integrity": "sha512-1IA3iTJNh4BkkA/nidKiVwbmkxr9o6LsPegycHMX/JYs255zpocN5GdLF1+onohQCJxbs5ldr8osKV7qNaNBjg==",
 -      "dev": true,
 -      "license": "MIT",
 -      "peer": true,
@@ -622,32 +622,32 @@
 -        "node": ">=16.0.0"
 -      },
 -      "optionalDependencies": {
--        "sass-embedded-android-arm": "1.86.3",
--        "sass-embedded-android-arm64": "1.86.3",
--        "sass-embedded-android-ia32": "1.86.3",
--        "sass-embedded-android-riscv64": "1.86.3",
--        "sass-embedded-android-x64": "1.86.3",
--        "sass-embedded-darwin-arm64": "1.86.3",
--        "sass-embedded-darwin-x64": "1.86.3",
--        "sass-embedded-linux-arm": "1.86.3",
--        "sass-embedded-linux-arm64": "1.86.3",
--        "sass-embedded-linux-ia32": "1.86.3",
--        "sass-embedded-linux-musl-arm": "1.86.3",
--        "sass-embedded-linux-musl-arm64": "1.86.3",
--        "sass-embedded-linux-musl-ia32": "1.86.3",
--        "sass-embedded-linux-musl-riscv64": "1.86.3",
--        "sass-embedded-linux-musl-x64": "1.86.3",
--        "sass-embedded-linux-riscv64": "1.86.3",
--        "sass-embedded-linux-x64": "1.86.3",
--        "sass-embedded-win32-arm64": "1.86.3",
--        "sass-embedded-win32-ia32": "1.86.3",
--        "sass-embedded-win32-x64": "1.86.3"
+-        "sass-embedded-android-arm": "1.87.0",
+-        "sass-embedded-android-arm64": "1.87.0",
+-        "sass-embedded-android-ia32": "1.87.0",
+-        "sass-embedded-android-riscv64": "1.87.0",
+-        "sass-embedded-android-x64": "1.87.0",
+-        "sass-embedded-darwin-arm64": "1.87.0",
+-        "sass-embedded-darwin-x64": "1.87.0",
+-        "sass-embedded-linux-arm": "1.87.0",
+-        "sass-embedded-linux-arm64": "1.87.0",
+-        "sass-embedded-linux-ia32": "1.87.0",
+-        "sass-embedded-linux-musl-arm": "1.87.0",
+-        "sass-embedded-linux-musl-arm64": "1.87.0",
+-        "sass-embedded-linux-musl-ia32": "1.87.0",
+-        "sass-embedded-linux-musl-riscv64": "1.87.0",
+-        "sass-embedded-linux-musl-x64": "1.87.0",
+-        "sass-embedded-linux-riscv64": "1.87.0",
+-        "sass-embedded-linux-x64": "1.87.0",
+-        "sass-embedded-win32-arm64": "1.87.0",
+-        "sass-embedded-win32-ia32": "1.87.0",
+-        "sass-embedded-win32-x64": "1.87.0"
 -      }
 -    },
 -    "node_modules/sass-embedded-android-arm": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.86.3.tgz",
--      "integrity": "sha512-UyeXrFzZSvrGbvrWUBcspbsbivGgAgebLGJdSqJulgSyGbA6no3DWQ5Qpdd6+OAUC39BlpPu74Wx9s4RrVuaFw==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.87.0.tgz",
+-      "integrity": "sha512-Z20u/Y1kFDpMbgiloR5YPLxNuMVeKQRC8e/n68oAAxf3u7rDSmNn2msi7USqgT1f2zdBBNawn/ifbFEla6JiHw==",
 -      "cpu": [
 -        "arm"
 -      ],
@@ -663,9 +663,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-android-arm64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.86.3.tgz",
--      "integrity": "sha512-q+XwFp6WgAv+UgnQhsB8KQ95kppvWAB7DSoJp+8Vino8b9ND+1ai3cUUZPE5u4SnLZrgo5NtrbPvN5KLc4Pfyg==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.87.0.tgz",
+-      "integrity": "sha512-uqeZoBuXm3W2KhxolScAAfWOLHL21e50g7AxlLmG0he7WZsWw6e9kSnmq301iLIFp4kvmXYXbXbNKAeu9ItRYA==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -681,9 +681,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-android-ia32": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.86.3.tgz",
--      "integrity": "sha512-gTJjVh2cRzvGujXj5ApPk/owUTL5SiO7rDtNLrzYAzi1N5HRuLYXqk3h1IQY3+eCOBjGl7mQ9XyySbJs/3hDvg==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.87.0.tgz",
+-      "integrity": "sha512-hSWTqo2Igdig528cUb1W1+emw9d1J4+nqOoR4tERS04zcwRRFNDiuBT0o5meV7nkEwE982F+h57YdcRXj8gTtg==",
 -      "cpu": [
 -        "ia32"
 -      ],
@@ -699,9 +699,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-android-riscv64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.86.3.tgz",
--      "integrity": "sha512-Po3JnyiCS16kd6REo1IMUbFGYtvL9O0rmKaXx5vOuBaJD1LPy2LiSSp7TU7wkJ9IxsTDGzFaSeP1I9qb6D8VVg==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.87.0.tgz",
+-      "integrity": "sha512-kBAPSjiTBLy5ua/0LRNAJwOAARhzFU7gP35fYORJcdBuz1lkIVPVnid1lh9qQ6Ce9MOJcr7VKFtGnTuqVeig5A==",
 -      "cpu": [
 -        "riscv64"
 -      ],
@@ -717,9 +717,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-android-x64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.86.3.tgz",
--      "integrity": "sha512-+7h3jdDv/0kUFx0BvxYlq2fa7CcHiDPlta6k5OxO5K6jyqJwo9hc0Z052BoYEauWTqZ+vK6bB5rv2BIzq4U9nA==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.87.0.tgz",
+-      "integrity": "sha512-ZHMrNdtdMSpJUYco2MesnlPwDTZftD3pqkkOMI2pbqarPoFUKJtP5k80nwCM0sJGtqfNE+O16w9yPght0CMiJg==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -735,9 +735,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-darwin-arm64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.86.3.tgz",
--      "integrity": "sha512-EgLwV4ORm5Hr0DmIXo0Xw/vlzwLnfAiqD2jDXIglkBsc5czJmo4/IBdGXOP65TRnsgJEqvbU3aQhuawX5++x9A==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.87.0.tgz",
+-      "integrity": "sha512-7TK1JWJdCIRSdZv5CJv/HpDz/wIfwUy2FoPz9sVOEj1pDTH0N+VfJd5VutCddIdoQN9jr0ap8vwkc65FbAxV2A==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -753,9 +753,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-darwin-x64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.86.3.tgz",
--      "integrity": "sha512-dfKhfrGPRNLWLC82vy/vQGmNKmAiKWpdFuWiePRtg/E95pqw+sCu6080Y6oQLfFu37Iq3MpnXiSpDuSo7UnPWA==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.87.0.tgz",
+-      "integrity": "sha512-2JiQzt7FmgUC4MYT2QvbeH/Bi3e76WEhaYoc5P3WyTW8unsHksyTdMuTuYe0Qf9usIyt6bmm5no/4BBw7c8Cig==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -771,9 +771,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-arm": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.86.3.tgz",
--      "integrity": "sha512-+fVCIH+OR0SMHn2NEhb/VfbpHuUxcPtqMS34OCV3Ka99LYZUJZqth4M3lT/ppGl52mwIVLNYzR4iLe6mdZ6mYA==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.87.0.tgz",
+-      "integrity": "sha512-z5P6INMsGXiUcq1sRRbksyQUhalFFYjTEexuxfSYdK3U2YQMADHubQh8pGzkWvFRPOpnh83RiGuwvpaARYHnsw==",
 -      "cpu": [
 -        "arm"
 -      ],
@@ -789,9 +789,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-arm64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.86.3.tgz",
--      "integrity": "sha512-tYq5rywR53Qtc+0KI6pPipOvW7a47ETY69VxfqI9BR2RKw2hBbaz0bIw6OaOgEBv2/XNwcWb7a4sr7TqgkqKAA==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.87.0.tgz",
+-      "integrity": "sha512-5z+mwJCbGZcg+q+MwdEVSh0ogFK7OSAe175Gsozzr/Izw34Q+RGUw9O82jsV2c4YNuTAQvzEHgIO5cvNvt3Quw==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -807,9 +807,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-ia32": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.86.3.tgz",
--      "integrity": "sha512-CmQ5OkqnaeLdaF+bMqlYGooBuenqm3LvEN9H8BLhjkpWiFW8hnYMetiqMcJjhrXLvDw601KGqA5sr/Rsg5s45g==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.87.0.tgz",
+-      "integrity": "sha512-Xzcp+YPp0iakGL148Jl57CO+MxLuj2jsry3M+rc1cSnDlvkjNVs6TMxaL70GFeV5HdU2V60voYcgE7adDUtJjw==",
 -      "cpu": [
 -        "ia32"
 -      ],
@@ -825,9 +825,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-musl-arm": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.86.3.tgz",
--      "integrity": "sha512-SEm65SQknI4pl+mH5Xf231hOkHJyrlgh5nj4qDbiBG6gFeutaNkNIeRgKEg3cflXchCr8iV/q/SyPgjhhzQb7w==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.87.0.tgz",
+-      "integrity": "sha512-4PyqOWhRzyu06RRmpCCBOJdF4BOv7s446wrV6yODtEyyfSIDx3MJabo3KT0oJ1lTWSI/aU3R89bKx0JFXcIHHw==",
 -      "cpu": [
 -        "arm"
 -      ],
@@ -843,9 +843,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-musl-arm64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.86.3.tgz",
--      "integrity": "sha512-4zOr2C/eW89rxb4ozTfn7lBzyyM5ZigA1ZSRTcAR26Qbg/t2UksLdGnVX9/yxga0d6aOi0IvO/7iM2DPPRRotg==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.87.0.tgz",
+-      "integrity": "sha512-HWE5eTRCoKzFZWsxOjDMTF5m4DDTQ0n7NJxSYiUXPBDydr9viPXbGOMYG7WVJLjiF7upr7DYo/mfp/SNTMlZyg==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -861,9 +861,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-musl-ia32": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.86.3.tgz",
--      "integrity": "sha512-84Tcld32LB1loiqUvczWyVBQRCChm0wNLlkT59qF29nxh8njFIVf9yaPgXcSyyjpPoD9Tu0wnq3dvVzoMCh9AQ==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.87.0.tgz",
+-      "integrity": "sha512-aQaPvlRn3kh93PLQvl6BcFKu8Ji92+42blFEkg6nMVvmugD5ZwH2TGFrX25ibx4CYxRpMS4ssF7a0i7vy5HB1Q==",
 -      "cpu": [
 -        "ia32"
 -      ],
@@ -879,9 +879,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-musl-riscv64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.86.3.tgz",
--      "integrity": "sha512-IxEqoiD7vdNpiOwccybbV93NljBy64wSTkUOknGy21SyV43C8uqESOwTwW9ywa3KufImKm8L3uQAW/B0KhJMWg==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.87.0.tgz",
+-      "integrity": "sha512-o5DxcqiFzET3KRWo+futHr/lhAMBP3tJGGx8YIgpHQYfvDMbsvE0hiFC+nZ/GF9dbcGd+ceIQwfvE5mcc7Gsjw==",
 -      "cpu": [
 -        "riscv64"
 -      ],
@@ -897,9 +897,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-musl-x64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.86.3.tgz",
--      "integrity": "sha512-ePeTPXUxPK6JgHcUfnrkIyDtyt+zlAvF22mVZv6y1g/PZFm1lSfX+Za7TYHg9KaYqaaXDiw6zICX4i44HhR8rA==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.87.0.tgz",
+-      "integrity": "sha512-dKxWsu9Wu/CyfzQmHdeiGqrRSzJ85VUjbSx+aP1/7ttmps3SSg+YW95PuqnCOa7GSuSreC3dKKpXHTywUxMLQA==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -915,9 +915,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-riscv64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.86.3.tgz",
--      "integrity": "sha512-NuXQ72dwfNLe35E+RaXJ4Noq4EkFwM65eWwCwxEWyJO9qxOx1EXiCAJii6x8kkOh5daWuMU0VAI1B9RsJaqqQQ==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.87.0.tgz",
+-      "integrity": "sha512-Sy3ESZ4FwBiijvmTA9n+0p0w3MNCue1AgINVPzpAY27EFi0h49eqQm9SWfOkFqmkFS2zFRYowdQOr5Bbr2gOXA==",
 -      "cpu": [
 -        "riscv64"
 -      ],
@@ -933,9 +933,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-linux-x64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.86.3.tgz",
--      "integrity": "sha512-t8be9zJ5B82+og9bQmIQ83yMGYZMTMrlGA+uGWtYacmwg6w3093dk91Fx0YzNSZBp3Tk60qVYjCZnEIwy60x0g==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.87.0.tgz",
+-      "integrity": "sha512-+UfjakOcHHKTnEqB3EZ+KqzezQOe1emvy4Rs+eQhLyfekpYuNze/qlRvYxfKTmrtvDiUrIto8MXsyZfMLzkuMA==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -951,9 +951,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-win32-arm64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.86.3.tgz",
--      "integrity": "sha512-4ghuAzjX4q8Nksm0aifRz8hgXMMxS0SuymrFfkfJlrSx68pIgvAge6AOw0edoZoe0Tf5ZbsWUWamhkNyNxkTvw==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.87.0.tgz",
+-      "integrity": "sha512-m1DS6FYUE0/fv+vt38uQB/kxR4UjnyD+2zcSc298pFmA0aYh/XZIPWw7RxG1HL3KLE1ZrGyu3254MPoxRhs3ig==",
 -      "cpu": [
 -        "arm64"
 -      ],
@@ -969,9 +969,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-win32-ia32": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.86.3.tgz",
--      "integrity": "sha512-tCaK4zIRq9mLRPxLzBAdYlfCuS/xLNpmjunYxeWkIwlJo+k53h1udyXH/FInnQ2GgEz0xMXyvH3buuPgzwWYsw==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.87.0.tgz",
+-      "integrity": "sha512-JztXLo59GMe2E6g+kCsyiERYhtZgkcyDYx6CrXoSTE5WaE+RbxRiCCCv8/1+hf406f08pUxJ8G0Ody7M5urtBA==",
 -      "cpu": [
 -        "ia32"
 -      ],
@@ -987,9 +987,9 @@
 -      }
 -    },
 -    "node_modules/sass-embedded-win32-x64": {
--      "version": "1.86.3",
--      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.86.3.tgz",
--      "integrity": "sha512-zS+YNKfTF4SnOfpC77VTb0qNZyTXrxnAezSoRV0xnw6HlY+1WawMSSB6PbWtmbvyfXNgpmJUttoTtsvJjRCucg==",
+-      "version": "1.87.0",
+-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.87.0.tgz",
+-      "integrity": "sha512-4nQErpauvhgSo+7ClumGdjdf9sGx+U9yBgvhI0+zUw+D5YvraVgvA0Lk8Wuwntx2PqnvKUk8YDr/vxHJostv4Q==",
 -      "cpu": [
 -        "x64"
 -      ],
@@ -1005,9 +1005,9 @@
 -      }
 -    },
      "node_modules/short-unique-id": {
-       "version": "5.2.2",
-       "resolved": "https://registry.npmjs.org/short-unique-id/-/short-unique-id-5.2.2.tgz",
-@@ -3234,23 +2330,6 @@
+       "version": "5.2.0",
+       "resolved": "https://registry.npmjs.org/short-unique-id/-/short-unique-id-5.2.0.tgz",
+@@ -3238,23 +2334,6 @@
          "node": ">=0.10.0"
        }
      },
@@ -1031,7 +1031,7 @@
      "node_modules/supports-preserve-symlinks-flag": {
        "version": "1.0.0",
        "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-@@ -3290,31 +2369,6 @@
+@@ -3294,31 +2373,6 @@
          "ramda-adjunct": "^5.1.0"
        }
      },
@@ -1063,7 +1063,7 @@
      "node_modules/timezones-list": {
        "version": "3.1.0",
        "resolved": "https://registry.npmjs.org/timezones-list/-/timezones-list-3.1.0.tgz",
-@@ -3335,19 +2389,6 @@
+@@ -3339,19 +2393,6 @@
          "node": ">=8.0"
        }
      },
@@ -1083,7 +1083,7 @@
      "node_modules/tree-sitter-json": {
        "version": "0.24.8",
        "resolved": "https://registry.npmjs.org/tree-sitter-json/-/tree-sitter-json-0.24.8.tgz",
-@@ -3378,17 +2419,6 @@
+@@ -3382,17 +2423,6 @@
          "node": "^18 || ^20 || >= 21"
        }
      },
@@ -1101,7 +1101,7 @@
      "node_modules/ts-mixer": {
        "version": "6.0.4",
        "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz",
-@@ -3401,14 +2431,6 @@
+@@ -3405,14 +2435,6 @@
        "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==",
        "license": "Apache-2.0"
      },
@@ -1116,7 +1116,7 @@
      "node_modules/types-ramda": {
        "version": "0.30.1",
        "resolved": "https://registry.npmjs.org/types-ramda/-/types-ramda-0.30.1.tgz",
-@@ -3423,14 +2445,6 @@
+@@ -3427,14 +2449,6 @@
        "resolved": "https://registry.npmjs.org/unraw/-/unraw-3.0.0.tgz",
        "integrity": "sha512-08/DA66UF65OlpUDIQtbJyrqTR0jTAlJ+jsnkQ4jxR7+K5g5YG1APZKQSMCE1vqqmD+2pv6+IdEjmopFatacvg==",
        "license": "MIT"
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index 078c9b8d52ef..ed7afab32169 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opendmarc
-PORTVERSION=	1.4.2
-PORTREVISION=	3
+DISTVERSION=	1.4.2
+PORTREVISION=	4
 CATEGORIES=	mail security
 MASTER_SITES=	GH
 
@@ -8,30 +8,36 @@ MAINTAINER=	freebsd@gushi.org
 COMMENT=	DMARC library and milter implementation
 WWW=		http://www.trusteddomain.org/opendmarc.html
 
-LICENSE=	BSD3CLAUSE SENDMAIL
-LICENSE_COMB=	multi
+LICENSE=			BSD3CLAUSE SENDMAIL
+LICENSE_COMB=			multi
+LICENSE_GROUPS_SENDMAIL=	FSF OSI
+LICENSE_NAME_SENDMAIL=		Sendmail Open Source License
+LICENSE_FILE_SENDMAIL=		${WRKSRC}/LICENSE.Sendmail
+LICENSE_PERMS_SENDMAIL=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	p5-Switch>=0:lang/p5-Switch \
 		p5-DBI>=0:databases/p5-DBI \
 		${DBD_MYSQL} \
-		p5-HTTP-Message>=0:www/p5-HTTP-Message
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		public_suffix_list>=0:dns/public_suffix_list
 
 USES=		cpe libtool mysql perl5 shebangfix autoreconf
-LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
-LICENSE_GROUPS_SENDMAIL=	FSF OSI
-LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
-LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
 CPE_VENDOR=	trusteddomain
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	opendmarc
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	trusteddomainproject
-GH_TAGNAME=	rel-opendmarc-1-4-2
 GH_PROJECT=	OpenDMARC
+GH_TAGNAME=	rel-${PORTNAME}-${DISTVERSION:S/./-/g}
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	${PORTNAME}
+
+SHEBANG_FILES=	reports/opendmarc-expire.in \
+		reports/opendmarc-import.in \
+		reports/opendmarc-params.in \
+		reports/opendmarc-reports.in
+
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+
+PORTDOCS=	*
 
 OPTIONS_DEFINE=		SPF DOCS
 OPTIONS_DEFAULT=	SPF
@@ -43,18 +49,15 @@ SPF_CONFIGURE_ON=	--with-spf \
 			--with-spf2-include=${LOCALBASE}/include/spf2 \
 			--with-spf2-lib=${LOCALBASE}/lib
 
-SHEBANG_FILES=	reports/opendmarc-expire.in \
-		reports/opendmarc-import.in \
-		reports/opendmarc-params.in \
-		reports/opendmarc-reports.in
-
-PORTDOCS=	*
-
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/opendmarc/opendmarc.conf.sample
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_DATA} \
diff --git a/mail/opendmarc/files/patch-opendmarc_opendmarc.conf.sample b/mail/opendmarc/files/patch-opendmarc_opendmarc.conf.sample
new file mode 100644
index 000000000000..96c7f823d274
--- /dev/null
+++ b/mail/opendmarc/files/patch-opendmarc_opendmarc.conf.sample
@@ -0,0 +1,10 @@
+--- opendmarc/opendmarc.conf.sample.orig	2021-12-20 06:40:37 UTC
++++ opendmarc/opendmarc.conf.sample
+@@ -294,6 +294,7 @@
+ ##  One location to retrieve the file from is https://publicsuffix.org/list/
+ #
+ # PublicSuffixList path
++PublicSuffixList %%PREFIX%%/share/public_suffix_list/public_suffix_list.dat
+ 
+ ##  RecordAllMessages { true | false }
+ ##  	default "false"
diff --git a/mail/py-imap-tools/Makefile b/mail/py-imap-tools/Makefile
index 907bc97b14f1..de563fe93a14 100644
--- a/mail/py-imap-tools/Makefile
+++ b/mail/py-imap-tools/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	imap-tools
-PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTVERSION=	1.10.0
 CATEGORIES=	mail python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/mail/py-imap-tools/distinfo b/mail/py-imap-tools/distinfo
index d531caf859ee..e4d1ff9a9f0a 100644
--- a/mail/py-imap-tools/distinfo
+++ b/mail/py-imap-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738062761
-SHA256 (imap_tools-1.9.1.tar.gz) = c2a866ec8c875613b6306b5874bd82d126d94ff85fbc6d5180f038f25af336f1
-SIZE (imap_tools-1.9.1.tar.gz) = 45185
+TIMESTAMP = 1746349751
+SHA256 (imap_tools-1.10.0.tar.gz) = 3d2bee8e2900a58a3bf91e09531e548453f91fae2e491965030a4d96c4a34557
+SIZE (imap_tools-1.10.0.tar.gz) = 45963
diff --git a/mail/rubygem-roadie-rails-rails52/Makefile b/mail/rubygem-roadie-rails-rails52/Makefile
index 3c0a73db835a..4eed36b72d09 100644
--- a/mail/rubygem-roadie-rails-rails52/Makefile
+++ b/mail/rubygem-roadie-rails-rails52/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails52
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Helper for generating HTML mails in Rails applications
 WWW=		https://github.com/Mange/roadie-rails
 
diff --git a/mail/rubygem-roadie-rails-rails61/Makefile b/mail/rubygem-roadie-rails-rails61/Makefile
index 8cd63099f50f..e142d4da41b5 100644
--- a/mail/rubygem-roadie-rails-rails61/Makefile
+++ b/mail/rubygem-roadie-rails-rails61/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Helper for generating HTML mails in Rails applications
 WWW=		https://github.com/Mange/roadie-rails
 
diff --git a/mail/rubygem-roadie-rails-rails72/Makefile b/mail/rubygem-roadie-rails-rails72/Makefile
index 61ae73fdb14f..d2d45865cb74 100644
--- a/mail/rubygem-roadie-rails-rails72/Makefile
+++ b/mail/rubygem-roadie-rails-rails72/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails72
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Helper for generating HTML mails in Rails applications
 WWW=		https://github.com/Mange/roadie-rails
 
diff --git a/mail/spfmilter/Makefile b/mail/spfmilter/Makefile
index dd7e9225115d..b729c8fcd85d 100644
--- a/mail/spfmilter/Makefile
+++ b/mail/spfmilter/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	spfmilter
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	mail
 MASTER_SITES=	https://acme.com/software/spfmilter/
 
diff --git a/mail/spfmilter/distinfo b/mail/spfmilter/distinfo
index b8598fbcf218..97cb927bbb38 100644
--- a/mail/spfmilter/distinfo
+++ b/mail/spfmilter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746203310
-SHA256 (spfmilter-2.1.tar.gz) = 5a95321f365d47d4fe0901f39ac477f916face853c15146aae6a071d1aa34deb
-SIZE (spfmilter-2.1.tar.gz) = 66059
+TIMESTAMP = 1746389880
+SHA256 (spfmilter-2.2.tar.gz) = ec80482187dfa1f1967ccbd54ab442a65c031cfe9b6d3845840619f1125640ab
+SIZE (spfmilter-2.2.tar.gz) = 65973
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 0dd701977366..3c8fb2a73bf3 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	wanderlust
 PORTVERSION=	2.15.9.b.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
@@ -19,10 +18,10 @@ RUN_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
 
 USES=		emacs
 USE_GITHUB=	yes
-GH_TAGNAME=	8b413b3
+GH_TAGNAME=	a346378
 
 NO_ARCH=	yes
-SNAPDATE=	20240913
+SNAPDATE=	20250506
 
 MAKE_ARGS+=	EMACS=${EMACS_CMD} \
 		FLAGS="-batch -q -no-site-file" \
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index 8e7d47a73f9d..a6268ce34663 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727583447
-SHA256 (wanderlust-wanderlust-2.15.9.b.20240913-8b413b3_GH0.tar.gz) = e48f6f75698b14e288817971a98c9589807c0dab27d6564593fd5a003f36fa95
-SIZE (wanderlust-wanderlust-2.15.9.b.20240913-8b413b3_GH0.tar.gz) = 1178238
+TIMESTAMP = 1746515528
+SHA256 (wanderlust-wanderlust-2.15.9.b.20250506-a346378_GH0.tar.gz) = f7a286d2a32948ee948c7be629765c5d4422ea52a655ba5c283aa4167b3ff9ea
+SIZE (wanderlust-wanderlust-2.15.9.b.20250506-a346378_GH0.tar.gz) = 1181585
diff --git a/mail/wanderlust/pkg-plist b/mail/wanderlust/pkg-plist
index 8526a0dfc93e..6f10ec541f24 100644
--- a/mail/wanderlust/pkg-plist
+++ b/mail/wanderlust/pkg-plist
@@ -169,6 +169,8 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/wl/modb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/wl/pldap.el
 %%EMACS_VERSION_SITE_LISPDIR%%/wl/pldap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/wl/rfc2368.el
+%%EMACS_VERSION_SITE_LISPDIR%%/wl/rfc2368.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/wl/slp.el
 %%EMACS_VERSION_SITE_LISPDIR%%/wl/slp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/wl/ssl.el
diff --git a/math/Makefile b/math/Makefile
index ae6a1efdb269..5a9ac034f0d3 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -584,6 +584,7 @@
     SUBDIR += octave-forge-fileio
     SUBDIR += octave-forge-financial
     SUBDIR += octave-forge-fits
+    SUBDIR += octave-forge-fl-core
     SUBDIR += octave-forge-fpl
     SUBDIR += octave-forge-fuzzy-logic-toolkit
     SUBDIR += octave-forge-ga
diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile
index c1b16cb4bac9..69519f3650ed 100644
--- a/math/R-cran-XLConnect/Makefile
+++ b/math/R-cran-XLConnect/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	XLConnect
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -21,25 +21,26 @@ RUN_DEPENDS=	R-cran-rJava>0:devel/R-cran-rJava	\
 		apache-commons-compress>0:archivers/apache-commons-compress \
 		apache-commons-collections4>0:java/apache-commons-collections4
 TEST_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo	\
+		R-cran-RUnit>0:devel/R-cran-RUnit	\
 		R-cran-ggplot2>0:graphics/R-cran-ggplot2
 
 USES=		cran java
 
-DEP_JARS=	commons-codec commons-collections4 commons-compress	\
-		commons-lang3 log4j-api poi poi-ooxml poi-ooxml-full	\
+DEP_JARS=	commons-codec commons-collections4 commons-compress commons-io	\
+		commons-lang3 commons-math log4j-api poi poi-ooxml poi-ooxml-full\
 		SparseBitSet xmlbeans
 
-post-install:
+post-stage:
 .for j in ${DEP_JARS}
 	${LN} -sf ${JAVALIBDIR}/${j}.jar ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/
 .endfor
 	${LN} -sf ${JAVALIBDIR}/commons-lang3.jar	\
-		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-lang3-3.14.0.jar
+		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-lang3-3.16.0.jar
 	${LN} -sf ${JAVALIBDIR}/commons-math.jar	\
 		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-math3.jar
-	${LN} -sf ${JAVALIBDIR}/commons-io-2.16.1.jar	\
-		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-io-2.16.1.jar
+	${LN} -sf ${JAVALIBDIR}/commons-io.jar	\
+		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-io-2.18.0.jar
 	${LN} -sf ${JAVALIBDIR}/commons-codec.jar	\
-		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.17.0.jar
+		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.18.0.jar
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo
index 13a4525145af..918d9b31c2b5 100644
--- a/math/R-cran-XLConnect/distinfo
+++ b/math/R-cran-XLConnect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743444718
-SHA256 (XLConnect_1.2.0.tar.gz) = 6dab078b45b691f6bac69194fd7f45b7afa3973e33ac7320c4e0797a378f046e
-SIZE (XLConnect_1.2.0.tar.gz) = 1467473
+TIMESTAMP = 1746259385
+SHA256 (XLConnect_1.2.1.tar.gz) = 9c081baff120ca7b5af79f8f3af5b03aa97fd94739b8484f9dbbcf51dae1946e
+SIZE (XLConnect_1.2.1.tar.gz) = 1474417
diff --git a/math/R-cran-XLConnect/files/patch-R_XLConnectSettings.R b/math/R-cran-XLConnect/files/patch-R_XLConnectSettings.R
new file mode 100644
index 000000000000..53fcbef8efde
--- /dev/null
+++ b/math/R-cran-XLConnect/files/patch-R_XLConnectSettings.R
@@ -0,0 +1,12 @@
+--- R/XLConnectSettings.R.orig	2025-04-29 09:58:50 UTC
++++ R/XLConnectSettings.R
+@@ -46,9 +46,6 @@ XLConnectSettings <- function(pdesc) {
+ 	options(XLConnect.RownameCol = ".rownames")
+ 
+ 	options(XLConnect.setCustomAttributes = FALSE)
+-	
+-	# Apply default POI configuration
+-	configurePOI()
+   
+ 	invisible()
+ }
diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R
index bf0baeaeb521..c44134cc8c79 100644
--- a/math/R-cran-XLConnect/files/patch-R_onLoad.R
+++ b/math/R-cran-XLConnect/files/patch-R_onLoad.R
@@ -1,4 +1,4 @@
---- R/onLoad.R.orig	2025-02-17 07:43:13 UTC
+--- R/onLoad.R.orig	2025-04-29 09:58:50 UTC
 +++ R/onLoad.R
 @@ -55,50 +55,7 @@
      repo <- "https://repo1.maven.org/maven2"
@@ -7,14 +7,14 @@
 -  sharedPaths <- tryCatch({
 -    c(
 -      xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/poi/poi-ooxml-full/5.4.0/poi-ooxml-full-5.4.0.jar"), "poi-ooxml-full.jar", 
--      "5.4.0",  libname, pkgname),
+-      paste0(apachePrefix, "/poi/poi-ooxml-full/5.4.1/poi-ooxml-full-5.4.1.jar"), "poi-ooxml-full.jar", 
+-      "5.4.1",  libname, pkgname),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/poi/poi-ooxml/5.4.0/poi-ooxml-5.4.0.jar"), "poi-ooxml.jar", 
--      "5.4.0",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
+-      paste0(apachePrefix, "/poi/poi-ooxml/5.4.1/poi-ooxml-5.4.1.jar"), "poi-ooxml.jar", 
+-      "5.4.1",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/poi/poi/5.4.0/poi-5.4.0.jar"), "poi.jar", 
--      "5.4.0",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
+-      paste0(apachePrefix, "/poi/poi/5.4.1/poi-5.4.1.jar"), "poi.jar", 
+-      "5.4.1",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
 -    xlcEnsureDependenciesFor(
 -      paste0(apachePrefix, "/commons/commons-compress/1.27.1/commons-compress-1.27.1.jar"), "commons-compress.jar",
 -      "1\\.(2[5-9]|[2-9][0-9]).*",  libname, pkgname, debianpkg = "libcommons-compress-java", rpmpkg="apache-commons-compress"),
@@ -34,7 +34,7 @@
 -      paste0(apachePrefix, "/logging/log4j/log4j-api/2.24.3/log4j-api-2.24.3.jar"), "log4j-api.jar",
 -      "2\\.24\\..*",  libname, pkgname),
 -    xlcEnsureDependenciesFor(
--      paste0(repo, "/commons-codec/commons-codec/1.17.1/commons-codec-1.17.1.jar"), "commons-codec-1.17.1.jar",
+-      paste0(repo, "/commons-codec/commons-codec/1.18.0/commons-codec-1.18.0.jar"), "commons-codec-1.18.0.jar",
 -      "1\\.(1[1-9]|[2-9][0-9]).*",  libname, pkgname, debianpkg="libcommons-codec-java", rpmpkg="apache-commons-codec"),
 -    xlcEnsureDependenciesFor(
 -      paste0(repo, "/commons-io/commons-io/2.18.0/commons-io-2.18.0.jar"), "commons-io-2.18.0.jar",
diff --git a/math/R-cran-XLConnect/pkg-plist b/math/R-cran-XLConnect/pkg-plist
index 1b648e2b90f2..c23b9d5691d5 100644
--- a/math/R-cran-XLConnect/pkg-plist
+++ b/math/R-cran-XLConnect/pkg-plist
@@ -58,15 +58,17 @@
 %%R_MOD_DIR%%/html/00Index.html
 %%R_MOD_DIR%%/html/R.css
 %%R_MOD_DIR%%/java/SparseBitSet.jar
-%%R_MOD_DIR%%/java/XLConnect-3.1.0.jar
-%%R_MOD_DIR%%/java/commons-codec-1.17.0.jar
+%%R_MOD_DIR%%/java/XLConnect-3.1.1.jar
+%%R_MOD_DIR%%/java/commons-codec-1.18.0.jar
 %%R_MOD_DIR%%/java/commons-codec.jar
 %%R_MOD_DIR%%/java/commons-collections4.jar
 %%R_MOD_DIR%%/java/commons-compress.jar
-%%R_MOD_DIR%%/java/commons-io-2.16.1.jar
-%%R_MOD_DIR%%/java/commons-lang3-3.14.0.jar
+%%R_MOD_DIR%%/java/commons-io-2.18.0.jar
+%%R_MOD_DIR%%/java/commons-io.jar
+%%R_MOD_DIR%%/java/commons-lang3-3.16.0.jar
 %%R_MOD_DIR%%/java/commons-lang3.jar
 %%R_MOD_DIR%%/java/commons-math3.jar
+%%R_MOD_DIR%%/java/commons-math.jar
 %%R_MOD_DIR%%/java/curvesapi-1.08.jar
 %%R_MOD_DIR%%/java/log4j-api.jar
 %%R_MOD_DIR%%/java/log4j2.system.properties
@@ -112,8 +114,10 @@
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookReadWorksheet.xlsx
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookSheets.xls
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookSheets.xlsx
+%%R_MOD_DIR%%/unitTests/resources/testZipBomb.xlsx
 %%R_MOD_DIR%%/unitTests/runit.arefidx.R
 %%R_MOD_DIR%%/unitTests/runit.colidx.R
+%%R_MOD_DIR%%/unitTests/runit.configurePOI.R
 %%R_MOD_DIR%%/unitTests/runit.crefidx.R
 %%R_MOD_DIR%%/unitTests/runit.dataframeConversion.R
 %%R_MOD_DIR%%/unitTests/runit.dumpAndRestore.R
diff --git a/math/R-cran-mathjaxr/Makefile b/math/R-cran-mathjaxr/Makefile
index 02e7c2fbfba8..46e47220b74d 100644
--- a/math/R-cran-mathjaxr/Makefile
+++ b/math/R-cran-mathjaxr/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mathjaxr
-DISTVERSION=	1.6-0
-PORTREVISION=	1
+DISTVERSION=	1.8-0
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-mathjaxr/distinfo b/math/R-cran-mathjaxr/distinfo
index 5dbfe57e82bb..3e3de31dd28c 100644
--- a/math/R-cran-mathjaxr/distinfo
+++ b/math/R-cran-mathjaxr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651909123
-SHA256 (mathjaxr_1.6-0.tar.gz) = ecc47607111b788d84789459af7f4f9102719f98640b7a23bd5a4eb1a6d3c179
-SIZE (mathjaxr_1.6-0.tar.gz) = 1050221
+TIMESTAMP = 1746519352
+SHA256 (mathjaxr_1.8-0.tar.gz) = eb2197c51c01c75654f7b0c755de1f14f8cbdda16945cb259cc2c5f60d321034
+SIZE (mathjaxr_1.8-0.tar.gz) = 1059933
diff --git a/math/R-cran-partitions/Makefile b/math/R-cran-partitions/Makefile
index 9b9772404165..53d4e045123c 100644
--- a/math/R-cran-partitions/Makefile
+++ b/math/R-cran-partitions/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	partitions
-DISTVERSION=	1.10-7
-PORTREVISION=	1
+DISTVERSION=	1.10-9
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-partitions/distinfo b/math/R-cran-partitions/distinfo
index 9b421b773eab..9075bbcbfd82 100644
--- a/math/R-cran-partitions/distinfo
+++ b/math/R-cran-partitions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659878642
-SHA256 (partitions_1.10-7.tar.gz) = 0bfb8371446f8f9be4595a8a3c50b3530c7d4c83c98be7fc4c23b74379f0b1cf
-SIZE (partitions_1.10-7.tar.gz) = 745639
+TIMESTAMP = 1746600087
+SHA256 (partitions_1.10-9.tar.gz) = 1a2dcded62592508932138d5233b6acd21fdde128dd55c907e07464a42ad1c21
+SIZE (partitions_1.10-9.tar.gz) = 489557
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index d16a94eb825b..dc5cb5d37aaf 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cantor
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,11 +29,11 @@ USE_QT=		base svg webchannel webengine \
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	LUAJIT MAXIMA OCTAVE R SAGE SCILAB DOCS
+OPTIONS_DEFINE=	LUAJIT MAXIMA OCTAVE R SCILAB DOCS
 OPTIONS_SUB=	yes # R LUAJIT
 
 LUAJIT_DESC=	Build LuaJIT backend and install LuaJIT
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
+LUAJIT_USES=	luajit
 LUAJIT_CMAKE_OFF=	-DWITH_LuaJIT:BOOL=FALSE
 
 MAXIMA_DESC=	Install Maxima
@@ -42,22 +42,16 @@ MAXIMA_RUN_DEPENDS=	maxima:math/maxima
 OCTAVE_DESC=	Install Octave
 OCTAVE_RUN_DEPENDS=	octave:math/octave
 
-R_DESC=		Build R backend and install R
+R_DESC=		Build R backend and install R (broken)
 R_LIB_DEPENDS=	libR.so:math/R
 # Required to set CFLAGS for -lgfortran.
 R_USES=		fortran
 R_CMAKE_OFF=	-DWITH_R:BOOL=FALSE
 R_BROKEN=	R backend fails with: /usr/include/c++/v1/__locale:1130:9: error: expected ';' at end of declaration list
 
-SAGE_DESC=	Install Sage
-SAGE_RUN_DEPENDS=	sage:math/sage
-
 SCILAB_DESC=	Install Scilab
 SCILAB_RUN_DEPENDS=	scilab:math/scilab
 
-# Disable python2 binding
-CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_PythonLibs
-
 post-patch:
 	${REINPLACE_CMD} -e '/FIND_PROGRAM(_GFORTRAN_EXECUTABLE/s,gfortran,${FC},' \
 		${WRKSRC}/cmake/FindR.cmake
diff --git a/math/libpoly/Makefile b/math/libpoly/Makefile
index eae88c064c92..6a254cb70cc9 100644
--- a/math/libpoly/Makefile
+++ b/math/libpoly/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	libpoly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.13
+DISTVERSION=	0.2.0
 CATEGORIES=	math
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	c1f82e63ccf3f84e2a2234589caac287d2bf6f71.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C library for manipulating polynomials
 WWW=		https://github.com/SRI-CSL/libpoly
@@ -29,4 +26,6 @@ CMAKE_OFF=	LIBPOLY_BUILD_PYTHON_API LIBPOLY_BUILD_STATIC LIBPOLY_BUILD_STATIC_PI
 CFLAGS+=       -Wno-error=unused-but-set-variable
 .endif
 
+# tests as of 0.2.0: 100% tests passed, 0 tests failed out of 14
+
 .include <bsd.port.post.mk>
diff --git a/math/libpoly/distinfo b/math/libpoly/distinfo
index 01734c316bd5..831611f67b9c 100644
--- a/math/libpoly/distinfo
+++ b/math/libpoly/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1705110337
-SHA256 (SRI-CSL-libpoly-v0.1.13_GH0.tar.gz) = ca7092eeeced3dd8bd86cdd3410207802ef1752d7052d92eee3e9e6bb496763c
-SIZE (SRI-CSL-libpoly-v0.1.13_GH0.tar.gz) = 621704
-SHA256 (c1f82e63ccf3f84e2a2234589caac287d2bf6f71.patch) = 4922156534124662b144ef0c56baca5f086c7c8351ea4c28e92975e90d48af29
-SIZE (c1f82e63ccf3f84e2a2234589caac287d2bf6f71.patch) = 658
+TIMESTAMP = 1746379622
+SHA256 (SRI-CSL-libpoly-v0.2.0_GH0.tar.gz) = 146adc0d3f6fe8038adb6b8b69dd16114a4be12f520d5c1fb333f3746d233abe
+SIZE (SRI-CSL-libpoly-v0.2.0_GH0.tar.gz) = 641486
diff --git a/math/libpoly/pkg-plist b/math/libpoly/pkg-plist
index 5b978415ec13..566daf94d073 100644
--- a/math/libpoly/pkg-plist
+++ b/math/libpoly/pkg-plist
@@ -3,6 +3,7 @@ include/poly/assignment.h
 include/poly/dyadic_interval.h
 include/poly/dyadic_rational.h
 include/poly/feasibility_set.h
+include/poly/feasibility_set_int.h
 include/poly/integer.h
 include/poly/interval.h
 include/poly/monomial.h
@@ -11,6 +12,7 @@ include/poly/poly.h
 include/poly/polynomial.h
 include/poly/polynomial_context.h
 include/poly/polynomial_hash_set.h
+include/poly/polynomial_heap.h
 include/poly/polynomial_vector.h
 include/poly/polyxx.h
 include/poly/polyxx/algebraic_number.h
@@ -43,7 +45,7 @@ include/poly/variable_order.h
 include/poly/version.h
 lib/libpoly.so
 lib/libpoly.so.0
-lib/libpoly.so.0.1.13
+lib/libpoly.so.0.2.0
 lib/libpolyxx.so
 lib/libpolyxx.so.0
-lib/libpolyxx.so.0.1.13
+lib/libpolyxx.so.0.2.0
diff --git a/math/metis/Makefile b/math/metis/Makefile
index 9c78855023ff..86fbd1d7935c 100644
--- a/math/metis/Makefile
+++ b/math/metis/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	metis
 DISTVERSION=	5.1.0-p13
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/petsc/pkg-metis/get/
@@ -54,7 +55,7 @@ CFLAGS+=	-fpic
 .include <bsd.port.options.mk>
 
 .if ${ARCH:M*64*}
-CFLAGS+=	-DMETIS_USE_LONGINDEX
+CMAKE_ARGS+=	-DMETIS_USE_LONGINDEX:BOOL="On"
 .endif
 
 pre-configure:
diff --git a/math/mpdecimal/Makefile b/math/mpdecimal/Makefile
index 153cddf87ee3..5d0737563a01 100644
--- a/math/mpdecimal/Makefile
+++ b/math/mpdecimal/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mpdecimal
-DISTVERSION=	4.0.0
+DISTVERSION=	4.0.1
 CATEGORIES=	math
 MASTER_SITES=	https://www.bytereef.org/software/mpdecimal/releases/
 
@@ -10,24 +10,15 @@ WWW=		https://www.bytereef.org/mpdecimal/index.html
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.txt
 
-USES=		compiler:c++11-lang gmake
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+USES=		compiler:c++11-lang gmake pathfix
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	LDXXFLAGS="${LDFLAGS}"
 ALL_TARGET=	default
 TEST_TARGET=	check_local
 
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CONFIGURE_ARGS=	LD="${CC}" LDXX="${CXX}"
-.endif
-
-CONFIGURE_ARGS+=	LDXXFLAGS="${LDFLAGS}"
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpdec.so.${DISTVERSION}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpdec++.so.${DISTVERSION}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/mpdecimal/distinfo b/math/mpdecimal/distinfo
index e2dccc54dba9..416517172a07 100644
--- a/math/mpdecimal/distinfo
+++ b/math/mpdecimal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705611012
-SHA256 (mpdecimal-4.0.0.tar.gz) = 942445c3245b22730fd41a67a7c5c231d11cb1b9936b9c0f76334fb7d0b4468c
-SIZE (mpdecimal-4.0.0.tar.gz) = 315325
+TIMESTAMP = 1746498597
+SHA256 (mpdecimal-4.0.1.tar.gz) = 96d33abb4bb0070c7be0fed4246cd38416188325f820468214471938545b1ac8
+SIZE (mpdecimal-4.0.1.tar.gz) = 316268
diff --git a/math/mpdecimal/pkg-plist b/math/mpdecimal/pkg-plist
index e5528a23a04f..8246911670da 100644
--- a/math/mpdecimal/pkg-plist
+++ b/math/mpdecimal/pkg-plist
@@ -3,11 +3,11 @@ include/mpdecimal.h
 lib/libmpdec++.a
 lib/libmpdec++.so
 lib/libmpdec++.so.4
-lib/libmpdec++.so.4.0.0
+lib/libmpdec++.so.4.0.1
 lib/libmpdec.a
 lib/libmpdec.so
 lib/libmpdec.so.4
-lib/libmpdec.so.4.0.0
+lib/libmpdec.so.4.0.1
 libdata/pkgconfig/libmpdec++.pc
 libdata/pkgconfig/libmpdec.pc
 share/man/man3/libmpdec++.3.gz
diff --git a/math/octave-forge-fl-core/Makefile b/math/octave-forge-fl-core/Makefile
new file mode 100644
index 000000000000..b88c9d21c12f
--- /dev/null
+++ b/math/octave-forge-fl-core/Makefile
@@ -0,0 +1,16 @@
+PORTNAME=	octave-forge-fl-core
+PORTVERSION=	1.0.2
+CATEGORIES=	math
+MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
+
+MAINTAINER=	stephen@FreeBSD.org
+COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+WWW=		https://packages.octave.org/
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
+
+USES=		gmake octave
+
+.include <bsd.port.mk>
diff --git a/math/octave-forge-fl-core/distinfo b/math/octave-forge-fl-core/distinfo
new file mode 100644
index 000000000000..11d6371a0177
--- /dev/null
+++ b/math/octave-forge-fl-core/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746215625
+SHA256 (octave-forge/fl-core-1.0.2.tar.gz) = 39e8b73ff29d1e8d11c5bafc436c01821c70e0a6ffb1f8906176c8e097751e59
+SIZE (octave-forge/fl-core-1.0.2.tar.gz) = 14212
diff --git a/math/octave-forge-fl-core/pkg-descr b/math/octave-forge-fl-core/pkg-descr
new file mode 100644
index 000000000000..b8df32044007
--- /dev/null
+++ b/math/octave-forge-fl-core/pkg-descr
@@ -0,0 +1,8 @@
+The octave-forge package is the result of The GNU Octave Repository project,
+which is intended to be a central location for custom scripts, functions and
+extensions for GNU Octave. contains the source for all the functions plus
+build and install scripts.
+
+This is fl-core.
+
+ Basic functions in Fuzzy Logic.
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index 37d33b5429ec..9933cf303500 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	octave-forge-geometry
 PORTVERSION=	4.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
@@ -12,12 +12,9 @@ WWW=		https://packages.octave.org/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
-BROKEN=		does not build with octave version >= 10.1.0
-
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${OCTAVE_TARBALLS_DIR}/matgeom.tar.gz:math/octave-forge-matgeom
 
 USES=		octave python:env
-USE_CXXSTD=	c++14
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-geometry/files/patch-martinez.h b/math/octave-forge-geometry/files/patch-martinez.h
new file mode 100644
index 000000000000..aca82d7312ff
--- /dev/null
+++ b/math/octave-forge-geometry/files/patch-martinez.h
@@ -0,0 +1,20 @@
+--- martinez.h.orig	2024-03-16 22:56:04 UTC
++++ martinez.h
+@@ -37,7 +37,7 @@ class Martinez { (private)
+ 	enum PolygonType { SUBJECT, CLIPPING };
+ 
+ 	struct SweepEvent;
+-	struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*, bool> { // for sorting edges in the sweep line
++	struct SegmentComp : public __binary_function<SweepEvent*, SweepEvent*, bool> { // for sorting edges in the sweep line
+ 		bool operator() (SweepEvent* e1, SweepEvent* e2) const;
+ 	};
+ 	
+@@ -64,7 +64,7 @@ class Martinez { (private)
+ 	
+ 	static void print (SweepEvent& e); // This function is intended for debugging purposes
+ 
+-	struct SweepEventComp : public binary_function<SweepEvent*, SweepEvent*, bool> { // for sortening events
++	struct SweepEventComp : public __binary_function<SweepEvent*, SweepEvent*, bool> { // for sortening events
+ 		bool operator() (SweepEvent* e1, SweepEvent* e2) const;
+ 	};
+ 
diff --git a/math/octave-forge-geometry/files/patch-polygon.cpp b/math/octave-forge-geometry/files/patch-polygon.cpp
new file mode 100644
index 000000000000..ceb023dc6029
--- /dev/null
+++ b/math/octave-forge-geometry/files/patch-polygon.cpp
@@ -0,0 +1,20 @@
+--- polygon.cpp.orig	2024-03-16 22:56:04 UTC
++++ polygon.cpp
+@@ -93,7 +93,7 @@ namespace { // start of anonymous namespace
+ 
+ namespace { // start of anonymous namespace
+ 	struct SweepEvent;
+-	struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*, bool> {
++	struct SegmentComp : public __binary_function<SweepEvent*, SweepEvent*, bool> {
+ 		bool operator() (SweepEvent* e1, SweepEvent* e2) const;
+ 	};
+ 
+@@ -116,7 +116,7 @@ namespace { // start of anonymous namespace
+ 		bool above (const Point& x) const { return !below (x); }
+ 	};
+ 
+-	struct SweepEventComp : public binary_function<SweepEvent*, SweepEvent*, bool> {
++	struct SweepEventComp : public __binary_function<SweepEvent*, SweepEvent*, bool> {
+ 		bool operator() (SweepEvent* e1, SweepEvent* e2) const {
+ 			if (e1->p.x < e2->p.x) // Different x coordinate
+ 				return true;
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index a1acc1680797..85e1116e21c3 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	octave-forge-image
-PORTVERSION=	2.16.0
+PORTVERSION=	2.16.1
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
diff --git a/math/octave-forge-image/distinfo b/math/octave-forge-image/distinfo
index 75f1632811f2..dffe7f307f38 100644
--- a/math/octave-forge-image/distinfo
+++ b/math/octave-forge-image/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742084167
-SHA256 (octave-forge/image-2.16.0.tar.gz) = 9bb26cca58eb1fbedfb3f84e3d2e7e1eeb5e16d7ebe3235b7c107d94f58d1417
-SIZE (octave-forge/image-2.16.0.tar.gz) = 457848
+TIMESTAMP = 1746215304
+SHA256 (octave-forge/image-2.16.1.tar.gz) = 34a84f755261f6c8d882d08b07567464ea25dc1515072ef6886f2b26ebf6f0a7
+SIZE (octave-forge/image-2.16.1.tar.gz) = 459001
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index 03a45f31da03..b658aa2b53ce 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	octave-forge-io
-PORTVERSION=	2.6.4
-PORTREVISION=	5
+PORTVERSION=	2.7.0
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
diff --git a/math/octave-forge-io/distinfo b/math/octave-forge-io/distinfo
index b9e1b087e51b..6be64d206175 100644
--- a/math/octave-forge-io/distinfo
+++ b/math/octave-forge-io/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640915433
-SHA256 (octave-forge/io-2.6.4.tar.gz) = a74a400bbd19227f6c07c585892de879cd7ae52d820da1f69f1a3e3e89452f5a
-SIZE (octave-forge/io-2.6.4.tar.gz) = 233544
+TIMESTAMP = 1746215173
+SHA256 (octave-forge/io-2.7.0.tar.gz) = 4aa48468b3697934bf8c854e27dbab8827605e9dd4fe37e56834265e6130ba6f
+SIZE (octave-forge/io-2.7.0.tar.gz) = 315347
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index afd1bee794dc..6c01eef5a28b 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	octave-forge-mapping
-PORTVERSION=	1.4.2
-PORTREVISION=	5
+PORTVERSION=	1.4.3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
@@ -12,8 +11,6 @@ WWW=		https://packages.octave.org/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
-BROKEN=		depends upon math/octave-forge-geometry, which is broken
-
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io \
 		${OCTAVE_TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry
 
diff --git a/math/octave-forge-mapping/distinfo b/math/octave-forge-mapping/distinfo
index c61d38f581b3..3005f4d1c02e 100644
--- a/math/octave-forge-mapping/distinfo
+++ b/math/octave-forge-mapping/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645394912
-SHA256 (octave-forge/mapping-1.4.2.tar.gz) = 9ab5105aa0b5e549790070ef84c94d4ada88306d99c5afa1076bc3c9e8b32da2
-SIZE (octave-forge/mapping-1.4.2.tar.gz) = 3714726
+TIMESTAMP = 1746383211
+SHA256 (octave-forge/mapping-1.4.3.tar.gz) = 2188b24639c7087840172e6047f75cb8a598d758120ae6e0810ce6300a869a1b
+SIZE (octave-forge/mapping-1.4.3.tar.gz) = 3832783
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 97909b7fb557..546992ffeab5 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	octave-forge
-PORTVERSION=	20250414
+PORTVERSION=	20250502
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	AUDIO ACTUARIAL AUTOMATIC_DIFFERENTIATION \
 		CHARTJS CIVIL_ENGINEERING CODER COMMUNICATIONS CONTROL \
 	        CSG_TOOLKIT DATA_SMOOTHING \
 		DATABASE DATAFRAME DATATYPES DICOM DIVAND DOCTEST ECONOMETRICS \
-		FDA FEMOCTAVE FENV FILEIO FINANCIAL FITS \
+		FDA FEMOCTAVE FENV FILEIO FINANCIAL FITS FL_CORE \
 		FPL FUZZY_LOGIC_TOOLKIT GA GEOGRAPHICLIB \
 		GEOMETRY GENERAL \
 		GENERATE_HTML GNUPLOT GSL HDF5OCT IDENT IMAGE \
@@ -37,7 +37,7 @@ OPTIONS_DEFINE=	AUDIO ACTUARIAL AUTOMATIC_DIFFERENTIATION \
 		TSA VIDEO VELAS \
 		WEBSOCKETS ZENITY ZEROMQ
 
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NBIOINFO:NCHARTJS:NDATA_SMOOTHING:NDATABASE:NECONOMETRICS:NFINANCIAL:NFITS:NGEOMETRY:NGNUPLOT:NINFORMATIONTHEORY:NIRSA:NMAPPING:NLEVEL_SET:NMECHANICS:NMPI:NNNET:NNLWING2:NPIQP:NPLOT:NOPTIM:NSYMBAND:NSPECFUN}
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NBIOINFO:NCHARTJS:NDATA_SMOOTHING:NDATABASE:NECONOMETRICS:NFINANCIAL:NFITS:NGNUPLOT:NINFORMATIONTHEORY:NIRSA:NLEVEL_SET:NMECHANICS:NMPI:NNNET:NNLWING2:NPIQP:NPLOT:NOPTIM:NSYMBAND:NSPECFUN}
 
 OCTAVE_TARBALLS_DIR=		${LOCALBASE}/share/octave/tarballs
 
diff --git a/math/p5-Math-Polygon/Makefile b/math/p5-Math-Polygon/Makefile
index 06ebaf810fd9..ec3053923bec 100644
--- a/math/p5-Math-Polygon/Makefile
+++ b/math/p5-Math-Polygon/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Math-Polygon
-PORTVERSION=	1.10
+PORTVERSION=	1.11
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Polygon/distinfo b/math/p5-Math-Polygon/distinfo
index dbc5bfe0f382..07c9bc25b96d 100644
--- a/math/p5-Math-Polygon/distinfo
+++ b/math/p5-Math-Polygon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515055409
-SHA256 (Math-Polygon-1.10.tar.gz) = 020d5f6e7ff3da17e485234dfb5e935528e6774d5760943d8765fab02bdfc2d7
-SIZE (Math-Polygon-1.10.tar.gz) = 26304
+TIMESTAMP = 1746329043
+SHA256 (Math-Polygon-1.11.tar.gz) = 14c117db44d42e09de60fd1918322d83bfb4b5474d1d767cf70c80fe78efa2d8
+SIZE (Math-Polygon-1.11.tar.gz) = 27063
diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile
index 2d86cd9f52c0..18574e3983e2 100644
--- a/math/py-sympy/Makefile
+++ b/math/py-sympy/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	sympy
-PORTVERSION=	1.13.3
-PORTREVISION=	1
+PORTVERSION=	1.14.0
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-sympy/distinfo b/math/py-sympy/distinfo
index 67412241a86d..d870ac4e7a05 100644
--- a/math/py-sympy/distinfo
+++ b/math/py-sympy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734660639
-SHA256 (sympy-1.13.3.tar.gz) = b27fd2c6530e0ab39e275fc9b683895367e51d5da91baa8d3d64db2565fec4d9
-SIZE (sympy-1.13.3.tar.gz) = 7533196
+TIMESTAMP = 1746348245
+SHA256 (sympy-1.14.0.tar.gz) = d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517
+SIZE (sympy-1.14.0.tar.gz) = 7793921
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 363cbe7392de..e4d83e4a33db 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rkward
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.1
 CATEGORIES=	math
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 
@@ -9,6 +9,7 @@ WWW=		https://rkward.kde.org/
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libR.so:math/R	\
 		libcups.so:print/cups	\
 		libxkbcommon.so:x11/libxkbcommon
@@ -25,8 +26,8 @@ USE_GL=		opengl
 USE_QT=		5compat base declarative positioning webchannel webengine
 USE_XORG=	ice x11 xext
 USE_KDE=	archive bookmarks breeze-icons colorscheme completion config	\
-		configwidgets coreaddons crash ecm doctools i18n itemviews	\
-		jobwidgets kio notifications parts service solid		\
+		configwidgets coreaddons crash ecm doctools guiaddons i18n	\
+		itemviews jobwidgets kio notifications parts service solid	\
 		syntaxhighlighting texteditor widgetsaddons windowsystem xmlgui
 
 TEST_TARGET=	plugintests
diff --git a/math/rkward/distinfo b/math/rkward/distinfo
index 0d0c93ca1c58..5c083031ad76 100644
--- a/math/rkward/distinfo
+++ b/math/rkward/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738347582
-SHA256 (rkward-0.8.0.tar.gz) = 179763b08cb7a15c594e4798d26ff212f43ff62befc27b8ba840df00b8debbd2
-SIZE (rkward-0.8.0.tar.gz) = 8614382
+TIMESTAMP = 1746364756
+SHA256 (rkward-0.8.1.tar.gz) = 44630c63d84f4ca7c040ab3c2dfcc938dfe8ad380900698b4c3803669b93b977
+SIZE (rkward-0.8.1.tar.gz) = 9054303
diff --git a/math/rkward/pkg-plist b/math/rkward/pkg-plist
index ee562ffb4328..ce0c941c66f2 100644
--- a/math/rkward/pkg-plist
+++ b/math/rkward/pkg-plist
@@ -37,6 +37,10 @@ share/applications/org.kde.rkward.desktop
 %%NLS%%share/doc/HTML/nl/rkward/index.docbook
 %%NLS%%share/doc/HTML/nl/rkwardplugins/index.cache.bz2
 %%NLS%%share/doc/HTML/nl/rkwardplugins/index.docbook
+%%NLS%%share/doc/HTML/sl/rkward/index.cache.bz2
+%%NLS%%share/doc/HTML/sl/rkward/index.docbook
+%%NLS%%share/doc/HTML/sl/rkwardplugins/index.cache.bz2
+%%NLS%%share/doc/HTML/sl/rkwardplugins/index.docbook
 %%NLS%%share/doc/HTML/sv/rkward/index.cache.bz2
 %%NLS%%share/doc/HTML/sv/rkward/index.docbook
 %%NLS%%share/doc/HTML/sv/rkwardplugins/index.cache.bz2
@@ -185,6 +189,8 @@ share/ktexteditor_snippets/data/RKWardutils.xml
 %%NLS%%share/locale/gl/LC_MESSAGES/rkward__item_response_theory.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/rkward__pages.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/rkward__plots.mo
+%%NLS%%share/locale/he/LC_MESSAGES/rkward__graphics_device.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/rkward__analysis.mo
 %%NLS%%share/locale/ia/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/ia/LC_MESSAGES/rkward__analysis.mo
 %%NLS%%share/locale/ia/LC_MESSAGES/rkward__data.mo
@@ -360,12 +366,16 @@ share/man/de/man1/rkward.1.gz
 share/man/it/man1/rkward.1.gz
 %%PORTDOCS%%share/man/man1/rkward.1.gz
 share/man/nl/man1/rkward.1.gz
+share/man/sl/man1/rkward.1.gz
 share/man/sv/man1/rkward.1.gz
 share/man/uk/man1/rkward.1.gz
 share/metainfo/org.kde.rkward.metainfo.xml
 share/mime/packages/vnd.kde.rkward-output.xml
 share/mime/packages/vnd.kde.rmarkdown.xml
 share/mime/packages/vnd.rkward.r.xml
+%%DATADIR%%/00saveload/DownloadAppImage.js
+%%DATADIR%%/00saveload/DownloadAppImage.rkh
+%%DATADIR%%/00saveload/DownloadAppImage.xml
 %%DATADIR%%/00saveload/import/convert_encoding.js
 %%DATADIR%%/00saveload/import/convert_encoding.xml
 %%DATADIR%%/00saveload/import/import_csv.js
@@ -855,6 +865,7 @@ share/mime/packages/vnd.rkward.r.xml
 %%DATADIR%%/rkwarddev_scripts/README_how_to_use_rkwarddev_scripts.md
 %%DATADIR%%/rkwarddev_scripts/rkwarddev_power_plugin_script.R
 %%DATADIR%%/rkwarddev_scripts/rkwarddev_rk.RMarkdown_plugin_script.R
+%%DATADIR%%/rkwarddev_scripts/rkwarddev_rk.download_appimage_plugin_script.R
 %%DATADIR%%/rkwarddev_scripts/subset_dataframe.R
 %%DATADIR%%/rkwarddev_scripts/write_csv.R
 %%DATADIR%%/rpackages/rkward.tgz
diff --git a/misc/Makefile b/misc/Makefile
index 290412f1507f..dfb9a6b6745a 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -62,6 +62,7 @@
     SUBDIR += compat11x
     SUBDIR += compat12x
     SUBDIR += compat13x
+    SUBDIR += compat14x
     SUBDIR += compat4x
     SUBDIR += compat5x
     SUBDIR += compat6x
@@ -115,6 +116,7 @@
     SUBDIR += figlet-fonts
     SUBDIR += findutils
     SUBDIR += flag
+    SUBDIR += flag-icons
     SUBDIR += flashlight
     SUBDIR += fortune-mod-bible
     SUBDIR += fortune-mod-bofh
@@ -669,6 +671,7 @@
     SUBDIR += viz
     SUBDIR += vote
     SUBDIR += vxl
+    SUBDIR += wavedrom
     SUBDIR += wego
     SUBDIR += whichman
     SUBDIR += window
diff --git a/misc/broot/Makefile b/misc/broot/Makefile
index 7dde26de2a10..6aab5ae20b84 100644
--- a/misc/broot/Makefile
+++ b/misc/broot/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	broot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.44.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/misc/clifm/Makefile b/misc/clifm/Makefile
index 0dd54827d027..83a3aa74af4f 100644
--- a/misc/clifm/Makefile
+++ b/misc/clifm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	clifm
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
 
diff --git a/misc/clifm/distinfo b/misc/clifm/distinfo
index 2fba5e793f37..3943ec6b94fd 100644
--- a/misc/clifm/distinfo
+++ b/misc/clifm/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1740902124
-SHA256 (leo-arch-clifm-v1.24_GH0.tar.gz) = fd279bcd8cfebaba1c6134ffdc0b429e2cd0b7d8ece94037bfb57cb210564a5e
-SIZE (leo-arch-clifm-v1.24_GH0.tar.gz) = 1623402
+TIMESTAMP = 1746293155
+SHA256 (leo-arch-clifm-v1.25_GH0.tar.gz) = ac9156753338f6027d05551b1d02bcb6f3044348108b00b9cefd97f125fc95ee
+SIZE (leo-arch-clifm-v1.25_GH0.tar.gz) = 1659318
 SHA256 (leo-arch-clifm-colors-9075864_GH0.tar.gz) = 2f34d8479b658ced4a723b573b705756d9e60c527641526273df14aaab0cb13c
 SIZE (leo-arch-clifm-colors-9075864_GH0.tar.gz) = 1539063
diff --git a/misc/compat10x/pkg-descr b/misc/compat10x/pkg-descr
index 5c50559158d2..74c269eca0ae 100644
--- a/misc/compat10x/pkg-descr
+++ b/misc/compat10x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat10x libraries on your
+This package provides the compat10x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat11x/pkg-descr b/misc/compat11x/pkg-descr
index 479522cc18a2..6d9467014b4a 100644
--- a/misc/compat11x/pkg-descr
+++ b/misc/compat11x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat11x libraries on your
+This package provides the compat11x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat12x/pkg-descr b/misc/compat12x/pkg-descr
index cfc7b0eefae0..2815eb9eb290 100644
--- a/misc/compat12x/pkg-descr
+++ b/misc/compat12x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat12x libraries on your
+This package provides the compat12x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat13x/Makefile b/misc/compat13x/Makefile
index 4f7eeda83c3b..f826b491abd2 100644
--- a/misc/compat13x/Makefile
+++ b/misc/compat13x/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	compat13x
 PORTVERSION=	13.5.1305000.20250330
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	LOCAL/arrowd
 PKGNAMESUFFIX=	-${ARCH}
@@ -26,6 +26,10 @@ NO_SHLIB_REQUIRES_GLOB=	*:32
 IGNORE=		is for FreeBSD 13.x and newer
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000
+RUN_DEPENDS+=	compat14x-${ARCH}>=0:misc/compat14x
+.endif
+
 .if ${ARCH} == amd64
 USE_LDCONFIG32=	${TARGET32_DIR}
 .endif
diff --git a/misc/compat13x/pkg-descr b/misc/compat13x/pkg-descr
index f79575bd620a..17325382b140 100644
--- a/misc/compat13x/pkg-descr
+++ b/misc/compat13x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat13x libraries on your
+This package provides the compat13x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat13x/pkg-plist.aarch64 b/misc/compat13x/pkg-plist.aarch64
index 0f067e13a488..56fe0dda5ab0 100644
--- a/misc/compat13x/pkg-plist.aarch64
+++ b/misc/compat13x/pkg-plist.aarch64
@@ -1,4 +1,4 @@
 lib/compat/libcrypto.so.111
-lib/compat/libmd.so.6
+@comment lib/compat/libmd.so.6
 lib/compat/libnv.so.0
 lib/compat/libssl.so.111
diff --git a/misc/compat13x/pkg-plist.amd64 b/misc/compat13x/pkg-plist.amd64
index 115808f71521..de92382731bc 100644
--- a/misc/compat13x/pkg-plist.amd64
+++ b/misc/compat13x/pkg-plist.amd64
@@ -1,8 +1,8 @@
 lib/compat/libcrypto.so.111
-lib/compat/libmd.so.6
+@comment lib/compat/libmd.so.6
 lib/compat/libnv.so.0
 lib/compat/libssl.so.111
 lib32/compat/libcrypto.so.111
-lib32/compat/libmd.so.6
+@comment lib32/compat/libmd.so.6
 lib32/compat/libnv.so.0
 lib32/compat/libssl.so.111
diff --git a/misc/compat13x/pkg-plist.i386 b/misc/compat13x/pkg-plist.i386
index 0f067e13a488..56fe0dda5ab0 100644
--- a/misc/compat13x/pkg-plist.i386
+++ b/misc/compat13x/pkg-plist.i386
@@ -1,4 +1,4 @@
 lib/compat/libcrypto.so.111
-lib/compat/libmd.so.6
+@comment lib/compat/libmd.so.6
 lib/compat/libnv.so.0
 lib/compat/libssl.so.111
diff --git a/misc/compat14x/Makefile b/misc/compat14x/Makefile
new file mode 100644
index 000000000000..8b25f38d7f4a
--- /dev/null
+++ b/misc/compat14x/Makefile
@@ -0,0 +1,39 @@
+PORTNAME=	compat14x
+PORTVERSION=	14.2.1402000.20250430
+CATEGORIES=	misc
+MASTER_SITES=	LOCAL/arrowd
+PKGNAMESUFFIX=	-${ARCH}
+DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
+
+MAINTAINER=	arrowd@FreeBSD.org
+COMMENT=	Convenience package to install the compat13x libraries
+
+LICENSE=	BSD2CLAUSE
+
+USES=		tar:xz
+NO_BUILD=	yes
+ONLY_FOR_ARCHS=	aarch64 amd64 i386
+PLIST=		${PKGDIR}/pkg-plist.${ARCH}
+TARGET_DIR=	${PREFIX}/lib/compat
+TARGET32_DIR=	${PREFIX}/lib32/compat
+USE_LDCONFIG=	${TARGET_DIR}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSREL:R} < 14
+IGNORE=		is for FreeBSD 14.x and newer
+.endif
+
+.if ${ARCH} == amd64
+USE_LDCONFIG32=	${TARGET32_DIR}
+.endif
+
+do-install:
+	@${MKDIR} -m 0755 ${STAGEDIR}${TARGET_DIR}
+	(cd ${WRKSRC}/lib && ${INSTALL_LIB} *.so.* ${STAGEDIR}${TARGET_DIR})
+.if ${ARCH} == amd64
+	@${MKDIR} ${STAGEDIR}${TARGET32_DIR}
+	(cd ${WRKSRC}/lib32 && ${INSTALL_LIB} *.so.* ${STAGEDIR}${TARGET32_DIR})
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/misc/compat14x/distinfo b/misc/compat14x/distinfo
new file mode 100644
index 000000000000..8c5e86385efc
--- /dev/null
+++ b/misc/compat14x/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1746026180
+SHA256 (compat14x-aarch64-14.2.1402000.20250430.tar.xz) = ab8ef228dfad1c1285f6a7736baf1dcd3d9a1331b5130aea852057a8f4b6f1ff
+SIZE (compat14x-aarch64-14.2.1402000.20250430.tar.xz) = 41772
+SHA256 (compat14x-amd64-14.2.1402000.20250430.tar.xz) = d2e9488f888352b44967c3181d446827751c7fcbba80f06861ce14f955cde332
+SIZE (compat14x-amd64-14.2.1402000.20250430.tar.xz) = 77684
+SHA256 (compat14x-i386-14.2.1402000.20250430.tar.xz) = c9919e9b26dc92946ae446a001a788c6273f8b14dba521b3192b07d1f09aa7f3
+SIZE (compat14x-i386-14.2.1402000.20250430.tar.xz) = 49244
diff --git a/misc/compat14x/pkg-descr b/misc/compat14x/pkg-descr
new file mode 100644
index 000000000000..e30901398aca
--- /dev/null
+++ b/misc/compat14x/pkg-descr
@@ -0,0 +1,12 @@
+This package provides the compat14x libraries for your
+system, so you can use legacy binaries that depend on them.
+
+Ports usage example:
+
+--
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 1500000
+LIB_DEPENDS+=	libmd.so.6:misc/compat14x
+.endif
+--
diff --git a/misc/compat14x/pkg-plist.aarch64 b/misc/compat14x/pkg-plist.aarch64
new file mode 100644
index 000000000000..251b34ef3b18
--- /dev/null
+++ b/misc/compat14x/pkg-plist.aarch64
@@ -0,0 +1 @@
+lib/compat/libmd.so.6
diff --git a/misc/compat14x/pkg-plist.amd64 b/misc/compat14x/pkg-plist.amd64
new file mode 100644
index 000000000000..836459079f4d
--- /dev/null
+++ b/misc/compat14x/pkg-plist.amd64
@@ -0,0 +1,2 @@
+lib/compat/libmd.so.6
+lib32/compat/libmd.so.6
diff --git a/misc/compat14x/pkg-plist.i386 b/misc/compat14x/pkg-plist.i386
new file mode 100644
index 000000000000..251b34ef3b18
--- /dev/null
+++ b/misc/compat14x/pkg-plist.i386
@@ -0,0 +1 @@
+lib/compat/libmd.so.6
diff --git a/misc/compat4x/pkg-descr b/misc/compat4x/pkg-descr
index 743e61c11adf..5fbef9d0d027 100644
--- a/misc/compat4x/pkg-descr
+++ b/misc/compat4x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat4x libraries on your
+This package provides the compat4x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat5x/pkg-descr b/misc/compat5x/pkg-descr
index 095d0677d329..8886ad4814ab 100644
--- a/misc/compat5x/pkg-descr
+++ b/misc/compat5x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat5x libraries on your
+This package provides the compat5x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat6x/pkg-descr b/misc/compat6x/pkg-descr
index 76d1a0cc175a..1dda0511243f 100644
--- a/misc/compat6x/pkg-descr
+++ b/misc/compat6x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat6x libraries on your
+This package provides the compat6x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat7x/pkg-descr b/misc/compat7x/pkg-descr
index 2c5e59869893..04167f362860 100644
--- a/misc/compat7x/pkg-descr
+++ b/misc/compat7x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat7x libraries on your
+This package provides the compat7x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat8x/pkg-descr b/misc/compat8x/pkg-descr
index 563c48db132a..547e17874751 100644
--- a/misc/compat8x/pkg-descr
+++ b/misc/compat8x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat8x libraries on your
+This package provides the compat8x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/compat9x/pkg-descr b/misc/compat9x/pkg-descr
index 5392c17a2516..1a4bef220d6b 100644
--- a/misc/compat9x/pkg-descr
+++ b/misc/compat9x/pkg-descr
@@ -1,4 +1,4 @@
-This package allows you to install the compat9x libraries on your
+This package provides the compat9x libraries for your
 system, so you can use legacy binaries that depend on them.
 
 Ports usage example:
diff --git a/misc/flag-icons/Makefile b/misc/flag-icons/Makefile
new file mode 100644
index 000000000000..21cf09b196fc
--- /dev/null
+++ b/misc/flag-icons/Makefile
@@ -0,0 +1,37 @@
+PORTNAME=	flag-icons
+PORTVERSION=	7.3.2
+DISTVERSIONPREFIX=	v
+CATEGORIES=	misc
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Curated collection of all country flags rendered in PNG
+WWW=		https://flagicons.lipis.dev/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	convert:graphics/ImageMagick6 # ${IMAGEMAGICK_DEFAULT}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	lipis
+
+NO_ARCH=	yes
+NO_INSTALL=	yes
+
+FLAGS_TOPDIR=	${PREFIX}/share/icons/${PORTNAME}
+FLAG_SIZES=	16 24 32 48 64 96 128 192 256 # 512 adds 25+ MB for .tbz package
+
+FLAVORS=	plain bordered rounded
+
+.if ${FLAVOR:U:Nplain}
+PKGNAMESUFFIX=	-${FLAVOR}
+.endif
+
+do-build:
+	cd ${BUILD_WRKSRC}/flags && ${SH} ${FILESDIR}/makeflags.sh \
+	${FLAVOR} ${STAGEDIR}${FLAGS_TOPDIR}/${FLAVOR} ${FLAG_SIZES}
+
+post-stage:
+	cd ${STAGEDIR}${PREFIX} && ${FIND} share -type f >> ${TMPPLIST}
+
+.include <bsd.port.mk>
diff --git a/misc/flag-icons/distinfo b/misc/flag-icons/distinfo
new file mode 100644
index 000000000000..4635639281ae
--- /dev/null
+++ b/misc/flag-icons/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1737122630
+SHA256 (lipis-flag-icons-v7.3.2_GH0.tar.gz) = 6a5497e1029e66415c3941a5e5ee001944b0a7e46bf365c6d5a91a033acee87e
+SIZE (lipis-flag-icons-v7.3.2_GH0.tar.gz) = 1322290
diff --git a/misc/flag-icons/files/makeflags.sh b/misc/flag-icons/files/makeflags.sh
new file mode 100644
index 000000000000..160212b7c673
--- /dev/null
+++ b/misc/flag-icons/files/makeflags.sh
@@ -0,0 +1,67 @@
+simple()
+{
+	local comment convert_extra_args destdir height ratio subdir t0 width
+
+	comment=$1; convert_extra_args=$2; destdir=$3; shift 3
+
+	for subdir in ?x?; do
+		ratio=${subdir%x*}/${subdir#*x}
+		for height; do
+			width=$((height * $ratio))
+			mkdir -p "$destdir/${width}x${height}"
+			echo -n "Generating $comment flags ${width}x${height}... "
+			t0=$(date +%s)
+			for flag in $subdir/*.svg; do
+				convert -resize ${width}x${height} $convert_extra_args \
+				"$flag" "$destdir/${width}x${height}/$(basename "$flag" svg)png"
+			done
+			echo "finished in $(date -ur $((`date +%s`-t0)) +%M:%S)"
+		done
+	done
+}
+
+plain()
+{
+	simple undecorated -strip "$@"
+}
+
+bordered()
+{
+	simple black-bordered '-shave 1x1 -bordercolor black -border 1 -strip' "$@"
+}
+
+# https://joeldare.com/rounding-image-corners-with-imagemagick
+rounded()
+{
+	local destdir height mask radius ratio subdir t0 width
+
+	destdir=$1; shift
+	mask=$(mktemp)
+
+	for subdir in ?x?; do
+		ratio=${subdir%x*}/${subdir#*x}
+		for height; do
+			width=$((height * $ratio))
+			radius=$((height / 10))
+
+			convert -size ${width}x${height} xc:none -draw \
+			"roundRectangle 0,0,$((width-1)),$((height-1)),$radius,$radius" \
+			-strip "png:$mask"
+
+			mkdir -p "$destdir/${width}x${height}"
+
+			echo -n "Generating rounded corner flags ${width}x${height}... "
+			t0=$(date +%s)
+			for flag in $subdir/*.svg; do
+				convert -resize ${width}x${height} \
+				"$flag" -matte "$mask" \
+				-compose DstIn -composite -strip \
+				"$destdir/${width}x${height}/$(basename "$flag" svg)png"
+			done
+			echo "finished in $(date -ur $((`date +%s`-t0)) +%M:%S)"
+		done
+	done
+	rm "$mask"
+}
+
+"$@"
diff --git a/misc/flag-icons/pkg-descr b/misc/flag-icons/pkg-descr
new file mode 100644
index 000000000000..c1cedd032cda
--- /dev/null
+++ b/misc/flag-icons/pkg-descr
@@ -0,0 +1,2 @@
+A curated collection of all country flags in 4x3 and 1x1 formats
+converted from SVG to PNG for various sizes, from 16px to 256px.
diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile
index 6e7f38c3845b..3ac572a9bfec 100644
--- a/misc/ignition-fuel-tools/Makefile
+++ b/misc/ignition-fuel-tools/Makefile
@@ -32,7 +32,9 @@ WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 PLIST_SUB+=	FUEL_TOOLS_IGN_VER=fuel_tools${DISTVERSION:R:R}
 
-do-test: # 4 tests are known to fail: https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/48/4-unit-tests-fail-unit_fuelclient_test
+TESTING_UNSAFE=	4 tests are known to fail: https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/48/4-unit-tests-fail-unit_fuelclient_test
+
+do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile
index cbe71548ca64..edcfc0829cf0 100644
--- a/misc/llama-cpp/Makefile
+++ b/misc/llama-cpp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llama-cpp
 DISTVERSIONPREFIX=	b
-DISTVERSION=	5195
+DISTVERSION=	5287
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/llama-cpp/distinfo b/misc/llama-cpp/distinfo
index 72c808d600d5..5682dec0737a 100644
--- a/misc/llama-cpp/distinfo
+++ b/misc/llama-cpp/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745716899
-SHA256 (ggerganov-llama.cpp-b5195_GH0.tar.gz) = 9dee0d0e9a645d232415e1d2b252fd3938f11357b430d268da17bd17db668d95
-SIZE (ggerganov-llama.cpp-b5195_GH0.tar.gz) = 21069357
+TIMESTAMP = 1746510097
+SHA256 (ggerganov-llama.cpp-b5287_GH0.tar.gz) = 2b62ce01b09300aa5ed628e520ea56a72aff64fda92c02c2576880e0810225a4
+SIZE (ggerganov-llama.cpp-b5287_GH0.tar.gz) = 21099950
 SHA256 (nomic-ai-kompute-4565194_GH0.tar.gz) = 95b52d2f0514c5201c7838348a9c3c9e60902ea3c6c9aa862193a212150b2bfc
 SIZE (nomic-ai-kompute-4565194_GH0.tar.gz) = 13540496
diff --git a/misc/llama-cpp/pkg-plist b/misc/llama-cpp/pkg-plist
index 929a283b5c72..fb952a574b2e 100644
--- a/misc/llama-cpp/pkg-plist
+++ b/misc/llama-cpp/pkg-plist
@@ -26,7 +26,6 @@ bin/convert_hf_to_gguf.py
 %%EXAMPLES%%bin/llama-passkey
 %%EXAMPLES%%bin/llama-perplexity
 %%EXAMPLES%%bin/llama-quantize
-%%EXAMPLES%%bin/llama-qwen2vl-cli
 %%EXAMPLES%%bin/llama-retrieval
 %%EXAMPLES%%bin/llama-run
 %%EXAMPLES%%bin/llama-save-load-state
diff --git a/misc/ncnn/Makefile b/misc/ncnn/Makefile
index 0430b8cbc328..f865a8fdcfb4 100644
--- a/misc/ncnn/Makefile
+++ b/misc/ncnn/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ncnn
-DISTVERSION=	20250427
+DISTVERSION=	20250503
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -31,6 +31,6 @@ VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CMAKE_BOOL=	NCNN_VULKAN
 VULKAN_BROKEN=		most tests are broken with Vulkan, see https://github.com/Tencent/ncnn/issues/4742#issuecomment-1879563662
 
-# tests as of 20241226: 99% tests passed, 1 tests failed out of 127
+# tests as of 20250503: 99% tests passed, 1 tests failed out of 135
 
 .include <bsd.port.mk>
diff --git a/misc/ncnn/distinfo b/misc/ncnn/distinfo
index 8d211007bdbc..a05d19925946 100644
--- a/misc/ncnn/distinfo
+++ b/misc/ncnn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745776466
-SHA256 (Tencent-ncnn-20250427_GH0.tar.gz) = 9b5bfefd129f89d84d8e8aad0505166cbfaffdbc3721049ccafdee5fb41b464b
-SIZE (Tencent-ncnn-20250427_GH0.tar.gz) = 13197329
+TIMESTAMP = 1746349260
+SHA256 (Tencent-ncnn-20250503_GH0.tar.gz) = 3afea4cf092ce97d06305b72c6affbcfb3530f536ae8e81a4f22007d82b729e9
+SIZE (Tencent-ncnn-20250503_GH0.tar.gz) = 13200604
diff --git a/misc/ola/Makefile b/misc/ola/Makefile
index 974a4ff26f3b..05ba68b1a7c6 100644
--- a/misc/ola/Makefile
+++ b/misc/ola/Makefile
@@ -26,15 +26,15 @@ USE_LDCONFIG=	yes
 LDFLAGS+=	-lprotobuf # workaround for https://github.com/OpenLightingProject/ola/issues/1871
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CONFIGURE_ARGS=		--disable-unittests --disable-examples
 CONFIGURE_ARGS+=	--disable-fatal-warnings # see https://github.com/OpenLightingProject/ola/issues/1962
 
 TEST_TARGET=	check
 INSTALL_TARGET=	install-strip
+TESTING_UNSAFE=	1 test fails, see https://github.com/OpenLightingProject/ola/issues/1872
 
-do-test: # 1 test fails, see https://github.com/OpenLightingProject/ola/issues/1872
+do-test:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ./configure ${CONFIGURE_ARGS} --enable-unittests && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${TEST_TARGET}
diff --git a/misc/p5-Business-ISBN-Data/Makefile b/misc/p5-Business-ISBN-Data/Makefile
index c5c3e35791f1..8336289ab385 100644
--- a/misc/p5-Business-ISBN-Data/Makefile
+++ b/misc/p5-Business-ISBN-Data/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Business-ISBN-Data
-PORTVERSION=	20250418.001
+PORTVERSION=	20250502.001
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/misc/p5-Business-ISBN-Data/distinfo b/misc/p5-Business-ISBN-Data/distinfo
index 90f3975a6711..d5e04ae4f2a0 100644
--- a/misc/p5-Business-ISBN-Data/distinfo
+++ b/misc/p5-Business-ISBN-Data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745744310
-SHA256 (Business-ISBN-Data-20250418.001.tar.gz) = c7c6d55f8894a376755375597951ec2630119040dafe1a13b89c445e969df11b
-SIZE (Business-ISBN-Data-20250418.001.tar.gz) = 36762
+TIMESTAMP = 1746607940
+SHA256 (Business-ISBN-Data-20250502.001.tar.gz) = 1ec3e246f4424d1058ab035b2998ffdee5c995462b8268cb9429bd5e474ea09d
+SIZE (Business-ISBN-Data-20250502.001.tar.gz) = 36827
diff --git a/misc/py-gguf/Makefile b/misc/py-gguf/Makefile
index 2477ca4fa9ab..b03b9d096471 100644
--- a/misc/py-gguf/Makefile
+++ b/misc/py-gguf/Makefile
@@ -24,7 +24,7 @@ USE_PYTHON=	pep517 autoplist pytest
 USE_GITHUB=	yes
 GH_ACCOUNT=	ggml-org
 GH_PROJECT=	llama.cpp
-GH_TAGNAME=	b5195
+GH_TAGNAME=	b5287
 
 WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}/gguf-py
 
@@ -37,6 +37,6 @@ post-patch: # update version to reflect llama-cpp revision, have to use '.' sinc
 		-e 's/version = "${DISTVERSION:R}"/version = "${DISTVERSION:R}.${GH_TAGNAME:S/b//}"/' \
 		${WRKSRC}/pyproject.toml
 
-# tests as of 0.16.0: 5 passed in 1.64s
+# tests as of 0.16.2.5280: 5 passed in 10.59s
 
 .include <bsd.port.mk>
diff --git a/misc/py-gguf/distinfo b/misc/py-gguf/distinfo
index e62946df8767..71d363f1c2b8 100644
--- a/misc/py-gguf/distinfo
+++ b/misc/py-gguf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745716689
-SHA256 (ggml-org-llama.cpp-0.16.2.5195-b5195_GH0.tar.gz) = 9dee0d0e9a645d232415e1d2b252fd3938f11357b430d268da17bd17db668d95
-SIZE (ggml-org-llama.cpp-0.16.2.5195-b5195_GH0.tar.gz) = 21069357
+TIMESTAMP = 1746512008
+SHA256 (ggml-org-llama.cpp-0.16.2.5287-b5287_GH0.tar.gz) = 2b62ce01b09300aa5ed628e520ea56a72aff64fda92c02c2576880e0810225a4
+SIZE (ggml-org-llama.cpp-0.16.2.5287-b5287_GH0.tar.gz) = 21099950
diff --git a/misc/py-litellm/Makefile b/misc/py-litellm/Makefile
index d0b76567f750..7f610c79d0c1 100644
--- a/misc/py-litellm/Makefile
+++ b/misc/py-litellm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	litellm
-DISTVERSION=	1.66.0
+DISTVERSION=	1.68.0
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httpx>=0.23.0:www/py-httpx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}openai>=1.68.2:misc/py-openai@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openai>=1.68.2<1.76.0:misc/py-openai@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dotenv>=0.2.0:www/py-python-dotenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tiktoken>=0.7.0:textproc/py-tiktoken@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=6.8.0:devel/py-importlib-metadata@${PY_FLAVOR} \
diff --git a/misc/py-litellm/distinfo b/misc/py-litellm/distinfo
index c81f20e82980..1fcf2bbbe413 100644
--- a/misc/py-litellm/distinfo
+++ b/misc/py-litellm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744663216
-SHA256 (litellm-1.66.0.tar.gz) = 15f592bab604233083dc8b79e1e510e7e234f06525efe4c4255732bfc7ceb219
-SIZE (litellm-1.66.0.tar.gz) = 7197719
+TIMESTAMP = 1746493464
+SHA256 (litellm-1.68.0.tar.gz) = 9fb24643db84dfda339b64bafca505a2eef857477afbc6e98fb56512c24dbbfa
+SIZE (litellm-1.68.0.tar.gz) = 7314051
diff --git a/misc/py-wurlitzer/Makefile b/misc/py-wurlitzer/Makefile
index 3b1ca233a0bb..e61bf82e353e 100644
--- a/misc/py-wurlitzer/Makefile
+++ b/misc/py-wurlitzer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wurlitzer
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,16 +12,17 @@ WWW=		https://github.com/minrk/wurlitzer
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils pytest
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
-# make tests: 14 passed, 1 skipped (test.py:168: requires _get_max_pipe_size)
+# make tests: 15 passed, 1 skipped (test.py:178: requires _get_max_pipe_size)
 TEST_ARGS=	test.py
 
 .include <bsd.port.mk>
diff --git a/misc/rash/Makefile b/misc/rash/Makefile
index 30727a04ef28..095121df3346 100644
--- a/misc/rash/Makefile
+++ b/misc/rash/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rash
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.9.10
+DISTVERSION=	2.9.11
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -50,7 +50,7 @@ CARGO_CRATES=	ahash-0.7.8 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.2.1 \
-		chrono-0.4.40 \
+		chrono-0.4.41 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
 		ciborium-ll-0.2.2 \
diff --git a/misc/rash/distinfo b/misc/rash/distinfo
index a3a34daf69bf..1c12d9282f49 100644
--- a/misc/rash/distinfo
+++ b/misc/rash/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745776270
+TIMESTAMP = 1746513342
 SHA256 (rust/crates/ahash-0.7.8.crate) = 891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9
 SIZE (rust/crates/ahash-0.7.8.crate) = 38550
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
@@ -67,8 +67,8 @@ SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582eb
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
 SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
-SHA256 (rust/crates/chrono-0.4.40.crate) = 1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c
-SIZE (rust/crates/chrono-0.4.40.crate) = 229824
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
 SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
 SIZE (rust/crates/ciborium-0.2.2.crate) = 35611
 SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757
@@ -583,5 +583,5 @@ SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464
 SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
 SHA256 (servo-ipc-channel-82f6c49096b116208861f928862f9eefaf47c3c9_GH0.tar.gz) = 89454d0b707a5117eac84ab1c9b9bf7cd8cc1fb3f1a970a10466750d1c173122
 SIZE (servo-ipc-channel-82f6c49096b116208861f928862f9eefaf47c3c9_GH0.tar.gz) = 151812
-SHA256 (rash-sh-rash-v2.9.10_GH0.tar.gz) = ab7f5772dbf1f75df12b90746d66a7b064ff156e8d213324a3a329394bbe03d4
-SIZE (rash-sh-rash-v2.9.10_GH0.tar.gz) = 210018
+SHA256 (rash-sh-rash-v2.9.11_GH0.tar.gz) = 817aeba917ef720143900584e242487998529ca116a0ddabefdbe827f933765d
+SIZE (rash-sh-rash-v2.9.11_GH0.tar.gz) = 210057
diff --git a/misc/tenere/Makefile b/misc/tenere/Makefile
index e52502f2c7a3..4bf3a99cf23f 100644
--- a/misc/tenere/Makefile
+++ b/misc/tenere/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tenere
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/wavedrom/Makefile b/misc/wavedrom/Makefile
new file mode 100644
index 000000000000..e68cb33e9882
--- /dev/null
+++ b/misc/wavedrom/Makefile
@@ -0,0 +1,166 @@
+PORTNAME=	wavedrom
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.0
+CATEGORIES=	misc
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Beautiful Digital Timing Diagrams with Rust
+WWW=		https://coastalwhite.github.io/wavedrom-rs \
+		https://github.com/coastalwhite/wavedrom-rs
+
+LICENSE=	APACHE20 MIT
+LICENSE_COMB=	dual
+LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
+
+USES=		cargo
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	coastalwhite
+GH_PROJECT=	${PORTNAME}-rs
+
+CARGO_CRATES=	aho-corasick-1.1.3 \
+		android-tzdata-0.1.1 \
+		android_system_properties-0.1.5 \
+		anstream-0.6.18 \
+		anstyle-1.0.10 \
+		anstyle-parse-0.2.6 \
+		anstyle-query-1.1.2 \
+		anstyle-wincon-3.0.7 \
+		anyhow-1.0.98 \
+		autocfg-1.4.0 \
+		bitflags-2.9.0 \
+		block-buffer-0.10.4 \
+		bstr-1.12.0 \
+		bumpalo-3.17.0 \
+		cc-1.2.21 \
+		cfg-if-1.0.0 \
+		chrono-0.4.41 \
+		clap-4.5.37 \
+		clap_builder-4.5.37 \
+		clap_complete-4.5.49 \
+		clap_lex-0.7.4 \
+		colorchoice-1.0.3 \
+		core-foundation-sys-0.8.7 \
+		cpufeatures-0.2.17 \
+		crypto-common-0.1.6 \
+		darling-0.20.11 \
+		darling_core-0.20.11 \
+		darling_macro-0.20.11 \
+		dbus-0.9.7 \
+		derive_builder-0.20.2 \
+		derive_builder_core-0.20.2 \
+		derive_builder_macro-0.20.2 \
+		digest-0.10.7 \
+		env_filter-0.1.3 \
+		env_logger-0.11.8 \
+		errno-0.3.11 \
+		fastrand-2.3.0 \
+		fnv-1.0.7 \
+		generic-array-0.14.7 \
+		getopts-0.2.21 \
+		getrandom-0.3.2 \
+		handlebars-6.3.2 \
+		hex-0.4.3 \
+		iana-time-zone-0.1.63 \
+		iana-time-zone-haiku-0.1.2 \
+		ident_case-1.0.1 \
+		is_terminal_polyfill-1.70.1 \
+		itoa-1.0.15 \
+		jiff-0.2.13 \
+		jiff-static-0.2.13 \
+		js-sys-0.3.77 \
+		json5-0.4.1 \
+		libc-0.2.172 \
+		libdbus-sys-0.2.5 \
+		linux-raw-sys-0.9.4 \
+		log-0.4.27 \
+		mdbook-0.4.49 \
+		memchr-2.7.4 \
+		normpath-1.3.0 \
+		num-modular-0.6.1 \
+		num-order-1.2.0 \
+		num-traits-0.2.19 \
+		once_cell-1.21.3 \
+		opener-0.7.2 \
+		pest-2.8.0 \
+		pest_derive-2.8.0 \
+		pest_generator-2.8.0 \
+		pest_meta-2.8.0 \
+		pkg-config-0.3.32 \
+		portable-atomic-1.11.0 \
+		portable-atomic-util-0.2.4 \
+		proc-macro2-1.0.95 \
+		pulldown-cmark-0.9.6 \
+		pulldown-cmark-0.10.3 \
+		pulldown-cmark-escape-0.10.1 \
+		pulldown-cmark-to-cmark-10.0.4 \
+		quote-1.0.40 \
+		r-efi-5.2.0 \
+		regex-1.11.1 \
+		regex-automata-0.4.9 \
+		regex-syntax-0.8.5 \
+		rustix-1.0.7 \
+		rustversion-1.0.20 \
+		ryu-1.0.20 \
+		semver-1.0.26 \
+		serde-1.0.219 \
+		serde_derive-1.0.219 \
+		serde_json-1.0.140 \
+		sha2-0.10.9 \
+		shlex-1.3.0 \
+		strsim-0.11.1 \
+		syn-2.0.101 \
+		tempfile-3.19.1 \
+		terminal_size-0.4.2 \
+		thiserror-2.0.12 \
+		thiserror-impl-2.0.12 \
+		toml-0.5.11 \
+		topological-sort-0.2.2 \
+		ttf-parser-0.19.2 \
+		typenum-1.18.0 \
+		ucd-trie-0.1.7 \
+		unicase-2.8.1 \
+		unicode-ident-1.0.18 \
+		unicode-width-0.1.14 \
+		utf8parse-0.2.2 \
+		version_check-0.9.5 \
+		wasi-0.14.2+wasi-0.2.4 \
+		wasm-bindgen-0.2.100 \
+		wasm-bindgen-backend-0.2.100 \
+		wasm-bindgen-macro-0.2.100 \
+		wasm-bindgen-macro-support-0.2.100 \
+		wasm-bindgen-shared-0.2.100 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-core-0.61.0 \
+		windows-implement-0.60.0 \
+		windows-interface-0.59.1 \
+		windows-link-0.1.1 \
+		windows-result-0.3.2 \
+		windows-strings-0.4.0 \
+		windows-sys-0.59.0 \
+		windows-targets-0.52.6 \
+		windows_aarch64_gnullvm-0.52.6 \
+		windows_aarch64_msvc-0.52.6 \
+		windows_i686_gnu-0.52.6 \
+		windows_i686_gnullvm-0.52.6 \
+		windows_i686_msvc-0.52.6 \
+		windows_x86_64_gnu-0.52.6 \
+		windows_x86_64_gnullvm-0.52.6 \
+		windows_x86_64_msvc-0.52.6 \
+		wit-bindgen-rt-0.39.0
+
+PLIST_FILES=	bin/${PORTNAME}  \
+		bin/mdbook-wavedrom-rs
+
+do-install:
+	# workaround for error: found a virtual manifest at `xx` instead of a package manifest
+.for e in ${PORTNAME} mdbook-wavedrom-rs
+	${INSTALL_PROGRAM} \
+		${WRKDIR}/target/release/${e} \
+		${STAGEDIR}${PREFIX}/bin/${e}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/misc/wavedrom/distinfo b/misc/wavedrom/distinfo
new file mode 100644
index 000000000000..4ad13334a51c
--- /dev/null
+++ b/misc/wavedrom/distinfo
@@ -0,0 +1,267 @@
+TIMESTAMP = 1746515727
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
+SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
+SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/anstream-0.6.18.crate) = 8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b
+SIZE (rust/crates/anstream-0.6.18.crate) = 29681
+SHA256 (rust/crates/anstyle-1.0.10.crate) = 55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9
+SIZE (rust/crates/anstyle-1.0.10.crate) = 15725
+SHA256 (rust/crates/anstyle-parse-0.2.6.crate) = 3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9
+SIZE (rust/crates/anstyle-parse-0.2.6.crate) = 22343
+SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c
+SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
+SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e
+SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400
+SHA256 (rust/crates/anyhow-1.0.98.crate) = e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487
+SIZE (rust/crates/anyhow-1.0.98.crate) = 53334
+SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
+SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
+SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd
+SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
+SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
+SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/bstr-1.12.0.crate) = 234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4
+SIZE (rust/crates/bstr-1.12.0.crate) = 351557
+SHA256 (rust/crates/bumpalo-3.17.0.crate) = 1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf
+SIZE (rust/crates/bumpalo-3.17.0.crate) = 91975
+SHA256 (rust/crates/cc-1.2.21.crate) = 8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0
+SIZE (rust/crates/cc-1.2.21.crate) = 106117
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
+SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071
+SIZE (rust/crates/clap-4.5.37.crate) = 56962
+SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2
+SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761
+SHA256 (rust/crates/clap_complete-4.5.49.crate) = 07ae023020f3bbb76bfd6c7b9dd3f903b40f60e4dc60696c303457c5c01e6cbe
+SIZE (rust/crates/clap_complete-4.5.49.crate) = 48072
+SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6
+SIZE (rust/crates/clap_lex-0.7.4.crate) = 12858
+SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990
+SIZE (rust/crates/colorchoice-1.0.3.crate) = 7923
+SHA256 (rust/crates/core-foundation-sys-0.8.7.crate) = 773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b
+SIZE (rust/crates/core-foundation-sys-0.8.7.crate) = 37712
+SHA256 (rust/crates/cpufeatures-0.2.17.crate) = 59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280
+SIZE (rust/crates/cpufeatures-0.2.17.crate) = 13466
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/darling-0.20.11.crate) = fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee
+SIZE (rust/crates/darling-0.20.11.crate) = 37614
+SHA256 (rust/crates/darling_core-0.20.11.crate) = 0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e
+SIZE (rust/crates/darling_core-0.20.11.crate) = 68006
+SHA256 (rust/crates/darling_macro-0.20.11.crate) = fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead
+SIZE (rust/crates/darling_macro-0.20.11.crate) = 2532
+SHA256 (rust/crates/dbus-0.9.7.crate) = 1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b
+SIZE (rust/crates/dbus-0.9.7.crate) = 104206
+SHA256 (rust/crates/derive_builder-0.20.2.crate) = 507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947
+SIZE (rust/crates/derive_builder-0.20.2.crate) = 36661
+SHA256 (rust/crates/derive_builder_core-0.20.2.crate) = 2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8
+SIZE (rust/crates/derive_builder_core-0.20.2.crate) = 31397
+SHA256 (rust/crates/derive_builder_macro-0.20.2.crate) = ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c
+SIZE (rust/crates/derive_builder_macro-0.20.2.crate) = 6360
+SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
+SIZE (rust/crates/digest-0.10.7.crate) = 19557
+SHA256 (rust/crates/env_filter-0.1.3.crate) = 186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0
+SIZE (rust/crates/env_filter-0.1.3.crate) = 15191
+SHA256 (rust/crates/env_logger-0.11.8.crate) = 13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f
+SIZE (rust/crates/env_logger-0.11.8.crate) = 32538
+SHA256 (rust/crates/errno-0.3.11.crate) = 976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e
+SIZE (rust/crates/errno-0.3.11.crate) = 12048
+SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be
+SIZE (rust/crates/fastrand-2.3.0.crate) = 15076
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
+SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5
+SIZE (rust/crates/getopts-0.2.21.crate) = 18457
+SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0
+SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
+SHA256 (rust/crates/handlebars-6.3.2.crate) = 759e2d5aea3287cb1190c8ec394f42866cb5bf74fcbf213f354e3c856ea26098
+SIZE (rust/crates/handlebars-6.3.2.crate) = 105065
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/iana-time-zone-0.1.63.crate) = b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8
+SIZE (rust/crates/iana-time-zone-0.1.63.crate) = 32919
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
+SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
+SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
+SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
+SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
+SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
+SIZE (rust/crates/itoa-1.0.15.crate) = 11231
+SHA256 (rust/crates/jiff-0.2.13.crate) = f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806
+SIZE (rust/crates/jiff-0.2.13.crate) = 707842
+SHA256 (rust/crates/jiff-static-0.2.13.crate) = f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48
+SIZE (rust/crates/jiff-static-0.2.13.crate) = 76123
+SHA256 (rust/crates/js-sys-0.3.77.crate) = 1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f
+SIZE (rust/crates/js-sys-0.3.77.crate) = 55538
+SHA256 (rust/crates/json5-0.4.1.crate) = 96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1
+SIZE (rust/crates/json5-0.4.1.crate) = 15678
+SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa
+SIZE (rust/crates/libc-0.2.172.crate) = 791646
+SHA256 (rust/crates/libdbus-sys-0.2.5.crate) = 06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72
+SIZE (rust/crates/libdbus-sys-0.2.5.crate) = 1557017
+SHA256 (rust/crates/linux-raw-sys-0.9.4.crate) = cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12
+SIZE (rust/crates/linux-raw-sys-0.9.4.crate) = 2311088
+SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
+SIZE (rust/crates/log-0.4.27.crate) = 48120
+SHA256 (rust/crates/mdbook-0.4.49.crate) = d1daacee059634081dee4250d2814763a365b92dfe14bfdef964bc27835209d4
+SIZE (rust/crates/mdbook-0.4.49.crate) = 1505342
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
+SHA256 (rust/crates/normpath-1.3.0.crate) = c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed
+SIZE (rust/crates/normpath-1.3.0.crate) = 20719
+SHA256 (rust/crates/num-modular-0.6.1.crate) = 17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f
+SIZE (rust/crates/num-modular-0.6.1.crate) = 32328
+SHA256 (rust/crates/num-order-1.2.0.crate) = 537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6
+SIZE (rust/crates/num-order-1.2.0.crate) = 19500
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
+SHA256 (rust/crates/opener-0.7.2.crate) = d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681
+SIZE (rust/crates/opener-0.7.2.crate) = 19229
+SHA256 (rust/crates/pest-2.8.0.crate) = 198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6
+SIZE (rust/crates/pest-2.8.0.crate) = 128955
+SHA256 (rust/crates/pest_derive-2.8.0.crate) = d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5
+SIZE (rust/crates/pest_derive-2.8.0.crate) = 42196
+SHA256 (rust/crates/pest_generator-2.8.0.crate) = db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841
+SIZE (rust/crates/pest_generator-2.8.0.crate) = 18617
+SHA256 (rust/crates/pest_meta-2.8.0.crate) = 7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0
+SIZE (rust/crates/pest_meta-2.8.0.crate) = 42931
+SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c
+SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370
+SHA256 (rust/crates/portable-atomic-1.11.0.crate) = 350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e
+SIZE (rust/crates/portable-atomic-1.11.0.crate) = 181258
+SHA256 (rust/crates/portable-atomic-util-0.2.4.crate) = d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507
+SIZE (rust/crates/portable-atomic-util-0.2.4.crate) = 47043
+SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
+SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
+SHA256 (rust/crates/pulldown-cmark-0.9.6.crate) = 57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b
+SIZE (rust/crates/pulldown-cmark-0.9.6.crate) = 117378
+SHA256 (rust/crates/pulldown-cmark-0.10.3.crate) = 76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993
+SIZE (rust/crates/pulldown-cmark-0.10.3.crate) = 141746
+SHA256 (rust/crates/pulldown-cmark-escape-0.10.1.crate) = bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3
+SIZE (rust/crates/pulldown-cmark-escape-0.10.1.crate) = 6672
+SHA256 (rust/crates/pulldown-cmark-to-cmark-10.0.4.crate) = 0194e6e1966c23cc5fd988714f85b18d548d773e81965413555d96569931833d
+SIZE (rust/crates/pulldown-cmark-to-cmark-10.0.4.crate) = 17917
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
+SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
+SIZE (rust/crates/r-efi-5.2.0.crate) = 64764
+SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191
+SIZE (rust/crates/regex-1.11.1.crate) = 254170
+SHA256 (rust/crates/regex-automata-0.4.9.crate) = 809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908
+SIZE (rust/crates/regex-automata-0.4.9.crate) = 618525
+SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c
+SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
+SHA256 (rust/crates/rustix-1.0.7.crate) = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+SIZE (rust/crates/rustix-1.0.7.crate) = 414500
+SHA256 (rust/crates/rustversion-1.0.20.crate) = eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2
+SIZE (rust/crates/rustversion-1.0.20.crate) = 20666
+SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f
+SIZE (rust/crates/ryu-1.0.20.crate) = 48738
+SHA256 (rust/crates/semver-1.0.26.crate) = 56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0
+SIZE (rust/crates/semver-1.0.26.crate) = 31303
+SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
+SIZE (rust/crates/serde-1.0.219.crate) = 78983
+SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
+SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798
+SHA256 (rust/crates/serde_json-1.0.140.crate) = 20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373
+SIZE (rust/crates/serde_json-1.0.140.crate) = 154852
+SHA256 (rust/crates/sha2-0.10.9.crate) = a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283
+SIZE (rust/crates/sha2-0.10.9.crate) = 29271
+SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
+SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
+SIZE (rust/crates/strsim-0.11.1.crate) = 14266
+SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf
+SIZE (rust/crates/syn-2.0.101.crate) = 299250
+SHA256 (rust/crates/tempfile-3.19.1.crate) = 7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf
+SIZE (rust/crates/tempfile-3.19.1.crate) = 39634
+SHA256 (rust/crates/terminal_size-0.4.2.crate) = 45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed
+SIZE (rust/crates/terminal_size-0.4.2.crate) = 9976
+SHA256 (rust/crates/thiserror-2.0.12.crate) = 567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708
+SIZE (rust/crates/thiserror-2.0.12.crate) = 28693
+SHA256 (rust/crates/thiserror-impl-2.0.12.crate) = 7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d
+SIZE (rust/crates/thiserror-impl-2.0.12.crate) = 21141
+SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
+SIZE (rust/crates/toml-0.5.11.crate) = 54910
+SHA256 (rust/crates/topological-sort-0.2.2.crate) = ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d
+SIZE (rust/crates/topological-sort-0.2.2.crate) = 10566
+SHA256 (rust/crates/ttf-parser-0.19.2.crate) = 49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1
+SIZE (rust/crates/ttf-parser-0.19.2.crate) = 158329
+SHA256 (rust/crates/typenum-1.18.0.crate) = 1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f
+SIZE (rust/crates/typenum-1.18.0.crate) = 74871
+SHA256 (rust/crates/ucd-trie-0.1.7.crate) = 2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971
+SIZE (rust/crates/ucd-trie-0.1.7.crate) = 46795
+SHA256 (rust/crates/unicase-2.8.1.crate) = 75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539
+SIZE (rust/crates/unicase-2.8.1.crate) = 24088
+SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
+SIZE (rust/crates/unicode-ident-1.0.18.crate) = 47743
+SHA256 (rust/crates/unicode-width-0.1.14.crate) = 7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af
+SIZE (rust/crates/unicode-width-0.1.14.crate) = 271615
+SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
+SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
+SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
+SIZE (rust/crates/version_check-0.9.5.crate) = 15554
+SHA256 (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3
+SIZE (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 140921
+SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
+SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
+SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
+SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
+SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-core-0.61.0.crate) = 4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980
+SIZE (rust/crates/windows-core-0.61.0.crate) = 36707
+SHA256 (rust/crates/windows-implement-0.60.0.crate) = a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836
+SIZE (rust/crates/windows-implement-0.60.0.crate) = 15073
+SHA256 (rust/crates/windows-interface-0.59.1.crate) = bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8
+SIZE (rust/crates/windows-interface-0.59.1.crate) = 11735
+SHA256 (rust/crates/windows-link-0.1.1.crate) = 76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38
+SIZE (rust/crates/windows-link-0.1.1.crate) = 6154
+SHA256 (rust/crates/windows-result-0.3.2.crate) = c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252
+SIZE (rust/crates/windows-result-0.3.2.crate) = 13399
+SHA256 (rust/crates/windows-strings-0.4.0.crate) = 7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97
+SIZE (rust/crates/windows-strings-0.4.0.crate) = 13939
+SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
+SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323
+SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
+SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
+SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
+SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
+SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
+SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
+SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
+SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
+SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
+SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
+SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
+SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241
+SHA256 (coastalwhite-wavedrom-rs-v0.1.0_GH0.tar.gz) = bbf54d16ac43f279c3c3e4b89eb4a6043fd0a55f550ea69a93bbce8b53fa474b
+SIZE (coastalwhite-wavedrom-rs-v0.1.0_GH0.tar.gz) = 138274
diff --git a/misc/wavedrom/pkg-descr b/misc/wavedrom/pkg-descr
new file mode 100644
index 000000000000..4153274bf1aa
--- /dev/null
+++ b/misc/wavedrom/pkg-descr
@@ -0,0 +1,11 @@
+wavedrom is a digital timing diagram generator based on WaveDrom.
+
+Features:
+- [x] All original WaveDrom Signal Types
+- [x] Signal Groups
+- [x] Arrows and Indicator Markers
+- [x] Headers and Footers
+- [x] Cycle Enumeration Markers
+- [x] Editor Website through WASM
+- [x] MdBook Preprocessor
+- [x] Full Customization via Skins
diff --git a/multimedia/get_iplayer/Makefile b/multimedia/get_iplayer/Makefile
index 42ad35ff2754..fc3533c1bedc 100644
--- a/multimedia/get_iplayer/Makefile
+++ b/multimedia/get_iplayer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	get_iplayer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.35
+DISTVERSION=	3.36
 CATEGORIES=	multimedia net
 
 MAINTAINER=	jamie@catflap.org
diff --git a/multimedia/get_iplayer/distinfo b/multimedia/get_iplayer/distinfo
index 0d4428272321..bab0a2a21b12 100644
--- a/multimedia/get_iplayer/distinfo
+++ b/multimedia/get_iplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715985824
-SHA256 (get-iplayer-get_iplayer-v3.35_GH0.tar.gz) = 048ff5f9bd5c6c0f51a05fd0c97eb137029d1950b594384a920c3c674f121e8c
-SIZE (get-iplayer-get_iplayer-v3.35_GH0.tar.gz) = 149783
+TIMESTAMP = 1746540170
+SHA256 (get-iplayer-get_iplayer-v3.36_GH0.tar.gz) = 9a70383143b6e3f43ee079f551b7f5719037ada86eb48d9defc66e00e619d996
+SIZE (get-iplayer-get_iplayer-v3.36_GH0.tar.gz) = 150345
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index b53b5dd0bf5c..2a75b4b2dd57 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	libmediainfo
-PORTVERSION=	25.03
+DISTVERSION=	25.03
+PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
-		LOCAL/sunpoet
-DISTNAME=	MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
+MASTER_SITES=	https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/
+DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	MediaInfo library
@@ -11,28 +11,32 @@ WWW=		https://mediaarea.net/en/MediaInfo \
 		https://github.com/MediaArea/MediaInfoLib
 
 LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/../../../License.html
+LICENSE_FILE=	${WRKSRC}/../../License.html
 
 LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2 \
 		libzen.so:multimedia/libzen
 
-USES=		compiler:c++11-lang dos2unix libtool localbase pathfix pkgconfig tar:xz
-
-CONFIGURE_ARGS=	--enable-shared --enable-static
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-PATHFIX_MAKEFILEIN+=	configure
+USES=		cmake compiler:c++11-lang dos2unix localbase:ldflags pathfix \
+		pkgconfig tar:xz
+DOS2UNIX_GLOB=	*.c *.cmake.in *.cpp *.h *.pc.in *.txt
+DOS2UNIX_WRKSRC=${WRKDIR}
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library
+EXTRACT_AFTER_ARGS=	--exclude MediaInfoLib/Source/ThirdParty/tinyxml2
+WRKSRC=		${WRKDIR}/MediaInfoLib/Project/CMake
+
+PLIST_SUB=	DISTVERSION=${DISTVERSION:S/.//}
 
-DOS2UNIX_FILES=	../../../Source/MediaInfo/Audio/File_Usac.cpp \
-		../../../Source/MediaInfo/Audio/File_Usac.h
+CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=	CURL
 OPTIONS_DEFAULT=CURL
 
-CURL_CONFIGURE_ON=	--with-libcurl=${LOCALBASE}
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_CURL
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in
+	${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/
 
 .include <bsd.port.mk>
diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo
index 0fce1db1249c..97ea1f14363e 100644
--- a/multimedia/libmediainfo/distinfo
+++ b/multimedia/libmediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744288736
-SHA256 (MediaInfo_CLI_25.03_GNU_FromSource.tar.xz) = 248f2183f1db14b2d70c5650e5fda84cc9923e1c57a79b9000000f09803e13fa
-SIZE (MediaInfo_CLI_25.03_GNU_FromSource.tar.xz) = 5897484
+TIMESTAMP = 1742645027
+SHA256 (libmediainfo_25.03.tar.xz) = 35f1fdab81239ca355c6de358a84fbde0477fed8eb350e5dfef6a598145c5207
+SIZE (libmediainfo_25.03.tar.xz) = 2117836
diff --git a/multimedia/libmediainfo/pkg-plist b/multimedia/libmediainfo/pkg-plist
index 9ef4e9825f73..2aa1b99b2181 100644
--- a/multimedia/libmediainfo/pkg-plist
+++ b/multimedia/libmediainfo/pkg-plist
@@ -4,8 +4,11 @@ include/MediaInfo/MediaInfo_Const.h
 include/MediaInfo/MediaInfo_Events.h
 include/MediaInfoDLL/MediaInfoDLL.h
 include/MediaInfoDLL/MediaInfoDLL_Static.h
-lib/libmediainfo.a
+lib/cmake/mediainfolib/MediaInfoLibConfig.cmake
+lib/cmake/mediainfolib/MediaInfoLibConfigVersion.cmake
+lib/cmake/mediainfolib/MediaInfoLibTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/mediainfolib/MediaInfoLibTargets.cmake
 lib/libmediainfo.so
 lib/libmediainfo.so.0
-lib/libmediainfo.so.0.0.0
+lib/libmediainfo.so.0.%%DISTVERSION%%.0
 libdata/pkgconfig/libmediainfo.pc
diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile
index 08d32db88ae1..42713667a858 100644
--- a/multimedia/libzen/Makefile
+++ b/multimedia/libzen/Makefile
@@ -1,10 +1,8 @@
 PORTNAME=	libzen
-PORTVERSION=	0.4.41.${MEDIAINFO_VERSION}
+DISTVERSION=	0.4.41.25.03
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	multimedia
-MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${MEDIAINFO_VERSION}/ \
-		LOCAL/sunpoet
-DISTNAME=	MediaInfo_CLI_${MEDIAINFO_VERSION}_GNU_FromSource
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ZenLib used by MediaInfo and its library
@@ -12,17 +10,21 @@ WWW=		https://mediaarea.net/en/MediaInfo \
 		https://github.com/MediaArea/ZenLib
 
 LICENSE=	ZLIB
-LICENSE_FILE=	${WRKSRC}/../../../License.txt
+LICENSE_FILE=	${WRKSRC}/../../License.txt
 
-USES=		compiler:c++11-lang dos2unix libtool pathfix tar:xz
-
-CONFIGURE_ARGS=	--enable-shared --enable-static
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+USES=		cmake compiler:c++11-lang dos2unix pathfix pkgconfig tar:xz
+DOS2UNIX_GLOB=	*.c *.cmake.in *.cpp *.h *.pc.in *.txt
+DOS2UNIX_WRKSRC=${WRKDIR}
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library
+USE_GITHUB=	yes
+GH_ACCOUNT=	MediaArea
+GH_PROJECT=	ZenLib
+GH_TAGNAME=	16e8ba0
+
+WRKSRC_SUBDIR=	Project/CMake
 
-MEDIAINFO_VERSION=	25.03
+post-patch:
+	@${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libzen.pc.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/libzen/distinfo b/multimedia/libzen/distinfo
index bdd723a753ee..cd550c7971a7 100644
--- a/multimedia/libzen/distinfo
+++ b/multimedia/libzen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744288734
-SHA256 (MediaInfo_CLI_25.03_GNU_FromSource.tar.xz) = 248f2183f1db14b2d70c5650e5fda84cc9923e1c57a79b9000000f09803e13fa
-SIZE (MediaInfo_CLI_25.03_GNU_FromSource.tar.xz) = 5897484
+TIMESTAMP = 1746346921
+SHA256 (MediaArea-ZenLib-0.4.41.25.03-16e8ba0_GH0.tar.gz) = 675dface61d0a2a918e07c31977a0590bb1d472c7fa27aca43e52076751c3282
+SIZE (MediaArea-ZenLib-0.4.41.25.03-16e8ba0_GH0.tar.gz) = 160560
diff --git a/multimedia/libzen/pkg-plist b/multimedia/libzen/pkg-plist
index 7be66e8fe0ef..6a0b0a0f1805 100644
--- a/multimedia/libzen/pkg-plist
+++ b/multimedia/libzen/pkg-plist
@@ -13,12 +13,6 @@ include/ZenLib/Format/Http/Http_Cookies.h
 include/ZenLib/Format/Http/Http_Handler.h
 include/ZenLib/Format/Http/Http_Request.h
 include/ZenLib/Format/Http/Http_Utils.h
-include/ZenLib/HTTP_Client.h
-include/ZenLib/HTTP_Client/HTTPClient.h
-include/ZenLib/HTTP_Client/HTTPClientAuth.h
-include/ZenLib/HTTP_Client/HTTPClientCommon.h
-include/ZenLib/HTTP_Client/HTTPClientString.h
-include/ZenLib/HTTP_Client/HTTPClientWrapper.h
 include/ZenLib/InfoMap.h
 include/ZenLib/MemoryDebug.h
 include/ZenLib/OS_Utils.h
@@ -33,8 +27,11 @@ include/ZenLib/ZtringListList.h
 include/ZenLib/ZtringListListF.h
 include/ZenLib/int128s.h
 include/ZenLib/int128u.h
-lib/libzen.a
+lib/cmake/zenlib/ZenLibConfig.cmake
+lib/cmake/zenlib/ZenLibConfigVersion.cmake
+lib/cmake/zenlib/ZenLibTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/zenlib/ZenLibTargets.cmake
 lib/libzen.so
 lib/libzen.so.0
-lib/libzen.so.0.0.0
+lib/libzen.so.0.4.41
 libdata/pkgconfig/libzen.pc
diff --git a/multimedia/uxplay/Makefile b/multimedia/uxplay/Makefile
index 50aec6213ae6..329725cc9aab 100644
--- a/multimedia/uxplay/Makefile
+++ b/multimedia/uxplay/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uxplay
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.71.1
+DISTVERSION=	1.72
 CATEGORIES=	multimedia
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/multimedia/uxplay/distinfo b/multimedia/uxplay/distinfo
index 89ea2adc0107..3d21b85eb0fa 100644
--- a/multimedia/uxplay/distinfo
+++ b/multimedia/uxplay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734457928
-SHA256 (FDH2-UxPlay-v1.71.1_GH0.tar.gz) = 61df20e78d9f4cf5f45974544873d9a7010b9e2783c1ac68cd170f27b783d3fa
-SIZE (FDH2-UxPlay-v1.71.1_GH0.tar.gz) = 466816
+TIMESTAMP = 1746687673
+SHA256 (FDH2-UxPlay-v1.72_GH0.tar.gz) = 98e36716d9f2a92f947f6f09020d8bcd3559bb62a53552487a0d3fc95c684d4a
+SIZE (FDH2-UxPlay-v1.72_GH0.tar.gz) = 479623
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f19898f3abb2..e4cdb487a0f6 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vlc
 DISTVERSION=	3.0.21
-PORTREVISION=	16
+PORTREVISION=	17
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/net-im/tdlib/Makefile b/net-im/tdlib/Makefile
index d338e8a95edc..28fbf97c053e 100644
--- a/net-im/tdlib/Makefile
+++ b/net-im/tdlib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tdlib
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.0
+DISTVERSION=	1.8.48
 CATEGORIES=	net-im devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -9,18 +9,19 @@ WWW=		https://github.com/tdlib/td
 
 LICENSE=	BSL
 
-USES=		cmake:testing compiler:c++14-lang gperf ssl
+USES=		cmake:testing compiler:c++14-lang gperf readline ssl
 
 USE_GITHUB=	yes
 GH_PROJECT=	td
+GH_TAGNAME=	b8b08b0 # hash corresponding to 1.8.48
 
-CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ON=	TD_INSTALL_SHARED_LIBRARIES TD_INSTALL_STATIC_LIBRARIES
 CMAKE_OFF=	BUILD_TESTING FREEBSD_BUILD_BENCHMARKS
 
-do-test:
-	@cd ${BUILD_WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFREEBSD_BUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+PLIST_SUB+=	LIBVERSION=${PORTVERSION}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%COMMIT%%|${GH_TAGNAME}|g' \
+		${WRKSRC}/CMake/GetGitRevisionDescription.cmake
 
 .include <bsd.port.mk>
diff --git a/net-im/tdlib/distinfo b/net-im/tdlib/distinfo
index c9fe9c1adc58..58f4d58e16cf 100644
--- a/net-im/tdlib/distinfo
+++ b/net-im/tdlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641141093
-SHA256 (tdlib-td-v1.8.0_GH0.tar.gz) = 30d560205fe82fb811cd57a8fcbc7ac853a5b6195e9cb9e6ff142f5e2d8be217
-SIZE (tdlib-td-v1.8.0_GH0.tar.gz) = 4527846
+TIMESTAMP = 1746135980
+SHA256 (tdlib-td-v1.8.48-b8b08b0_GH0.tar.gz) = 7e9885decba915c15e3297b824e2320ddd3d95fcca4ed47eb0ffa6c91f159548
+SIZE (tdlib-td-v1.8.48-b8b08b0_GH0.tar.gz) = 5465084
diff --git a/net-im/tdlib/files/patch-CMakeLists.txt b/net-im/tdlib/files/patch-CMakeLists.txt
index fa81fa16eb1a..ace0aa6c9837 100644
--- a/net-im/tdlib/files/patch-CMakeLists.txt
+++ b/net-im/tdlib/files/patch-CMakeLists.txt
@@ -1,14 +1,8 @@
-- make tests and benchmarks conditional on special cmake variables, see https://github.com/tdlib/td/issues/1583
-
---- CMakeLists.txt.orig	2021-05-20 23:05:03 UTC
+--- CMakeLists.txt.orig	2025-04-30 22:25:21 UTC
 +++ CMakeLists.txt
-@@ -189,9 +189,11 @@ add_subdirectory(sqlite)
- 
- add_subdirectory(tddb)
- 
-+if (BUILD_TESTING)
- add_subdirectory(test)
-+endif()
+@@ -213,7 +213,7 @@ add_subdirectory(tde2e)
+ set(TDE2E_ENABLE_INSTALL ${TD_INSTALL_STATIC_LIBRARIES} CACHE BOOL "" FORCE)
+ add_subdirectory(tde2e)
  
 -if (NOT CMAKE_CROSSCOMPILING)
 +if (FREEBSD_BUILD_BENCHMARKS AND NOT CMAKE_CROSSCOMPILING)
diff --git a/net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake b/net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake
new file mode 100644
index 000000000000..cf442232b657
--- /dev/null
+++ b/net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake
@@ -0,0 +1,11 @@
+--- CMake/GetGitRevisionDescription.cmake.orig	2025-04-30 22:25:21 UTC
++++ CMake/GetGitRevisionDescription.cmake
+@@ -67,7 +67,7 @@ function(get_git_head_revision _refspecvar _hashvar)
+   endif()
+   if (GIT_DIR STREQUAL "")
+     set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+-    set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
++    set(${_hashvar} "%%COMMIT%%" PARENT_SCOPE)
+     return()
+   endif()
+ 
diff --git a/net-im/tdlib/files/patch-tde2e_CMakeLists.txt b/net-im/tdlib/files/patch-tde2e_CMakeLists.txt
new file mode 100644
index 000000000000..8dc1e7c1fb01
--- /dev/null
+++ b/net-im/tdlib/files/patch-tde2e_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- tde2e/CMakeLists.txt.orig	2025-04-30 22:25:21 UTC
++++ tde2e/CMakeLists.txt
+@@ -83,4 +83,7 @@ if (TDE2E_ENABLE_INSTALL)
+     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   )
++  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/td
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++    FILES_MATCHING PATTERN "*.h")
+ endif()
diff --git a/net-im/tdlib/files/patch-tdutils_CMakeLists.txt b/net-im/tdlib/files/patch-tdutils_CMakeLists.txt
new file mode 100644
index 000000000000..bea6582773bf
--- /dev/null
+++ b/net-im/tdlib/files/patch-tdutils_CMakeLists.txt
@@ -0,0 +1,12 @@
+--- tdutils/CMakeLists.txt.orig	2025-04-30 22:25:21 UTC
++++ tdutils/CMakeLists.txt
+@@ -416,6 +416,9 @@ if (TDUTILS_ENABLE_INSTALL)
+     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   )
++  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/td
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++    FILES_MATCHING PATTERN "*.h")
+ endif()
+ 
+ if (TD_TEST_FOLLY AND ABSL_FOUND AND TDUTILS_USE_EXTERNAL_DEPENDENCIES)
diff --git a/net-im/tdlib/pkg-plist b/net-im/tdlib/pkg-plist
index 1bbd84ed34c4..eee8bb81e4c1 100644
--- a/net-im/tdlib/pkg-plist
+++ b/net-im/tdlib/pkg-plist
@@ -1,3 +1,21 @@
+include/td/e2e/BitString.h
+include/td/e2e/Blockchain.h
+include/td/e2e/Call.h
+include/td/e2e/CheckSharedSecret.h
+include/td/e2e/Container.h
+include/td/e2e/DecryptedKey.h
+include/td/e2e/EncryptedKey.h
+include/td/e2e/EncryptedStorage.h
+include/td/e2e/Keys.h
+include/td/e2e/MessageEncryption.h
+include/td/e2e/Mnemonic.h
+include/td/e2e/QRHandshake.h
+include/td/e2e/TestBlockchain.h
+include/td/e2e/Trie.h
+include/td/e2e/bip39.h
+include/td/e2e/e2e_api.h
+include/td/e2e/e2e_errors.h
+include/td/e2e/utils.h
 include/td/telegram/Client.h
 include/td/telegram/Log.h
 include/td/telegram/td_api.h
@@ -6,21 +24,195 @@ include/td/telegram/td_json_client.h
 include/td/telegram/td_log.h
 include/td/telegram/tdjson_export.h
 include/td/tl/TlObject.h
+include/td/utils/AesCtrByteFlow.h
+include/td/utils/AsyncFileLog.h
+include/td/utils/AtomicRead.h
+include/td/utils/BigNum.h
+include/td/utils/BufferedFd.h
+include/td/utils/BufferedReader.h
+include/td/utils/BufferedUdp.h
+include/td/utils/ByteFlow.h
+include/td/utils/CancellationToken.h
+include/td/utils/ChainScheduler.h
+include/td/utils/ChangesProcessor.h
+include/td/utils/Closure.h
+include/td/utils/CombinedLog.h
+include/td/utils/ConcurrentHashTable.h
+include/td/utils/Container.h
+include/td/utils/Context.h
+include/td/utils/DecTree.h
+include/td/utils/Destructor.h
+include/td/utils/Ed25519.h
+include/td/utils/Enumerator.h
+include/td/utils/EpochBasedMemoryReclamation.h
+include/td/utils/ExitGuard.h
+include/td/utils/FileLog.h
+include/td/utils/FlatHashMap.h
+include/td/utils/FlatHashMapChunks.h
+include/td/utils/FlatHashSet.h
+include/td/utils/FlatHashTable.h
+include/td/utils/FloodControlFast.h
+include/td/utils/FloodControlGlobal.h
+include/td/utils/FloodControlStrict.h
+include/td/utils/Gzip.h
+include/td/utils/GzipByteFlow.h
+include/td/utils/Hash.h
+include/td/utils/HashMap.h
+include/td/utils/HashSet.h
+include/td/utils/HashTableUtils.h
+include/td/utils/HazardPointers.h
+include/td/utils/Heap.h
+include/td/utils/Hints.h
+include/td/utils/HttpDate.h
+include/td/utils/HttpUrl.h
+include/td/utils/JsonBuilder.h
+include/td/utils/List.h
+include/td/utils/MapNode.h
+include/td/utils/MemoryLog.h
+include/td/utils/MimeType.h
+include/td/utils/MovableValue.h
+include/td/utils/MpmcQueue.h
+include/td/utils/MpmcWaiter.h
+include/td/utils/MpscLinkQueue.h
+include/td/utils/MpscPollableQueue.h
+include/td/utils/Named.h
+include/td/utils/NullLog.h
+include/td/utils/ObjectPool.h
+include/td/utils/Observer.h
+include/td/utils/OptionParser.h
+include/td/utils/OrderedEventsProcessor.h
+include/td/utils/Parser.h
+include/td/utils/PathView.h
+include/td/utils/Promise.h
+include/td/utils/Random.h
+include/td/utils/ScopeGuard.h
+include/td/utils/SetNode.h
+include/td/utils/SharedObjectPool.h
+include/td/utils/SharedSlice.h
+include/td/utils/Slice-decl.h
+include/td/utils/Slice.h
+include/td/utils/SliceBuilder.h
+include/td/utils/Span.h
+include/td/utils/SpinLock.h
+include/td/utils/StackAllocator.h
+include/td/utils/Status.h
+include/td/utils/StealingQueue.h
+include/td/utils/Storer.h
+include/td/utils/StorerBase.h
+include/td/utils/StringBuilder.h
+include/td/utils/ThreadLocalStorage.h
+include/td/utils/ThreadSafeCounter.h
+include/td/utils/Time.h
+include/td/utils/TimedStat.h
+include/td/utils/Timer.h
+include/td/utils/TlDowncastHelper.h
+include/td/utils/TlStorerToString.h
+include/td/utils/TsCerr.h
+include/td/utils/TsFileLog.h
+include/td/utils/TsList.h
+include/td/utils/TsLog.h
+include/td/utils/UInt.h
+include/td/utils/Variant.h
+include/td/utils/VectorQueue.h
+include/td/utils/WaitFreeHashMap.h
+include/td/utils/WaitFreeHashSet.h
+include/td/utils/WaitFreeVector.h
+include/td/utils/algorithm.h
+include/td/utils/as.h
+include/td/utils/base64.h
+include/td/utils/benchmark.h
+include/td/utils/bits.h
+include/td/utils/buffer.h
+include/td/utils/check.h
+include/td/utils/common.h
+include/td/utils/crypto.h
+include/td/utils/emoji.h
+include/td/utils/filesystem.h
+include/td/utils/find_boundary.h
+include/td/utils/fixed_vector.h
+include/td/utils/format.h
+include/td/utils/int_types.h
+include/td/utils/invoke.h
+include/td/utils/logging.h
+include/td/utils/misc.h
+include/td/utils/optional.h
+include/td/utils/overloaded.h
+include/td/utils/port/Clocks.h
+include/td/utils/port/CxCli.h
+include/td/utils/port/EventFd.h
+include/td/utils/port/EventFdBase.h
+include/td/utils/port/FileFd.h
+include/td/utils/port/FromApp.h
+include/td/utils/port/IPAddress.h
+include/td/utils/port/IoSlice.h
+include/td/utils/port/MemoryMapping.h
+include/td/utils/port/Mutex.h
+include/td/utils/port/Poll.h
+include/td/utils/port/PollBase.h
+include/td/utils/port/PollFlags.h
+include/td/utils/port/RwMutex.h
+include/td/utils/port/ServerSocketFd.h
+include/td/utils/port/SocketFd.h
+include/td/utils/port/Stat.h
+include/td/utils/port/StdStreams.h
+include/td/utils/port/UdpSocketFd.h
+include/td/utils/port/config.h
+include/td/utils/port/detail/Epoll.h
+include/td/utils/port/detail/EventFdBsd.h
+include/td/utils/port/detail/EventFdLinux.h
+include/td/utils/port/detail/EventFdWindows.h
+include/td/utils/port/detail/Iocp.h
+include/td/utils/port/detail/KQueue.h
+include/td/utils/port/detail/NativeFd.h
+include/td/utils/port/detail/Poll.h
+include/td/utils/port/detail/PollableFd.h
+include/td/utils/port/detail/Select.h
+include/td/utils/port/detail/ThreadIdGuard.h
+include/td/utils/port/detail/ThreadPthread.h
+include/td/utils/port/detail/ThreadStl.h
+include/td/utils/port/detail/WineventPoll.h
+include/td/utils/port/detail/skip_eintr.h
+include/td/utils/port/path.h
+include/td/utils/port/platform.h
+include/td/utils/port/rlimit.h
+include/td/utils/port/signals.h
+include/td/utils/port/sleep.h
+include/td/utils/port/stacktrace.h
+include/td/utils/port/thread.h
+include/td/utils/port/thread_local.h
+include/td/utils/port/uname.h
+include/td/utils/port/user.h
+include/td/utils/port/wstring_convert.h
+include/td/utils/queue.h
+include/td/utils/simple_tests.h
+include/td/utils/tests.h
+include/td/utils/tl_helpers.h
+include/td/utils/tl_parsers.h
+include/td/utils/tl_storers.h
+include/td/utils/translit.h
+include/td/utils/type_traits.h
+include/td/utils/uint128.h
+include/td/utils/unicode.h
+include/td/utils/unique_ptr.h
+include/td/utils/unique_value_ptr.h
+include/td/utils/utf8.h
 lib/cmake/Td/TdConfig.cmake
 lib/cmake/Td/TdConfigVersion.cmake
 lib/cmake/Td/TdTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Td/TdTargets.cmake
+lib/cmake/Td/TdStaticTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Td/TdStaticTargets.cmake
 lib/libtdactor.a
-lib/libtdapi.so
-lib/libtdapi.so.1.8.0
-lib/libtdclient.so
-lib/libtdclient.so.1.8.0
+lib/libtdapi.a
+lib/libtdclient.a
 lib/libtdcore.a
 lib/libtddb.a
+lib/libtde2e.a
 lib/libtdjson.so
-lib/libtdjson.so.1.8.0
+lib/libtdjson.so.%%LIBVERSION%%
 lib/libtdjson_private.a
 lib/libtdjson_static.a
+lib/libtdmtproto.a
 lib/libtdnet.a
 lib/libtdsqlite.a
 lib/libtdutils.a
@@ -29,9 +221,11 @@ libdata/pkgconfig/tdapi.pc
 libdata/pkgconfig/tdclient.pc
 libdata/pkgconfig/tdcore.pc
 libdata/pkgconfig/tddb.pc
+libdata/pkgconfig/tde2e.pc
 libdata/pkgconfig/tdjson.pc
 libdata/pkgconfig/tdjson_private.pc
 libdata/pkgconfig/tdjson_static.pc
+libdata/pkgconfig/tdmtproto.pc
 libdata/pkgconfig/tdnet.pc
 libdata/pkgconfig/tdsqlite.pc
 libdata/pkgconfig/tdutils.pc
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 3735ffaed5f4..abef119fab27 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,11 +1,13 @@
 PORTNAME=	telegram-desktop
-DISTVERSION=	5.13.1
-PORTREVISION=	7
+DISTVERSION=	5.14.1
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
+PATCH_SITES=	https://github.com/telegramdesktop/tdesktop/commit/
+PATCHFILES=	f676d32f96e70874d9d8e78788c37b82b1e3324a.patch:-p1
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Telegram Desktop messaging app
 WWW=		https://desktop.telegram.org/
@@ -25,6 +27,7 @@ BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		tl-expected>0:devel/tl-expected \
 		v4l_compat>0:multimedia/v4l_compat \
 		yasm:devel/yasm \
+		${LOCALBASE}/lib/libtde2e.a:net-im/tdlib \
 		${LOCALBASE}/lib/libtg_owt.a:net-im/tg_owt
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libada.so:devel/libada \
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index 21a0070d466b..397a77ea5471 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1743084723
-SHA256 (tdesktop-5.13.1-full.tar.gz) = caa37bbf7d9fcdfecdb5f596f02a44becbe468ea5c6af7f3c670b61952744a80
-SIZE (tdesktop-5.13.1-full.tar.gz) = 72699182
+TIMESTAMP = 1746300493
+SHA256 (tdesktop-5.14.1-full.tar.gz) = 42d3130292b21928f04e39539f4e7358206bde913ea6e5171b0ffdeb38b9872e
+SIZE (tdesktop-5.14.1-full.tar.gz) = 72779847
+SHA256 (f676d32f96e70874d9d8e78788c37b82b1e3324a.patch) = a3b6ad6badcbfeb9af01a3d7591c433779c2fea99d57c735ed8a6beed549e5ce
+SIZE (f676d32f96e70874d9d8e78788c37b82b1e3324a.patch) = 862
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp
deleted file mode 100644
index 25db4543f4ef..000000000000
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix build with Qt >= 6.9.0
-
-Backported from: https://github.com/desktop-app/lib_base/pull/268
-
---- Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp.orig	2025-02-25 06:14:47 UTC
-+++ Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-@@ -16,7 +16,11 @@
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
- #include <qpa/qplatformintegration.h>
- #include <private/qguiapplication_p.h>
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-+#include <private/qdesktopunixservices_p.h>
-+#else // Qt >= 6.9.0
- #include <private/qgenericunixservices_p.h>
-+#endif // Qt < 6.9.0
- #endif // Qt >= 6.5.0
- 
- #include <sstream>
-@@ -39,7 +43,10 @@ std::string ParentWindowID(QWindow *window) {
- 	}
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
--	if (const auto services = dynamic_cast<QGenericUnixServices*>(
-+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
-+	using QDesktopUnixServices = QGenericUnixServices;
-+#endif // Qt < 6.9.0
-+	if (const auto services = dynamic_cast<QDesktopUnixServices*>(
- 			QGuiApplicationPrivate::platformIntegration()->services())) {
- 		return services->portalWindowIdentifier(window).toStdString();
- 	}
diff --git a/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake b/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake
index aa1b987526cb..06e5d4af10e9 100644
--- a/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake
+++ b/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake
@@ -1,6 +1,6 @@
---- cmake/external/qt/package.cmake.orig	2024-10-11 07:45:28 UTC
+--- cmake/external/qt/package.cmake.orig	2025-05-01 07:59:09 UTC
 +++ cmake/external/qt/package.cmake
-@@ -66,6 +66,8 @@ if (QT_VERSION_MAJOR GREATER_EQUAL 6)
+@@ -69,6 +69,8 @@ if (QT_VERSION_MAJOR GREATER_EQUAL 6)
  
  if (QT_VERSION_MAJOR GREATER_EQUAL 6)
      find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED)
diff --git a/net-im/telegram-desktop/files/patch-cmake_external_td_CMakeLists.txt b/net-im/telegram-desktop/files/patch-cmake_external_td_CMakeLists.txt
new file mode 100644
index 000000000000..6bee7cb39b28
--- /dev/null
+++ b/net-im/telegram-desktop/files/patch-cmake_external_td_CMakeLists.txt
@@ -0,0 +1,15 @@
+--- cmake/external/td/CMakeLists.txt.orig	2025-05-01 07:59:09 UTC
++++ cmake/external/td/CMakeLists.txt
+@@ -7,6 +7,12 @@ add_library(desktop-app::external_td ALIAS external_td
+ add_library(external_td INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_td ALIAS external_td)
+ 
++if (DESKTOP_APP_USE_PACKAGED)
++    find_package(Td REQUIRED)
++    target_link_libraries(external_td INTERFACE Td::tde2e)
++    return()
++endif()
++
+ set(td_loc ${libs_loc}/td)
+ set(td_build_loc ${td_loc}/out/$<IF:$<CONFIG:Debug>,Debug,Release>)
+ if (WIN32)
diff --git a/net-im/tg_owt/Makefile b/net-im/tg_owt/Makefile
index 2b2efd12709d..8c07236aeb6a 100644
--- a/net-im/tg_owt/Makefile
+++ b/net-im/tg_owt/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tg_owt
-PORTVERSION=	0.0.20250429
+PORTVERSION=	0.0.20250501
 CATEGORIES=	net-im
 
 MAINTAINER=	ports@FreeBSD.org
@@ -27,7 +27,7 @@ USE_XORG=	x11 xcomposite xdamage xrender xrandr xtst
 USE_GL=		gbm gl
 USE_GITHUB=	yes
 GH_ACCOUNT=	desktop-app
-GH_TAGNAME=	698c4f7
+GH_TAGNAME=	c4192e8
 
 CMAME_ON=	TG_OWT_PACKAGED_BUILD
 
diff --git a/net-im/tg_owt/distinfo b/net-im/tg_owt/distinfo
index 47b41462665a..c2fa5169c57e 100644
--- a/net-im/tg_owt/distinfo
+++ b/net-im/tg_owt/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1745936846
-SHA256 (desktop-app-tg_owt-0.0.20250429-698c4f7_GH0.tar.gz) = 76dbcfc393dc8eef3e7d131778e7b78f0a9745c77deacc10adb7f186d29aa6d9
-SIZE (desktop-app-tg_owt-0.0.20250429-698c4f7_GH0.tar.gz) = 11716320
+TIMESTAMP = 1746127286
+SHA256 (desktop-app-tg_owt-0.0.20250501-c4192e8_GH0.tar.gz) = 87a58d153e0e0a12521335a41e695befd1abf72ec3545db48c8f4cc801116d52
+SIZE (desktop-app-tg_owt-0.0.20250501-c4192e8_GH0.tar.gz) = 11716225
 SHA256 (osokin-libyuv-04821d1_GH0.tar.gz) = cffd73dc527a8991e0fa78f0013d5db457a55298dada5896b4d6fa1b4ec5713f
 SIZE (osokin-libyuv-04821d1_GH0.tar.gz) = 559577
-SHA256 (4f7618d717335ec7e96ee665591aae87e8caf22d.patch) = 6fafbce24ffec707fa0556591cbe551aa946c0b4c6efa1ca25867dd3af0a2e89
-SIZE (4f7618d717335ec7e96ee665591aae87e8caf22d.patch) = 1478
diff --git a/net-im/toot/Makefile b/net-im/toot/Makefile
index 0eafadb91d1f..5c678b70ced5 100644
--- a/net-im/toot/Makefile
+++ b/net-im/toot/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	toot
-DISTVERSION=	0.47.1
+DISTVERSION=	0.48.0
 CATEGORIES=	net-im python
 MASTER_SITES=	PYPI \
 		https://github.com/ihabunek/toot/releases/download/${DISTVERSION}/
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0<5.0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.1<9:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.1<3.0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.13<3.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomlkit>=0.10.0<1.0:textproc/py-tomlkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urwid>=2.0.0<3.0:devel/py-urwid@${PY_FLAVOR} \
@@ -23,8 +24,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urwidgets>=0:devel/py-urwidgets@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	flavors pytest
@@ -36,6 +36,19 @@ NO_INSTALL=	yes
 SUB_FILES=	toot
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
+OPTIONS_DEFAULT=	IMAGES RICHTEXT
+OPTIONS_GROUP=		SUPPORT
+OPTIONS_GROUP_SUPPORT=	IMAGES RICHTEXT
+
+IMAGES_DESC=	Required to display images in the TUI
+RICHTEXT_DESC=	Required to display rich text in the TUI
+
+IMAGES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=9.5.0:graphics/py-pillow@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}term-image>=0.7.2:graphics/py-term-image@${PY_FLAVOR}
+RICHTEXT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwidgets>=0.2<0.3:devel/py-urwidgets@${PY_FLAVOR}
+
+PORTSCOUT=		skipv:0.48.1
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/toot \
 		${STAGEDIR}${PREFIX}/bin/toot
diff --git a/net-im/toot/distinfo b/net-im/toot/distinfo
index b2fd38e376a1..b5a61a3c5c79 100644
--- a/net-im/toot/distinfo
+++ b/net-im/toot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735070581
-SHA256 (toot-0.47.1.tar.gz) = fae758b50d22c019379a1f90ac0fe7adfc152ce8899005e463b36ee2e88abc2b
-SIZE (toot-0.47.1.tar.gz) = 1318249
+TIMESTAMP = 1746327277
+SHA256 (toot-0.48.0.tar.gz) = 7e9134a1568ac5f4d1bc63c26795cba85b07d832871fb0b8cb5d80d7f749d096
+SIZE (toot-0.48.0.tar.gz) = 1476183
diff --git a/net-im/toot/pkg-plist b/net-im/toot/pkg-plist
index ae2888f13fa6..a5d3f304b236 100644
--- a/net-im/toot/pkg-plist
+++ b/net-im/toot/pkg-plist
@@ -14,6 +14,7 @@ bin/toot
 %%PYTHON_SITELIBDIR%%/toot/cli/statuses.py
 %%PYTHON_SITELIBDIR%%/toot/cli/tags.py
 %%PYTHON_SITELIBDIR%%/toot/cli/timelines.py
+%%PYTHON_SITELIBDIR%%/toot/cli/timelines_v2.py
 %%PYTHON_SITELIBDIR%%/toot/cli/tui.py
 %%PYTHON_SITELIBDIR%%/toot/cli/validators.py
 %%PYTHON_SITELIBDIR%%/toot/config.py
diff --git a/net-mgmt/cdpd/files/patch-Makefile.in b/net-mgmt/cdpd/files/patch-Makefile.in
new file mode 100644
index 000000000000..0b26f2bf5c5f
--- /dev/null
+++ b/net-mgmt/cdpd/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2010-04-02 08:47:58.000000000 -0700
++++ Makefile.in	2025-03-13 13:51:50.304959000 -0700
+@@ -9,7 +9,7 @@
+ all: cdpd
+ 
+ cdpd: cdpd.o daemon.o strlcpy.o
+-	$(CC) ${CFLAGS} cdpd.o daemon.o strlcpy.o -o cdpd ${LDADD}
++	$(CC) ${CFLAGS} ${LDFLAGS} cdpd.o daemon.o strlcpy.o -o cdpd ${LDADD}
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $< 
diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile
index ed5af6b17c09..4651e306e9c1 100644
--- a/net-mgmt/driftnet/Makefile
+++ b/net-mgmt/driftnet/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	driftnet
-DISTVERSION=	1.5.0
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.6.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -22,7 +21,7 @@ USES=		autoreconf gettext-runtime gmake gnome jpeg localbase:ldflags \
 USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	deiv
-USE_GNOME=	gtk20
+USE_GNOME=	gtk30
 USE_XORG=	x11 xext xi
 
 GNU_CONFIGURE=		yes
@@ -30,8 +29,7 @@ CONFIGURE_ARGS+=	--disable-debug
 
 INSTALL_TARGET=	install-strip
 
-PLIST_FILES=	${DATADIR}/static-html/index.html \
-		bin/driftnet \
+PLIST_FILES=	bin/driftnet \
 		share/man/man1/driftnet.1.gz
 PORTDOCS=	*
 
diff --git a/net-mgmt/driftnet/distinfo b/net-mgmt/driftnet/distinfo
index 0ce8e457a7af..adfb64c15dfb 100644
--- a/net-mgmt/driftnet/distinfo
+++ b/net-mgmt/driftnet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680280740
-SHA256 (deiv-driftnet-v1.5.0_GH0.tar.gz) = 41e7941f858638c1b087625f78b754a76d603932a52576a6b862a4b5dbcf2547
-SIZE (deiv-driftnet-v1.5.0_GH0.tar.gz) = 5691414
+TIMESTAMP = 1746360781
+SHA256 (deiv-driftnet-v1.6.0_GH0.tar.gz) = 4b81ecaa6164d7deb38ca95aa1b2a90985594082cbd166d94664d95c5956f226
+SIZE (deiv-driftnet-v1.6.0_GH0.tar.gz) = 5772879
diff --git a/net-mgmt/driftnet/files/patch-configure.ac b/net-mgmt/driftnet/files/patch-configure.ac
deleted file mode 100644
index 1d0e8e96f76d..000000000000
--- a/net-mgmt/driftnet/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2023-03-25 20:10:06 UTC
-+++ configure.ac
-@@ -22,7 +22,7 @@ build_linux=no
- build_mac=no
- 
- case "${host_os}" in
--    linux*)
-+    linux*|freebsd*)
-         build_linux=yes
-         ;;
-     cygwin*|mingw*)
diff --git a/net-mgmt/driftnet/files/patch-src_display_img.h b/net-mgmt/driftnet/files/patch-src_display_img.h
deleted file mode 100644
index 272fc42f0a6e..000000000000
--- a/net-mgmt/driftnet/files/patch-src_display_img.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/display/img.h.orig	2023-07-15 23:49:00 UTC
-+++ src/display/img.h
-@@ -69,6 +69,7 @@ typedef uint32_t pel;
- #   define GETB(p)             ((chan)(((p) & (pel)0xff000000) >> 24))
- #   define GETA(p)             ((chan)(((p) & (pel)0x000000ff)      ))
- #endif
-+#else
- #   error "no endianness defined"
- #endif
- 
diff --git a/net-mgmt/driftnet/files/patch-src_media_image.c b/net-mgmt/driftnet/files/patch-src_media_image.c
deleted file mode 100644
index 0bce47354b74..000000000000
--- a/net-mgmt/driftnet/files/patch-src_media_image.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/media/image.c.orig	2022-04-16 21:14:04 UTC
-+++ src/media/image.c
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */
- #include <string.h>
-+#include <sys/types.h>
- 
- #include <netinet/in.h> /* ntohl */
- 
diff --git a/net-mgmt/driftnet/files/patch-src_media_media.c b/net-mgmt/driftnet/files/patch-src_media_media.c
deleted file mode 100644
index 3c051f665887..000000000000
--- a/net-mgmt/driftnet/files/patch-src_media_media.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/media/media.c.orig	2022-04-16 21:14:04 UTC
-+++ src/media/media.c
-@@ -17,6 +17,7 @@
- #include "compat/compat.h"
- 
- #include <string.h>
-+#include <sys/types.h>
- 
- #include "common/util.h"
- #include "common/tmpdir.h"
diff --git a/net-mgmt/ipgen/Makefile b/net-mgmt/ipgen/Makefile
index 25d324f9d3b0..e2e33b19c453 100644
--- a/net-mgmt/ipgen/Makefile
+++ b/net-mgmt/ipgen/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ipgen
 PORTVERSION=	1.30.20240527
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/net-mgmt/ipgen/files/patch-gen_compat.h b/net-mgmt/ipgen/files/patch-gen_compat.h
new file mode 100644
index 000000000000..373d113da027
--- /dev/null
+++ b/net-mgmt/ipgen/files/patch-gen_compat.h
@@ -0,0 +1,23 @@
+--- gen/compat.h.orig	2024-05-27 06:59:46 UTC
++++ gen/compat.h
+@@ -48,6 +48,7 @@
+ #define ETHERTYPE_FLOWCONTROL	0x8808
+ #endif
+ 
++#if !defined(__FreeBSD__) || defined(__i386__)
+ #ifndef atomic_fetchadd_32
+ #define	atomic_fetchadd_32(t, v) __atomic_fetch_add(t, v, __ATOMIC_CONSUME)
+ #endif
+@@ -67,10 +68,11 @@ atomic_cmpset_32(volatile uint32_t *p, uint32_t cmpval
+ 	bool ret = __atomic_compare_exchange_n(p, &cmpval, newval, false, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
+ 	return ret ? 1 : 0;
+ }
+-#endif
++#endif /* !defined(__FreeBSD__) || defined(__i386__) */
+ 
+ #ifndef __unused
+ #define __unused	__attribute__((unused))
++#endif
+ #endif
+ 
+ #endif /* _COMPAT_H_ */
diff --git a/net-mgmt/ipgen/files/patch-gen_util.c b/net-mgmt/ipgen/files/patch-gen_util.c
new file mode 100644
index 000000000000..83dfd7f6a23d
--- /dev/null
+++ b/net-mgmt/ipgen/files/patch-gen_util.c
@@ -0,0 +1,14 @@
+--- gen/util.c.orig	2025-05-05 17:12:32 UTC
++++ gen/util.c
+@@ -351,7 +351,11 @@ getiflinkaddr(const char *ifname, struct ether_addr *a
+ 			if ((sdl->sdl_type == IFT_ETHER) &&
+ 			    (sdl->sdl_alen == ETHER_ADDR_LEN)) {
+ 
++#ifdef CLLADDR
+ 				memcpy(addr, (const struct ether_addr *)CLLADDR(sdl), ETHER_ADDR_LEN);
++#else
++				memcpy(addr, (const struct ether_addr *)LLADDR(sdl), ETHER_ADDR_LEN);
++#endif
+ 				found = 1;
+ 				break;
+ 			}
diff --git a/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile b/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile
index 7c76074a0089..21aea9fe2223 100644
--- a/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile
+++ b/net-mgmt/ipgen/files/patch-libpkt-GNUmakefile
@@ -1,6 +1,6 @@
---- libpkt/GNUmakefile.orig	2024-02-29 01:38:00 UTC
+--- libpkt/GNUmakefile.orig	2024-05-27 06:59:46 UTC
 +++ libpkt/GNUmakefile
-@@ -8,7 +8,6 @@ SRCS+=		utils.c
+@@ -8,16 +8,15 @@ SRCS+=		utils.c
  SRCS+=		ip6pkt.c
  SRCS+=		utils.c
  
@@ -8,3 +8,14 @@
  CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
  CFLAGS+=	-Wreturn-type -Wswitch -Wshadow
  CFLAGS+=	-Wcast-qual -Wwrite-strings
+ CFLAGS+=	-Wno-address-of-packed-member
+ 
+ # x86
+-CFLAGS+=	-DUSE_CPU_IN_CKSUM
++#CFLAGS+=	-DUSE_CPU_IN_CKSUM
+ SRCS+=		in_cksum.c
+-SRCS+=		cpu_in_cksum.S
++#SRCS+=		cpu_in_cksum.S
+ 
+ 
+ OBJS+=	$(patsubst %.S,%.o,$(SRCS:%.c=%.o))
diff --git a/net-mgmt/seafile-client/pkg-plist b/net-mgmt/seafile-client/pkg-plist
index d9c93321a60e..bbc58f35e875 100644
--- a/net-mgmt/seafile-client/pkg-plist
+++ b/net-mgmt/seafile-client/pkg-plist
@@ -9,11 +9,13 @@ lib/libseafile.so
 lib/libseafile.so.0
 lib/libseafile.so.0.0.0
 %%PYTHON_SITELIBDIR%%/seafile/__init__.py
-%%PYTHON_SITELIBDIR%%/seafile/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/seafile/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/seafile/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/seafile/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/seafile/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/seafile/__pycache__/rpcclient%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/seafile/__pycache__/rpcclient%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/seafile/__pycache__/rpcclient%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/seafile/rpcclient.py
-%%PYTHON_SITELIBDIR%%/seafile/__pycache__/rpcclient.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/seafile/__pycache__/rpcclient.cpython-%%PYTHON_SUFFIX%%.pyc
 libdata/pkgconfig/libseafile.pc
 share/man/man1/seaf-cli.1.gz
 share/man/man1/seaf-daemon.1.gz
diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 68b721ce7ffe..af91620f22f9 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	telegraf
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.34.2
+DISTVERSION=	1.34.3
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org
@@ -35,6 +35,9 @@ GROUPS=		${TELEGRAF_GROUP}
 
 TELEGRAF_LOGDIR=/var/log/${PORTNAME}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config/config.go
+
 post-install:
 	${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR}
 
diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo
index d36d63ceba8e..a01e86bb1876 100644
--- a/net-mgmt/telegraf/distinfo
+++ b/net-mgmt/telegraf/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1744714785
-SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.mod) = cc8644deb9eb449241d909b0d0dc8ca9d19943863bfe84d683c123511957a360
-SIZE (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.mod) = 27169
-SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.zip) = 6eb4ae787983b612c4b85018c8c57d225d95bc202ae51209f019763906076d4d
-SIZE (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.zip) = 7051054
+TIMESTAMP = 1746522044
+SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.mod) = 495fb5a3b430b68bf92d257e615c839a6ba7b713ad160e0f86d4d15e072f2044
+SIZE (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.mod) = 27383
+SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.zip) = 66739fe2f568a3c2aa7bc2f28250804afbc9de75ec4321f6528a8bde8f86dfbd
+SIZE (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.zip) = 7055291
diff --git a/net-mgmt/telegraf/files/patch-config_config.go b/net-mgmt/telegraf/files/patch-config_config.go
new file mode 100644
index 000000000000..a6f1c04b7722
--- /dev/null
+++ b/net-mgmt/telegraf/files/patch-config_config.go
@@ -0,0 +1,18 @@
+--- config/config.go.orig	2025-05-06 11:09:55.069815000 +0000
++++ config/config.go	2025-05-06 11:10:17.098859000 +0000
+@@ -481,12 +481,12 @@
+ // Try to find a default config file at these locations (in order):
+ //  1. $TELEGRAF_CONFIG_PATH
+ //  2. $HOME/.telegraf/telegraf.conf
+-//  3. /etc/telegraf/telegraf.conf and /etc/telegraf/telegraf.d/*.conf
++//  3. /usr/local/etc/telegraf/telegraf.conf and /etc/telegraf/telegraf.d/*.conf
+ func GetDefaultConfigPath() ([]string, error) {
+ 	envfile := os.Getenv("TELEGRAF_CONFIG_PATH")
+ 	homefile := os.ExpandEnv("${HOME}/.telegraf/telegraf.conf")
+-	etcfile := "/etc/telegraf/telegraf.conf"
+-	etcfolder := "/etc/telegraf/telegraf.d"
++	etcfile := "/usr/local/etc/telegraf/telegraf.conf"
++	etcfolder := "/usr/local/etc/telegraf/telegraf.d"
+ 
+ 	if runtime.GOOS == "windows" {
+ 		programFiles := os.Getenv("ProgramFiles")
diff --git a/net-mgmt/zabbix5-server/Makefile b/net-mgmt/zabbix5-server/Makefile
index 67adce9374f7..e6ace1e4f8f1 100644
--- a/net-mgmt/zabbix5-server/Makefile
+++ b/net-mgmt/zabbix5-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zabbix5
-DISTVERSION=	5.0.45
+DISTVERSION=	5.0.46
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
diff --git a/net-mgmt/zabbix5-server/distinfo b/net-mgmt/zabbix5-server/distinfo
index c79f70f9a242..0c746a7946c1 100644
--- a/net-mgmt/zabbix5-server/distinfo
+++ b/net-mgmt/zabbix5-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732290452
-SHA256 (zabbix-5.0.45.tar.gz) = 3f7ad9ccd0723d24019a783c3149804fab7b5a6d3db158e592913f85d9b4d1f6
-SIZE (zabbix-5.0.45.tar.gz) = 21885357
+TIMESTAMP = 1746546658
+SHA256 (zabbix-5.0.46.tar.gz) = a7a39900ba4e406eafef4636d1c0b66dd9734c8373dc905df6a19664009f725e
+SIZE (zabbix-5.0.46.tar.gz) = 22125542
diff --git a/net-mgmt/zabbix5-server/pkg-plist.java b/net-mgmt/zabbix5-server/pkg-plist.java
index 3c583b91a9e9..bbb4ef31d704 100644
--- a/net-mgmt/zabbix5-server/pkg-plist.java
+++ b/net-mgmt/zabbix5-server/pkg-plist.java
@@ -1,9 +1,9 @@
 sbin/zabbix_java/shutdown.sh
 sbin/zabbix_java/lib/logback-console.xml
-sbin/zabbix_java/lib/logback-core-1.2.9.jar
-sbin/zabbix_java/lib/logback-classic-1.2.9.jar
+sbin/zabbix_java/lib/logback-core-1.5.16.jar
+sbin/zabbix_java/lib/logback-classic-1.5.16.jar
 sbin/zabbix_java/lib/logback.xml
-sbin/zabbix_java/lib/slf4j-api-1.7.32.jar
+sbin/zabbix_java/lib/slf4j-api-2.0.16.jar
 sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
 @sample sbin/zabbix_java/settings.sh.sample
 sbin/zabbix_java/startup.sh
diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile
index 37337ae773b5..5cdc460fdd4c 100644
--- a/net-mgmt/zabbix6-server/Makefile
+++ b/net-mgmt/zabbix6-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zabbix6
-DISTVERSION=	6.0.39
+DISTVERSION=	6.0.40
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
diff --git a/net-mgmt/zabbix6-server/distinfo b/net-mgmt/zabbix6-server/distinfo
index 540868aa7e72..8fa107e09ea1 100644
--- a/net-mgmt/zabbix6-server/distinfo
+++ b/net-mgmt/zabbix6-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741027077
-SHA256 (zabbix-6.0.39.tar.gz) = e1a874bac0f72c71d89812f1f997d810c8c58daecb2628f9b7cc0577c6f43585
-SIZE (zabbix-6.0.39.tar.gz) = 41030406
+TIMESTAMP = 1746546671
+SHA256 (zabbix-6.0.40.tar.gz) = 065a744538ff78f0d7abf8392b149ae23761edfdc6a3dcc6c47c8c33275b33ad
+SIZE (zabbix-6.0.40.tar.gz) = 41181725
diff --git a/net-mgmt/zabbix6-server/pkg-plist.frontend b/net-mgmt/zabbix6-server/pkg-plist.frontend
index a7ebd10901de..adce17050847 100644
--- a/net-mgmt/zabbix6-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix6-server/pkg-plist.frontend
@@ -832,6 +832,7 @@
 %%WWWDIR%%/include/classes/html/CTextBox.php
 %%WWWDIR%%/include/classes/html/CUiWidget.php
 %%WWWDIR%%/include/classes/html/CVar.php
+%%WWWDIR%%/include/classes/html/CVertical.php
 %%WWWDIR%%/include/classes/html/CVisibilityBox.php
 %%WWWDIR%%/include/classes/html/CWarning.php
 %%WWWDIR%%/include/classes/html/interfaces/CButtonInterface.php
@@ -1256,6 +1257,7 @@
 %%WWWDIR%%/js/common.js
 %%WWWDIR%%/js/component.z-bar-gauge.js
 %%WWWDIR%%/js/component.z-select.js
+%%WWWDIR%%/js/component.z-vertical.js
 %%WWWDIR%%/js/flickerfreescreen.js
 %%WWWDIR%%/js/functions.js
 %%WWWDIR%%/js/gtlc.js
diff --git a/net-mgmt/zabbix7-server/Makefile b/net-mgmt/zabbix7-server/Makefile
index 8a34a063317e..2435bbdf03f6 100644
--- a/net-mgmt/zabbix7-server/Makefile
+++ b/net-mgmt/zabbix7-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zabbix7
-DISTVERSION=	7.0.11
+DISTVERSION=	7.0.12
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
diff --git a/net-mgmt/zabbix7-server/distinfo b/net-mgmt/zabbix7-server/distinfo
index baf8e0c55c3d..6476d48e56b1 100644
--- a/net-mgmt/zabbix7-server/distinfo
+++ b/net-mgmt/zabbix7-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743085253
-SHA256 (zabbix-7.0.11.tar.gz) = afd54dcb76d1b85bc900bf994046ca8c2012dfe02f7ad9d60301632f1155b865
-SIZE (zabbix-7.0.11.tar.gz) = 45305649
+TIMESTAMP = 1746546685
+SHA256 (zabbix-7.0.12.tar.gz) = 6069ed604aa5e33fe631ccc68b782654a697071952a1cf365151655a0a122b05
+SIZE (zabbix-7.0.12.tar.gz) = 45617597
diff --git a/net-mgmt/zabbix7-server/pkg-plist.frontend b/net-mgmt/zabbix7-server/pkg-plist.frontend
index b44af1f8b945..7d5de47dd5b3 100644
--- a/net-mgmt/zabbix7-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix7-server/pkg-plist.frontend
@@ -1020,6 +1020,7 @@
 %%WWWDIR%%/include/classes/html/CTextAreaFlexible.php
 %%WWWDIR%%/include/classes/html/CTextBox.php
 %%WWWDIR%%/include/classes/html/CVar.php
+%%WWWDIR%%/include/classes/html/CVertical.php
 %%WWWDIR%%/include/classes/html/CVisibilityBox.php
 %%WWWDIR%%/include/classes/html/CWarning.php
 %%WWWDIR%%/include/classes/html/interfaces/CButtonInterface.php
@@ -1438,6 +1439,7 @@
 %%WWWDIR%%/js/common.js
 %%WWWDIR%%/js/component.z-bar-gauge.js
 %%WWWDIR%%/js/component.z-select.js
+%%WWWDIR%%/js/component.z-vertical.js
 %%WWWDIR%%/js/defines.js
 %%WWWDIR%%/js/flickerfreescreen.js
 %%WWWDIR%%/js/functions.js
@@ -1551,6 +1553,8 @@
 %%WWWDIR%%/locale/uk/LC_MESSAGES/frontend.mo
 %%WWWDIR%%/locale/uk/LC_MESSAGES/frontend.po
 %%WWWDIR%%/locale/update_po.sh
+%%WWWDIR%%/locale/uz/LC_MESSAGES/frontend.mo
+%%WWWDIR%%/locale/uz/LC_MESSAGES/frontend.po
 %%WWWDIR%%/locale/vi/LC_MESSAGES/frontend.mo
 %%WWWDIR%%/locale/vi/LC_MESSAGES/frontend.po
 %%WWWDIR%%/locale/zh_CN/LC_MESSAGES/frontend.mo
diff --git a/net-mgmt/zabbix72-server/Makefile b/net-mgmt/zabbix72-server/Makefile
index b367ce6a630a..bfe2fb3b89bc 100644
--- a/net-mgmt/zabbix72-server/Makefile
+++ b/net-mgmt/zabbix72-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zabbix72
-DISTVERSION=	7.2.5
+DISTVERSION=	7.2.6
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
diff --git a/net-mgmt/zabbix72-server/distinfo b/net-mgmt/zabbix72-server/distinfo
index 80ef9c6f5b5e..0e7c184b05d1 100644
--- a/net-mgmt/zabbix72-server/distinfo
+++ b/net-mgmt/zabbix72-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743085271
-SHA256 (zabbix-7.2.5.tar.gz) = 0d01b393dd22b2a60b36fb37a98fcf1081c683ad98832a2ddd87943a1200839e
-SIZE (zabbix-7.2.5.tar.gz) = 41190095
+TIMESTAMP = 1746546711
+SHA256 (zabbix-7.2.6.tar.gz) = e8099cd909dc1bc1b3ec945f88686963877c3febcafc8a9ef54347fe563b9041
+SIZE (zabbix-7.2.6.tar.gz) = 41544456
diff --git a/net-mgmt/zabbix72-server/pkg-plist.frontend b/net-mgmt/zabbix72-server/pkg-plist.frontend
index 1a41390e40a8..5172efd83c11 100644
--- a/net-mgmt/zabbix72-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix72-server/pkg-plist.frontend
@@ -1014,6 +1014,7 @@
 %%WWWDIR%%/include/classes/html/CTextAreaFlexible.php
 %%WWWDIR%%/include/classes/html/CTextBox.php
 %%WWWDIR%%/include/classes/html/CVar.php
+%%WWWDIR%%/include/classes/html/CVertical.php
 %%WWWDIR%%/include/classes/html/CVisibilityBox.php
 %%WWWDIR%%/include/classes/html/CWarning.php
 %%WWWDIR%%/include/classes/html/interfaces/CButtonInterface.php
@@ -1440,6 +1441,7 @@
 %%WWWDIR%%/js/component.z-bar-gauge.js
 %%WWWDIR%%/js/component.z-select.js
 %%WWWDIR%%/js/component.z-sparkline.js
+%%WWWDIR%%/js/component.z-vertical.js
 %%WWWDIR%%/js/defines.js
 %%WWWDIR%%/js/flickerfreescreen.js
 %%WWWDIR%%/js/functions.js
@@ -1554,6 +1556,8 @@
 %%WWWDIR%%/locale/uk/LC_MESSAGES/frontend.mo
 %%WWWDIR%%/locale/uk/LC_MESSAGES/frontend.po
 %%WWWDIR%%/locale/update_po.sh
+%%WWWDIR%%/locale/uz/LC_MESSAGES/frontend.mo
+%%WWWDIR%%/locale/uz/LC_MESSAGES/frontend.po
 %%WWWDIR%%/locale/vi/LC_MESSAGES/frontend.mo
 %%WWWDIR%%/locale/vi/LC_MESSAGES/frontend.po
 %%WWWDIR%%/locale/zh_CN/LC_MESSAGES/frontend.mo
diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index ae1500f49347..41a682e5d5e0 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -41,7 +41,6 @@
     SUBDIR += jigdo
     SUBDIR += ktorrent
     SUBDIR += libktorrent
-    SUBDIR += libswift
     SUBDIR += libtorrent
     SUBDIR += libtorrent-rasterbar
     SUBDIR += libtorrent-rasterbar2
@@ -68,12 +67,8 @@
     SUBDIR += ogmios
     SUBDIR += opendchub
     SUBDIR += oura
-    SUBDIR += p5-Net-BitTorrent
-    SUBDIR += p5-Net-BitTorrent-File
-    SUBDIR += p5-Net-BitTorrent-PeerPacket
     SUBDIR += p5-Net-DirectConnect
     SUBDIR += p5-WWW-BitTorrent
-    SUBDIR += phex
     SUBDIR += prowlarr
     SUBDIR += pulsar-client-cpp
     SUBDIR += py-ed2k-tools
@@ -94,7 +89,6 @@
     SUBDIR += retroshare
     SUBDIR += rslsync
     SUBDIR += rtorrent
-    SUBDIR += shx
     SUBDIR += sonarr
     SUBDIR += torrent-file-editor
     SUBDIR += torrentcheck
diff --git a/net-p2p/aeron/Makefile b/net-p2p/aeron/Makefile
index 22da522e4c37..29e494e63b97 100644
--- a/net-p2p/aeron/Makefile
+++ b/net-p2p/aeron/Makefile
@@ -33,6 +33,6 @@ CMAKE_TESTING_ON=	AERON_TESTS \
 LDFLAGS+=	-lm \
 		-luuid
 
-# tests as of 1.44.6: 89% tests passed, 15 tests failed out of 131, see https://github.com/real-logic/aeron/issues/1696
+TESTING_UNSAFE=	tests as of 1.44.6: 89% tests passed, 15 tests failed out of 131, see https://github.com/real-logic/aeron/issues/1696
 
 .include <bsd.port.mk>
diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile
index 8244a72eaf20..5fa44e0aaa30 100644
--- a/net-p2p/c-lightning/Makefile
+++ b/net-p2p/c-lightning/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	c-lightning
 # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
-PORTVERSION=	25.02
+PORTVERSION=	25.02.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
 #PORTVERSION=	0
 #PKGNAMESUFFIX=	-git-f8d8348c
diff --git a/net-p2p/c-lightning/distinfo b/net-p2p/c-lightning/distinfo
index 95997944f736..6913c4098a2f 100644
--- a/net-p2p/c-lightning/distinfo
+++ b/net-p2p/c-lightning/distinfo
@@ -559,8 +559,8 @@ SHA256 (rust/crates/zip-2.2.2.crate) = ae9c1ea7b3a5e1f4b922ff856a129881167511563
 SIZE (rust/crates/zip-2.2.2.crate) = 108809
 SHA256 (rust/crates/zopfli-0.8.1.crate) = e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946
 SIZE (rust/crates/zopfli-0.8.1.crate) = 50972
-SHA256 (ElementsProject-lightning-v25.02_GH0.tar.gz) = 06d8ded06c00d6274fb4bc85f99ed90c1f3c8f9964042186068751f55773ad54
-SIZE (ElementsProject-lightning-v25.02_GH0.tar.gz) = 14379436
+SHA256 (ElementsProject-lightning-v25.02.2_GH0.tar.gz) = 74ad54a0a3f00fab0ceea1d454a70512de6415e83f7c1c5bd2d1a5a421c265de
+SIZE (ElementsProject-lightning-v25.02.2_GH0.tar.gz) = 14382028
 SHA256 (ElementsProject-libwally-core-11e1bf6d60a13_GH0.tar.gz) = 199e3340e72048026043532684c301fcb6027ec4f19e5701c0bc288e2cd6065e
 SIZE (ElementsProject-libwally-core-11e1bf6d60a13_GH0.tar.gz) = 1040755
 SHA256 (BlockstreamResearch-secp256k1-zkp-1e04d3244_GH0.tar.gz) = cbf5b21c848a5b760ce1307b617990509cd6c054fe9bf072ce27f50262f707b2
diff --git a/net-p2p/c-lightning/files/update_crates.sh b/net-p2p/c-lightning/files/update_crates.sh
index c669d416eb56..49dc2fa6506b 100755
--- a/net-p2p/c-lightning/files/update_crates.sh
+++ b/net-p2p/c-lightning/files/update_crates.sh
@@ -7,4 +7,4 @@ set -e
 
 cargo-lock --file "$(make -V WRKSRC)/Cargo.lock" \
     | grep -vE "(cln-rpc|cln-grpc|clnrest|grpc-plugin|rest-plugin)" \
-    | sed -E 's/^- ([^ ]+) (.+)$/CARGO_CRATES+=\t\1-\2/g' > ../../Makefile.crates
+    | sed -E 's/^- ([^ ]+) (.+)$/CARGO_CRATES+=\t\1-\2/g' > Makefile.crates
diff --git a/net-p2p/clboss/files/patch-Makefile.am b/net-p2p/clboss/files/patch-Makefile.am
new file mode 100644
index 000000000000..962d4d22a5e9
--- /dev/null
+++ b/net-p2p/clboss/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2025-05-05 16:37:48 UTC
++++ Makefile.am
+@@ -571,7 +571,7 @@ EXTRA_DIST = \
+     generate_commit_hash.sh \
+     commit_hash.h
+ 
+-AM_CXXFLAGS = -Wall -Werror $(PTHREAD_CFLAGS) $(libev_CFLAGS) $(SQLITE3_CFLAGS) $(CURL_CFLAGS) $(CLBOSS_CXXFLAGS)
++AM_CXXFLAGS = -Wall $(PTHREAD_CFLAGS) $(libev_CFLAGS) $(SQLITE3_CFLAGS) $(CURL_CFLAGS) $(CLBOSS_CXXFLAGS)
+ LDADD = libclboss.la $(PTHREAD_LIBS) $(libev_LIBS) $(SQLITE3_LIBS) $(CURL_LIBS)
+ 
+ if ENABLE_EXCEPTION_BACKTRACE
diff --git a/net-p2p/libswift/Makefile b/net-p2p/libswift/Makefile
deleted file mode 100644
index 30d79802652e..000000000000
--- a/net-p2p/libswift/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PORTNAME=		libswift
-PORTVERSION=		20190302
-PORTREVISION=		1
-CATEGORIES=		net-p2p
-
-MAINTAINER=		dch@FreeBSD.org
-COMMENT=		IETF Peer-to-Peer Streaming Peer Protocol implementation
-WWW=		https://github.com/skunkwerks/libswift
-
-LICENSE=		LGPL21
-
-DEPRECATED=	Upstream archived repo on Feb 19, 2024 and no active development in several years
-EXPIRATION_DATE=2025-04-30
-
-LIB_DEPENDS=		libevent.so:devel/libevent
-
-USES=			compiler:c++11-lang gmake ssl
-
-USE_GITHUB=		yes
-GH_ACCOUNT=		skunkwerks
-GH_TAGNAME=		dc0cbcc
-PORTDOCS=		README.md
-
-SUB_FILES=		${PORTNAME}
-SUB_LIST+=		SWIFT_USER=${SWIFT_USER} \
-				SWIFT_GROUP=${SWIFT_GROUP} \
-				SWIFT_SHAREDIR=${SWIFT_SHAREDIR} \
-				SWIFT_PIDDIR=${SWIFT_PIDDIR}
-
-PLIST_SUB=		SWIFT_USER=${SWIFT_USER} \
-				SWIFT_GROUP=${SWIFT_GROUP} \
-				SWIFT_SHAREDIR=${SWIFT_SHAREDIR} \
-				SWIFT_PIDDIR=${SWIFT_PIDDIR}
-
-SWIFT_USER?=	www
-SWIFT_GROUP?=	www
-
-SWIFT_SHAREDIR=	/var/db/${PORTNAME}/
-SWIFT_PIDDIR=	/var/run/${PORTNAME}/
-
-USE_RC_SUBR=	${PORTNAME}
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${REINPLACE_CMD} -e 's/CXX=clang++/CXX?=clang++/' ${WRKSRC}/Makefile
-
-do-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR} \
-		${STAGEDIR}${SWIFT_SHAREDIR} \
-		${STAGEDIR}${SWIFT_PIDDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/swift ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-.include <bsd.port.post.mk>
diff --git a/net-p2p/libswift/distinfo b/net-p2p/libswift/distinfo
deleted file mode 100644
index 4e633dd35bed..000000000000
--- a/net-p2p/libswift/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1551561964
-SHA256 (skunkwerks-libswift-20190302-dc0cbcc_GH0.tar.gz) = 2da59582b62a331934e87189327fdb4e72f10737dd3ba4b888c19fe2380b0255
-SIZE (skunkwerks-libswift-20190302-dc0cbcc_GH0.tar.gz) = 3330071
diff --git a/net-p2p/libswift/files/libswift.in b/net-p2p/libswift/files/libswift.in
deleted file mode 100644
index 9bc41cdf9fb7..000000000000
--- a/net-p2p/libswift/files/libswift.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: libswift
-# REQUIRE: LOGIN NETWORKING SERVERS
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# libswift_enable (bool):   Set to NO by default.
-# Set it to YES to enable swift.
-#
-# libswift_user   (user):   Set to www by default.
-# libswift_group  (group):  Set to www by default.
-# libswift_port   (num):    Port for daemon to listen on, 7777 by default.
-# libswift_dir    (string): Optional full path to streaming content directory.
-
-. /etc/rc.subr
-
-name=libswift
-rcvar=libswift_enable
-
-load_rc_config ${name}
-
-# defaults
-libswift_enable=${libswift_enable:-"NO"}
-libswift_user=${libswift_user:-"www"}
-libswift_port=${libswift_port:-"7777"}
-libswift_dir=${libswift_dir:-"/var/db/${name}"}
-libswift_options=${libswift_options:-" --dir ${libswift_dir} --listen ${libswift_port}"}
-
-# daemon
-
-libswift_pidfile="%%SWIFT_PIDDIR%%${name}.pid"
-procname="%%PREFIX%%/bin/${name}"
-
-command=/usr/sbin/daemon
-command_args=" -c -f -p ${libswift_pidfile} ${procname} ${libswift_flags} ${libswift_options}"
-
-start_precmd=libswift_precmd
-
-libswift_precmd()
-{
-	# create empty pidfile with correct permissions
-	install -o ${libswift_user} /dev/null ${libswift_pidfile}
-}
-
-run_rc_command "$1"
diff --git a/net-p2p/libswift/pkg-descr b/net-p2p/libswift/pkg-descr
deleted file mode 100644
index b1862434968a..000000000000
--- a/net-p2p/libswift/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-LibSwift is the reference UDP-based implementation of IETF RFC7574,
-a multi-peer transport layer protocol. Its mission is to disseminate
-content among a swarm of peers.
-
-Given a root hash, the data is received from whatever source available
-and data integrity is checked cryptographically with Merkle hash
-trees.
diff --git a/net-p2p/libswift/pkg-message b/net-p2p/libswift/pkg-message
deleted file mode 100644
index 3c06a1d864d4..000000000000
--- a/net-p2p/libswift/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To run a server, copy any files you wish to share into /var/db/libswift,
-ensure that it is read and writable by the appropriate user, and
-start the libswift daemon:
-
-# service libswift onestart
-
-To retrieve a file, use:
-
-$ libswift --tracker  127.0.0.1:7777 --hash ....
-
-To view the root hashes, use `grep root *.mbinmap` in the share dir once
-hashing is complete. For large files this may take some time.
-EOM
-}
-]
diff --git a/net-p2p/libswift/pkg-plist b/net-p2p/libswift/pkg-plist
deleted file mode 100644
index 9e724aa7bf2f..000000000000
--- a/net-p2p/libswift/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/libswift
-@dir(%%SWIFT_USER%%,%%SWIFT_GROUP%%,0750) %%SWIFT_PIDDIR%%
-@dir(%%SWIFT_USER%%,%%SWIFT_GROUP%%,0755) %%SWIFT_SHAREDIR%%
diff --git a/net-p2p/mkbrr/Makefile b/net-p2p/mkbrr/Makefile
index b8bb96e26040..d27ce80989e4 100644
--- a/net-p2p/mkbrr/Makefile
+++ b/net-p2p/mkbrr/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mkbrr
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.10.0
+DISTVERSION=	1.11.0
 CATEGORIES=	net-p2p
 
 MAINTAINER=	diizzy@FreeBSD.org
diff --git a/net-p2p/mkbrr/distinfo b/net-p2p/mkbrr/distinfo
index 9309dee5dd3b..31a9ff8165f8 100644
--- a/net-p2p/mkbrr/distinfo
+++ b/net-p2p/mkbrr/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745951846
-SHA256 (go/net-p2p_mkbrr/mkbrr-v1.10.0/v1.10.0.mod) = 8bd69401dec4290c24dc9d8f95bec83d2af23d6b0e2968c37a438f7e658820b6
-SIZE (go/net-p2p_mkbrr/mkbrr-v1.10.0/v1.10.0.mod) = 2213
-SHA256 (go/net-p2p_mkbrr/mkbrr-v1.10.0/v1.10.0.zip) = 2aeee7ccc4fb5d1e42bd58294977246e6478afbff6f094b6929d10706f6ed770
-SIZE (go/net-p2p_mkbrr/mkbrr-v1.10.0/v1.10.0.zip) = 444958
+TIMESTAMP = 1746314185
+SHA256 (go/net-p2p_mkbrr/mkbrr-v1.11.0/v1.11.0.mod) = 7c9809454ddeec7b6b6e28e931661b32ee5f2599cf392166f19a31515d9a62e9
+SIZE (go/net-p2p_mkbrr/mkbrr-v1.11.0/v1.11.0.mod) = 2214
+SHA256 (go/net-p2p_mkbrr/mkbrr-v1.11.0/v1.11.0.zip) = 2bb2853bc5d0c6e6df039ccd1e7636c8eb20ba5995a08f77d007e2dddedf2a0c
+SIZE (go/net-p2p_mkbrr/mkbrr-v1.11.0/v1.11.0.zip) = 447799
diff --git a/net-p2p/p5-Net-BitTorrent-File/Makefile b/net-p2p/p5-Net-BitTorrent-File/Makefile
deleted file mode 100644
index bfd106d61fb5..000000000000
--- a/net-p2p/p5-Net-BitTorrent-File/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-PORTNAME=	Net-BitTorrent-File
-PORTVERSION=	1.02
-DISTVERSIONSUFFIX=	-fix
-PORTREVISION=	1
-CATEGORIES=	net-p2p perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Perl5 module for handles loading and saving of .torrent file
-WWW=		https://metacpan.org/release/Net-BitTorrent-File
-
-LICENSE=	ART10 GPLv1+
-LICENSE_COMB=	dual
-
-DEPRECATED=	Deprecated, no active development in more than a decade so any "new" functionality is missing and interoperability with recent software is very limited if not completely broken
-EXPIRATION_DATE=2025-04-30
-
-BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Convert-Bencode>=0:converters/p5-Convert-Bencode \
-		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
-
-NO_ARCH=	yes
-USE_PERL5=	configure
-USES=		perl5
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/p5-Net-BitTorrent-File/distinfo b/net-p2p/p5-Net-BitTorrent-File/distinfo
deleted file mode 100644
index ce4e504f707c..000000000000
--- a/net-p2p/p5-Net-BitTorrent-File/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Net-BitTorrent-File-1.02-fix.tar.gz) = 5327b9ea29f35285c7b79e5552500aaa660bc2a7463fc782b927964e11db951e
-SIZE (Net-BitTorrent-File-1.02-fix.tar.gz) = 13554
diff --git a/net-p2p/p5-Net-BitTorrent-File/pkg-descr b/net-p2p/p5-Net-BitTorrent-File/pkg-descr
deleted file mode 100644
index 05e7ef00bdfe..000000000000
--- a/net-p2p/p5-Net-BitTorrent-File/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This module handles loading and saveing of .torrent files as well as
-providing a convenient way to store torrent file info in memory. Most
-users of the module will most likely just call the new method with the
-name of a existing torrent file and use the data from that.
diff --git a/net-p2p/p5-Net-BitTorrent-File/pkg-plist b/net-p2p/p5-Net-BitTorrent-File/pkg-plist
deleted file mode 100644
index 2efb5b491c9d..000000000000
--- a/net-p2p/p5-Net-BitTorrent-File/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%SITE_PERL%%/Net/BitTorrent/File.pm
-%%PERL5_MAN3%%/Net::BitTorrent::File.3.gz
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
deleted file mode 100644
index 09366d05c662..000000000000
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-PORTNAME=	Net-BitTorrent-PeerPacket
-PORTVERSION=	1.2
-PORTREVISION=	1
-CATEGORIES=	net-p2p perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Parse/Build Peer Packets from BitTorrent
-WWW=		https://metacpan.org/release/Net-BitTorrent-PeerPacket
-
-USES=		perl5
-USE_PERL5=	modbuild
-
-DEPRECATED=	Deprecated, no active development in more than a decade so any "new" functionality is missing and interoperability with recent software is very limited if not completely broken
-EXPIRATION_DATE=2025-04-30
-
-.include <bsd.port.mk>
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/distinfo b/net-p2p/p5-Net-BitTorrent-PeerPacket/distinfo
deleted file mode 100644
index 62028c165e8d..000000000000
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Net-BitTorrent-PeerPacket-1.2.tar.gz) = d9dfc74686edde2318f5c67697b3553b43e95589ea766904fbf27da0f77a4fb5
-SIZE (Net-BitTorrent-PeerPacket-1.2.tar.gz) = 6645
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-descr b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-descr
deleted file mode 100644
index 6a31b2a11e8e..000000000000
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Net::BitTorrent::PeerPacket handles parsing and building binary data
-shared between BitTorrent peers. The module optinally exports a single
-subroutine for building packets and another for parsing packets, as
-well as, a constant for each packet type defined by BitTorrent.
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
deleted file mode 100644
index 18e109d71981..000000000000
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%PERL5_MAN3%%/Net::BitTorrent::PeerPacket.3.gz
-%%SITE_PERL%%/Net/BitTorrent/PeerPacket.pm
diff --git a/net-p2p/p5-Net-BitTorrent/Makefile b/net-p2p/p5-Net-BitTorrent/Makefile
deleted file mode 100644
index 5cbd5aca6dfe..000000000000
--- a/net-p2p/p5-Net-BitTorrent/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME=	Net-BitTorrent
-PORTVERSION=	0.052
-PORTREVISION=	5
-CATEGORIES=	net-p2p perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:SANKO
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	BitTorrent peer-to-peer protocol class
-WWW=		https://metacpan.org/release/Net-BitTorrent
-
-LICENSE=	ART20
-
-DEPRECATED=	Deprecated, no active development in more than a decade so any "new" functionality is missing and interoperability with recent software is very limited if not completely broken
-EXPIRATION_DATE=2025-04-30
-
-PORTSCOUT=	limit:^[0-9\.]*$$
-
-CONFIGURE_ARGS=	</dev/null
-
-USES=		perl5
-USE_PERL5=	modbuild
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/net-p2p/p5-Net-BitTorrent/distinfo b/net-p2p/p5-Net-BitTorrent/distinfo
deleted file mode 100644
index 283396407d3b..000000000000
--- a/net-p2p/p5-Net-BitTorrent/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Net-BitTorrent-0.052.tar.gz) = a506f1fd9ce277f423ab0abe18273891e75d1c34cf5da56185d29dd3f0eb8698
-SIZE (Net-BitTorrent-0.052.tar.gz) = 180217
diff --git a/net-p2p/p5-Net-BitTorrent/pkg-descr b/net-p2p/p5-Net-BitTorrent/pkg-descr
deleted file mode 100644
index c6bc0569be02..000000000000
--- a/net-p2p/p5-Net-BitTorrent/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Net::BitTorrent is a class based implementation of the current
-BitTorrent Protocol Specification. Each Net::BitTorrent object is
-capable of handling several concurrent .torrent sessions.
diff --git a/net-p2p/p5-Net-BitTorrent/pkg-plist b/net-p2p/p5-Net-BitTorrent/pkg-plist
deleted file mode 100644
index 25b07a580fb9..000000000000
--- a/net-p2p/p5-Net-BitTorrent/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/net-bittorrent.pl
-%%SITE_PERL%%/Net/BitTorrent.pm
-%%SITE_PERL%%/Net/BitTorrent/ConfigData.pm
-%%SITE_PERL%%/Net/BitTorrent/DHT.pm
-%%SITE_PERL%%/Net/BitTorrent/Notes.pod
-%%SITE_PERL%%/Net/BitTorrent/Peer.pm
-%%SITE_PERL%%/Net/BitTorrent/Protocol.pm
-%%SITE_PERL%%/Net/BitTorrent/Torrent.pm
-%%SITE_PERL%%/Net/BitTorrent/Torrent/File.pm
-%%SITE_PERL%%/Net/BitTorrent/Torrent/Tracker.pm
-%%SITE_PERL%%/Net/BitTorrent/Torrent/Tracker/HTTP.pm
-%%SITE_PERL%%/Net/BitTorrent/Torrent/Tracker/UDP.pm
-%%SITE_PERL%%/Net/BitTorrent/Util.pm
-%%SITE_PERL%%/Net/BitTorrent/Version.pm
-%%PERL5_MAN3%%/Net::BitTorrent.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::ConfigData.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::DHT.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Notes.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Peer.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Protocol.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Torrent.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Torrent::File.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Torrent::Tracker.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Torrent::Tracker::HTTP.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Torrent::Tracker::UDP.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Util.3.gz
-%%PERL5_MAN3%%/Net::BitTorrent::Version.3.gz
-%%PERL5_MAN1%%/net-bittorrent.pl.1.gz
diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
deleted file mode 100644
index c04538f46d98..000000000000
--- a/net-p2p/phex/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-PORTNAME=	phex
-PORTVERSION=	3.4.2.116
-PORTREVISION=	1
-CATEGORIES=	net-p2p java
-MASTER_SITES=	SF/${PORTNAME}/Phex%20Final%20Releases/Phex%20${PORTVERSION:R}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	jhale@FreeBSD.org
-COMMENT=	Multi-platform and spyware-free Gnutella client
-WWW=		http://phex.sourceforge.net/
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Abandonware, last update upstream in 2009. Consider using net-p2p/gtk-gnutella
-EXPIRATION_DATE=2025-04-30
-
-USES=		java zip
-
-NO_BUILD=	yes
-
-SUB_FILES=	${PORTNAME}.sh
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-
-PORTDOCS=	Phex_other.htm \
-		Undocumented.htm
-
-OPTIONS_DEFINE=	DOCS
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/readme/|} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/phex/distinfo b/net-p2p/phex/distinfo
deleted file mode 100644
index 947a8687c59f..000000000000
--- a/net-p2p/phex/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (phex_3.4.2.116.zip) = d22d0436639d464c82ddded9831dba96d2cab3446ee67cd6f8508a64efa2380c
-SIZE (phex_3.4.2.116.zip) = 7989529
diff --git a/net-p2p/phex/files/phex.sh.in b/net-p2p/phex/files/phex.sh.in
deleted file mode 100644
index 28164277d05f..000000000000
--- a/net-p2p/phex/files/phex.sh.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar phex.jar "${@}"
diff --git a/net-p2p/phex/pkg-descr b/net-p2p/phex/pkg-descr
deleted file mode 100644
index 663790154b8b..000000000000
--- a/net-p2p/phex/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Phex is a multi-platform and spyware-free Gnutella client written in Java.
-
-- Automatic search functionality to find new download candidates
-- Download resuming across different hosts
-- Advanced configuration options
-- Passive searching for files
diff --git a/net-p2p/phex/pkg-plist b/net-p2p/phex/pkg-plist
deleted file mode 100644
index 7f1eadf38ded..000000000000
--- a/net-p2p/phex/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/phex
-%%DATADIR%%/bcpg-jdk15-140.jar
-%%DATADIR%%/bcprov-jdk15-140.jar
-%%DATADIR%%/commons-collections-3.2.jar
-%%DATADIR%%/commons-httpclient-3.0.1.jar
-%%DATADIR%%/forms-1.1.0.jar
-%%DATADIR%%/jcl-over-slf4j-1.5.6.jar
-%%DATADIR%%/logback-classic-0.9.13.jar
-%%DATADIR%%/logback-core-0.9.13.jar
-%%DATADIR%%/looks-2.1.4.jar
-%%DATADIR%%/mrjadapter-1.1.jar
-%%DATADIR%%/phex.jar
-%%DATADIR%%/slf4j-api-1.5.6.jar
-%%DATADIR%%/xSocket-2.2.jar
diff --git a/net-p2p/shx/Makefile b/net-p2p/shx/Makefile
deleted file mode 100644
index 2802ca9d74f2..000000000000
--- a/net-p2p/shx/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-PORTNAME=	shx
-PORTVERSION=	0.2.4
-PORTREVISION=	2
-CATEGORIES=	net-p2p
-MASTER_SITES=	http://synhxd.sourceforge.net/releases/
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME}.diff.gz
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Text based Hotline Communications client for Unix
-WWW=		https://synhxd.sourceforge.net/
-
-LICENSE=	GPLv1
-
-DEPRECATED=	Obsolete protocol that has been superseded by many others
-EXPIRATION_DATE=2025-04-30
-
-USES=		readline ssl tar:tgz
-
-GNU_CONFIGURE=	yes
-
-MAKEFILE=	makefile
-
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-
-CONFLICTS_INSTALL=	helix # bin/hx
-
-PLIST_FILES=	bin/hx				\
-		share/examples/shx/hxrc		\
-		share/examples/shx/hxvars
-
-OPTIONS_DEFINE=	WARNINGS HTXF_PTHREAD HFS HOPE CIPHER COMPRESS HAL XMMS NOIPV4
-OPTIONS_DEFAULT=HTXF_PTHREAD HFS HOPE CIPHER COMPRESS XMMS
-
-CIPHER_DESC=		Enable Cipher (HOPE required)
-COMPRESS_DESC=		Enable Compress (HOPE required)
-HAL_DESC=		Compile MegaHAL (enables hal command)
-HFS_DESC=		Enable HFS file system emulation
-HOPE_DESC=		Enable HOPE (required by Cipher/Compress)
-HTXF_PTHREAD_DESC=	Use pthread instead of fork or clone for htxf
-NOIPV4_DESC=		IPv6 support (disables IPv4 support)
-WARNINGS_DESC=		Show compiler warnings
-XMMS_DESC=		Enable trackname command
-
-CIPHER_IMPLIES=			HOPE
-CIPHER_CONFIGURE_ENABLE=	cipher
-COMPRESS_IMPLIES=		HOPE
-COMPRESS_CONFIGURE_ENABLE=	compress
-HAL_CONFIGURE_ENABLE=		hal
-HFS_CONFIGURE_ENABLE=		hfs
-HOPE_CONFIGURE_ENABLE=		hope
-HTXF_PTHREAD_CONFIGURE_ENABLE=	htxf-pthread
-NOIPV4_CONFIGURE_ENABLE=	ipv6
-WARNINGS_CONFIGURE_ENABLE=	warnings
-XMMS_CONFIGURE_ENABLE=		xmms
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=int-conversion
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
-do-install:
-	${CP} -fv ${WRKSRC}/run/hx ${STAGEDIR}${PREFIX}/bin/
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/${PORTNAME}
-	${CP} -fv ${WRKSRC}/run/hxrc ${STAGEDIR}${PREFIX}/share/examples/${PORTNAME}/
-	${CP} -fv ${WRKSRC}/run/hxvars ${STAGEDIR}${PREFIX}/share/examples/${PORTNAME}/
-
-.include <bsd.port.post.mk>
diff --git a/net-p2p/shx/distinfo b/net-p2p/shx/distinfo
deleted file mode 100644
index ea9f9b720608..000000000000
--- a/net-p2p/shx/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (shx-0.2.4.tgz) = 0fe2d3bed542c4659614d449bf42b618a37130c7e63bce13db3832575e45e325
-SIZE (shx-0.2.4.tgz) = 290512
-SHA256 (shx-0.2.4.diff.gz) = 70d41179c0e2fb5f8dd3ee104aeddac2346da45a7f344682dfa2c67116c78e2a
-SIZE (shx-0.2.4.diff.gz) = 651
diff --git a/net-p2p/shx/files/patch-src__Makefile.in b/net-p2p/shx/files/patch-src__Makefile.in
deleted file mode 100644
index 700c9bd01869..000000000000
--- a/net-p2p/shx/files/patch-src__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Makefile.in.orig	2014-08-16 19:38:31.000000000 -0400
-+++ ./src/Makefile.in	2014-08-16 19:38:57.000000000 -0400
-@@ -34,7 +34,7 @@
- LDFLAGS         = @LDFLAGS@
- SYS_INCLUDES    = @SYS_INCLUDES@
- INCLUDE         = -I. -I./include -I$(top_include)
--CFLAGS          = @CFLAGS@ $(INCLUDE) $(SYS_INCLUDES) $(DEFS)
-+CFLAGS          = @CFLAGS@ $(INCLUDE) $(SYS_INCLUDES) @CPPFLAGS@ $(DEFS)
- 
- # Libraries
- 
diff --git a/net-p2p/shx/files/patch-src_main.c b/net-p2p/shx/files/patch-src_main.c
deleted file mode 100644
index 7a5a182c22e5..000000000000
--- a/net-p2p/shx/files/patch-src_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.c.orig	2002-12-17 19:28:19 UTC
-+++ src/main.c
-@@ -296,7 +296,7 @@ loopZ (void)
- #if defined(CONFIG_CIPHER)
- #include "cipher.h"
- 
--#if USE_OPENSSL
-+#if USE_OPENSSL && !defined(OPENSSL_NO_EGD)
- #include <openssl/rand.h>
- 
- static char *egd_path = 0;
-@@ -324,7 +324,7 @@ set_egd_path (char **egd_pathp, const ch
- static void
- cipher_init (void)
- {
--#if USE_OPENSSL
-+#if USE_OPENSSL && !defined(OPENSSL_NO_EGD)
- 	variable_add(&egd_path, set_egd_path, "egd_path");
- #else
- 	srand(getpid()*clock());
diff --git a/net-p2p/shx/pkg-descr b/net-p2p/shx/pkg-descr
deleted file mode 100644
index 358de3eb616a..000000000000
--- a/net-p2p/shx/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a text based version of the popular hotline client for
-Macintosh. Hotline is a chat/ftp/news protocol. It's setup almost
-like an IRC client, but with the ability to do commands such as cd
-into a directory with /cd and more file transfer oriented functions.
diff --git a/net/Makefile b/net/Makefile
index 999d6f218069..70e75dfdd8d0 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -428,7 +428,6 @@
     SUBDIR += libslirp
     SUBDIR += libsockpp
     SUBDIR += libsrtp2
-    SUBDIR += libtnl
     SUBDIR += libtrace
     SUBDIR += libunp
     SUBDIR += libusipp
@@ -575,7 +574,6 @@
     SUBDIR += ooni-mini
     SUBDIR += ooni-probe-cli
     SUBDIR += open-isns
-    SUBDIR += openbgpd
     SUBDIR += openbgpd6
     SUBDIR += openbgpd7
     SUBDIR += openbgpd8
diff --git a/net/bird2/Makefile b/net/bird2/Makefile
index 65baeacfc733..cd79c33d782c 100644
--- a/net/bird2/Makefile
+++ b/net/bird2/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bird
-DISTVERSION=	2.17
+DISTVERSION=	2.17.1
 CATEGORIES=	net
 MASTER_SITES=	https://bird.network.cz/download/
 PKGNAMESUFFIX=	2
diff --git a/net/bird2/distinfo b/net/bird2/distinfo
index 836a4e570ef8..9c8173f95b91 100644
--- a/net/bird2/distinfo
+++ b/net/bird2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743751904
-SHA256 (bird-2.17.tar.gz) = 79bbcc77c63e9e1b7a10a48389c86f4f75b053fd3dec48e3c6cbe0df1ba81eb3
-SIZE (bird-2.17.tar.gz) = 1465739
+TIMESTAMP = 1746480313
+SHA256 (bird-2.17.1.tar.gz) = bfd718dfa596819b3801688783212514b467163329aec9bbcd0fa3dee03e10e9
+SIZE (bird-2.17.1.tar.gz) = 1471008
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 865bfbd5fda5..39044e3d1bfe 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -1,28 +1,25 @@
 PORTNAME=	echoping
 PORTVERSION=	6.0.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	net
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	Ping-like program that uses TCP and/or HTTP
 WWW=		https://framagit.org/bortzmeyer/echoping
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Unmaintained upstream as of 2015 and depends on deprecated libidn
-EXPIRATION_DATE=2025-04-30
+LIB_DEPENDS=	libpopt.so:devel/popt
 
-LIB_DEPENDS=	libpopt.so:devel/popt \
-		libidn.so:dns/libidn
-
-USES=		autoreconf cpe libtool pkgconfig ssl
+USES=		autoreconf cpe iconv libtool pkgconfig ssl
 
 CPE_VENDOR=	echoping_project
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-http --enable-icp --enable-smtp --with-ssl \
-		--enable-ttcp --enable-tos --with-libidn=${LOCALBASE} \
+		--enable-ttcp --enable-tos \
+		--with-popt=${LOCALBASE} \
 		--enable-plugin="${PING_PLUGINS}"
 INSTALL_TARGET=	install-strip
 
@@ -35,9 +32,14 @@ GL_TAGNAME=	ccf3c95d9249d3065db3853486f41c852d20101e
 WRKSRC_SUBDIR=	SRC
 
 OPTIONS_DEFINE=	LDAP PGSQL
-OPTIONS_DEFAULT=LDAP
+OPTIONS_DEFAULT=LDAP IDN
+OPTIONS_SINGLE=	LIBIDN
+OPTIONS_SINGLE_LIBIDN=IDN IDN2
 OPTIONS_SUB=	yes
 
+IDN_DESC=	Use GNU libidn
+IDN2_DESC=	Use GNU libidn2
+
 LDAP_USES=	ldap
 LDAP_VARS=	PING_PLUGINS+=ldap
 
@@ -51,4 +53,18 @@ pre-configure:
 	  ${MV} configure.ac.tmp configure.ac' \;
 	${REINPLACE_CMD} '/^echoping_LDADD =/s/$$/ -lm/' ${WRKSRC}/Makefile.am
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIDN2}
+CONFIGURE_ARGS+=	--with-libidn2=${LOCALBASE}
+LIB_DEPENDS+=		libidn2.so:dns/libidn2
+EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-idn2-acinclude.m4 \
+			${PATCHDIR}/extra-patch-idn2-configure.ac \
+			${PATCHDIR}/extra-patch-idn2-echoping.c \
+			${PATCHDIR}/extra-patch-idn2-echoping.h
+.else
+CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
+LIB_DEPENDS+=		libidn.so:dns/libidn
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/echoping/files/extra-patch-idn2-acinclude.m4 b/net/echoping/files/extra-patch-idn2-acinclude.m4
new file mode 100644
index 000000000000..8390d699d09d
--- /dev/null
+++ b/net/echoping/files/extra-patch-idn2-acinclude.m4
@@ -0,0 +1,16 @@
+--- acinclude.m4.orig	2019-12-29 17:14:41.000000000 +0700
++++ acinclude.m4	2025-05-05 00:12:04.181029000 +0700
+@@ -166,6 +166,13 @@
+ [AC_ERROR([Get the GNU libidn library (http://www.josefsson.org/libidn/) in order to use Unicode - multi-script - domain names or use --without-libidn to disable it])], dnl
+ )])
+ 
++AC_DEFUN([CF_LIB_LIBIDN2],
++[
++AC_CHECK_LIB(idn2,idn2_to_ascii_8z,
++[LIBS="${LIBS} -lidn2"],
++[AC_ERROR([Get the GNU libidn2 library (https://www.gnu.org/software/libidn/) in order to use Unicode - multi-script - domain names or use --without-libidn2 to disable it])], dnl
++)])
++
+ # Check OpenSSL
+ AC_DEFUN([CF_LIB_OPENSSL],
+ [
diff --git a/net/echoping/files/extra-patch-idn2-configure.ac b/net/echoping/files/extra-patch-idn2-configure.ac
new file mode 100644
index 000000000000..24a45a894ced
--- /dev/null
+++ b/net/echoping/files/extra-patch-idn2-configure.ac
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2019-12-29 17:14:41.000000000 +0700
++++ configure.ac	2025-05-04 23:33:58.901840000 +0700
+@@ -61,8 +68,8 @@
+ dnl IDN
+ dnl Default: enable it	
+ LIBIDN=1
+-AC_ARG_WITH(libidn,
+- [  --with-libidn[=DIR]   Internationalized Domain Names support (needs GNU libidn)],dnl
++AC_ARG_WITH(libidn2,
++ [  --with-libidn2[=DIR]   Internationalized Domain Names support (needs GNU libidn2)],dnl
+  [if test "$withval" != "no"; then
+    if test "$withval" != "yes"; then
+ 	IDNROOT=$withval
+@@ -186,7 +193,7 @@
+        [AC_MSG_ERROR([echoping requires dlopen (dynamic loading of libraries) for plugins])])])
+ 
+ if test "$LIBIDN" = "1"; then
+-CF_LIB_LIBIDN
++CF_LIB_LIBIDN2
+ fi
+ if test "$OPENSSL" = "1" && test "$GNUTLS" = "1"; then
+ AC_MSG_ERROR([Choose OpenSSL or GNU TLS but not both])
diff --git a/net/echoping/files/extra-patch-idn2-echoping.c b/net/echoping/files/extra-patch-idn2-echoping.c
new file mode 100644
index 000000000000..e5a3ed3e1ffa
--- /dev/null
+++ b/net/echoping/files/extra-patch-idn2-echoping.c
@@ -0,0 +1,219 @@
+--- echoping.c.orig	2025-05-05 00:28:45.988741000 +0700
++++ echoping.c	2025-05-05 01:44:14.970048000 +0700
+@@ -9,6 +9,12 @@
+  *
+  *  */
+ 
++#include <iconv.h>
++#include <langinfo.h>
++#include <limits.h>
++#include <stdint.h>
++#include <strings.h>
++
+ char           *progname;
+ 
+ #include	"echoping.h"
+@@ -54,6 +60,188 @@ static terminate_f plugin_terminate;
+ struct timeval null_timeval;
+ static struct timeval max_timeval;
+ 
++#ifdef LIBIDN
++/* Basically stolen from libidn with small modifications */
++
++static char * _str_cd_iconv (const char *src, iconv_t cd);
++static char * _str_iconv (const char *src, const char *from_codeset, const char *to_codeset);
++
++static char *
++_str_cd_iconv (const char *src, iconv_t cd)
++{
++  char *result;
++  size_t result_size;
++  size_t length;
++  const char *inptr = src;
++  size_t inbytes_remaining = strlen (src);
++
++  /* Make a guess for the worst-case output size, in order to avoid a
++     realloc.  It's OK if the guess is wrong as long as it is not zero and
++     doesn't lead to an integer overflow.  */
++  result_size = inbytes_remaining;
++  {
++    size_t approx_sqrt_SIZE_MAX = SIZE_MAX >> (sizeof (size_t) * CHAR_BIT / 2);
++    if (result_size <= approx_sqrt_SIZE_MAX / MB_LEN_MAX)
++      result_size *= MB_LEN_MAX;
++  }
++  result_size += 1; /* for the terminating NUL */
++
++  result = (char *) malloc (result_size);
++  if (result == NULL)
++    {
++      errno = ENOMEM;
++      return NULL;
++    }
++
++  /* Set to the initial state.  */
++  iconv (cd, NULL, NULL, NULL, NULL);
++
++  /* Do the conversion.  */
++  {
++    char *outptr = result;
++    size_t outbytes_remaining = result_size - 1;
++
++    for (;;)
++      {
++        /* Here inptr + inbytes_remaining = src + strlen (src),
++                outptr + outbytes_remaining = result + result_size - 1.  */
++        size_t res = iconv (cd,
++                            &inptr, &inbytes_remaining,
++                            &outptr, &outbytes_remaining);
++
++        if (res == (size_t)(-1))
++          {
++            if (errno == EINVAL)
++              break;
++            else if (errno == E2BIG)
++              {
++                size_t used = outptr - result;
++                size_t newsize = result_size * 2;
++                char *newresult;
++
++                if (!(newsize > result_size))
++                  {
++                    errno = ENOMEM;
++                    goto failed;
++                  }
++                newresult = (char *) realloc (result, newsize);
++                if (newresult == NULL)
++                  {
++                    errno = ENOMEM;
++                    goto failed;
++                  }
++                result = newresult;
++                result_size = newsize;
++                outptr = result + used;
++                outbytes_remaining = result_size - 1 - used;
++              }
++            else
++              goto failed;
++          }
++        else
++          break;
++      }
++    for (;;)
++      {
++        /* Here outptr + outbytes_remaining = result + result_size - 1.  */
++        size_t res = iconv (cd, NULL, NULL, &outptr, &outbytes_remaining);
++
++        if (res == (size_t)(-1))
++          {
++            if (errno == E2BIG)
++              {
++                size_t used = outptr - result;
++                size_t newsize = result_size * 2;
++                char *newresult;
++
++                if (!(newsize > result_size))
++                  {
++                    errno = ENOMEM;
++                    goto failed;
++                  }
++                newresult = (char *) realloc (result, newsize);
++                if (newresult == NULL)
++                  {
++                    errno = ENOMEM;
++                    goto failed;
++                  }
++                result = newresult;
++                result_size = newsize;
++                outptr = result + used;
++                outbytes_remaining = result_size - 1 - used;
++              }
++            else
++              goto failed;
++          }
++        else
++          break;
++      }
++
++    /* Add the terminating NUL byte.  */
++    *outptr++ = '\0';
++
++    length = outptr - result;
++  }
++
++  /* Give away unused memory.  */
++  if (length < result_size)
++    {
++      char *smaller_result = (char *) realloc (result, length);
++
++      if (smaller_result != NULL)
++        result = smaller_result;
++    }
++
++  return result;
++
++ failed:
++  free (result);
++  return NULL;
++}
++
++static char *
++_str_iconv (const char *src, const char *from_codeset, const char *to_codeset)
++{
++  if (*src == '\0' || strcasecmp (from_codeset, to_codeset) == 0)
++    {
++      char *result = strdup (src);
++
++      if (result == NULL)
++        errno = ENOMEM;
++      return result;
++    }
++  else
++    {
++      iconv_t cd;
++      char *result;
++
++      cd = iconv_open (to_codeset, from_codeset);
++      if (cd == (iconv_t) -1)
++        return NULL;
++
++      result = _str_cd_iconv (src, cd);
++
++      if (result == NULL)
++        {
++          /* Close cd, but preserve the errno from str_cd_iconv.  */
++          int saved_errno = errno;
++          iconv_close (cd);
++          errno = saved_errno;
++        }
++      else
++        {
++          if (iconv_close (cd) < 0)
++            {
++              free (result);
++              return NULL;
++            }
++        }
++      return result;
++    }
++}
++
++#endif
++
+ int
+ main(argc, argv)
+     int             argc;
+@@ -561,12 +749,12 @@ main(argc, argv)
+     server = leftover[0];
+ #ifdef LIBIDN
+     locale_server = server;
+-    utf8_server = stringprep_locale_to_utf8(server);
++    utf8_server = _str_iconv(server, nl_langinfo(CODESET), "UTF-8");
+     if (utf8_server)
+         server = utf8_server;
+     else
+         err_quit("Cannot convert %s to UTF-8 encoding: wrong locale (%s)?",
+-                 server, stringprep_locale_charset());
++                 server, nl_langinfo(CODESET));
+ #endif
+     if (!http && !icp) {
+         for (p = server; *p && (*p != ':'); p++) {
diff --git a/net/echoping/files/extra-patch-idn2-echoping.h b/net/echoping/files/extra-patch-idn2-echoping.h
new file mode 100644
index 000000000000..d278434dc817
--- /dev/null
+++ b/net/echoping/files/extra-patch-idn2-echoping.h
@@ -0,0 +1,12 @@
+--- echoping.h.orig	2025-05-05 00:28:45.991560000 +0700
++++ echoping.h	2025-05-05 01:41:01.729365000 +0700
+@@ -52,8 +52,7 @@
+ #endif
+ 
+ #ifdef LIBIDN
+-#include <stringprep.h>		/* stringprep_locale_to_utf8() */
+-#include <idna.h>		/* idna_to_ascii_from_utf8() */
++#include <idn2.h>		/* idna_to_ascii_from_utf8() */
+ #endif
+ 
+ #ifndef FALSE
diff --git a/net/fb303/Makefile b/net/fb303/Makefile
index 25720c01f9ee..165148067907 100644
--- a/net/fb303/Makefile
+++ b/net/fb303/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fb303
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/fb303/distinfo b/net/fb303/distinfo
index 61a482e0d465..78bab259466e 100644
--- a/net/fb303/distinfo
+++ b/net/fb303/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891842
-SHA256 (facebook-fb303-v2025.04.28.00_GH0.tar.gz) = a79d60389c719af19db63d86512b9f6a9dd875369fb888d5a5a59a1d31e625a3
-SIZE (facebook-fb303-v2025.04.28.00_GH0.tar.gz) = 265263
+TIMESTAMP = 1746504544
+SHA256 (facebook-fb303-v2025.05.05.00_GH0.tar.gz) = 43ef101fde636ce7a659fba3b35a64955fc721f7318e39f5a86e33eefffce1e3
+SIZE (facebook-fb303-v2025.05.05.00_GH0.tar.gz) = 266023
diff --git a/net/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile
index 2ad84dc394fb..2c206ed92861 100644
--- a/net/google-cloud-sdk/Makefile
+++ b/net/google-cloud-sdk/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	google-cloud-sdk
-DISTVERSION=	520.0.0
+DISTVERSION=	521.0.0
 CATEGORIES=	net
 MASTER_SITES=	https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/
 DISTNAME=	google-cloud-sdk-${PORTVERSION}-linux-x86_64
diff --git a/net/google-cloud-sdk/distinfo b/net/google-cloud-sdk/distinfo
index ec2c70ad82b0..b426c478a21c 100644
--- a/net/google-cloud-sdk/distinfo
+++ b/net/google-cloud-sdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746176304
-SHA256 (google-cloud-sdk-520.0.0-linux-x86_64.tar.gz) = 04353e32b2188dee082fc83dee3fa1dfb1de5302cec9e2916771ce5269a99b8a
-SIZE (google-cloud-sdk-520.0.0-linux-x86_64.tar.gz) = 148538398
+TIMESTAMP = 1746605334
+SHA256 (google-cloud-sdk-521.0.0-linux-x86_64.tar.gz) = 84af8b5ff6c416963b65f85715450408bf85c9c2b27c237d5c2d31b66698ce3c
+SIZE (google-cloud-sdk-521.0.0-linux-x86_64.tar.gz) = 148653868
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 58c917b52619..68f090875e6a 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	haproxy
-DISTVERSION=	3.0.9
+DISTVERSION=	3.0.10
 CATEGORIES=	net www
 MASTER_SITES=	http://www.haproxy.org/download/3.0/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 818ed32b545f..457279ddbb6f 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742484875
-SHA256 (haproxy-3.0.9.tar.gz) = 7dc731b681b7aa93dc23aa36b85fa7b91bb1cf53faaca97404544ea454acecad
-SIZE (haproxy-3.0.9.tar.gz) = 4729071
+TIMESTAMP = 1746700926
+SHA256 (haproxy-3.0.10.tar.gz) = d1508670b6fd5839c669a0a916842f0d3d3d0b578bb351a2a74a1de3d929ce26
+SIZE (haproxy-3.0.10.tar.gz) = 4734325
diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile
index 10f22b206f4f..c186744d2024 100644
--- a/net/keycloak/Makefile
+++ b/net/keycloak/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	keycloak
-DISTVERSION=	26.0.8
+DISTVERSION=	26.2.3
 CATEGORIES=	net java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
diff --git a/net/keycloak/distinfo b/net/keycloak/distinfo
index 71022ea2665d..1287e9d32d50 100644
--- a/net/keycloak/distinfo
+++ b/net/keycloak/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736843614
-SHA256 (keycloak-26.0.8.tar.gz) = 8cf143b894afcf7d3be4549dc5af4790bda63bd471a5ac8e384094fb729e4b15
-SIZE (keycloak-26.0.8.tar.gz) = 146864314
+TIMESTAMP = 1746520726
+SHA256 (keycloak-26.2.3.tar.gz) = fae0b41f5fee0ff1fbe3facc2e2bbde1ff05b11e2c5cc4d5203817ce5fb862aa
+SIZE (keycloak-26.2.3.tar.gz) = 155013093
diff --git a/net/keycloak/pkg-plist b/net/keycloak/pkg-plist
index fb03bab50724..ea74daf308ad 100644
--- a/net/keycloak/pkg-plist
+++ b/net/keycloak/pkg-plist
@@ -1,7 +1,7 @@
 bin/kcadm
 bin/kcreg
 %%JAVASHAREDIR%%/keycloak/bin/client/keycloak-admin-cli-%%VERSION%%.jar
-%%JAVASHAREDIR%%/keycloak/bin/client/lib/bcprov-jdk18on-1.78.1.jar
+%%JAVASHAREDIR%%/keycloak/bin/client/lib/bcprov-jdk18on-1.80.jar
 %%JAVASHAREDIR%%/keycloak/bin/client/lib/keycloak-crypto-default-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/bin/client/lib/keycloak-crypto-fips1402-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/bin/federation-sssd-setup.sh
@@ -11,125 +11,135 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/conf/README.md
 %%JAVASHAREDIR%%/keycloak/lib/app/keycloak.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.github.crac.org-crac-0.1.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-bootstrap-runner-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-classloader-commons-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-development-mode-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-vertx-latebound-mdc-provider-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-constraint-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-cpu-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-expression-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-function-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-io-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-net-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-os-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-ref-2.6.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-bootstrap-runner-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-classloader-commons-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-development-mode-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-vertx-latebound-mdc-provider-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-constraint-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-cpu-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-expression-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-function-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-io-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-net-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-os-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-ref-2.10.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/boot/jakarta.json.jakarta.json-api-2.1.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/boot/org.eclipse.parsson.parsson-1.1.7.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/org.jboss.logging.jboss-logging-3.6.0.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/org.jboss.logmanager.jboss-logmanager-3.0.6.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/org.jboss.logging.jboss-logging-3.6.1.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/org.jboss.logmanager.jboss-logmanager-3.1.2.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/appmodel.dat
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/com.fasterxml.jackson.dataformat.jackson-dataformat-yaml-2.17.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/com.fasterxml.jackson.dataformat.jackson-dataformat-yaml-2.18.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/deployment-class-path.dat
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.arc.arc-processor-3.15.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.arc.arc-processor-3.20.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.gizmo.gizmo-1.8.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-core-5.3.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-http-core-5.3.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-servlet-5.3.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-test-supplement-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-app-model-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-core-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-builder-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-caffeine-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-class-change-agent-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-core-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-credentials-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-utilities-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-grpc-common-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-validator-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jaxrs-spi-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-h2-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mariadb-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mssql-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mysql-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-oracle-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-postgresql-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jsonp-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-service-binding-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-logging-json-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-registry-prometheus-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-mutiny-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-narayana-jta-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-netty-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-opentelemetry-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-reactive-routes-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-common-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-jackson-common-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-jackson-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-server-spi-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-spi-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-common-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-security-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-openapi-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-tls-registry-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-undertow-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-deployment-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-dev-ui-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-virtual-threads-deployment-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.qute.qute-core-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-common-processor-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-processor-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.jandex-3.2.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.smallrye-health-ui-4.1.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.smallrye-open-api-core-3.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-core-5.3.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-http-core-5.3.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-servlet-5.3.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-dev-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-test-supplement-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-app-model-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-core-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-builder-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-caffeine-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-class-change-agent-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-core-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-credentials-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-base-codestarts-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-common-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-message-writer-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-registry-client-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-utilities-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-grpc-common-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-validator-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jaxrs-spi-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-h2-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mariadb-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mssql-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mysql-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-oracle-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-postgresql-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jsonp-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-service-binding-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-logging-json-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-registry-prometheus-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-mutiny-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-narayana-jta-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-netty-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-opentelemetry-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-reactive-routes-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-common-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-jackson-common-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-jackson-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-server-spi-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-rest-spi-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-common-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-security-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-openapi-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-tls-registry-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-undertow-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-deployment-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-dev-ui-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-virtual-threads-deployment-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.qute.qute-core-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-common-processor-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-processor-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.common.smallrye-common-version-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.jandex-3.2.7.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.smallrye-health-ui-4.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.smallrye-open-api-core-4.0.8.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.smallrye-open-api-model-4.0.8.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/jakarta.servlet.jakarta.servlet-api-6.0.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/jakarta.validation.jakarta.validation-api-3.0.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.aesh.aesh-2.8.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.aesh.readline-2.6.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.eclipse.microprofile.openapi.microprofile-openapi-api-3.1.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.apache.commons.commons-compress-1.27.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.codejive.java-properties-0.0.7.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.eclipse.microprofile.openapi.microprofile-openapi-api-4.0.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.fusesource.jansi.jansi-2.4.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.graalvm.sdk.nativeimage-23.1.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.graalvm.sdk.word-23.1.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/org.keycloak.keycloak-quarkus-server-deployment-%%VERSION%%.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.aayushatharva.brotli4j.brotli4j-1.16.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.aayushatharva.brotli4j.native-linux-x86_64-1.16.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.aayushatharva.brotli4j.service-1.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.apicatalog.titanium-json-ld-1.3.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.classmate-1.7.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.core.jackson-annotations-2.17.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.core.jackson-core-2.17.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.core.jackson-databind-2.17.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.dataformat.jackson-dataformat-cbor-2.17.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.17.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.17.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.module.jackson-module-parameter-names-2.17.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.github.ben-manes.caffeine.caffeine-3.1.5.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.core.jackson-annotations-2.18.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.core.jackson-core-2.18.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.core.jackson-databind-2.18.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.dataformat.jackson-dataformat-cbor-2.18.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.18.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.18.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.fasterxml.jackson.module.jackson-module-parameter-names-2.18.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.github.ben-manes.caffeine.caffeine-3.2.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.github.ua-parser.uap-java-1.5.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.github.waffle.waffle-jna-3.3.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.api.grpc.proto-google-common-protos-2.41.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.code.findbugs.jsr305-3.0.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.code.gson.gson-2.11.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.errorprone.error_prone_annotations-2.30.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.guava.guava-33.2.1-jre.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.api.grpc.proto-google-common-protos-2.51.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.code.gson.gson-2.12.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.errorprone.error_prone_annotations-2.36.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.guava.guava-33.4.0-jre.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.protobuf.protobuf-java-3.25.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.zxing.core-3.4.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.google.zxing.javase-3.4.0.jar
@@ -144,154 +154,158 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.sun.xml.messaging.saaj.saaj-impl-2.0.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.webauthn4j.webauthn4j-core-0.21.5.RELEASE.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/com.webauthn4j.webauthn4j-util-0.21.5.RELEASE.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/commons-codec.commons-codec-1.17.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/commons-io.commons-io-2.16.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/commons-codec.commons-codec-1.18.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/commons-io.commons-io-2.18.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/info.picocli.picocli-4.7.6.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.agroal.agroal-api-2.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.agroal.agroal-narayana-2.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.agroal.agroal-pool-2.5.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-api-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-context-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-core-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-netty-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-protobuf-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-protobuf-lite-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-stub-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-util-1.65.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-commons-1.13.5.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-core-1.13.5.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-observation-1.13.5.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-registry-prometheus-simpleclient-1.13.5.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-buffer-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-dns-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-haproxy-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http2-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-socks-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-common-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-proxy-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-dns-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-classes-epoll-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-unix-common-4.1.111.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-annotations-2.5.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-annotations-support-2.5.0-alpha.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-api-2.5.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-api-incubator-2.5.0-alpha.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-jdbc-2.5.0-alpha.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-api-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-api-incubator-1.39.0-alpha.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-context-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-common-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-otlp-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-otlp-common-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-sender-okhttp-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-common-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-extension-autoconfigure-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-extension-autoconfigure-spi-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-logs-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-metrics-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-trace-1.39.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.semconv.opentelemetry-semconv-1.26.0-alpha.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.semconv.opentelemetry-semconv-incubating-1.26.0-alpha.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.perfmark.perfmark-api-0.26.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-api-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-context-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-core-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-netty-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-protobuf-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-protobuf-lite-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-stub-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.grpc.grpc-util-1.69.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-commons-1.14.5.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-core-1.14.5.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-observation-1.14.5.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-registry-prometheus-simpleclient-1.14.5.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-buffer-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-dns-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-haproxy-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http2-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-socks-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-common-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-proxy-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-dns-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-classes-epoll-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.118.Final-linux-aarch_64.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.118.Final-linux-x86_64.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-unix-common-4.1.118.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-apache-httpclient-4.3-2.10.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-annotations-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-annotations-support-2.10.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-api-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-instrumentation-api-incubator-2.10.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-jdbc-2.10.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-runtime-telemetry-java17-2.10.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.instrumentation.opentelemetry-runtime-telemetry-java8-2.10.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-api-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-api-incubator-1.44.1-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-context-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-common-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-otlp-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-otlp-common-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-exporter-sender-okhttp-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-common-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-extension-autoconfigure-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-extension-autoconfigure-spi-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-logs-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-metrics-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.opentelemetry-sdk-trace-1.44.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.semconv.opentelemetry-semconv-1.28.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.opentelemetry.semconv.opentelemetry-semconv-incubating-1.29.0-alpha.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.perfmark.perfmark-api-0.27.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_common-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_tracer_common-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_tracer_otel_agent-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_tracer_otel-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient-0.16.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.arc.arc-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-agroal-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-arc-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-caffeine-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-core-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-credentials-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-common-3.15.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.arc.arc-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-agroal-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-arc-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-caffeine-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-core-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-credentials-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-common-3.20.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-fs-util-0.0.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-grpc-common-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-hibernate-orm-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jackson-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-h2-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mariadb-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mssql-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mysql-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-oracle-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-postgresql-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jsonp-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-logging-json-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-registry-prometheus-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-mutiny-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-narayana-jta-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-netty-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-opentelemetry-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-reactive-routes-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-common-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-jackson-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-jackson-common-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-security-runtime-spi-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-context-propagation-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-health-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-tls-registry-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-transaction-annotations-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-http-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-virtual-threads-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-types-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-jackson-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-vertx-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.security.quarkus-security-2.1.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.vertx.utils.quarkus-vertx-utils-3.15.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.reactivex.rxjava3.rxjava-3.1.8.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-grpc-common-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-hibernate-orm-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jackson-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-h2-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mariadb-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mssql-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mysql-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-oracle-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-postgresql-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jsonp-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-logging-json-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-registry-prometheus-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-mutiny-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-narayana-jta-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-netty-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-opentelemetry-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-reactive-routes-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-common-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-jackson-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-rest-jackson-common-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-security-runtime-spi-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-context-propagation-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-health-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-tls-registry-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-transaction-annotations-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-http-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-virtual-threads-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-types-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-jackson-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-vertx-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.security.quarkus-security-2.2.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.vertx.utils.quarkus-vertx-utils-3.20.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.reactivex.rxjava3.rxjava-3.1.10.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.setl.rdf-urdna-1.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-annotation-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-classloader-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-vertx-context-2.6.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-3.9.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-common-3.9.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-core-3.9.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-source-keystore-3.9.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-2.6.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-smallrye-context-propagation-2.6.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-zero-flow-adapters-1.1.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-auth-common-3.15.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-bridge-common-3.15.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-core-3.15.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-runtime-3.15.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-uri-template-3.15.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-3.15.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-common-3.15.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.certs.smallrye-private-key-pem-parser-0.9.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-annotation-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-classloader-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-vertx-context-2.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-3.11.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-common-3.11.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-core-3.11.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-source-keystore-3.11.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-2.8.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-smallrye-context-propagation-2.8.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-zero-flow-adapters-1.1.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-auth-common-3.18.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-bridge-common-3.18.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-core-3.18.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-runtime-3.18.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-uri-template-3.18.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-3.18.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-common-3.18.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-reactive-converter-api-3.0.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-reactive-converter-mutiny-3.0.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.vertx-mutiny-generator-3.15.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-api-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-jta-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-storage-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-fault-tolerance-vertx-6.4.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-4.1.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-api-4.1.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-provided-checks-4.1.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-auth-common-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-bridge-common-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-codegen-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-core-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-client-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-common-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-server-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-4.5.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-common-4.5.10.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.vertx-mutiny-generator-3.18.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-api-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-jta-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-storage-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-fault-tolerance-vertx-6.9.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-4.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-api-4.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-provided-checks-4.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-auth-common-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-bridge-common-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-codegen-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-core-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-client-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-common-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-grpc-server-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-4.5.13.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-common-4.5.13.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.activation.jakarta.activation-api-2.1.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.annotation.jakarta.annotation-api-3.0.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.el.jakarta.el-api-5.0.1.jar
@@ -307,55 +321,54 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.xml.bind.jakarta.xml.bind-api-4.0.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.xml.soap.jakarta.xml.soap-api-3.0.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/javax.xml.bind.jaxb-api-2.3.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/net.bytebuddy.byte-buddy-1.14.18.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/net.bytebuddy.byte-buddy-1.15.11.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/net.java.dev.jna.jna-5.8.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/net.java.dev.jna.jna-platform-5.8.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.antlr.antlr4-runtime-4.13.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.apache.commons.commons-collections4-4.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.apache.commons.commons-lang3-3.14.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.apache.commons.commons-lang3-3.17.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.apache.httpcomponents.httpclient-4.5.14.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.apache.httpcomponents.httpcore-4.4.16.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.apache.kerby.kerby-asn1-2.0.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.apache.santuario.xmlsec-2.2.6.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.bouncycastle.bcpkix-jdk18on-1.78.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.bouncycastle.bcprov-jdk18on-1.78.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.bouncycastle.bcutil-jdk18on-1.78.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.bouncycastle.bcpkix-jdk18on-1.80.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.bouncycastle.bcprov-jdk18on-1.80.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.bouncycastle.bcutil-jdk18on-1.80.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.eclipse.angus.angus-activation-2.0.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.eclipse.angus.angus-mail-2.0.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.eclipse.microprofile.config.microprofile-config-api-3.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.eclipse.microprofile.context-propagation.microprofile-context-propagation-api-1.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.eclipse.microprofile.health.microprofile-health-api-4.0.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.eclipse.microprofile.reactive-streams-operators.microprofile-reactive-streams-operators-api-3.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.eclipse.microprofile.reactive-streams-operators.microprofile-reactive-streams-operators-api-3.0.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.freemarker.freemarker-2.3.32.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.glassfish.jaxb.jaxb-core-4.0.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.glassfish.jaxb.jaxb-runtime-4.0.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.glassfish.jaxb.txw2-4.0.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hdrhistogram.HdrHistogram-2.2.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.common.hibernate-commons-annotations-7.0.1.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.orm.hibernate-core-6.6.0.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.orm.hibernate-graalvm-6.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.common.hibernate-commons-annotations-7.0.3.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.orm.hibernate-core-6.6.11.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.orm.hibernate-graalvm-6.6.11.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.quarkus-local-cache-0.3.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-api-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-cachestore-remote-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-client-hotrod-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-commons-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-core-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-multimap-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-query-dsl-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-remote-query-client-15.0.11.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-5.0.10.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-processor-5.0.10.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-types-5.0.10.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-api-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-cachestore-remote-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-client-hotrod-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-commons-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-core-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-multimap-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-query-dsl-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-remote-query-client-15.0.14.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-5.0.13.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-types-5.0.13.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.invocation.jboss-invocation-2.0.0.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.jboss-transaction-spi-8.0.0.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.logging.commons-logging-jboss-logging-1.0.0.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.logging.jboss-logging-annotations-3.0.1.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.narayana.jta.narayana-jta-7.0.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.narayana.jts.narayana-jts-integration-7.0.2.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.logging.jboss-logging-annotations-3.0.4.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.narayana.jta.narayana-jta-7.2.1.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.narayana.jts.narayana-jts-integration-7.2.1.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.slf4j.slf4j-jboss-logmanager-2.0.0.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.threads.jboss-threads-3.6.1.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.threads.jboss-threads-3.8.0.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jctools.jctools-core-4.0.5.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jgroups.jgroups-5.3.10.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jgroups.jgroups-5.3.15.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jspecify.jspecify-1.0.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jvnet.staxex.stax-ex-2.0.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-account-ui-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-admin-ui-%%VERSION%%.jar
@@ -365,6 +378,7 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-core-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-crypto-default-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-crypto-fips1402-%%VERSION%%.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-ipatuura-federation-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-kerberos-federation-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-ldap-federation-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-model-infinispan-%%VERSION%%.jar
@@ -381,51 +395,52 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-services-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-sssd-federation-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-themes-%%VERSION%%.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-themes-vendor-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.latencyutils.LatencyUtils-2.0.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.liquibase.liquibase-core-4.29.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.locationtech.jts.jts-core-1.19.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.mariadb.jdbc.mariadb-java-client-3.4.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.mariadb.jdbc.mariadb-java-client-3.5.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.openjdk.nashorn.nashorn-core-15.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-9.7.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-analysis-9.7.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-commons-9.7.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-tree-9.7.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-util-9.7.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.postgresql.postgresql-42.7.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-9.7.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-analysis-9.7.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-commons-9.7.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-tree-9.7.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.ow2.asm.asm-util-9.7.1.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.postgresql.postgresql-42.7.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.reactivestreams.reactive-streams-1.0.4.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.slf4j.slf4j-api-2.0.6.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.snakeyaml.snakeyaml-engine-2.6.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.twitter4j.twitter4j-core-4.1.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.common.wildfly-common-1.5.4.Final-format-001.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-asn1-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-auth-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-auth-server-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-base-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-credential-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-http-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-keystore-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-digest-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-gssapi-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-oauth2-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-scram-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-password-impl-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-permission-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-provider-util-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-digest-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-external-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-gs2-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-gssapi-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-oauth2-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-plain-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-scram-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-security-manager-action-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-ssl-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-util-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-x500-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-x500-cert-2.5.2.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-x500-cert-util-2.5.2.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-asn1-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-auth-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-auth-server-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-base-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-credential-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-http-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-keystore-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-digest-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-gssapi-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-oauth2-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-mechanism-scram-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-password-impl-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-permission-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-provider-util-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-digest-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-external-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-gs2-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-gssapi-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-oauth2-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-plain-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-sasl-scram-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-security-manager-action-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-ssl-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-util-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-x500-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-x500-cert-2.6.0.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.wildfly.security.wildfly-elytron-x500-cert-util-2.6.0.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.yaml.snakeyaml-2.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/quarkus-run.jar
 %%JAVASHAREDIR%%/keycloak/providers/README.md
diff --git a/net/landrop/Makefile b/net/landrop/Makefile
index 4a268004ceb7..76fedd7f3ad7 100644
--- a/net/landrop/Makefile
+++ b/net/landrop/Makefile
@@ -11,6 +11,9 @@ WWW=		https://landrop.app
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Unmaintained version and the newer version turned to close source
+EXPIRATION_DATE=2025-06-13
+
 LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES=	gl qmake:outsource qt:5
diff --git a/net/libiscsi/Makefile b/net/libiscsi/Makefile
index fa7e9b7ef526..2681d9586868 100644
--- a/net/libiscsi/Makefile
+++ b/net/libiscsi/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libiscsi
-DISTVERSION=	1.20.0.240205
+DISTVERSION=	1.20.1
 CATEGORIES=	net
 
 MAINTAINER=	d8zNeCFG@aon.at
@@ -14,13 +14,15 @@ LICENSE_FILE_LGPL21+ =	${WRKSRC}/LICENCE-LGPL-2.1.txt
 USES=		autoreconf compiler:c11 gmake libtool pathfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	sahlberg
-GH_TAGNAME=	fef688aa9980
 
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
+# 1.20.2 only affects environments defining __APPLE__
+PORTSCOUT=	skipv:1.20.2
+
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.10.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.11.0.0
 
 .include <bsd.port.mk>
diff --git a/net/libiscsi/distinfo b/net/libiscsi/distinfo
index 00f17b720f5b..9144771bb827 100644
--- a/net/libiscsi/distinfo
+++ b/net/libiscsi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711120874
-SHA256 (sahlberg-libiscsi-1.20.0.240205-fef688aa9980_GH0.tar.gz) = c600d951c86ea496374df2054f0bf602923870aef76922bcd68d20d83e302804
-SIZE (sahlberg-libiscsi-1.20.0.240205-fef688aa9980_GH0.tar.gz) = 302430
+TIMESTAMP = 1746280868
+SHA256 (sahlberg-libiscsi-1.20.1_GH0.tar.gz) = 6bd6feef2904de1bb1869cec935b58995bc1311cad57184a2221e09ed6137eec
+SIZE (sahlberg-libiscsi-1.20.1_GH0.tar.gz) = 323554
diff --git a/net/libiscsi/files/patch-configure.ac b/net/libiscsi/files/patch-configure.ac
index ddf9df4dee23..0c94e2655838 100644
--- a/net/libiscsi/files/patch-configure.ac
+++ b/net/libiscsi/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2024-02-05 23:51:38 UTC
+--- configure.ac.orig	2025-05-03 00:02:42 UTC
 +++ configure.ac
-@@ -170,7 +170,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@@ -205,7 +205,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  #include <infiniband/verbs.h>
  #include <rdma/rdma_cma.h>
@@ -10,3 +10,25 @@
  [[int ibv = IBV_WC_SEND;]])],
  [libiscsi_cv_HAVE_LINUX_ISER=yes],[libiscsi_cv_HAVE_LINUX_ISER=no])])
  if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then
+@@ -229,6 +230,21 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test x$libiscsi_cv_HAV
+ 	   AC_DEFINE(HAVE_MULTITHREADING,1,[Whether we have multithreading support])
+ 	fi
+ AM_CONDITIONAL([HAVE_PTHREAD], [test x$libiscsi_cv_HAVE_PTHREAD = xyes])
++
++AC_CACHE_CHECK([whether libthr is available],
++               [ac_cv_have_thr],
++               [ac_save_CFLAGS="$CFLAGS"
++                ac_save_LIBS="$LIBS"
++                CFLAGS="$CFLAGS $GLIB_CFLAGS"
++                LIBS="$GLIB_LIBS $LIBS -lthr"
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                    #include <pthread.h>
++                    ]], [[]])],[ac_cv_have_thr=yes],[ac_cv_have_thr=no])
++                CFLAGS="$ac_save_CFLAGS"
++                LIBS="$ac_save_LIBS"])
++if test "$ac_cv_have_thr" = yes ; then
++	LIBS="$LIBS -lthr"
++fi
+ 
+ AC_CACHE_CHECK([whether libcunit is available],
+                [ac_cv_have_cunit],
diff --git a/net/libiscsi/files/patch-include_iscsi-multithreading.h b/net/libiscsi/files/patch-include_iscsi-multithreading.h
new file mode 100644
index 000000000000..455692032244
--- /dev/null
+++ b/net/libiscsi/files/patch-include_iscsi-multithreading.h
@@ -0,0 +1,12 @@
+--- include/iscsi-multithreading.h.orig	2025-05-03 00:02:42 UTC
++++ include/iscsi-multithreading.h
+@@ -46,6 +46,9 @@ typedef uint64_t iscsi_tid_t;
+ #endif
+ #ifdef HAVE_PTHREAD_THREADID_NP
+ typedef uint64_t iscsi_tid_t;
++#elif defined(__FreeBSD__)
++#include <pthread_np.h>
++typedef int iscsi_tid_t;
+ #else
+ typedef pid_t iscsi_tid_t;
+ #endif
diff --git a/net/libiscsi/files/patch-lib_multithreading.c b/net/libiscsi/files/patch-lib_multithreading.c
new file mode 100644
index 000000000000..48f51331ce5d
--- /dev/null
+++ b/net/libiscsi/files/patch-lib_multithreading.c
@@ -0,0 +1,11 @@
+--- lib/multithreading.c.orig	2025-05-03 00:02:42 UTC
++++ lib/multithreading.c
+@@ -154,6 +154,8 @@ iscsi_tid_t iscsi_mt_get_tid(void)
+ #elif defined(SYS_gettid)
+         pid_t tid = syscall(SYS_gettid);
+         return tid;
++#elif defined(__FreeBSD__)
++	return pthread_getthreadid_np();
+ #else
+ #error "SYS_gettid unavailable on this system"
+ #endif
diff --git a/net/libiscsi/files/patch-lib_socket.c b/net/libiscsi/files/patch-lib_socket.c
index 25ed1fdaece0..73abffcea2e6 100644
--- a/net/libiscsi/files/patch-lib_socket.c
+++ b/net/libiscsi/files/patch-lib_socket.c
@@ -1,15 +1,15 @@
---- lib/socket.c.orig	2024-02-05 23:51:38 UTC
+--- lib/socket.c.orig	2025-05-03 00:02:42 UTC
 +++ lib/socket.c
-@@ -140,7 +140,7 @@ iscsi_add_to_outqueue(struct iscsi_context *iscsi, str
- 	pdu->next = NULL;
+@@ -162,7 +162,7 @@ iscsi_add_to_outqueue(struct iscsi_context *iscsi, str
+         return;
  }
  
 -void iscsi_decrement_iface_rr() {
 +void iscsi_decrement_iface_rr(void) {
+         /* TODO QQQ use an atomic here */
  	iface_rr--;
  }
- 
-@@ -531,7 +531,7 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscs
+@@ -579,7 +579,7 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscs
  
  	if (pos < iovector->offset) {
  		iscsi_set_error(iscsi, "%s: iovector reset. pos(%d) is smaller than"
diff --git a/net/libiscsi/files/patch-utils_iscsi-discard.c b/net/libiscsi/files/patch-utils_iscsi-discard.c
index a1452a04ac04..f81134c17c76 100644
--- a/net/libiscsi/files/patch-utils_iscsi-discard.c
+++ b/net/libiscsi/files/patch-utils_iscsi-discard.c
@@ -1,4 +1,4 @@
---- utils/iscsi-discard.c.orig	2024-02-05 23:51:38 UTC
+--- utils/iscsi-discard.c.orig	2025-05-03 00:02:42 UTC
 +++ utils/iscsi-discard.c
 @@ -220,7 +220,11 @@ int main(int argc, char *argv[])
  
diff --git a/net/libiscsi/pkg-plist b/net/libiscsi/pkg-plist
index 9dde0241b0ac..237fe5d52a92 100644
--- a/net/libiscsi/pkg-plist
+++ b/net/libiscsi/pkg-plist
@@ -10,8 +10,8 @@ include/iscsi/iscsi.h
 include/iscsi/scsi-lowlevel.h
 lib/libiscsi.a
 lib/libiscsi.so
-lib/libiscsi.so.10
-lib/libiscsi.so.10.0.0
+lib/libiscsi.so.11
+lib/libiscsi.so.11.0.0
 libdata/pkgconfig/libiscsi.pc
 share/man/man1/iscsi-inq.1.gz
 share/man/man1/iscsi-ls.1.gz
diff --git a/net/libtnl/Makefile b/net/libtnl/Makefile
deleted file mode 100644
index 88fb8d4e7d82..000000000000
--- a/net/libtnl/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-PORTNAME=	libtnl
-PORTVERSION=	1.5.0
-PORTREVISION=	8
-CATEGORIES=	net devel
-MASTER_SITES=	SF/opentnl/TNL%20Source/${PORTVERSION}
-DISTNAME=	tnl-${PORTVERSION}-source
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Robust, secure, easy to use cross-platform C++ networking API
-WWW=		https://sourceforge.net/projects/opentnl/
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
-
-DEPRECATED=	Unmaintained upstream and no consumers in the ports tree
-EXPIRATION_DATE=2025-04-28
-
-# Other arches can be added easily, provided there is hardware to test:
-ONLY_FOR_ARCHS=	amd64 powerpc powerpc64 powerpc64le
-
-USES=		uidfix
-USE_GCC=	yes
-USE_LDCONFIG=	yes
-
-MAKEFILE=	${FILESDIR}/Makefile.bsd
-
-WRKSRC=		${WRKDIR}/tnl/tnl
-
-.include <bsd.port.pre.mk>
-
-.if defined(NO_PROFILE) || defined(NOPROFILE) || ${OPSYS} == FreeBSD
-PLIST_SUB+=	PROFILE='@comment '
-.else
-PLIST_SUB+=	PROFILE=''
-.endif
-
-# When security/libtomcrypt is fixed to provide a shared version, we'll
-# stop extracting our own and will LIB_DEPEND on theirs instead:
-#LIB_DEPENDS=	tomcrypt:security/libtomcrypt
-#
-#EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude tnl/libtomcrypt
-
-pre-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/tnl
-
-.include <bsd.port.post.mk>
diff --git a/net/libtnl/distinfo b/net/libtnl/distinfo
deleted file mode 100644
index 60d0985222e6..000000000000
--- a/net/libtnl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (tnl-1.5.0-source.tar.gz) = 28f55eedbe3346ebdbd9cb69e6640d3bc67cd876e70daf90f1fd90e3cbe757df
-SIZE (tnl-1.5.0-source.tar.gz) = 2292358
diff --git a/net/libtnl/files/Makefile.bsd b/net/libtnl/files/Makefile.bsd
deleted file mode 100644
index 6c1fc7de673e..000000000000
--- a/net/libtnl/files/Makefile.bsd
+++ /dev/null
@@ -1,66 +0,0 @@
-LIB=			tnl
-CXXFLAGS+=		-I../libtomcrypt -w -g -fpermissive -DNO_IPX_SUPPORT -DTNL_OS_LINUX -DTNL_DEBUG -D_TNL_ENABLE_LOGGING
-SHLIB_MAJOR=	1
-SHLIB_MINOR=	5
-SRCS=	        assert.cpp\
-				asymmetricKey.cpp\
-				bitStream.cpp\
-				byteBuffer.cpp\
-				certificate.cpp\
-				clientPuzzle.cpp\
-				connectionStringTable.cpp\
-				dataChunker.cpp\
-				eventConnection.cpp\
-				ghostConnection.cpp\
-				huffmanStringProcessor.cpp\
-				log.cpp\
-				netBase.cpp\
-				netConnection.cpp\
-				netInterface.cpp\
-				netObject.cpp\
-				netStringTable.cpp\
-				platform.cpp\
-				random.cpp\
-				rpc.cpp\
-				symmetricCipher.cpp\
-				tnlMethodDispatch.cpp\
-				journal.cpp\
-				udp.cpp\
-				vector.cpp
-INCS=			tnl.h \
-				tnlNetBase.h \
-				tnlAssert.h \
-				tnlNetConnection.h \
-				tnlAsymmetricKey.h \
-				tnlNetEvent.h \
-				tnlBitSet.h \
-				tnlNetInterface.h \
-				tnlBitStream.h \
-				tnlNetObject.h \
-				tnlByteBuffer.h \
-				tnlNetStringTable.h \
-				tnlCertificate.h \
-				tnlNonce.h \
-				tnlClientPuzzle.h \
-				tnlPlatform.h \
-				tnlConnectionStringTable.h \
-				tnlRPC.h \
-				tnlDataChunker.h \
-				tnlRandom.h \
-				tnlEndian.h \
-				tnlString.h \
-				tnlEventConnection.h \
-				tnlSymmetricCipher.h \
-				tnlGhostConnection.h \
-				tnlThread.h \
-				tnlHuffmanStringProcessor.h \
-				tnlTypes.h \
-				tnlJournal.h \
-				tnlUDP.h \
-				tnlLog.h \
-				tnlVector.h \
-				tnlMethodDispatch.h
-INCLUDEDIR=		${PREFIX}/include/tnl
-LIBDIR=			${PREFIX}/lib
-
-.include <bsd.lib.mk>
diff --git a/net/libtnl/files/patch-platform b/net/libtnl/files/patch-platform
deleted file mode 100644
index 9b79b1939863..000000000000
--- a/net/libtnl/files/patch-platform
+++ /dev/null
@@ -1,105 +0,0 @@
---- platform.cpp.orig	2004-08-20 18:26:58 UTC
-+++ platform.cpp
-@@ -434,55 +434,4 @@ bool atob(const char *str)
-    return !stricmp(str, "true") || atof(str);
- }
- 
--S32 dSprintf(char *buffer, U32 bufferSize, const char *format, ...)
--{
--   va_list args;
--   va_start(args, format);
--#ifdef TNL_COMPILER_VISUALC
--   S32 len = _vsnprintf(buffer, bufferSize, format, args);
--#else
--   S32 len = vsnprintf(buffer, bufferSize, format, args);
--#endif
--   return (len);
--}
--
--
--S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, void *arglist)
--{
--#ifdef TNL_COMPILER_VISUALC
--   S32 len = _vsnprintf(buffer, bufferSize, format, (va_list) arglist);
--#else
--   S32 len = vsnprintf(buffer, bufferSize, format, (char *) arglist);
--#endif
--   return len;
--}
--
- };
--
--
--#if defined (__GNUC__)
--
--int stricmp(const char *str1, const char *str2)
--{
--   while(toupper(*str1) == toupper(*str2) && *str1)
--   {
--      str1++;
--      str2++;
--   }
--   return (toupper(*str1) > toupper(*str2)) ? 1 : ((toupper(*str1) < toupper(*str2)) ? -1 : 0);
--}
--
--int strnicmp(const char *str1, const char *str2, unsigned int len)
--{
--   for(unsigned int i = 0; i < len; i++)
--   {
--      if(toupper(str1[i]) == toupper(str2[i]))
--         continue;
--      return (toupper(str1[i]) > toupper(str2[i])) ? 1 : ((toupper(str1[i]) < toupper(str2[i])) ? -1 : 0);
--   }
--   return 0;
--}
--
--#endif
--
--
-Use defines instead of (partially incorrect) function-wrappers for
-standard functions.
-
-	-mi
-
---- tnlPlatform.h.orig	2004-09-28 18:45:25 UTC
-+++ tnlPlatform.h
-@@ -30,6 +30,7 @@
- #ifndef _TNL_TYPES_H_
- #include "tnlTypes.h"
- #endif
-+#include <stdio.h>
- 
- namespace TNL {
- 
-@@ -100,13 +101,14 @@ extern bool        atob(const char *str); ///< String 
- /// Printf into string with a buffer size.
- ///
- /// This will print into the specified string until the buffer size is reached.
--extern int    dSprintf(char *buffer, U32 bufferSize, const char *format, ...);
-+#ifdef TNL_COMPILER_VISUALC
-+#	define dSprintf	_snprintf
-+#	define dVsprintf	_vsnprintf
-+#else
-+#	define dSprintf	snprintf
-+#	define dVsprintf	vsnprintf
-+#endif
- 
--/// Vsprintf with buffer size argument.
--///
--/// This will print into the specified string until the buffer size is reached.
--extern int    dVsprintf(char *buffer, U32 bufferSize, const char *format, void *arglist); ///< compiler independent
--
- inline char dToupper(const char c) { if (c >= char('a') && c <= char('z')) return char(c + 'A' - 'a'); else return c; } ///< Converts an ASCII character to upper case.
- inline char dTolower(const char c) { if (c >= char('A') && c <= char('Z')) return char(c - 'A' + 'a'); else return c; } ///< Converts an ASCII character to lower case.
- 
-@@ -119,8 +121,8 @@ inline char dTolower(const char c) { if (c >= char('A'
- 
- #if defined (__GNUC__)
- 
--int stricmp(const char *str1, const char *str2);
--int strnicmp(const char *str1, const char *str2, unsigned int len);
-+#define stricmp(str1, str2)	strcasecmp(str1, str2)
-+#define strnicmp(str1, str2, size)	strncasecmp(str1, str2, size)
- 
- #endif
- 
diff --git a/net/libtnl/files/patch-tnlTypes.h b/net/libtnl/files/patch-tnlTypes.h
deleted file mode 100644
index d8195f5d8877..000000000000
--- a/net/libtnl/files/patch-tnlTypes.h
+++ /dev/null
@@ -1,27 +0,0 @@
-This allows building on amd64 and with gcc above 3.x. Adding support for
-other architectures is easy too.
-
-	-mi
-
---- tnlTypes.h.orig	2004-09-28 18:45:25 UTC
-+++ tnlTypes.h
-@@ -284,8 +284,8 @@ typedef unsigned long long  U64;  ///< Compiler indepe
- // Identify the target CPU and assembly language options
- //----------------------------------------------------------------------------------
- 
--#if defined(_M_IX86) || defined(i386)
--#  define TNL_CPU_STRING "Intel x86"
-+#if defined(_M_IX86) || defined(i386) || defined(__amd64__)
-+#  define TNL_CPU_STRING "x86"
- #  define TNL_CPU_X86
- #  define TNL_LITTLE_ENDIAN
- #  define TNL_SUPPORTS_NASM
-@@ -293,7 +293,7 @@ typedef unsigned long long  U64;  ///< Compiler indepe
- #  if defined (__GNUC__)
- #    if __GNUC__ == 2
- #      define TNL_GCC_2
--#    elif __GNUC__ == 3
-+#    elif __GNUC__ >= 3
- #      define TNL_GCC_3
- #    else
- #      error "TNL: Unsupported version of GCC (see tnlMethodDispatch.cpp)"
diff --git a/net/libtnl/pkg-descr b/net/libtnl/pkg-descr
deleted file mode 100644
index ba98865231ef..000000000000
--- a/net/libtnl/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-The Torque Network Library is a robust, secure, easy to use, cross-platform
-C++ networking API designed for high performance simulations and games. The
-network architecture in TNL has powered some of the best internet
-multiplayer action games to date. Whether you're writing a multiplayer game,
-developing a complex simulation, or just need a solid foundation for network
-apps, TNL will meet your needs.
-
-TNL is available under the GNU General Public License (GPL), an indie
-license, and a commercial license.
diff --git a/net/libtnl/pkg-plist b/net/libtnl/pkg-plist
deleted file mode 100644
index dc14292d56ae..000000000000
--- a/net/libtnl/pkg-plist
+++ /dev/null
@@ -1,37 +0,0 @@
-include/tnl/tnl.h
-include/tnl/tnlAssert.h
-include/tnl/tnlAsymmetricKey.h
-include/tnl/tnlBitSet.h
-include/tnl/tnlBitStream.h
-include/tnl/tnlByteBuffer.h
-include/tnl/tnlCertificate.h
-include/tnl/tnlClientPuzzle.h
-include/tnl/tnlConnectionStringTable.h
-include/tnl/tnlDataChunker.h
-include/tnl/tnlEndian.h
-include/tnl/tnlEventConnection.h
-include/tnl/tnlGhostConnection.h
-include/tnl/tnlHuffmanStringProcessor.h
-include/tnl/tnlJournal.h
-include/tnl/tnlLog.h
-include/tnl/tnlMethodDispatch.h
-include/tnl/tnlNetBase.h
-include/tnl/tnlNetConnection.h
-include/tnl/tnlNetEvent.h
-include/tnl/tnlNetInterface.h
-include/tnl/tnlNetObject.h
-include/tnl/tnlNetStringTable.h
-include/tnl/tnlNonce.h
-include/tnl/tnlPlatform.h
-include/tnl/tnlRPC.h
-include/tnl/tnlRandom.h
-include/tnl/tnlString.h
-include/tnl/tnlSymmetricCipher.h
-include/tnl/tnlThread.h
-include/tnl/tnlTypes.h
-include/tnl/tnlUDP.h
-include/tnl/tnlVector.h
-lib/libtnl.a
-lib/libtnl.so
-lib/libtnl.so.1
-%%PROFILE%%lib/libtnl_p.a
diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index 12f13212fc87..372cd379d30c 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	liveMedia
-DISTVERSION=	2025.01.17
+DISTVERSION=	2025.04.24
 PORTEPOCH=	2
 CATEGORIES=	net devel
 MASTER_SITES=	https://download.videolan.org/contrib/live555/
@@ -18,12 +18,11 @@ USE_LDCONFIG=	yes
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	genMakefiles
-CONFIGURE_ARGS=		fixed-freebsd
+CONFIGURE_ARGS=		linux-with-shared-libraries
 
 WRKSRC=		${WRKDIR}/live
 
 post-patch:
-	${CP} ${FILESDIR}/config.fixed-freebsd ${WRKSRC}
 	@${REINPLACE_CMD} \
 		-e '/^PREFIX/s|=|?=|' \
 			${WRKSRC}/*/Makefile.head
diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo
index f87e51ff1a07..af1157295a8e 100644
--- a/net/liveMedia/distinfo
+++ b/net/liveMedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738821860
-SHA256 (live.2025.01.17.tar.gz) = 273d9cf77468015c2377e50e384e3eea67cf255c75fe60a175e9e0917afe847b
-SIZE (live.2025.01.17.tar.gz) = 696558
+TIMESTAMP = 1746664554
+SHA256 (live.2025.04.24.tar.gz) = a34a17e8c0922097bcd1fae6d5b42a6d75d493266a4f4a6f11dc0b4c3351a6f6
+SIZE (live.2025.04.24.tar.gz) = 696521
diff --git a/net/liveMedia/files/config.fixed-freebsd b/net/liveMedia/files/config.fixed-freebsd
deleted file mode 100644
index 9374167a8060..000000000000
--- a/net/liveMedia/files/config.fixed-freebsd
+++ /dev/null
@@ -1,46 +0,0 @@
-# 'CURRENT':'REVISION':'AGE' are updated - whenever a library changes - as follows:
-# The library code changes, but without any changes to the API (i.e., interfaces) => increment REVISION
-# At least one interface changes, or is removed => CURRENT += 1; REVISION = 0; AGE = 0
-# One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1
-
-libliveMedia_VERSION_CURRENT=	16
-libliveMedia_VERSION_REVISION=	1
-libliveMedia_VERSION_AGE=	0
-libliveMedia_LIB_SUFFIX=	so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
-
-libBasicUsageEnvironment_VERSION_CURRENT=	0
-libBasicUsageEnvironment_VERSION_REVISION=	1
-libBasicUsageEnvironment_VERSION_AGE=	0
-libBasicUsageEnvironment_LIB_SUFFIX=	so.$(shell expr $(libBasicUsageEnvironment_VERSION_CURRENT) - $(libBasicUsageEnvironment_VERSION_AGE)).$(libBasicUsageEnvironment_VERSION_AGE).$(libBasicUsageEnvironment_VERSION_REVISION)
-
-libUsageEnvironment_VERSION_CURRENT=	1
-libUsageEnvironment_VERSION_REVISION=	0
-libUsageEnvironment_VERSION_AGE=	0
-libUsageEnvironment_LIB_SUFFIX=	so.$(shell expr $(libUsageEnvironment_VERSION_CURRENT) - $(libUsageEnvironment_VERSION_AGE)).$(libUsageEnvironment_VERSION_AGE).$(libUsageEnvironment_VERSION_REVISION)
-
-libgroupsock_VERSION_CURRENT=	1
-libgroupsock_VERSION_REVISION=	1
-libgroupsock_VERSION_AGE=	0
-libgroupsock_LIB_SUFFIX=	so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
-#####
-
-COMPILE_OPTS =		$(INCLUDES) -I. -DBSD=1 -DNEWLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_SOCKADDR_LEN=1 -fpic
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -Wno-deprecated $(CPPFLAGS) $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L. $(LDFLAGS)
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CC) -o
-SHORT_LIB_SUFFIX=	so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
-LIB_SUFFIX =	 	$(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
-LIBRARY_LINK_OPTS =	-shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
-LIBS_FOR_CONSOLE_APPLICATION = -L$(OPENSSLLIB) -lssl -lcrypto
-LIBS_FOR_GUI_APPLICATION =
-LIBS_FOR_LIVEMEDIA_LIB = -L$(OPENSSLLIB) -lssl -lcrypto
-EXE =
-INSTALL2 =		install_shared_libraries
diff --git a/net/liveMedia/files/patch-config.linux-with-shared-libraries b/net/liveMedia/files/patch-config.linux-with-shared-libraries
new file mode 100644
index 000000000000..ef68b02f40d4
--- /dev/null
+++ b/net/liveMedia/files/patch-config.linux-with-shared-libraries
@@ -0,0 +1,22 @@
+--- config.linux-with-shared-libraries.orig	2025-04-24 20:16:36 UTC
++++ config.linux-with-shared-libraries
+@@ -24,7 +24,7 @@ libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock
+ libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
+ #####
+ 
+-COMPILE_OPTS =		$(INCLUDES) -I/usr/local/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
++COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
+ C =			c
+ C_COMPILER =		$(CC)
+ C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
+@@ -39,8 +39,8 @@ LIBRARY_LINK_OPTS =	-shared -Wl,-soname,$(NAME).$(SHOR
+ SHORT_LIB_SUFFIX =	so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
+ LIB_SUFFIX =	 	$(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
+ LIBRARY_LINK_OPTS =	-shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
+-LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
++LIBS_FOR_CONSOLE_APPLICATION = -L$(OPENSSLLIB) -lssl -lcrypto
+ LIBS_FOR_GUI_APPLICATION =
+-LIBS_FOR_LIVEMEDIA_LIB = -lssl -lcrypto
++LIBS_FOR_LIVEMEDIA_LIB = -L$(OPENSSLLIB) -lssl -lcrypto
+ EXE =
+ INSTALL2 =		install_shared_libraries
diff --git a/net/liveMedia/pkg-plist b/net/liveMedia/pkg-plist
index 2d63153419a8..a6916eaa1fd2 100644
--- a/net/liveMedia/pkg-plist
+++ b/net/liveMedia/pkg-plist
@@ -218,14 +218,14 @@ include/liveMedia/liveMedia_version.hh
 include/liveMedia/ourMD5.hh
 include/liveMedia/uLawAudioFilter.hh
 lib/libBasicUsageEnvironment.so
-lib/libBasicUsageEnvironment.so.0
-lib/libBasicUsageEnvironment.so.0.0.1
+lib/libBasicUsageEnvironment.so.2
+lib/libBasicUsageEnvironment.so.2.1.0
 lib/libUsageEnvironment.so
-lib/libUsageEnvironment.so.1
-lib/libUsageEnvironment.so.1.0.0
+lib/libUsageEnvironment.so.3
+lib/libUsageEnvironment.so.3.2.0
 lib/libgroupsock.so
-lib/libgroupsock.so.1
-lib/libgroupsock.so.1.0.1
+lib/libgroupsock.so.30
+lib/libgroupsock.so.30.2.0
 lib/libliveMedia.so
-lib/libliveMedia.so.16
-lib/libliveMedia.so.16.0.1
+lib/libliveMedia.so.116
+lib/libliveMedia.so.116.0.2
diff --git a/net/mdns-bridge/Makefile b/net/mdns-bridge/Makefile
index 2736eaa02726..824c2189b609 100644
--- a/net/mdns-bridge/Makefile
+++ b/net/mdns-bridge/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	mdns-bridge
-PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+DISTVERSION=	2.0.0
 CATEGORIES=	net
 
 MAINTAINER=	dennypage@me.com
diff --git a/net/mdns-bridge/distinfo b/net/mdns-bridge/distinfo
index f335f9e8e12b..cc38ead7601c 100644
--- a/net/mdns-bridge/distinfo
+++ b/net/mdns-bridge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730828610
-SHA256 (dennypage-mdns-bridge-v1.0.1_GH0.tar.gz) = e4c42db1b2f1f49e7427db92da0553b54f36225c6e4dd6af9679174840e6f492
-SIZE (dennypage-mdns-bridge-v1.0.1_GH0.tar.gz) = 26051
+TIMESTAMP = 1746480700
+SHA256 (dennypage-mdns-bridge-v2.0.0_GH0.tar.gz) = 07264c9f405648064e3d0f8043eadaddcc0a4b6505605e05da8e92f4077d1a79
+SIZE (dennypage-mdns-bridge-v2.0.0_GH0.tar.gz) = 26273
diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile
index affda61d61d8..a364ad12a7cc 100644
--- a/net/minidlna/Makefile
+++ b/net/minidlna/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	minidlna
 PORTVERSION=	1.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	net multimedia www
 
@@ -27,7 +27,7 @@ CPE_VENDOR=	minidlna_project
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glebius
-GH_TAGNAME=	ae2141d
+GH_TAGNAME=	5b88c1b
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
 SUB_FILES+=	pkg-message
diff --git a/net/minidlna/distinfo b/net/minidlna/distinfo
index c7d661a602af..8e53a7d8b7ec 100644
--- a/net/minidlna/distinfo
+++ b/net/minidlna/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737925332
-SHA256 (glebius-minidlna-1.3.3-ae2141d_GH0.tar.gz) = 820e8d755da708dcb043e9dc487fec097daada156e2fb4650b521ae2991d8269
-SIZE (glebius-minidlna-1.3.3-ae2141d_GH0.tar.gz) = 300081
+TIMESTAMP = 1746631052
+SHA256 (glebius-minidlna-1.3.3-5b88c1b_GH0.tar.gz) = 383b252f538afa607b4c29239d996f709350fecdaa35e45377c698b08c3f8cae
+SIZE (glebius-minidlna-1.3.3-5b88c1b_GH0.tar.gz) = 300079
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index fafefa0ad735..fa092ff3beef 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	miniupnpd
-DISTVERSION=	2.3.7
+DISTVERSION=	2.3.9
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/ \
diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo
index 587e74fc7dfd..7c57bc76cb0c 100644
--- a/net/miniupnpd/distinfo
+++ b/net/miniupnpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726178413
-SHA256 (miniupnpd-2.3.7.tar.gz) = fbdd5501039730f04a8420ea2f8f54b7df63f9f04cde2dc67fa7371e80477bbe
-SIZE (miniupnpd-2.3.7.tar.gz) = 265329
+TIMESTAMP = 1745338102
+SHA256 (miniupnpd-2.3.9.tar.gz) = 66cb3c3d697ab2bb3a61d3c48628166d6ba328d7c2dbeb95898fdf2a3202af7b
+SIZE (miniupnpd-2.3.9.tar.gz) = 302607
diff --git a/net/miniupnpd/files/patch-Makefile.bsd b/net/miniupnpd/files/patch-Makefile.bsd
deleted file mode 100644
index 996743a4601d..000000000000
--- a/net/miniupnpd/files/patch-Makefile.bsd
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.bsd.orig	2023-02-17 03:09:33 UTC
-+++ Makefile.bsd
-@@ -150,8 +150,8 @@ install:	miniupnpd genuuid
- 	$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)
- 	$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)
- 	$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)
--	$(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
--	$(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)
-+	$(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)/miniupnpd.conf.sample
-+	$(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)/man8
- 	$(INSTALL) -m 644 miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8
- 
- # genuuid is using the uuid cli tool available under OpenBSD 4.0 in
diff --git a/net/mvfst/Makefile b/net/mvfst/Makefile
index 36d06b4e718c..343ce75bf01e 100644
--- a/net/mvfst/Makefile
+++ b/net/mvfst/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mvfst
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/mvfst/distinfo b/net/mvfst/distinfo
index 528b335098f2..4fc3938857d1 100644
--- a/net/mvfst/distinfo
+++ b/net/mvfst/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891844
-SHA256 (facebook-mvfst-v2025.04.28.00_GH0.tar.gz) = 10f47a23f96dfbe14587666821b5a8f06eb38972c5ef403a1bfb2135fae8976a
-SIZE (facebook-mvfst-v2025.04.28.00_GH0.tar.gz) = 2074903
+TIMESTAMP = 1746504546
+SHA256 (facebook-mvfst-v2025.05.05.00_GH0.tar.gz) = 8a93da1819356974ab2fedad0ed766f90f64829cd5ace92e2812318d127a8362
+SIZE (facebook-mvfst-v2025.05.05.00_GH0.tar.gz) = 2075410
diff --git a/net/mvfst/pkg-plist b/net/mvfst/pkg-plist
index 2a23d36bd595..6b747becc28b 100644
--- a/net/mvfst/pkg-plist
+++ b/net/mvfst/pkg-plist
@@ -138,6 +138,7 @@ include/quic/logging/QLoggerCommon.h
 include/quic/logging/QLoggerConstants.h
 include/quic/logging/QLoggerTypes.h
 include/quic/loss/QuicLossFunctions.h
+include/quic/mvfst-config.h
 include/quic/observer/SocketObserverContainer.h
 include/quic/observer/SocketObserverInterface.h
 include/quic/observer/SocketObserverTypes.h
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
deleted file mode 100644
index a1b128c07dc9..000000000000
--- a/net/openbgpd/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-PORTNAME=	openbgpd
-PORTVERSION=	5.2.20121209
-PORTREVISION=	5
-PORTEPOCH=	1
-CATEGORIES=	net
-MASTER_SITES=	OPENBSD/OpenBGPD
-DISTNAME=	${PORTNAME}-4.6
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
-WWW=		https://www.openbgpd.org/
-
-LICENSE=	ISCL
-LICENSE_FILE=	${FILESDIR}/COPYING
-
-DEPRECATED=	Unsupported upstream, consider using net/openbgpd8
-EXPIRATION_DATE=2025-04-30
-
-USES=		tar:tgz uidfix
-USE_RC_SUBR=	${PORTNAME}
-
-CONFLICTS=	zebra quagga
-
-NO_WRKSUBDIR=	yes
-PLIST_FILES=	sbin/bgpctl sbin/bgpd share/man/man5/bgpd.conf.5.gz \
-		share/man/man8/bgpctl.8.gz share/man/man8/bgpd.8.gz
-SUB_FILES=	pkg-message
-USERS=		_bgpd
-GROUPS=		_bgpd
-
-CFLAGS=		-fcommon
-
-OPTIONS_DEFINE=	IPV6LLPEER
-OPTIONS_DEFAULT=IPV6LLPEER
-IPV6LLPEER_DESC=Support nexthop using IPv6 link-local address
-IPV6LLPEER_MAKE_ARGS=	-DIPV6_LINKLOCAL_PEER
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g"	\
-	    ${WRKSRC}/bgpd/bgpd.8			\
-	    ${WRKSRC}/bgpd/bgpd.conf.5			\
-	    ${WRKSRC}/bgpctl/bgpctl.8
-
-.include <bsd.port.mk>
diff --git a/net/openbgpd/distinfo b/net/openbgpd/distinfo
deleted file mode 100644
index a4c5403642fe..000000000000
--- a/net/openbgpd/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1556692508
-SHA256 (openbgpd/openbgpd-4.6.tgz) = d9a0a3542e5ec744889ca12871f01aa1d86f12844e093010f37d0601796e15cf
-SIZE (openbgpd/openbgpd-4.6.tgz) = 168197
diff --git a/net/openbgpd/files/COPYING b/net/openbgpd/files/COPYING
deleted file mode 100644
index 0e9cfc51f9c0..000000000000
--- a/net/openbgpd/files/COPYING
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2003-2007 Henning Brauer <henning@openbsd.org>
-Copyright (c) 2002 Daniel Hartmeier <dhartmei@openbsd.org>
-Copyright (c) 2003, 2004, 2006 Claudio Jeker <claudio@openbsd.org>
-Copyright (c) 2003, 2004 Markus Friedl <markus@openbsd.org>
-Copyright (c) 2004 Damien Miller <djm@openbsd.org>
-Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
-Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/net/openbgpd/files/openbgpd.in b/net/openbgpd/files/openbgpd.in
deleted file mode 100644
index 9f17d0032365..000000000000
--- a/net/openbgpd/files/openbgpd.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: bgpd dynamicrouting
-# REQUIRE: LOGIN abi
-# BEFORE:  securelevel
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable openbgpd:
-#
-# openbgpd_enable="YES"
-# openbgpd_flags="<set as needed>"
-#
-# See bgpd(8) for openbgpd_flags
-
-. /etc/rc.subr
-
-name=openbgpd
-rcvar=openbgpd_enable
-
-extra_commands=reload
-command="%%PREFIX%%/sbin/bgpd"
-required_files="%%PREFIX%%/etc/bgpd.conf"
-
-: ${openbgpd_enable=NO}
-
-check_process()
-{
-	/bin/pgrep -f 'bgpd: parent.*'
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/openbgpd/files/patch-Makefile b/net/openbgpd/files/patch-Makefile
deleted file mode 100644
index 77ae22e026e6..000000000000
--- a/net/openbgpd/files/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Makefile
-===================================================================
-RCS file: Makefile
-diff -N Makefile
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ Makefile	30 Jun 2009 07:07:55 -0000	1.2
-@@ -0,0 +1,5 @@
-+# $hrs: openbgpd/Makefile,v 1.2 2009/06/30 07:07:55 hrs Exp $
-+
-+SUBDIR=	bgpd bgpctl
-+
-+.include <bsd.subdir.mk>
diff --git a/net/openbgpd/files/patch-Makefile.inc b/net/openbgpd/files/patch-Makefile.inc
deleted file mode 100644
index 489b88da0449..000000000000
--- a/net/openbgpd/files/patch-Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Makefile.inc
-===================================================================
-RCS file: Makefile.inc
-diff -N Makefile.inc
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ Makefile.inc	16 May 2014 01:06:14 -0000	1.5
-@@ -0,0 +1,5 @@
-+# $hrs: openbgpd/Makefile.inc,v 1.5 2014/05/16 01:06:14 hrs Exp $
-+
-+PREFIX?=	/usr/local
-+BINDIR?=	${PREFIX}/sbin
-+MANDIR?=	${PREFIX}/share/man/man
diff --git a/net/openbgpd/files/patch-bgpctl_Makefile b/net/openbgpd/files/patch-bgpctl_Makefile
deleted file mode 100644
index 572c0fcb8362..000000000000
--- a/net/openbgpd/files/patch-bgpctl_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: bgpctl/Makefile
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/Makefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.4
-diff -u -p -r1.1.1.1 -r1.4
---- bgpctl/Makefile	30 Jun 2009 05:46:15 -0000	1.1.1.1
-+++ bgpctl/Makefile	13 Oct 2012 18:35:56 -0000	1.4
-@@ -1,17 +1,18 @@
- #	$OpenBSD: Makefile,v 1.10 2007/12/20 17:08:48 henning Exp $
- 
--.PATH:		${.CURDIR}/../bgpd
-+.PATH:		${.CURDIR}/../bgpd ${.CURDIR}/../openbsd-compat
- 
- PROG=	bgpctl
--SRCS=	bgpctl.c parser.c buffer.c imsg.c util.c timer.c
-+SRCS=	bgpctl.c parser.c util.c timer.c
- SRCS+=	irrfilter.c whois.c irr_asset.c irr_prefix.c irr_output.c
--SRCS+=	irr_parser.c
-+SRCS+=	irr_parser.c mrtparser.c
-+SRCS+=	fmt_scaled.c imsg.c imsg-buffer.c
- CFLAGS+= -Wall
- CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
- CFLAGS+= -Wmissing-declarations
- CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
- CFLAGS+= -Wsign-compare
--CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../bgpd
-+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../bgpd -I${.CURDIR}/../openbsd-compat
- MAN=	bgpctl.8
- LDADD= -lutil
- DPADD+= ${LIBUTIL}
diff --git a/net/openbgpd/files/patch-bgpctl_bgpctl.8 b/net/openbgpd/files/patch-bgpctl_bgpctl.8
deleted file mode 100644
index 2e08c575981e..000000000000
--- a/net/openbgpd/files/patch-bgpctl_bgpctl.8
+++ /dev/null
@@ -1,287 +0,0 @@
-Index: bgpctl/bgpctl.8
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/bgpctl.8,v
-retrieving revision 1.1.1.6
-retrieving revision 1.6
-diff -u -p -r1.1.1.6 -r1.6
---- bgpctl/bgpctl.8	14 Feb 2010 20:20:13 -0000	1.1.1.6
-+++ bgpctl/bgpctl.8	13 Oct 2012 18:35:56 -0000	1.6
-@@ -1,4 +1,4 @@
--.\" $OpenBSD: bgpctl.8,v 1.49 2009/06/06 06:11:17 claudio Exp $
-+.\" $OpenBSD: bgpctl.8,v 1.59 2012/05/27 20:49:42 jmc Exp $
- .\"
- .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
- .\"
-@@ -14,7 +14,7 @@
- .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- .\"
--.Dd $Mdocdate: June 6 2009 $
-+.Dd $Mdocdate: May 27 2012 $
- .Dt BGPCTL 8
- .Os
- .Sh NAME
-@@ -32,8 +32,7 @@ The
- program controls the
- .Xr bgpd 8
- daemon.
--Commands to switch between displays may be abbreviated to the
--minimum unambiguous prefix; for example,
-+Commands may be abbreviated to the minimum unambiguous prefix; for example,
- .Cm s s
- for
- .Cm show summary .
-@@ -53,11 +52,19 @@ to communicate with
- .Pp
- The commands are as follows:
- .Bl -tag -width xxxxxx
--.It Cm fib couple
--Insert the learned routes into the Forwarding Information Base
-+.It Xo
-+.Cm fib
-+.Op Cm table Ar number
-+.Cm couple
-+.Xc
-+Insert the learned routes into the specified Forwarding Information Base
- a.k.a. the kernel routing table.
--.It Cm fib decouple
--Remove the learned routes from the Forwarding Information Base
-+.It Xo
-+.Cm fib
-+.Op Cm table Ar number
-+.Cm decouple
-+.Xc
-+Remove the learned routes from the specified Forwarding Information Base
- a.k.a. the kernel routing table.
- .It Xo
- .Cm irrfilter
-@@ -79,7 +86,15 @@ The options are as follows:
- Use
- .Ar directory
- to write the filter files to.
-+.It Fl 4
-+Fetch only IPv4 prefixes from the registry.
-+.It Fl 6
-+Fetch only IPv6 prefixes from the registry.
- .El
-+.It Cm log brief
-+Disable verbose debug logging.
-+.It Cm log verbose
-+Enable verbose debug logging.
- .It Cm neighbor Ar peer Cm up
- Take the BGP session to the specified neighbor up.
- .Ar peer
-@@ -98,12 +113,21 @@ Note that the neighbor is not obliged to
- all, even if it announced the route refresh capability.
- .Ar peer
- may be the neighbor's address or description.
--.It Cm network add Ar prefix
-+.It Cm network add Ar prefix Op Ar arguments
- Add the specified prefix to the list of announced networks.
-+It is possible to set various path attributes with additional
-+.Ar arguments .
- .It Cm network delete Ar prefix
- Remove the specified prefix from the list of announced networks.
- .It Cm network flush
- Remove all dynamically added prefixes from the list of announced networks.
-+.It Cm network mrt file Ar file filter
-+Import networks from an MRT table dump for debugging purposes.
-+.Ar filter
-+can be specified similarly to the
-+.Ar show mrt
-+command.
-+Only networks matching the filter will be imported.
- .It Cm network show Ar family
- Show all announced networks.
- .Ar family ,
-@@ -122,7 +146,7 @@ view of the Forwarding Information Base.
- can be an IP address, in which case the route to this address is shown,
- or a flag:
- .Pp
--.Bl -tag -width connected -compact
-+.Bl -tag -width tableXnumber -compact
- .It Cm connected
- Show only connected routes.
- .It Cm static
-@@ -133,9 +157,81 @@ Show only routes originating from
- itself.
- .It Cm nexthop
- Show only routes required to reach a BGP nexthop.
-+.It Cm inet
-+Show only IPv4 routes.
-+.It Cm inet6
-+Show only IPv6 routes.
-+.It Cm table Ar number
-+Show the routing table with ID
-+.Ar number
-+instead of the default routing table with ID 0.
- .El
- .It Cm show interfaces
- Show the interface states.
-+.It Xo
-+.Cm show mrt
-+.Op Ar options
-+.Ar filter
-+.Xc
-+Show routes from an MRT table dump file.
-+.Ar filter
-+can be an IP address, a CIDR prefix, an AS filter, a combination or nothing:
-+.Pp
-+.Bl -tag -width "address/len all" -compact
-+.It Ar address
-+Show best matching route for address.
-+.It Ar address Ns Li / Ns Ar len
-+Show RIB entry for this CIDR prefix.
-+.It Xo
-+.Ar address Ns Li / Ns Ar len
-+.Cm all
-+.Xc
-+Show all entries in the specified range.
-+.\".It Ar address/len Cm longer-prefixes
-+.It Cm as Ar as
-+Show all entries with
-+.Ar as
-+anywhere in the AS path.
-+.It Cm empty-as
-+Show all entries that are internal routes with no AS's in the AS path.
-+.It Cm neighbor Ar ip
-+Show only entries from the specified peer.
-+.It Cm peer-as Ar as
-+Show all entries with
-+.Ar as
-+as leftmost AS.
-+.It Cm source-as Ar as
-+Show all entries with
-+.Ar as
-+as rightmost AS.
-+.It Cm transit-as Ar as
-+Show all entries with
-+.Ar as
-+anywhere but rightmost.
-+.El
-+.Pp
-+Additionally, the following
-+.Ar options
-+are defined:
-+.Pp
-+.Bl -tag -width "file name" -compact
-+.It Cm detail
-+Show more detailed output for matching routes.
-+.It Ar family
-+Limit the output to the given address family.
-+.It Cm file Ar name
-+Read the MRT dump from file
-+.Ar name
-+instead of using stdin.
-+.El
-+.Pp
-+Multiple options and filters can be used at the same time.
-+.It Cm show summary
-+Show a list of all neighbors, including information about the session state
-+and message counters.
-+.It Cm show summary terse
-+Show a list of all neighbors, including information about the session state,
-+in a terse format.
- .It Cm show neighbor Ar peer modifier
- Show detailed information about the neighbor identified by
- .Ar peer ,
-@@ -183,33 +279,33 @@ Show all entries in the specified range.
- Show all entries with
- .Ar as
- anywhere in the AS path.
--.It Cm source-as Ar as
--Show all entries with
--.Ar as
--as rightmost AS.
--.It Cm transit-as Ar as
--Show all entries with
--.Ar as
--anywhere but rightmost.
--.It Cm peer-as Ar as
--Show all entries with
--.Ar as
--as leftmost AS.
--.It Cm empty-as
--Show all entries that are internal routes with no AS's in the AS path.
- .It Cm community Ar community
- Show all entries with community
- .Ar community .
-+.It Cm empty-as
-+Show all entries that are internal routes with no AS's in the AS path.
-+.It Cm memory
-+Show RIB memory statistics.
- .It Cm neighbor Ar peer
- Show only entries from the specified peer.
--.It Cm table Ar rib
--Show only entries from the specified RIB table.
-+.It Cm peer-as Ar as
-+Show all entries with
-+.Ar as
-+as leftmost AS.
-+.It Cm source-as Ar as
-+Show all entries with
-+.Ar as
-+as rightmost AS.
- .It Cm summary
- This is the same as the
- .Ic show summary
- command.
--.It Cm memory
--Show RIB memory statistics.
-+.It Cm table Ar rib
-+Show only entries from the specified RIB table.
-+.It Cm transit-as Ar as
-+Show all entries with
-+.Ar as
-+anywhere but rightmost.
- .El
- .Pp
- Additionally, the following
-@@ -217,8 +313,10 @@ Additionally, the following
- are defined:
- .Pp
- .Bl -tag -width "detail" -compact
-+.It Cm selected
-+Show only selected routes.
- .It Cm detail
--Show more detailed output for matched routes.
-+Show more detailed output for matching routes.
- .It Ar family
- Limit the output to the given address family.
- .It Cm in
-@@ -243,10 +341,12 @@ and message counters.
- .It Cm show summary terse
- Show a list of all neighbors, including information about the session state,
- in a terse format.
-+.It Cm show tables
-+Show a list of all currently loaded fib routing tables.
- .El
- .Sh FILES
- .Bl -tag -width "/var/run/bgpd.sockXXX" -compact
--.It Pa /etc/bgpd.conf
-+.It Pa %%PREFIX%%/etc/bgpd.conf
- default
- .Xr bgpd 8
- configuration file
-@@ -260,10 +360,19 @@ control socket
- .Xr bgpd 8 ,
- .Xr bgplg 8 ,
- .Xr bgplgsh 8
-+.Sh STANDARDS
- .Rs
--.%R RFC 2622
--.%T "Routing Policy Specification Language (RPSL)"
-+.%A C. Alaettinoglu
-+.%A C. Villamizar
-+.%A E. Gerich
-+.%A D. Kessens
-+.%A D. Meyer
-+.%A T. Bates
-+.%A D. Karrenberg
-+.%A M. Terpstra
- .%D June 1999
-+.%R RFC 2622
-+.%T Routing Policy Specification Language (RPSL)
- .Re
- .Sh HISTORY
- The
diff --git a/net/openbgpd/files/patch-bgpctl_bgpctl.c b/net/openbgpd/files/patch-bgpctl_bgpctl.c
deleted file mode 100644
index 1553efc83281..000000000000
--- a/net/openbgpd/files/patch-bgpctl_bgpctl.c
+++ /dev/null
@@ -1,1529 +0,0 @@
-Index: bgpctl/bgpctl.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/bgpctl.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.10
-diff -u -p -r1.1.1.7 -r1.10
---- bgpctl/bgpctl.c	14 Feb 2010 20:20:14 -0000	1.1.1.7
-+++ bgpctl/bgpctl.c	8 Dec 2012 20:17:55 -0000	1.10
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: bgpctl.c,v 1.142 2009/06/06 06:33:15 eric Exp $ */
-+/*	$OpenBSD: bgpctl.c,v 1.167 2012/11/15 19:55:08 sthen Exp $ */
- 
- /*
-  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
-@@ -16,11 +16,19 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#if defined(__FreeBSD__)	/* compat */
-+#include "openbsd-compat.h"
-+#endif /* defined(__FreeBSD__) */
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <net/if.h>
-+#if defined(__FreeBSD__)	/* net/if_media.h */
-+#include "if_media.h"
-+#else
- #include <net/if_media.h>
-+#endif /* defined(__FreeBSD__) */
- #include <net/if_types.h>
- 
- #include <err.h>
-@@ -29,7 +37,11 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#if defined(__FreeBSD__)	/* util.h */
-+#include "util.h"
-+#else
- #include <util.h>
-+#endif /* defined(__FreeBSD__) */
- 
- #include "bgpd.h"
- #include "session.h"
-@@ -37,6 +49,11 @@
- #include "log.h"
- #include "parser.h"
- #include "irrfilter.h"
-+#include "mrtparser.h"
-+
-+#if defined(__FreeBSD__) /* FreeBSD has no LINK_STATE_IS_UP macro. */
-+#define LINK_STATE_IS_UP(_s)  ((_s) >= LINK_STATE_UP)
-+#endif /* defined(__FreeBSD__) */ 
- 
- enum neighbor_views {
- 	NV_DEFAULT,
-@@ -50,12 +67,14 @@ int		 show_summary_msg(struct imsg *, in
- int		 show_summary_terse_msg(struct imsg *, int);
- int		 show_neighbor_terse(struct imsg *);
- int		 show_neighbor_msg(struct imsg *, enum neighbor_views);
--void		 print_neighbor_capa_mp_safi(u_int8_t);
-+void		 print_neighbor_capa_mp(struct peer *);
-+void		 print_neighbor_capa_restart(struct peer *);
- void		 print_neighbor_msgstats(struct peer *);
- void		 print_timer(const char *, time_t);
- static char	*fmt_timeframe(time_t t);
- static char	*fmt_timeframe_core(time_t t);
- void		 show_fib_head(void);
-+void		 show_fib_tables_head(void);
- void		 show_network_head(void);
- void		 show_fib_flags(u_int16_t);
- int		 show_fib_msg(struct imsg *);
-@@ -65,7 +84,7 @@ void		 show_interface_head(void);
- int		 ift2ifm(int);
- const char *	 get_media_descr(int);
- const char *	 get_linkstate(int, int);
--void		 print_baudrate(u_int64_t);
-+const char *	 get_baudrate(u_int64_t, char *);
- int		 show_interface_msg(struct imsg *);
- void		 show_rib_summary_head(void);
- void		 print_prefix(struct bgpd_addr *, u_int8_t, u_int8_t);
-@@ -73,16 +92,25 @@ const char *	 print_origin(u_int8_t, int
- void		 print_flags(u_int8_t, int);
- int		 show_rib_summary_msg(struct imsg *);
- int		 show_rib_detail_msg(struct imsg *, int);
-+void		 show_rib_brief(struct ctl_show_rib *, u_char *);
-+void		 show_rib_detail(struct ctl_show_rib *, u_char *, int);
-+void		 show_attr(void *, u_int16_t);
- void		 show_community(u_char *, u_int16_t);
--const char	*get_ext_subtype(u_int8_t);
- void		 show_ext_community(u_char *, u_int16_t);
- char		*fmt_mem(int64_t);
- int		 show_rib_memory_msg(struct imsg *);
- void		 send_filterset(struct imsgbuf *, struct filter_set_head *);
- static const char	*get_errstr(u_int8_t, u_int8_t);
- int		 show_result(struct imsg *);
-+void		 show_mrt_dump(struct mrt_rib *, struct mrt_peer *, void *);
-+void		 network_mrt_dump(struct mrt_rib *, struct mrt_peer *, void *);
-+void		 show_mrt_state(struct mrt_bgp_state *, void *);
-+void		 show_mrt_msg(struct mrt_bgp_msg *, void *);
-+void		 mrt_to_bgpd_addr(union mrt_addr *, struct bgpd_addr *);
- 
- struct imsgbuf	*ibuf;
-+struct mrt_parser show_mrt = { show_mrt_dump, show_mrt_state, show_mrt_msg };
-+struct mrt_parser net_mrt = { network_mrt_dump, NULL, NULL };
- 
- __dead void
- usage(void)
-@@ -98,7 +126,7 @@ int
- main(int argc, char *argv[])
- {
- 	struct sockaddr_un	 sun;
--	int			 fd, n, done, ch, nodescr = 0;
-+	int			 fd, n, done, ch, nodescr = 0, verbose = 0;
- 	struct imsg		 imsg;
- 	struct network_config	 net;
- 	struct parse_result	*res;
-@@ -128,8 +156,11 @@ main(int argc, char *argv[])
- 	if ((res = parse(argc, argv)) == NULL)
- 		exit(1);
- 
--	if (res->action == IRRFILTER)
-+	if (res->action == IRRFILTER) {
-+		if (!(res->flags & (F_IPV4|F_IPV6)))
-+			res->flags |= (F_IPV4|F_IPV6);
- 		irr_main(res->as.as, res->flags, res->irr_outdir);
-+	}
- 
- 	memcpy(&neighbor.addr, &res->peeraddr, sizeof(neighbor.addr));
- 	strlcpy(neighbor.descr, res->peerdesc, sizeof(neighbor.descr));
-@@ -154,7 +185,7 @@ main(int argc, char *argv[])
- 	case NONE:
- 	case IRRFILTER:
- 		usage();
--		/* not reached */
-+		/* NOTREACHED */
- 	case SHOW:
- 	case SHOW_SUMMARY:
- 		imsg_compose(ibuf, IMSG_CTL_SHOW_NEIGHBOR, 0, 0, -1, NULL, 0);
-@@ -164,24 +195,32 @@ main(int argc, char *argv[])
- 		imsg_compose(ibuf, IMSG_CTL_SHOW_TERSE, 0, 0, -1, NULL, 0);
- 		break;
- 	case SHOW_FIB:
--		if (!res->addr.af) {
--			struct buf	*msg;
--
--			if ((msg = imsg_create(ibuf, IMSG_CTL_KROUTE, 0, 0,
--			    sizeof(res->flags) + sizeof(res->af))) == NULL)
-+		if (!res->addr.aid) {
-+			struct ibuf	*msg;
-+			sa_family_t	 af;
-+
-+			af = aid2af(res->aid);
-+			if ((msg = imsg_create(ibuf, IMSG_CTL_KROUTE,
-+			    res->rtableid, 0, sizeof(res->flags) +
-+			    sizeof(af))) == NULL)
- 				errx(1, "imsg_create failure");
- 			if (imsg_add(msg, &res->flags, sizeof(res->flags)) ==
- 			    -1 ||
--			    imsg_add(msg, &res->af, sizeof(res->af)) == -1)
-+			    imsg_add(msg, &af, sizeof(af)) == -1)
- 				errx(1, "imsg_add failure");
- 			imsg_close(ibuf, msg);
- 		} else
--			imsg_compose(ibuf, IMSG_CTL_KROUTE_ADDR, 0, 0, -1,
--			    &res->addr, sizeof(res->addr));
-+			imsg_compose(ibuf, IMSG_CTL_KROUTE_ADDR, res->rtableid,
-+			    0, -1, &res->addr, sizeof(res->addr));
- 		show_fib_head();
- 		break;
-+	case SHOW_FIB_TABLES:
-+		imsg_compose(ibuf, IMSG_CTL_SHOW_FIB_TABLES, 0, 0, -1, NULL, 0);
-+		show_fib_tables_head();
-+		break;
- 	case SHOW_NEXTHOP:
--		imsg_compose(ibuf, IMSG_CTL_SHOW_NEXTHOP, 0, 0, -1, NULL, 0);
-+		imsg_compose(ibuf, IMSG_CTL_SHOW_NEXTHOP, res->rtableid, 0, -1,
-+		    NULL, 0);
- 		show_nexthop_head();
- 		break;
- 	case SHOW_INTERFACE:
-@@ -192,7 +231,7 @@ main(int argc, char *argv[])
- 	case SHOW_NEIGHBOR_TIMERS:
- 	case SHOW_NEIGHBOR_TERSE:
- 		neighbor.show_timers = (res->action == SHOW_NEIGHBOR_TIMERS);
--		if (res->peeraddr.af || res->peerdesc[0])
-+		if (res->peeraddr.aid || res->peerdesc[0])
- 			imsg_compose(ibuf, IMSG_CTL_SHOW_NEIGHBOR, 0, 0, -1,
- 			    &neighbor, sizeof(neighbor));
- 		else
-@@ -206,7 +245,7 @@ main(int argc, char *argv[])
- 			memcpy(&ribreq.as, &res->as, sizeof(res->as));
- 			type = IMSG_CTL_SHOW_RIB_AS;
- 		}
--		if (res->addr.af) {
-+		if (res->addr.aid) {
- 			memcpy(&ribreq.prefix, &res->addr, sizeof(res->addr));
- 			ribreq.prefixlen = res->prefixlen;
- 			type = IMSG_CTL_SHOW_RIB_PREFIX;
-@@ -217,15 +256,35 @@ main(int argc, char *argv[])
- 			    sizeof(res->community));
- 			type = IMSG_CTL_SHOW_RIB_COMMUNITY;
- 		}
--		memcpy(&ribreq.neighbor, &neighbor,
--		    sizeof(ribreq.neighbor));
-+		memcpy(&ribreq.neighbor, &neighbor, sizeof(ribreq.neighbor));
- 		strlcpy(ribreq.rib, res->rib, sizeof(ribreq.rib));
--		ribreq.af = res->af;
-+		ribreq.aid = res->aid;
- 		ribreq.flags = res->flags;
- 		imsg_compose(ibuf, type, 0, 0, -1, &ribreq, sizeof(ribreq));
- 		if (!(res->flags & F_CTL_DETAIL))
- 			show_rib_summary_head();
- 		break;
-+	case SHOW_MRT:
-+		close(fd);
-+		bzero(&ribreq, sizeof(ribreq));
-+		if (res->as.type != AS_NONE)
-+			memcpy(&ribreq.as, &res->as, sizeof(res->as));
-+		if (res->addr.aid) {
-+			memcpy(&ribreq.prefix, &res->addr, sizeof(res->addr));
-+			ribreq.prefixlen = res->prefixlen;
-+		}
-+		if (res->community.as != COMMUNITY_UNSET &&
-+		    res->community.type != COMMUNITY_UNSET)
-+			memcpy(&ribreq.community, &res->community,
-+			    sizeof(res->community));
-+		memcpy(&ribreq.neighbor, &neighbor, sizeof(ribreq.neighbor));
-+		ribreq.aid = res->aid;
-+		ribreq.flags = res->flags;
-+		show_mrt.arg = &ribreq;
-+		if (!(res->flags & F_CTL_DETAIL))
-+			show_rib_summary_head();
-+		mrt_parse(res->mrtfd, &show_mrt, 1);
-+		exit(0);
- 	case SHOW_RIB_MEM:
- 		imsg_compose(ibuf, IMSG_CTL_SHOW_RIB_MEM, 0, 0, -1, NULL, 0);
- 		break;
-@@ -237,12 +296,14 @@ main(int argc, char *argv[])
- 		errx(1, "action==FIB");
- 		break;
- 	case FIB_COUPLE:
--		imsg_compose(ibuf, IMSG_CTL_FIB_COUPLE, 0, 0, -1, NULL, 0);
-+		imsg_compose(ibuf, IMSG_CTL_FIB_COUPLE, res->rtableid, 0, -1,
-+		    NULL, 0);
- 		printf("couple request sent.\n");
- 		done = 1;
- 		break;
- 	case FIB_DECOUPLE:
--		imsg_compose(ibuf, IMSG_CTL_FIB_DECOUPLE, 0, 0, -1, NULL, 0);
-+		imsg_compose(ibuf, IMSG_CTL_FIB_DECOUPLE, res->rtableid, 0, -1,
-+		    NULL, 0);
- 		printf("decouple request sent.\n");
- 		done = 1;
- 		break;
-@@ -290,12 +351,40 @@ main(int argc, char *argv[])
- 		break;
- 	case NETWORK_SHOW:
- 		bzero(&ribreq, sizeof(ribreq));
--		ribreq.af = res->af;
-+		ribreq.aid = res->aid;
- 		strlcpy(ribreq.rib, res->rib, sizeof(ribreq.rib));
- 		imsg_compose(ibuf, IMSG_CTL_SHOW_NETWORK, 0, 0, -1,
- 		    &ribreq, sizeof(ribreq));
- 		show_network_head();
- 		break;
-+	case NETWORK_MRT:
-+		bzero(&ribreq, sizeof(ribreq));
-+		if (res->as.type != AS_NONE)
-+			memcpy(&ribreq.as, &res->as, sizeof(res->as));
-+		if (res->addr.aid) {
-+			memcpy(&ribreq.prefix, &res->addr, sizeof(res->addr));
-+			ribreq.prefixlen = res->prefixlen;
-+		}
-+		if (res->community.as != COMMUNITY_UNSET &&
-+		    res->community.type != COMMUNITY_UNSET)
-+			memcpy(&ribreq.community, &res->community,
-+			    sizeof(res->community));
-+		memcpy(&ribreq.neighbor, &neighbor, sizeof(ribreq.neighbor));
-+		ribreq.aid = res->aid;
-+		ribreq.flags = res->flags;
-+		net_mrt.arg = &ribreq;
-+		mrt_parse(res->mrtfd, &net_mrt, 1);
-+		done = 1;
-+		break;
-+	case LOG_VERBOSE:
-+		verbose = 1;
-+		/* FALLTHROUGH */
-+	case LOG_BRIEF:
-+		imsg_compose(ibuf, IMSG_CTL_LOG_VERBOSE, 0, 0, -1,
-+		    &verbose, sizeof(verbose));
-+		printf("logging request sent.\n");
-+		done = 1;
-+		break;
- 	}
- 
- 	while (ibuf->w.queued)
-@@ -304,13 +393,13 @@ main(int argc, char *argv[])
- 
- 	while (!done) {
- 		if ((n = imsg_read(ibuf)) == -1)
--			errx(1, "imsg_read error");
-+			err(1, "imsg_read error");
- 		if (n == 0)
- 			errx(1, "pipe closed");
- 
- 		while (!done) {
- 			if ((n = imsg_get(ibuf, &imsg)) == -1)
--				errx(1, "imsg_get error");
-+				err(1, "imsg_get error");
- 			if (n == 0)
- 				break;
- 
-@@ -329,6 +418,8 @@ main(int argc, char *argv[])
- 				done = show_summary_terse_msg(&imsg, nodescr);
- 				break;
- 			case SHOW_FIB:
-+			case SHOW_FIB_TABLES:
-+			case NETWORK_SHOW:
- 				done = show_fib_msg(&imsg);
- 				break;
- 			case SHOW_NEXTHOP:
-@@ -356,9 +447,6 @@ main(int argc, char *argv[])
- 			case SHOW_RIB_MEM:
- 				done = show_rib_memory_msg(&imsg);
- 				break;
--			case NETWORK_SHOW:
--				done = show_fib_msg(&imsg);
--				break;
- 			case NEIGHBOR:
- 			case NEIGHBOR_UP:
- 			case NEIGHBOR_DOWN:
-@@ -373,6 +461,10 @@ main(int argc, char *argv[])
- 			case NETWORK_REMOVE:
- 			case NETWORK_FLUSH:
- 			case IRRFILTER:
-+			case LOG_VERBOSE:
-+			case LOG_BRIEF:
-+			case SHOW_MRT:
-+			case NETWORK_MRT:
- 				break;
- 			}
- 			imsg_free(&imsg);
-@@ -398,8 +490,8 @@ fmt_peer(const char *descr, const struct
- 	}
- 
- 	ip = log_addr(remote_addr);
--	if (masklen != -1 && ((remote_addr->af == AF_INET && masklen != 32) ||
--	    (remote_addr->af == AF_INET6 && masklen != 128))) {
-+	if (masklen != -1 && ((remote_addr->aid == AID_INET && masklen != 32) ||
-+	    (remote_addr->aid == AID_INET6 && masklen != 128))) {
- 		if (asprintf(&p, "%s/%u", ip, masklen) == -1)
- 			err(1, NULL);
- 	} else {
-@@ -430,7 +522,7 @@ show_summary_msg(struct imsg *imsg, int 
- 		    p->conf.remote_masklen, nodescr);
- 		if (strlen(s) >= 20)
- 			s[20] = 0;
--		printf("%-20s %8s %10llu %10llu %5u %-8s ",
-+		printf("%-20s %8s %10" PRIu64 " %10" PRIu64 " %5u %-8s ",
- 		    s, log_as(p->conf.remote_as),
- 		    p->stats.msg_rcvd_open + p->stats.msg_rcvd_notification +
- 		    p->stats.msg_rcvd_update + p->stats.msg_rcvd_keepalive +
-@@ -492,8 +584,8 @@ show_neighbor_terse(struct imsg *imsg)
- 	switch (imsg->hdr.type) {
- 	case IMSG_CTL_SHOW_NEIGHBOR:
- 		p = imsg->data;
--		printf("%llu %llu %llu %llu %llu %llu %llu "
--		    "%llu %llu %llu %u %u %llu %llu %llu %llu\n",
-+		printf("%" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " "
-+		    "%" PRIu64 " %" PRIu64 " %" PRIu64 " %u %u %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 "\n",
- 		    p->stats.msg_sent_open, p->stats.msg_rcvd_open,
- 		    p->stats.msg_sent_notification,
- 		    p->stats.msg_rcvd_notification,
-@@ -521,13 +613,15 @@ show_neighbor_msg(struct imsg *imsg, enu
- 	struct ctl_timer	*t;
- 	struct in_addr		 ina;
- 	char			 buf[NI_MAXHOST], pbuf[NI_MAXSERV], *s;
-+	int			 hascapamp = 0;
-+	u_int8_t		 i;
- 
- 	switch (imsg->hdr.type) {
- 	case IMSG_CTL_SHOW_NEIGHBOR:
- 		p = imsg->data;
--		if ((p->conf.remote_addr.af == AF_INET &&
-+		if ((p->conf.remote_addr.aid == AID_INET &&
- 		    p->conf.remote_masklen != 32) ||
--		    (p->conf.remote_addr.af == AF_INET6 &&
-+		    (p->conf.remote_addr.aid == AID_INET6 &&
- 		    p->conf.remote_masklen != 128)) {
- 			if (asprintf(&s, "%s/%u",
- 			    log_addr(&p->conf.remote_addr),
-@@ -549,9 +643,20 @@ show_neighbor_msg(struct imsg *imsg, enu
- 			printf(", Template");
- 		if (p->conf.cloned)
- 			printf(", Cloned");
-+		if (p->conf.passive)
-+			printf(", Passive");
-+		if (p->conf.ebgp && p->conf.distance > 1)
-+			printf(", Multihop (%u)", (int)p->conf.distance);
- 		printf("\n");
- 		if (p->conf.descr[0])
- 			printf(" Description: %s\n", p->conf.descr);
-+		if (p->conf.max_prefix) {
-+			printf(" Max-prefix: %u", p->conf.max_prefix);
-+			if (p->conf.max_prefix_restart)
-+				printf(" (restart %u)",
-+				    p->conf.max_prefix_restart);
-+			printf("\n");
-+		}
- 		printf("  BGP version 4, remote router-id %s\n",
- 		    inet_ntoa(ina));
- 		printf("  BGP state = %s", statenames[p->state]);
-@@ -563,22 +668,24 @@ show_neighbor_msg(struct imsg *imsg, enu
- 		printf("  Last read %s, holdtime %us, keepalive interval %us\n",
- 		    fmt_timeframe(p->stats.last_read),
- 		    p->holdtime, p->holdtime/3);
--		if (p->capa.peer.mp_v4 || p->capa.peer.mp_v6 ||
--		    p->capa.peer.refresh || p->capa.peer.restart ||
--		    p->capa.peer.as4byte) {
-+		for (i = 0; i < AID_MAX; i++)
-+			if (p->capa.peer.mp[i])
-+				hascapamp = 1;
-+		if (hascapamp || p->capa.peer.refresh ||
-+		    p->capa.peer.grestart.restart || p->capa.peer.as4byte) {
- 			printf("  Neighbor capabilities:\n");
--			if (p->capa.peer.mp_v4) {
--				printf("    Multiprotocol extensions: IPv4");
--				print_neighbor_capa_mp_safi(p->capa.peer.mp_v4);
--			}
--			if (p->capa.peer.mp_v6) {
--				printf("    Multiprotocol extensions: IPv6");
--				print_neighbor_capa_mp_safi(p->capa.peer.mp_v6);
-+			if (hascapamp) {
-+				printf("    Multiprotocol extensions: ");
-+				print_neighbor_capa_mp(p);
-+				printf("\n");
- 			}
- 			if (p->capa.peer.refresh)
- 				printf("    Route Refresh\n");
--			if (p->capa.peer.restart)
--				printf("    Graceful Restart\n");
-+			if (p->capa.peer.grestart.restart) {
-+				printf("    Graceful Restart");
-+				print_neighbor_capa_restart(p);
-+				printf("\n");
-+			}
- 			if (p->capa.peer.as4byte)
- 				printf("    4-byte AS numbers\n");
- 		}
-@@ -633,20 +740,38 @@ show_neighbor_msg(struct imsg *imsg, enu
- }
- 
- void
--print_neighbor_capa_mp_safi(u_int8_t safi)
-+print_neighbor_capa_mp(struct peer *p)
- {
--	switch (safi) {
--	case SAFI_UNICAST:
--		printf(" Unicast");
--		break;
--	case SAFI_MULTICAST:
--		printf(" Multicast");
--		break;
--	default:
--		printf(" unknown (%u)", safi);
--		break;
--	}
--	printf("\n");
-+	int		comma;
-+	u_int8_t	i;
-+
-+	for (i = 0, comma = 0; i < AID_MAX; i++)
-+		if (p->capa.peer.mp[i]) {
-+			printf("%s%s", comma ? ", " : "", aid2str(i));
-+			comma = 1;
-+		}
-+}
-+
-+void
-+print_neighbor_capa_restart(struct peer *p)
-+{
-+	int		comma;
-+	u_int8_t	i;
-+
-+	if (p->capa.peer.grestart.timeout)
-+		printf(": Timeout: %d, ", p->capa.peer.grestart.timeout);
-+	for (i = 0, comma = 0; i < AID_MAX; i++)
-+		if (p->capa.peer.grestart.flags[i] & CAPA_GR_PRESENT) {
-+			if (!comma &&
-+			    p->capa.peer.grestart.flags[i] & CAPA_GR_RESTART)
-+				printf("restarted, ");
-+			if (comma)
-+				printf(", ");
-+			printf("%s", aid2str(i));
-+			if (p->capa.peer.grestart.flags[i] & CAPA_GR_FORWARD)
-+				printf(" (preserved)");
-+			comma = 1;
-+		}
- }
- 
- void
-@@ -654,17 +779,17 @@ print_neighbor_msgstats(struct peer *p)
- {
- 	printf("  Message statistics:\n");
- 	printf("  %-15s %-10s %-10s\n", "", "Sent", "Received");
--	printf("  %-15s %10llu %10llu\n", "Opens",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "Opens",
- 	    p->stats.msg_sent_open, p->stats.msg_rcvd_open);
--	printf("  %-15s %10llu %10llu\n", "Notifications",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "Notifications",
- 	    p->stats.msg_sent_notification, p->stats.msg_rcvd_notification);
--	printf("  %-15s %10llu %10llu\n", "Updates",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "Updates",
- 	    p->stats.msg_sent_update, p->stats.msg_rcvd_update);
--	printf("  %-15s %10llu %10llu\n", "Keepalives",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "Keepalives",
- 	    p->stats.msg_sent_keepalive, p->stats.msg_rcvd_keepalive);
--	printf("  %-15s %10llu %10llu\n", "Route Refresh",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "Route Refresh",
- 	    p->stats.msg_sent_rrefresh, p->stats.msg_rcvd_rrefresh);
--	printf("  %-15s %10llu %10llu\n\n", "Total",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n\n", "Total",
- 	    p->stats.msg_sent_open + p->stats.msg_sent_notification +
- 	    p->stats.msg_sent_update + p->stats.msg_sent_keepalive +
- 	    p->stats.msg_sent_rrefresh,
-@@ -673,14 +798,16 @@ print_neighbor_msgstats(struct peer *p)
- 	    p->stats.msg_rcvd_rrefresh);
- 	printf("  Update statistics:\n");
- 	printf("  %-15s %-10s %-10s\n", "", "Sent", "Received");
--	printf("  %-15s %10llu %10llu\n", "Updates",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "Updates",
- 	    p->stats.prefix_sent_update, p->stats.prefix_rcvd_update);
--	printf("  %-15s %10llu %10llu\n", "Withdraws",
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "Withdraws",
- 	    p->stats.prefix_sent_withdraw, p->stats.prefix_rcvd_withdraw);
-+	printf("  %-15s %10" PRIu64 " %10" PRIu64 "\n", "End-of-Rib",
-+	    p->stats.prefix_sent_eor, p->stats.prefix_rcvd_eor);
- }
- 
- void
--print_timer(const char *name, timer_t d)
-+print_timer(const char *name, time_t d)
- {
- 	printf("  %-20s ", name);
- 
-@@ -745,6 +872,12 @@ show_fib_head(void)
- }
- 
- void
-+show_fib_tables_head(void)
-+{
-+	printf("%-5s %-20s %-8s\n", "Table", "Description", "State");
-+}
-+
-+void
- show_network_head(void)
- {
- 	printf("flags: S = Static\n");
-@@ -788,56 +921,44 @@ show_fib_flags(u_int16_t flags)
- int
- show_fib_msg(struct imsg *imsg)
- {
--	struct kroute		*k;
--	struct kroute6		*k6;
-+	struct kroute_full	*kf;
-+	struct ktable		*kt;
- 	char			*p;
- 
- 	switch (imsg->hdr.type) {
- 	case IMSG_CTL_KROUTE:
- 	case IMSG_CTL_SHOW_NETWORK:
--		if (imsg->hdr.len < IMSG_HEADER_SIZE + sizeof(struct kroute))
-+		if (imsg->hdr.len < IMSG_HEADER_SIZE + sizeof(*kf))
- 			errx(1, "wrong imsg len");
--		k = imsg->data;
-+		kf = imsg->data;
- 
--		show_fib_flags(k->flags);
-+		show_fib_flags(kf->flags);
- 
--		if (asprintf(&p, "%s/%u", inet_ntoa(k->prefix), k->prefixlen) ==
--		    -1)
-+		if (asprintf(&p, "%s/%u", log_addr(&kf->prefix),
-+		    kf->prefixlen) == -1)
- 			err(1, NULL);
--		printf("%4i %-20s ", k->priority, p);
-+		printf("%4i %-20s ", kf->priority, p);
- 		free(p);
- 
--		if (k->nexthop.s_addr)
--			printf("%s", inet_ntoa(k->nexthop));
--		else if (k->flags & F_CONNECTED)
--			printf("link#%u", k->ifindex);
-+		if (kf->flags & F_CONNECTED)
-+			printf("link#%u", kf->ifindex);
-+		else
-+			printf("%s", log_addr(&kf->nexthop));
- 		printf("\n");
- 
- 		break;
--	case IMSG_CTL_KROUTE6:
--	case IMSG_CTL_SHOW_NETWORK6:
--		if (imsg->hdr.len < IMSG_HEADER_SIZE + sizeof(struct kroute6))
-+	case IMSG_CTL_SHOW_FIB_TABLES:
-+		if (imsg->hdr.len < IMSG_HEADER_SIZE + sizeof(*kt))
- 			errx(1, "wrong imsg len");
--		k6 = imsg->data;
--
--		show_fib_flags(k6->flags);
-+		kt = imsg->data;
- 
--		if (asprintf(&p, "%s/%u", log_in6addr(&k6->prefix),
--		    k6->prefixlen) == -1)
--			err(1, NULL);
--		printf("%4i %-20s ", k6->priority, p);
--		free(p);
--
--		if (!IN6_IS_ADDR_UNSPECIFIED(&k6->nexthop))
--			printf("%s", log_in6addr(&k6->nexthop));
--		else if (k6->flags & F_CONNECTED)
--			printf("link#%u", k6->ifindex);
--		printf("\n");
-+		printf("%5i %-20s %-8s%s\n", kt->rtableid, kt->descr,
-+		    kt->fib_sync ? "coupled" : "decoupled",
-+		    kt->fib_sync != kt->fib_conf ? "*" : "");
- 
- 		break;
- 	case IMSG_CTL_END:
- 		return (1);
--		break;
- 	default:
- 		break;
- 	}
-@@ -848,35 +969,70 @@ show_fib_msg(struct imsg *imsg)
- void
- show_nexthop_head(void)
- {
--	printf("%-20s %-10s\n", "Nexthop", "State");
-+	printf("Flags: * = nexthop valid\n");
-+	printf("\n  %-15s %-19s%-4s %-15s %-20s\n", "Nexthop", "Route",
-+	     "Prio", "Gateway", "Iface");
- }
- 
- int
- show_nexthop_msg(struct imsg *imsg)
- {
- 	struct ctl_show_nexthop	*p;
--	int			 ifms_type;
-+	struct kroute		*k;
-+	struct kroute6		*k6;
-+	char			*s;
- 
- 	switch (imsg->hdr.type) {
- 	case IMSG_CTL_SHOW_NEXTHOP:
- 		p = imsg->data;
--		printf("%-20s %-10s", log_addr(&p->addr),
--		    p->valid ? "valid" : "invalid");
-+		printf("%s %-15s ", p->valid ? "*" : " ", log_addr(&p->addr));
-+		if (!p->krvalid) {
-+			printf("\n");
-+			return (0);
-+		}
-+		switch (p->addr.aid) {
-+		case AID_INET:
-+			k = &p->kr.kr4;
-+			if (asprintf(&s, "%s/%u", inet_ntoa(k->prefix),
-+			    k->prefixlen) == -1)
-+				err(1, NULL);
-+			printf("%-20s", s);
-+			free(s);
-+			printf("%3i %-15s ", k->priority,
-+			    k->flags & F_CONNECTED ? "connected" :
-+			    inet_ntoa(k->nexthop));
-+			break;
-+		case AID_INET6:
-+			k6 = &p->kr.kr6;
-+			if (asprintf(&s, "%s/%u", log_in6addr(&k6->prefix),
-+			    k6->prefixlen) == -1)
-+				err(1, NULL);
-+			printf("%-20s", s);
-+			free(s);
-+			printf("%3i %-15s ", k6->priority,
-+			    k6->flags & F_CONNECTED ? "connected" :
-+			    log_in6addr(&k6->nexthop));
-+			break;
-+		default:
-+			printf("unknown address family\n");
-+			return (0);
-+		}
- 		if (p->kif.ifname[0]) {
--			printf("%-8s", p->kif.ifname);
--			if (p->kif.flags & IFF_UP) {
--				printf("UP");
--				ifms_type = ift2ifm(p->kif.media_type);
--				if (ifms_type != 0)
--					printf(", %s, %s",
--					    get_media_descr(ifms_type),
--					    get_linkstate(ifms_type,
--					    p->kif.link_state));
--				if (p->kif.baudrate) {
--					printf(", ");
--					print_baudrate(p->kif.baudrate);
--				}
--			}
-+			char *s1;
-+			if (p->kif.baudrate) {
-+				if (asprintf(&s1, ", %s",
-+				    get_baudrate(p->kif.baudrate,
-+				    "bps")) == -1)
-+					err(1, NULL);
-+			} else if (asprintf(&s1, ", %s", get_linkstate(
-+			    p->kif.media_type, p->kif.link_state)) == -1)
-+					err(1, NULL);
-+			if (asprintf(&s, "%s (%s%s)", p->kif.ifname,
-+			    p->kif.flags & IFF_UP ? "UP" : "DOWN", s1) == -1)
-+				err(1, NULL);
-+			printf("%-15s", s);
-+			free(s1);
-+			free(s);
- 		}
- 		printf("\n");
- 		break;
-@@ -898,9 +1054,8 @@ show_interface_head(void)
- 	    "Link state");
- }
- 
--const int	ifm_status_valid_list[] = IFM_STATUS_VALID_LIST;
--const struct ifmedia_status_description
--		ifm_status_descriptions[] = IFM_STATUS_DESCRIPTIONS;
-+const struct if_status_description
-+		if_status_descriptions[] = LINK_STATE_DESCRIPTIONS;
- const struct ifmedia_description
- 		ifm_type_descriptions[] = IFM_TYPE_DESCRIPTIONS;
- 
-@@ -936,36 +1091,36 @@ get_media_descr(int media_type)
- const char *
- get_linkstate(int media_type, int link_state)
- {
--	const struct ifmedia_status_description	*p;
--	int					 i;
--
--	if (link_state == LINK_STATE_UNKNOWN)
--		return ("unknown");
--
--	for (i = 0; ifm_status_valid_list[i] != 0; i++)
--		for (p = ifm_status_descriptions; p->ifms_valid != 0; p++) {
--			if (p->ifms_type != media_type ||
--			    p->ifms_valid != ifm_status_valid_list[i])
--				continue;
--			if (LINK_STATE_IS_UP(link_state))
--				return (p->ifms_string[1]);
--			return (p->ifms_string[0]);
--		}
-+	const struct if_status_description *p;
-+	static char buf[8];
- 
--	return ("unknown link state");
-+	for (p = if_status_descriptions; p->ifs_string != NULL; p++) {
-+		if (LINK_STATE_DESC_MATCH(p, media_type, link_state))
-+			return (p->ifs_string);
-+	}
-+	snprintf(buf, sizeof(buf), "[#%d]", link_state);
-+	return (buf);
- }
- 
--void
--print_baudrate(u_int64_t baudrate)
-+const char *
-+get_baudrate(u_int64_t baudrate, char *unit)
- {
-+	static char bbuf[16];
-+
- 	if (baudrate > IF_Gbps(1))
--		printf("%llu GBit/s", baudrate / IF_Gbps(1));
-+		snprintf(bbuf, sizeof(bbuf), "%" PRIu64 " G%s",
-+		    baudrate / IF_Gbps(1), unit);
- 	else if (baudrate > IF_Mbps(1))
--		printf("%llu MBit/s", baudrate / IF_Mbps(1));
-+		snprintf(bbuf, sizeof(bbuf), "%" PRIu64 " M%s",
-+		    baudrate / IF_Mbps(1), unit);
- 	else if (baudrate > IF_Kbps(1))
--		printf("%llu KBit/s", baudrate / IF_Kbps(1));
-+		snprintf(bbuf, sizeof(bbuf), "%" PRIu64 " K%s",
-+		    baudrate / IF_Kbps(1), unit);
- 	else
--		printf("%llu Bit/s", baudrate);
-+		snprintf(bbuf, sizeof(bbuf), "%" PRIu64 " %s",
-+		    baudrate, unit);
-+
-+	return (bbuf);
- }
- 
- int
-@@ -982,17 +1137,12 @@ show_interface_msg(struct imsg *imsg)
- 		printf("%-15s", k->flags & IFF_UP ? "UP" : "");
- 
- 		if ((ifms_type = ift2ifm(k->media_type)) != 0)
--			printf("%s, %s", get_media_descr(ifms_type),
--			    get_linkstate(ifms_type, k->link_state));
--		else if (k->link_state == LINK_STATE_UNKNOWN)
--			printf("unknown");
--		else
--			printf("link state %u", k->link_state);
-+			printf("%s, ", get_media_descr(ifms_type));
- 
--		if (k->link_state != LINK_STATE_DOWN && k->baudrate > 0) {
--			printf(", ");
--			print_baudrate(k->baudrate);
--		}
-+		printf("%s", get_linkstate(k->media_type, k->link_state));
-+
-+		if (k->link_state != LINK_STATE_DOWN && k->baudrate > 0)
-+			printf(", %s", get_baudrate(k->baudrate, "Bit/s"));
- 		printf("\n");
- 		break;
- 	case IMSG_CTL_END:
-@@ -1008,10 +1158,10 @@ show_interface_msg(struct imsg *imsg)
- void
- show_rib_summary_head(void)
- {
--	printf(
--	    "flags: * = Valid, > = Selected, I = via IBGP, A = Announced\n");
-+	printf("flags: * = Valid, > = Selected, I = via IBGP, A = Announced, "
-+	    "S = Stale\n");
- 	printf("origin: i = IGP, e = EGP, ? = Incomplete\n\n");
--	printf("%-5s %-20s%-15s  %5s %5s %s\n", "flags", "destination",
-+	printf("%-5s %-20s %-15s  %5s %5s %s\n", "flags", "destination",
- 	    "gateway", "lpref", "med", "aspath origin");
- }
- 
-@@ -1049,26 +1199,30 @@ print_flags(u_int8_t flags, int sum)
- 	char	*p = flagstr;
- 
- 	if (sum) {
--		if (flags & F_RIB_ANNOUNCE)
-+		if (flags & F_PREF_ANNOUNCE)
- 			*p++ = 'A';
--		if (flags & F_RIB_INTERNAL)
-+		if (flags & F_PREF_INTERNAL)
- 			*p++ = 'I';
--		if (flags & F_RIB_ELIGIBLE)
-+		if (flags & F_PREF_STALE)
-+			*p++ = 'S';
-+		if (flags & F_PREF_ELIGIBLE)
- 			*p++ = '*';
--		if (flags & F_RIB_ACTIVE)
-+		if (flags & F_PREF_ACTIVE)
- 			*p++ = '>';
- 		*p = '\0';
- 		printf("%-5s ", flagstr);
- 	} else {
--		if (flags & F_RIB_INTERNAL)
-+		if (flags & F_PREF_INTERNAL)
- 			printf("internal");
- 		else
- 			printf("external");
--		if (flags & F_RIB_ELIGIBLE)
-+		if (flags & F_PREF_STALE)
-+			printf(", stale");
-+		if (flags & F_PREF_ELIGIBLE)
- 			printf(", valid");
--		if (flags & F_RIB_ACTIVE)
-+		if (flags & F_PREF_ACTIVE)
- 			printf(", best");
--		if (flags & F_RIB_ANNOUNCE)
-+		if (flags & F_PREF_ANNOUNCE)
- 			printf(", announced");
- 	}
- }
-@@ -1077,27 +1231,14 @@ int
- show_rib_summary_msg(struct imsg *imsg)
- {
- 	struct ctl_show_rib	 rib;
--	char			*aspath;
- 	u_char			*asdata;
- 
- 	switch (imsg->hdr.type) {
- 	case IMSG_CTL_SHOW_RIB:
- 		memcpy(&rib, imsg->data, sizeof(rib));
--
--		print_prefix(&rib.prefix, rib.prefixlen, rib.flags);
--		printf("%-15s ", log_addr(&rib.exit_nexthop));
--
--		printf(" %5u %5u ", rib.local_pref, rib.med);
--
- 		asdata = imsg->data;
- 		asdata += sizeof(struct ctl_show_rib);
--		if (aspath_asprint(&aspath, asdata, rib.aspath_len) == -1)
--			err(1, NULL);
--		if (strlen(aspath) > 0)
--			printf("%s ", aspath);
--		free(aspath);
--
--		printf("%s\n", print_origin(rib.origin, 1));
-+		show_rib_brief(&rib, asdata);
- 		break;
- 	case IMSG_CTL_END:
- 		return (1);
-@@ -1112,108 +1253,21 @@ int
- show_rib_detail_msg(struct imsg *imsg, int nodescr)
- {
- 	struct ctl_show_rib	 rib;
--	struct in_addr		 id;
--	char			*aspath, *s;
--	u_char			*data;
--	u_int32_t		 as;
--	u_int16_t		 ilen, alen, ioff;
--	u_int8_t		 flags, type;
--	time_t			 now;
-+	u_char			*asdata;
-+	u_int16_t		 ilen;
- 
- 	switch (imsg->hdr.type) {
- 	case IMSG_CTL_SHOW_RIB:
- 		memcpy(&rib, imsg->data, sizeof(rib));
--
--		printf("\nBGP routing table entry for %s/%u\n",
--		    log_addr(&rib.prefix), rib.prefixlen);
--
--		data = imsg->data;
--		data += sizeof(struct ctl_show_rib);
--		if (aspath_asprint(&aspath, data, rib.aspath_len) == -1)
--			err(1, NULL);
--		if (strlen(aspath) > 0)
--			printf("    %s\n", aspath);
--		free(aspath);
--
--		s = fmt_peer(rib.descr, &rib.remote_addr, -1, nodescr);
--		printf("    Nexthop %s ", log_addr(&rib.exit_nexthop));
--		printf("(via %s) from %s (", log_addr(&rib.true_nexthop), s);
--		free(s);
--		id.s_addr = htonl(rib.remote_id);
--		printf("%s)\n", inet_ntoa(id));
--
--		printf("    Origin %s, metric %u, localpref %u, ",
--		    print_origin(rib.origin, 0), rib.med, rib.local_pref);
--		print_flags(rib.flags, 0);
--
--		now = time(NULL);
--		if (now > rib.lastchange)
--			now -= rib.lastchange;
--		else
--			now = 0;
--
--		printf("\n    Last update: %s ago\n",
--		    fmt_timeframe_core(now));
-+		asdata = imsg->data;
-+		asdata += sizeof(struct ctl_show_rib);
-+		show_rib_detail(&rib, asdata, nodescr);
- 		break;
- 	case IMSG_CTL_SHOW_RIB_ATTR:
- 		ilen = imsg->hdr.len - IMSG_HEADER_SIZE;
- 		if (ilen < 3)
- 			errx(1, "bad IMSG_CTL_SHOW_RIB_ATTR received");
--		data = imsg->data;
--		flags = data[0];
--		type = data[1];
--
--		/* get the attribute length */
--		if (flags & ATTR_EXTLEN) {
--			if (ilen < 4)
--				errx(1, "bad IMSG_CTL_SHOW_RIB_ATTR received");
--			memcpy(&alen, data+2, sizeof(u_int16_t));
--			alen = ntohs(alen);
--			data += 4;
--			ilen -= 4;
--		} else {
--			alen = data[2];
--			data += 3;
--			ilen -= 3;
--		}
--		/* bad imsg len how can that happen!? */
--		if (alen != ilen)
--			errx(1, "bad IMSG_CTL_SHOW_RIB_ATTR received");
--
--		switch (type) {
--		case ATTR_COMMUNITIES:
--			printf("    Communities: ");
--			show_community(data, alen);
--			printf("\n");
--			break;
--		case ATTR_AGGREGATOR:
--			memcpy(&as, data, sizeof(as));
--			memcpy(&id, data + sizeof(as), sizeof(id));
--			printf("    Aggregator: %s [%s]\n", 
--			    log_as(htonl(as)), inet_ntoa(id));
--			break;
--		case ATTR_ORIGINATOR_ID:
--			memcpy(&id, data, sizeof(id));
--			printf("    Originator Id: %s\n", inet_ntoa(id));
--			break;
--		case ATTR_CLUSTER_LIST:
--			printf("    Cluster ID List:");
--			for (ioff = 0; ioff + sizeof(id) <= ilen;
--			    ioff += sizeof(id)) {
--				memcpy(&id, data + ioff, sizeof(id));
--				printf(" %s", inet_ntoa(id));
--			}
--			printf("\n");
--			break;
--		case ATTR_EXT_COMMUNITIES:
--			printf("    Ext. communities: ");
--			show_ext_community(data, alen);
--			printf("\n");
--			break;
--		default:
--			/* ignore unknown attributes */
--			break;
--		}
-+		show_attr(imsg->data, ilen);
- 		break;
- 	case IMSG_CTL_END:
- 		printf("\n");
-@@ -1225,67 +1279,128 @@ show_rib_detail_msg(struct imsg *imsg, i
- 	return (0);
- }
- 
--char *
--fmt_mem(int64_t num)
-+void
-+show_rib_brief(struct ctl_show_rib *r, u_char *asdata)
- {
--	static char	buf[16];
-+	char			*aspath;
- 
--	if (fmt_scaled(num, buf) == -1)
--		snprintf(buf, sizeof(buf), "%lldB", (long long)num);
-+	print_prefix(&r->prefix, r->prefixlen, r->flags);
-+	printf(" %-15s ", log_addr(&r->exit_nexthop));
-+	printf(" %5u %5u ", r->local_pref, r->med);
- 
--	return (buf);
-+	if (aspath_asprint(&aspath, asdata, r->aspath_len) == -1)
-+		err(1, NULL);
-+	if (strlen(aspath) > 0)
-+		printf("%s ", aspath);
-+	free(aspath);
-+
-+	printf("%s\n", print_origin(r->origin, 1));
- }
- 
--int
--show_rib_memory_msg(struct imsg *imsg)
-+void
-+show_rib_detail(struct ctl_show_rib *r, u_char *asdata, int nodescr)
- {
--	struct rde_memstats	stats;
-+	struct in_addr		 id;
-+	char			*aspath, *s;
-+	time_t			 now;
- 
--	switch (imsg->hdr.type) {
--	case IMSG_CTL_SHOW_RIB_MEM:
--		memcpy(&stats, imsg->data, sizeof(stats));
--		printf("RDE memory statistics\n");
--		printf("%10lld IPv4 network entries using %s of memory\n",
--		    (long long)stats.pt4_cnt, fmt_mem(stats.pt4_cnt *
--		    sizeof(struct pt_entry4)));
--		if (stats.pt6_cnt != 0)
--			printf("%10lld IPv6 network entries using "
--			    "%s of memory\n", (long long)stats.pt6_cnt,
--			    fmt_mem(stats.pt6_cnt * sizeof(struct pt_entry6)));
--		printf("%10lld rib entries using %s of memory\n",
--		    (long long)stats.rib_cnt, fmt_mem(stats.rib_cnt *
--		    sizeof(struct rib_entry)));
--		printf("%10lld prefix entries using %s of memory\n",
--		    (long long)stats.prefix_cnt, fmt_mem(stats.prefix_cnt *
--		    sizeof(struct prefix)));
--		printf("%10lld BGP path attribute entries using %s of memory\n",
--		    (long long)stats.path_cnt, fmt_mem(stats.path_cnt *
--		    sizeof(struct rde_aspath)));
--		printf("%10lld BGP AS-PATH attribute entries using "
--		    "%s of memory,\n\t   and holding %lld references\n",
--		    (long long)stats.aspath_cnt, fmt_mem(stats.aspath_size),
--		    (long long)stats.aspath_refs);
--		printf("%10lld BGP attributes entries using %s of memory\n",
--		    (long long)stats.attr_cnt, fmt_mem(stats.attr_cnt *
--		    sizeof(struct attr)));
--		printf("\t   and holding %lld references\n",
--		    (long long)stats.attr_refs);
--		printf("%10lld BGP attributes using %s of memory\n",
--		    (long long)stats.attr_dcnt, fmt_mem(stats.attr_data));
--		printf("RIB using %s of memory\n", fmt_mem(
--		    stats.pt4_cnt * sizeof(struct pt_entry4) +
--		    stats.pt6_cnt * sizeof(struct pt_entry6) +
--		    stats.prefix_cnt * sizeof(struct prefix) +
--		    stats.rib_cnt * sizeof(struct rib_entry) +
--		    stats.path_cnt * sizeof(struct rde_aspath) +
--		    stats.aspath_size + stats.attr_cnt * sizeof(struct attr) +
--		    stats.attr_data));
-+	printf("\nBGP routing table entry for %s/%u\n",
-+	    log_addr(&r->prefix), r->prefixlen);
-+
-+	if (aspath_asprint(&aspath, asdata, r->aspath_len) == -1)
-+		err(1, NULL);
-+	if (strlen(aspath) > 0)
-+		printf("    %s\n", aspath);
-+	free(aspath);
-+
-+	s = fmt_peer(r->descr, &r->remote_addr, -1, nodescr);
-+	printf("    Nexthop %s ", log_addr(&r->exit_nexthop));
-+	printf("(via %s) from %s (", log_addr(&r->true_nexthop), s);
-+	free(s);
-+	id.s_addr = htonl(r->remote_id);
-+	printf("%s)\n", inet_ntoa(id));
-+
-+	printf("    Origin %s, metric %u, localpref %u, weight %u, ",
-+	    print_origin(r->origin, 0), r->med, r->local_pref, r->weight);
-+	print_flags(r->flags, 0);
-+
-+	now = time(NULL);
-+	if (now > r->lastchange)
-+		now -= r->lastchange;
-+	else
-+		now = 0;
-+
-+	printf("\n    Last update: %s ago\n", fmt_timeframe_core(now));
-+}
-+
-+void
-+show_attr(void *b, u_int16_t len)
-+{
-+	char		*data = b;
-+	struct in_addr	 id;
-+	u_int32_t	 as;
-+	u_int16_t	 alen, ioff;
-+	u_int8_t	 flags, type;
-+
-+	data = b;
-+	if (len < 3)
-+		errx(1, "show_attr: too short bgp attr");
-+
-+	flags = data[0];
-+	type = data[1];
-+
-+	/* get the attribute length */
-+	if (flags & ATTR_EXTLEN) {
-+		if (len < 4)
-+			errx(1, "show_attr: too short bgp attr");
-+		memcpy(&alen, data+2, sizeof(u_int16_t));
-+		alen = ntohs(alen);
-+		data += 4;
-+		len -= 4;
-+	} else {
-+		alen = data[2];
-+		data += 3;
-+		len -= 3;
-+	}
-+
-+	/* bad imsg len how can that happen!? */
-+	if (alen > len)
-+		errx(1, "show_attr: bad length");
-+
-+	switch (type) {
-+	case ATTR_COMMUNITIES:
-+		printf("    Communities: ");
-+		show_community(data, alen);
-+		printf("\n");
-+		break;
-+	case ATTR_AGGREGATOR:
-+		memcpy(&as, data, sizeof(as));
-+		memcpy(&id, data + sizeof(as), sizeof(id));
-+		printf("    Aggregator: %s [%s]\n",
-+		    log_as(ntohl(as)), inet_ntoa(id));
-+		break;
-+	case ATTR_ORIGINATOR_ID:
-+		memcpy(&id, data, sizeof(id));
-+		printf("    Originator Id: %s\n", inet_ntoa(id));
-+		break;
-+	case ATTR_CLUSTER_LIST:
-+		printf("    Cluster ID List:");
-+		for (ioff = 0; ioff + sizeof(id) <= alen;
-+		    ioff += sizeof(id)) {
-+			memcpy(&id, data + ioff, sizeof(id));
-+			printf(" %s", inet_ntoa(id));
-+		}
-+		printf("\n");
-+		break;
-+	case ATTR_EXT_COMMUNITIES:
-+		printf("    Ext. communities: ");
-+		show_ext_community(data, alen);
-+		printf("\n");
- 		break;
- 	default:
-+		/* ignore unknown attributes */
- 		break;
- 	}
--
--	return (1);
- }
- 
- void
-@@ -1328,30 +1443,6 @@ show_community(u_char *data, u_int16_t l
- 	}
- }
- 
--const char *
--get_ext_subtype(u_int8_t type)
--{
--	static char etype[6];
--
--	switch (type) {
--	case EXT_COMMUNITY_ROUTE_TGT:
--		return "rt";	/* route target */
--	case EXT_CUMMUNITY_ROUTE_ORIG:
--		return "soo";	/* source of origin */
--	case EXT_COMMUNITY_OSPF_DOM_ID:
--		return "odi";	/* ospf domain id */
--	case EXT_COMMUNITY_OSPF_RTR_TYPE:
--		return "ort";	/* ospf route type */
--	case EXT_COMMUNITY_OSPF_RTR_ID:
--		return "ori";	/* ospf router id */
--	case EXT_COMMUNITY_BGP_COLLECT:
--		return "bdc";	/* bgp data collection */
--	default:
--		snprintf(etype, sizeof(etype), "[%i]", (int)type);
--		return etype;
--	}
--}
--
- void
- show_ext_community(u_char *data, u_int16_t len)
- {
-@@ -1372,34 +1463,101 @@ show_ext_community(u_char *data, u_int16
- 		case EXT_COMMUNITY_TWO_AS:
- 			memcpy(&as2, data + i + 2, sizeof(as2));
- 			memcpy(&u32, data + i + 4, sizeof(u32));
--			printf("%s %hu:%u", get_ext_subtype(subtype), as2, u32);
-+			printf("%s %s:%u", log_ext_subtype(subtype),
-+			    log_as(ntohs(as2)), ntohl(u32));
- 			break;
- 		case EXT_COMMUNITY_IPV4:
- 			memcpy(&ip, data + i + 2, sizeof(ip));
- 			memcpy(&u16, data + i + 6, sizeof(u16));
--			printf("%s %s:%hu", get_ext_subtype(subtype),
--			    inet_ntoa(ip), u16);
-+			printf("%s %s:%hu", log_ext_subtype(subtype),
-+			    inet_ntoa(ip), ntohs(u16));
- 			break;
- 		case EXT_COMMUNITY_FOUR_AS:
- 			memcpy(&as4, data + i + 2, sizeof(as4));
- 			memcpy(&u16, data + i + 6, sizeof(u16));
--			printf("%s %s:%hu", get_ext_subtype(subtype),
--			    log_as(as4), u16);
-+			printf("%s %s:%hu", log_ext_subtype(subtype),
-+			    log_as(ntohl(as4)), ntohs(u16));
- 			break;
- 		case EXT_COMMUNITY_OPAQUE:
- 			memcpy(&ext, data + i, sizeof(ext));
- 			ext = betoh64(ext) & 0xffffffffffffLL;
--			printf("%s 0x%llx", get_ext_subtype(subtype), ext); 
-+			printf("%s 0x%" PRIx64, log_ext_subtype(subtype), ext);
- 			break;
- 		default:
- 			memcpy(&ext, data + i, sizeof(ext));
--			printf("0x%llx", betoh64(ext)); 
-+			printf("0x%" PRIx64, betoh64(ext));
- 		}
- 		if (i + 8 < len)
- 			printf(", ");
- 	}
- }
- 
-+char *
-+fmt_mem(int64_t num)
-+{
-+	static char	buf[16];
-+
-+	if (fmt_scaled(num, buf) == -1)
-+		snprintf(buf, sizeof(buf), "%lldB", (long long)num);
-+
-+	return (buf);
-+}
-+
-+size_t  pt_sizes[AID_MAX] = AID_PTSIZE;
-+
-+int
-+show_rib_memory_msg(struct imsg *imsg)
-+{
-+	struct rde_memstats	stats;
-+	size_t			pts = 0;
-+	int			i;
-+
-+	switch (imsg->hdr.type) {
-+	case IMSG_CTL_SHOW_RIB_MEM:
-+		memcpy(&stats, imsg->data, sizeof(stats));
-+		printf("RDE memory statistics\n");
-+		for (i = 0; i < AID_MAX; i++) {
-+			if (stats.pt_cnt[i] == 0)
-+				continue;
-+			pts += stats.pt_cnt[i] * pt_sizes[i];
-+			printf("%10lld %s network entries using %s of memory\n",
-+			    (long long)stats.pt_cnt[i], aid_vals[i].name,
-+			    fmt_mem(stats.pt_cnt[i] * pt_sizes[i]));
-+		}
-+		printf("%10lld rib entries using %s of memory\n",
-+		    (long long)stats.rib_cnt, fmt_mem(stats.rib_cnt *
-+		    sizeof(struct rib_entry)));
-+		printf("%10lld prefix entries using %s of memory\n",
-+		    (long long)stats.prefix_cnt, fmt_mem(stats.prefix_cnt *
-+		    sizeof(struct prefix)));
-+		printf("%10lld BGP path attribute entries using %s of memory\n",
-+		    (long long)stats.path_cnt, fmt_mem(stats.path_cnt *
-+		    sizeof(struct rde_aspath)));
-+		printf("%10lld BGP AS-PATH attribute entries using "
-+		    "%s of memory,\n\t   and holding %lld references\n",
-+		    (long long)stats.aspath_cnt, fmt_mem(stats.aspath_size),
-+		    (long long)stats.aspath_refs);
-+		printf("%10lld BGP attributes entries using %s of memory\n",
-+		    (long long)stats.attr_cnt, fmt_mem(stats.attr_cnt *
-+		    sizeof(struct attr)));
-+		printf("\t   and holding %lld references\n",
-+		    (long long)stats.attr_refs);
-+		printf("%10lld BGP attributes using %s of memory\n",
-+		    (long long)stats.attr_dcnt, fmt_mem(stats.attr_data));
-+		printf("RIB using %s of memory\n", fmt_mem(pts +
-+		    stats.prefix_cnt * sizeof(struct prefix) +
-+		    stats.rib_cnt * sizeof(struct rib_entry) +
-+		    stats.path_cnt * sizeof(struct rde_aspath) +
-+		    stats.aspath_size + stats.attr_cnt * sizeof(struct attr) +
-+		    stats.attr_data));
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return (1);
-+}
-+
- void
- send_filterset(struct imsgbuf *i, struct filter_set_head *set)
- {
-@@ -1469,6 +1627,183 @@ show_result(struct imsg *imsg)
- 	return (1);
- }
- 
-+void
-+show_mrt_dump(struct mrt_rib *mr, struct mrt_peer *mp, void *arg)
-+{
-+	struct ctl_show_rib		 ctl;
-+	struct ctl_show_rib_request	*req = arg;
-+	struct mrt_rib_entry		*mre;
-+	u_int16_t			 i, j;
-+
-+	for (i = 0; i < mr->nentries; i++) {
-+		mre = &mr->entries[i];
-+		bzero(&ctl, sizeof(ctl));
-+		mrt_to_bgpd_addr(&mr->prefix, &ctl.prefix);
-+		ctl.prefixlen = mr->prefixlen;
-+		ctl.lastchange = mre->originated;
-+		mrt_to_bgpd_addr(&mre->nexthop, &ctl.true_nexthop);
-+		mrt_to_bgpd_addr(&mre->nexthop, &ctl.exit_nexthop);
-+		ctl.origin = mre->origin;
-+		ctl.local_pref = mre->local_pref;
-+		ctl.med = mre->med;
-+		/* weight is not part of the mrt dump so it can't be set */
-+		ctl.aspath_len = mre->aspath_len;
-+
-+		if (mre->peer_idx < mp->npeers) {
-+			mrt_to_bgpd_addr(&mp->peers[mre->peer_idx].addr,
-+			    &ctl.remote_addr);
-+			ctl.remote_id = mp->peers[mre->peer_idx].bgp_id;
-+		}
-+
-+		/* filter by neighbor */
-+		if (req->neighbor.addr.aid != AID_UNSPEC &&
-+		    memcmp(&req->neighbor.addr, &ctl.remote_addr,
-+		    sizeof(ctl.remote_addr)) != 0) 
-+			continue;
-+		/* filter by AF */
-+		if (req->aid && req->aid != ctl.prefix.aid)
-+			return;
-+		/* filter by prefix */
-+		if (req->prefix.aid != AID_UNSPEC) {
-+			if (!prefix_compare(&req->prefix, &ctl.prefix,
-+			    req->prefixlen)) {
-+				if (req->flags & F_LONGER) {
-+					if (req->prefixlen > ctl.prefixlen)
-+						return;
-+				} else if (req->prefixlen != ctl.prefixlen)
-+					return;
-+			} else
-+				return;
-+		}
-+		/* filter by AS */
-+		if (req->as.type != AS_NONE &&
-+		   !aspath_match(mre->aspath, mre->aspath_len,
-+		   req->as.type, req->as.as))
-+			continue;
-+
-+		if (req->flags & F_CTL_DETAIL) {
-+			show_rib_detail(&ctl, mre->aspath, 1);
-+			for (j = 0; j < mre->nattrs; j++)
-+				show_attr(mre->attrs[j].attr,
-+					mre->attrs[j].attr_len);
-+		} else
-+			show_rib_brief(&ctl, mre->aspath);
-+	}
-+}
-+
-+void
-+network_mrt_dump(struct mrt_rib *mr, struct mrt_peer *mp, void *arg)
-+{
-+	struct ctl_show_rib		 ctl;
-+	struct network_config		 net;
-+	struct ctl_show_rib_request	*req = arg;
-+	struct mrt_rib_entry		*mre;
-+	struct ibuf			*msg;
-+	u_int16_t			 i, j;
-+
-+	for (i = 0; i < mr->nentries; i++) {
-+		mre = &mr->entries[i];
-+		bzero(&ctl, sizeof(ctl));
-+		mrt_to_bgpd_addr(&mr->prefix, &ctl.prefix);
-+		ctl.prefixlen = mr->prefixlen;
-+		ctl.lastchange = mre->originated;
-+		mrt_to_bgpd_addr(&mre->nexthop, &ctl.true_nexthop);
-+		mrt_to_bgpd_addr(&mre->nexthop, &ctl.exit_nexthop);
-+		ctl.origin = mre->origin;
-+		ctl.local_pref = mre->local_pref;
-+		ctl.med = mre->med;
-+		ctl.aspath_len = mre->aspath_len;
-+
-+		if (mre->peer_idx < mp->npeers) {
-+			mrt_to_bgpd_addr(&mp->peers[mre->peer_idx].addr,
-+			    &ctl.remote_addr);
-+			ctl.remote_id = mp->peers[mre->peer_idx].bgp_id;
-+		}
-+
-+		/* filter by neighbor */
-+		if (req->neighbor.addr.aid != AID_UNSPEC &&
-+		    memcmp(&req->neighbor.addr, &ctl.remote_addr,
-+		    sizeof(ctl.remote_addr)) != 0) 
-+			continue;
-+		/* filter by AF */
-+		if (req->aid && req->aid != ctl.prefix.aid)
-+			return;
-+		/* filter by prefix */
-+		if (req->prefix.aid != AID_UNSPEC) {
-+			if (!prefix_compare(&req->prefix, &ctl.prefix,
-+			    req->prefixlen)) {
-+				if (req->flags & F_LONGER) {
-+					if (req->prefixlen > ctl.prefixlen)
-+						return;
-+				} else if (req->prefixlen != ctl.prefixlen)
-+					return;
-+			} else
-+				return;
-+		}
-+		/* filter by AS */
-+		if (req->as.type != AS_NONE &&
-+		   !aspath_match(mre->aspath, mre->aspath_len,
-+		   req->as.type, req->as.as))
-+			continue;
-+
-+		bzero(&net, sizeof(net));
-+		memcpy(&net.prefix, &ctl.prefix, sizeof(net.prefix));
-+		net.prefixlen = ctl.prefixlen;
-+		net.type = NETWORK_MRTCLONE;
-+		/* XXX rtableid */
-+
-+		imsg_compose(ibuf, IMSG_NETWORK_ADD, 0, 0, -1,
-+		    &net, sizeof(net));
-+		if ((msg = imsg_create(ibuf, IMSG_NETWORK_ASPATH,
-+		    0, 0, sizeof(ctl) + mre->aspath_len)) == NULL)
-+			errx(1, "imsg_create failure");
-+		if (imsg_add(msg, &ctl, sizeof(ctl)) == -1 ||
-+		    imsg_add(msg, mre->aspath, mre->aspath_len) == -1)
-+			errx(1, "imsg_add failure");
-+		imsg_close(ibuf, msg);
-+		for (j = 0; j < mre->nattrs; j++)
-+			imsg_compose(ibuf, IMSG_NETWORK_ATTR, 0, 0, -1,
-+			    mre->attrs[j].attr, mre->attrs[j].attr_len);
-+		imsg_compose(ibuf, IMSG_NETWORK_DONE, 0, 0, -1, NULL, 0);
-+
-+		while (ibuf->w.queued) {
-+			if (msgbuf_write(&ibuf->w) < 0)
-+				err(1, "write error");
-+		}
-+	}
-+}
-+
-+void
-+show_mrt_state(struct mrt_bgp_state *ms, void *arg)
-+{
-+	printf("show_mrt_state\n");
-+}
-+
-+void
-+show_mrt_msg(struct mrt_bgp_msg *mm, void *arg)
-+{
-+	printf("show_mrt_msg\n");
-+}
-+
-+void
-+mrt_to_bgpd_addr(union mrt_addr *ma, struct bgpd_addr *ba)
-+{
-+	switch (ma->sa.sa_family) {
-+	case AF_INET:
-+	case AF_INET6:
-+		sa2addr(&ma->sa, ba);
-+		break;
-+	case AF_VPNv4:
-+		bzero(ba, sizeof(*ba));
-+		ba->aid = AID_VPN_IPv4;
-+		ba->vpn4.rd = ma->svpn4.sv_rd;
-+		ba->vpn4.addr.s_addr = ma->svpn4.sv_addr.s_addr;
-+		memcpy(ba->vpn4.labelstack, ma->svpn4.sv_label,
-+		    sizeof(ba->vpn4.labelstack));
-+		break;
-+	}
-+}
-+
- /* following functions are necessary for imsg framework */
- void
- log_warnx(const char *emsg, ...)
-@@ -1495,3 +1830,9 @@ fatal(const char *emsg)
- {
- 	err(1, emsg);
- }
-+
-+void
-+fatalx(const char *emsg)
-+{
-+	errx(1, emsg);
-+}
diff --git a/net/openbgpd/files/patch-bgpctl_irr_asset.c b/net/openbgpd/files/patch-bgpctl_irr_asset.c
deleted file mode 100644
index cf0e4a449c66..000000000000
--- a/net/openbgpd/files/patch-bgpctl_irr_asset.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: bgpctl/irr_asset.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/irr_asset.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.1.1.3
-diff -u -p -r1.1.1.2 -r1.1.1.3
---- bgpctl/irr_asset.c	9 Jul 2009 16:49:55 -0000	1.1.1.2
-+++ bgpctl/irr_asset.c	13 Oct 2012 18:22:52 -0000	1.1.1.3
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: irr_asset.c,v 1.8 2009/04/14 21:10:54 jj Exp $ */
-+/*	$OpenBSD: irr_asset.c,v 1.7 2007/03/31 12:46:55 henning Exp $ */
- 
- /*
-  * Copyright (c) 2007 Henning Brauer <henning@openbsd.org>
diff --git a/net/openbgpd/files/patch-bgpctl_irr_output.c b/net/openbgpd/files/patch-bgpctl_irr_output.c
deleted file mode 100644
index b611216c1928..000000000000
--- a/net/openbgpd/files/patch-bgpctl_irr_output.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: bgpctl/irr_output.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/irr_output.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.2
-diff -u -p -r1.1.1.1 -r1.1.1.2
---- bgpctl/irr_output.c	30 Jun 2009 05:46:15 -0000	1.1.1.1
-+++ bgpctl/irr_output.c	13 Oct 2012 18:22:52 -0000	1.1.1.2
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: irr_output.c,v 1.13 2007/03/05 17:28:21 henning Exp $ */
-+/*	$OpenBSD: irr_output.c,v 1.12 2007/03/05 15:02:05 henning Exp $ */
- 
- /*
-  * Copyright (c) 2007 Henning Brauer <henning@openbsd.org>
diff --git a/net/openbgpd/files/patch-bgpctl_irr_parser.c b/net/openbgpd/files/patch-bgpctl_irr_parser.c
deleted file mode 100644
index 2e445ea37809..000000000000
--- a/net/openbgpd/files/patch-bgpctl_irr_parser.c
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: bgpctl/irr_parser.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/irr_parser.c,v
-retrieving revision 1.1.1.5
-retrieving revision 1.5
-diff -u -p -r1.1.1.5 -r1.5
---- bgpctl/irr_parser.c	14 Feb 2010 20:20:14 -0000	1.1.1.5
-+++ bgpctl/irr_parser.c	13 Oct 2012 18:35:56 -0000	1.5
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: irr_parser.c,v 1.8 2007/03/05 22:34:08 henning Exp $ */
-+/*	$OpenBSD: irr_parser.c,v 1.9 2009/09/08 15:40:25 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2007 Henning Brauer <henning@openbsd.org>
-@@ -81,6 +81,7 @@ parse_response(FILE *f, enum qtype qtype
- 				return (-1);
- 			break;
- 		case QTYPE_ROUTE:
-+		case QTYPE_ROUTE6:
- 			if ((n = parse_route(key, val)) == -1)
- 				return (-1);
- 			break;
-@@ -281,7 +282,7 @@ parse_policy(char *key, char *val)
- 				    !isdigit(tok[2]))
- 					errx(1, "peering spec \"%s\": format "
- 					    "error, AS expected", tok);
--				pi->peer_as = strtonum(tok + 2, 1, USHRT_MAX,
-+				pi->peer_as = strtonum(tok + 2, 1, UINT_MAX,
- 				    &errstr);
- 				if (errstr)
- 					errx(1, "peering spec \"%s\": format "
-@@ -407,11 +408,13 @@ parse_asset(char *key, char *val)
- int
- parse_route(char *key, char *val)
- {
--	if (strcmp(key, "route"))	/* ignore everything else */
-+	if (strcmp(key, "route") && strcmp(key, "route6"))
-+		/* ignore everything else */
- 		return (0);
- 
--	/* route is single-value, but seen trailing , in the wild */
--	if (strlen(val) > 0 && val[strlen(val) - 1] == ',')
-+	/* route is single-value, but seen trailing , and \r in the wild */
-+	if (strlen(val) > 0 && (val[strlen(val) - 1] == ',' ||
-+	    val[strlen(val) - 1] == '\r'))
- 		val[strlen(val) - 1] = '\0';
- 
- 	return (prefixset_addmember(val));
diff --git a/net/openbgpd/files/patch-bgpctl_irr_prefix.c b/net/openbgpd/files/patch-bgpctl_irr_prefix.c
deleted file mode 100644
index 4c97de2a4c7d..000000000000
--- a/net/openbgpd/files/patch-bgpctl_irr_prefix.c
+++ /dev/null
@@ -1,157 +0,0 @@
-Index: bgpctl/irr_prefix.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/irr_prefix.c,v
-retrieving revision 1.1.1.5
-retrieving revision 1.1.1.8
-diff -u -p -r1.1.1.5 -r1.1.1.8
---- bgpctl/irr_prefix.c	14 Feb 2010 20:20:14 -0000	1.1.1.5
-+++ bgpctl/irr_prefix.c	13 Oct 2012 18:22:52 -0000	1.1.1.8
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: irr_prefix.c,v 1.15 2007/05/27 18:54:25 henning Exp $ */
-+/*	$OpenBSD: irr_prefix.c,v 1.17 2009/09/08 16:11:36 sthen Exp $ */
- 
- /*
-  * Copyright (c) 2007 Henning Brauer <henning@openbsd.org>
-@@ -29,6 +29,7 @@
- #include <arpa/inet.h>
- 
- #include "irrfilter.h"
-+#include "bgpd.h"
- 
- void	 prefixset_aggregate(struct prefix_set *);
- int	 prefix_aggregate(struct irr_prefix *, const struct irr_prefix *);
-@@ -63,7 +64,11 @@ prefixset_get(char *as)
- 		fflush(stdout);
- 	}
- 	curpfxs = pfxs;
--	if (whois(as, QTYPE_ROUTE) == -1)
-+	if ((irrflags & F_IPV4) && whois(as, QTYPE_ROUTE) == -1)
-+		errx(1, "whois error, prefixset_get %s", as);
-+	if ((irrflags & F_IPV6) && whois(as, QTYPE_ROUTE6) == -1)
-+		errx(1, "whois error, prefixset_get %s", as);
-+	if (whois(as, QTYPE_ROUTE6) == -1)
- 		errx(1, "whois error, prefixset_get %s", as);
- 	curpfxs = NULL;
- 	if (irrverbose >= 3)
-@@ -80,9 +85,11 @@ prefixset_addmember(char *s)
- 	void			*p;
- 	u_int			 i;
- 	struct irr_prefix	*pfx;
--	int			 len;
-+	int			 len, ret;
-+	char			*slash;
-+	const char		*errstr;
- 
--	if (strchr(s, '/') == NULL) {
-+	if ((slash = strchr(s, '/')) == NULL) {
- 		fprintf(stderr, "%s: prefix %s does not have the len "
- 		    "specified, ignoring\n", curpfxs->as, s);
- 		return (0);
-@@ -92,17 +99,26 @@ prefixset_addmember(char *s)
- 		err(1, "prefixset_addmember calloc");
- 
- 	if ((len = inet_net_pton(AF_INET, s, &pfx->addr.in,
--	    sizeof(pfx->addr.in))) == -1) {
--		if (errno == ENOENT) {
--			fprintf(stderr, "%s: prefix \"%s\": parse error\n",
-+	    sizeof(pfx->addr.in))) != -1) {
-+		pfx->af = AF_INET;
-+	} else {
-+		len = strtonum(slash + 1, 0, 128, &errstr);
-+		if (errstr)
-+			errx(1, "prefixset_addmember %s prefix %s: prefixlen "
-+			    "is %s", curpfxs->as, s, errstr);
-+		*slash = '\0';
-+
-+		if ((ret = inet_pton(AF_INET6, s, &pfx->addr.in6)) == -1)
-+			err(1, "prefixset_addmember %s prefix \"%s\"",
- 			    curpfxs->as, s);
-+		else if (ret == 0) {
-+			fprintf(stderr, "prefixset_addmember %s prefix \"%s\": "
-+			    "No matching address family found", curpfxs->as, s);
-+			free(pfx);
- 			return (0);
--		} else
--			err(1, "prefixset_addmember %s inet_net_pton \"%s\"",
--			    curpfxs->as, s);
-+		}
-+		pfx->af = AF_INET6;
- 	}
--
--	pfx->af = AF_INET;
- 	pfx->len = pfx->maxlen = len;
- 
- 	/* yes, there are dupes... e. g. from multiple sources */
-@@ -175,24 +191,47 @@ prefixset_aggregate(struct prefix_set *p
- int
- prefix_aggregate(struct irr_prefix *a, const struct irr_prefix *b)
- {
--	in_addr_t	mask;
-+	in_addr_t	 mask;
-+	struct in6_addr	 ma;
-+	struct in6_addr	 mb;
- 
- 	if (a->len == 0)
- 		return (1);
- 
--	mask = htonl(0xffffffff << (32 - a->len));
-+	if (a->af != b->af)
-+		/* We cannot aggregate addresses of different families. */
-+		return (0);
- 
--	if ((a->addr.in.s_addr & mask) == (b->addr.in.s_addr & mask))
--		return (1);
-+	if (a->af == AF_INET) {
-+		mask = htonl(prefixlen2mask(a->len));
-+		if ((a->addr.in.s_addr & mask) == (b->addr.in.s_addr & mask))
-+			return (1);
-+	} else if (a->af == AF_INET6) {
-+		inet6applymask(&ma, &a->addr.in6, a->len);
-+		inet6applymask(&mb, &b->addr.in6, a->len);
-+		if (IN6_ARE_ADDR_EQUAL(&ma, &mb))
-+			return (1);
-+	}
- 
--	/* see wether we can fold them in one */
-+	/* see whether we can fold them in one */
- 	if (a->len == b->len && a->len > 1) {
--		mask = htonl(0xffffffff << (32 - (a->len - 1)));
--		if ((a->addr.in.s_addr & mask) ==
--		    (b->addr.in.s_addr & mask)) {
--			a->len--;
--			a->addr.in.s_addr &= mask;
--			return (1);
-+		if (a->af == AF_INET) {
-+			mask = htonl(prefixlen2mask(a->len - 1));
-+			if ((a->addr.in.s_addr & mask) ==
-+			    (b->addr.in.s_addr & mask)) {
-+				a->len--;
-+				a->addr.in.s_addr &= mask;
-+				return (1);
-+			}
-+		} else if (a->af == AF_INET6) {
-+			inet6applymask(&ma, &a->addr.in6, a->len - 1);
-+			inet6applymask(&mb, &b->addr.in6, a->len - 1);
-+
-+			if (IN6_ARE_ADDR_EQUAL(&ma, &mb)) {
-+				a->len--;
-+				memcpy(&a->addr.in6, &ma, sizeof(ma));
-+				return (1);
-+			}
- 		}
- 	}
- 
-@@ -219,6 +258,13 @@ irr_prefix_cmp(const void *a, const void
- 		if (ntohl(pa->addr.in.s_addr) >
- 		    ntohl(pb->addr.in.s_addr))
- 			return (1);
-+	} else if (pa->af == AF_INET6) {
-+		for (r = 0; r < 16; r++) {
-+			if (pa->addr.in6.s6_addr[r] < pb->addr.in6.s6_addr[r])
-+				return (-1);
-+			if (pa->addr.in6.s6_addr[r] > pb->addr.in6.s6_addr[r])
-+				return (1);
-+		}
- 	} else
- 		errx(1, "irr_prefix_cmp unknown af %u", pa->af);
- 
diff --git a/net/openbgpd/files/patch-bgpctl_irrfilter.c b/net/openbgpd/files/patch-bgpctl_irrfilter.c
deleted file mode 100644
index 79c31fc722aa..000000000000
--- a/net/openbgpd/files/patch-bgpctl_irrfilter.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: bgpctl/irrfilter.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/irrfilter.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -p -r1.1.1.1 -r1.3
---- bgpctl/irrfilter.c	30 Jun 2009 05:46:15 -0000	1.1.1.1
-+++ bgpctl/irrfilter.c	13 Oct 2012 18:35:56 -0000	1.3
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: irrfilter.c,v 1.4 2007/05/28 23:31:53 henning Exp $ */
-+/*	$OpenBSD: irrfilter.c,v 1.3 2007/03/06 16:45:34 henning Exp $ */
- 
- /*
-  * Copyright (c) 2007 Henning Brauer <henning@openbsd.org>
-@@ -15,6 +15,9 @@
-  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
-+#if defined(__FreeBSD__)	/* compat */
-+#include "openbsd-compat.h"
-+#endif /* defined(__FreeBSD__) */
- 
- #include <sys/types.h>
- #include <sys/param.h>
diff --git a/net/openbgpd/files/patch-bgpctl_irrfilter.h b/net/openbgpd/files/patch-bgpctl_irrfilter.h
deleted file mode 100644
index 485b97320e58..000000000000
--- a/net/openbgpd/files/patch-bgpctl_irrfilter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: bgpctl/irrfilter.h
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/irrfilter.h,v
-retrieving revision 1.1.1.5
-retrieving revision 1.4
-diff -u -p -r1.1.1.5 -r1.4
---- bgpctl/irrfilter.h	14 Feb 2010 20:20:14 -0000	1.1.1.5
-+++ bgpctl/irrfilter.h	13 Oct 2012 18:35:56 -0000	1.4
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: irrfilter.h,v 1.7 2007/03/06 16:45:34 henning Exp $ */
-+/*	$OpenBSD: irrfilter.h,v 1.8 2009/09/08 15:40:25 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2007 Henning Brauer <henning@openbsd.org>
-@@ -16,11 +16,17 @@
-  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#if defined(__FreeBSD__)	/* compat */
-+#include "openbsd-compat.h"
-+#endif /* defined(__FreeBSD__) */
-+
- #include <sys/queue.h>
- #include <sys/tree.h>
- #include <netinet/in.h>
- 
- #define	F_IMPORTONLY	0x01	/* skip export: items */
-+#define	F_IPV4		0x02	/* use IPv4 items */
-+#define	F_IPV6		0x04	/* use IPv6 items */
- 
- int	irrflags;
- int	irrverbose;
-@@ -37,7 +43,7 @@ struct policy_item {
- 	char				*action;
- 	char				*filter;
- 	enum pdir			 dir;
--	u_int16_t			 peer_as;
-+	u_int32_t			 peer_as;
- };
- 
- TAILQ_HEAD(policy_head, policy_item);
-@@ -55,7 +61,8 @@ enum qtype {
- 	QTYPE_NONE,
- 	QTYPE_OWNAS,
- 	QTYPE_ASSET,
--	QTYPE_ROUTE
-+	QTYPE_ROUTE,
-+	QTYPE_ROUTE6
- };
- 
- struct as_set {
-@@ -72,6 +79,7 @@ struct as_set {
- struct irr_prefix {
- 	union {
- 		struct in_addr	in;
-+		struct in6_addr	in6;
- 	} addr;
- 	sa_family_t	af;
- 	u_int8_t	len;
diff --git a/net/openbgpd/files/patch-bgpctl_mrtparser.c b/net/openbgpd/files/patch-bgpctl_mrtparser.c
deleted file mode 100644
index 0d463c0064ef..000000000000
--- a/net/openbgpd/files/patch-bgpctl_mrtparser.c
+++ /dev/null
@@ -1,977 +0,0 @@
-Index: bgpctl/mrtparser.c
-===================================================================
-RCS file: bgpctl/mrtparser.c
-diff -N bgpctl/mrtparser.c
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ bgpctl/mrtparser.c	13 Oct 2012 18:22:53 -0000	1.1.1.1
-@@ -0,0 +1,970 @@
-+/*	$OpenBSD: mrtparser.c,v 1.2 2012/03/06 07:52:32 claudio Exp $ */
-+/*
-+ * Copyright (c) 2011 Claudio Jeker <claudio@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <err.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "mrt.h"
-+#include "mrtparser.h"
-+
-+void	*mrt_read_msg(int, struct mrt_hdr *);
-+size_t	 mrt_read_buf(int, void *, size_t);
-+
-+struct mrt_peer	*mrt_parse_v2_peer(struct mrt_hdr *, void *);
-+struct mrt_rib	*mrt_parse_v2_rib(struct mrt_hdr *, void *);
-+int	mrt_parse_dump(struct mrt_hdr *, void *, struct mrt_peer **,
-+	    struct mrt_rib **);
-+int	mrt_parse_dump_mp(struct mrt_hdr *, void *, struct mrt_peer **,
-+	    struct mrt_rib **);
-+int	mrt_extract_attr(struct mrt_rib_entry *, u_char *, int, sa_family_t,
-+	    int);
-+
-+void	mrt_free_peers(struct mrt_peer *);
-+void	mrt_free_rib(struct mrt_rib *);
-+void	mrt_free_bgp_state(struct mrt_bgp_state *);
-+void	mrt_free_bgp_msg(struct mrt_bgp_msg *);
-+
-+u_char *mrt_aspath_inflate(void *, u_int16_t, u_int16_t *);
-+int	mrt_extract_addr(void *, u_int, union mrt_addr *, sa_family_t);
-+
-+void *
-+mrt_read_msg(int fd, struct mrt_hdr *hdr)
-+{
-+	void *buf;
-+
-+	bzero(hdr, sizeof(*hdr));
-+	if (mrt_read_buf(fd, hdr, sizeof(*hdr)) != sizeof(*hdr))
-+		return (NULL);
-+
-+	if ((buf = malloc(ntohl(hdr->length))) == NULL)
-+		err(1, "malloc(%d)", hdr->length);
-+
-+	if (mrt_read_buf(fd, buf, ntohl(hdr->length)) != ntohl(hdr->length)) {
-+		free(buf);
-+		return (NULL);
-+	}
-+	return (buf);
-+}
-+
-+size_t
-+mrt_read_buf(int fd, void *buf, size_t len)
-+{
-+	char *b = buf;
-+	ssize_t n;
-+
-+	while (len > 0) {
-+		if ((n = read(fd, b, len)) == -1) {
-+			if (errno == EINTR)
-+				continue;
-+			err(1, "read");
-+		}
-+		if (n == 0)
-+			break;
-+		b += n;
-+		len -= n;
-+	}
-+
-+	return (b - (char *)buf);
-+}
-+
-+void
-+mrt_parse(int fd, struct mrt_parser *p, int verbose)
-+{
-+	struct mrt_hdr	h;
-+	struct mrt_peer	*pctx = NULL;
-+	struct mrt_rib	*r;
-+	void		*msg;
-+
-+	while ((msg = mrt_read_msg(fd, &h))) {
-+		switch (ntohs(h.type)) {
-+		case MSG_NULL:
-+		case MSG_START:
-+		case MSG_DIE:
-+		case MSG_I_AM_DEAD:
-+		case MSG_PEER_DOWN:
-+		case MSG_PROTOCOL_BGP:
-+		case MSG_PROTOCOL_IDRP:
-+		case MSG_PROTOCOL_BGP4PLUS:
-+		case MSG_PROTOCOL_BGP4PLUS1:
-+			if (verbose)
-+				printf("deprecated MRT type %d\n",
-+				    ntohs(h.type));
-+			break;
-+		case MSG_PROTOCOL_RIP:
-+		case MSG_PROTOCOL_RIPNG:
-+		case MSG_PROTOCOL_OSPF:
-+		case MSG_PROTOCOL_ISIS_ET:
-+		case MSG_PROTOCOL_ISIS:
-+		case MSG_PROTOCOL_OSPFV3_ET:
-+		case MSG_PROTOCOL_OSPFV3:
-+			if (verbose)
-+				printf("unsuported MRT type %d\n",
-+				    ntohs(h.type));
-+			break;
-+		case MSG_TABLE_DUMP:
-+			switch (ntohs(h.subtype)) {
-+			case MRT_DUMP_AFI_IP:
-+			case MRT_DUMP_AFI_IPv6:
-+				if (p->dump == NULL)
-+					break;
-+				if (mrt_parse_dump(&h, msg, &pctx, &r) == 0) {
-+					p->dump(r, pctx, p->arg);
-+					mrt_free_rib(r);
-+				}
-+				break;
-+			default:
-+				if (verbose)
-+					printf("unknown AFI %d in table dump\n",
-+					    ntohs(h.subtype));
-+				break;
-+			}
-+			break;
-+		case MSG_TABLE_DUMP_V2:
-+			switch (ntohs(h.subtype)) {
-+			case MRT_DUMP_V2_PEER_INDEX_TABLE:
-+				if (p->dump == NULL)
-+					break;
-+				if (pctx)
-+					mrt_free_peers(pctx);
-+				pctx = mrt_parse_v2_peer(&h, msg);
-+				break;
-+			case MRT_DUMP_V2_RIB_IPV4_UNICAST:
-+			case MRT_DUMP_V2_RIB_IPV4_MULTICAST:
-+			case MRT_DUMP_V2_RIB_IPV6_UNICAST:
-+			case MRT_DUMP_V2_RIB_IPV6_MULTICAST:
-+			case MRT_DUMP_V2_RIB_GENERIC:
-+				if (p->dump == NULL)
-+					break;
-+				r = mrt_parse_v2_rib(&h, msg);
-+				if (r) {
-+					p->dump(r, pctx, p->arg);
-+					mrt_free_rib(r);
-+				}
-+				break;
-+			default:
-+				if (verbose)
-+					printf("unhandled BGP4MP subtype %d\n",
-+					    ntohs(h.subtype));
-+				break;
-+			}
-+			break;
-+		case MSG_PROTOCOL_BGP4MP_ET:
-+			/* currently just ignore the microsec field */
-+			msg = (char *)msg + sizeof(u_int32_t);
-+			h.length -= sizeof(u_int32_t);
-+			/* FALLTHROUGH */
-+		case MSG_PROTOCOL_BGP4MP:
-+			switch (ntohs(h.subtype)) {
-+			case BGP4MP_STATE_CHANGE:
-+			case BGP4MP_STATE_CHANGE_AS4:
-+				/* XXX p->state(s, p->arg); */
-+				errx(1, "BGP4MP subtype not yet implemented");
-+				break;
-+			case BGP4MP_MESSAGE:
-+			case BGP4MP_MESSAGE_AS4:
-+			case BGP4MP_MESSAGE_LOCAL:
-+			case BGP4MP_MESSAGE_AS4_LOCAL:
-+				/* XXX p->message(m, p->arg); */
-+				errx(1, "BGP4MP subtype not yet implemented");
-+				break;
-+			case BGP4MP_ENTRY:
-+				if (p->dump == NULL)
-+					break;
-+				if (mrt_parse_dump_mp(&h, msg, &pctx, &r) ==
-+				    0) {
-+					p->dump(r, pctx, p->arg);
-+					mrt_free_rib(r);
-+				}
-+				break;
-+			default:
-+				if (verbose)
-+					printf("unhandled BGP4MP subtype %d\n",
-+					    ntohs(h.subtype));
-+				break;
-+			}
-+			break;
-+		default:
-+			if (verbose)
-+				printf("unknown MRT type %d\n", ntohs(h.type));
-+			break;
-+		}
-+		free(msg);
-+	}
-+	if (pctx)
-+		mrt_free_peers(pctx);
-+}
-+
-+struct mrt_peer *
-+mrt_parse_v2_peer(struct mrt_hdr *hdr, void *msg)
-+{
-+	struct mrt_peer_entry	*peers;
-+	struct mrt_peer	*p;
-+	u_int8_t	*b = msg;
-+	u_int32_t	bid, as4;
-+	u_int16_t	cnt, i, as2;
-+	u_int		len = ntohl(hdr->length);
-+
-+	if (len < 8)	/* min msg size */
-+		return NULL;
-+
-+	p = calloc(1, sizeof(struct mrt_peer));
-+	if (p == NULL)
-+		err(1, "calloc");
-+
-+	/* collector bgp id */
-+	memcpy(&bid, b, sizeof(bid));
-+	b += sizeof(bid);
-+	len -= sizeof(bid);
-+	p->bgp_id = ntohl(bid);
-+
-+	/* view name length */
-+	memcpy(&cnt, b, sizeof(cnt));
-+	b += sizeof(cnt);
-+	len -= sizeof(cnt);
-+	cnt = ntohs(cnt);
-+
-+	/* view name */
-+	if (cnt > len)
-+		goto fail;
-+	if (cnt != 0) {
-+		if ((p->view = malloc(cnt + 1)) == NULL)
-+			err(1, "malloc");
-+		memcpy(p->view, b, cnt);
-+		p->view[cnt] = 0;
-+	} else
-+		if ((p->view = strdup("")) == NULL)
-+			err(1, "strdup");
-+	b += cnt;
-+	len -= cnt;
-+
-+	/* peer_count */
-+	if (len < sizeof(cnt))
-+		goto fail;
-+	memcpy(&cnt, b, sizeof(cnt));
-+	b += sizeof(cnt);
-+	len -= sizeof(cnt);
-+	cnt = ntohs(cnt);
-+
-+	/* peer entries */
-+	if ((peers = calloc(cnt, sizeof(struct mrt_peer_entry))) == NULL)
-+		err(1, "calloc");
-+	for (i = 0; i < cnt; i++) {
-+		u_int8_t type;
-+
-+		if (len < sizeof(u_int8_t) + sizeof(u_int32_t))
-+			goto fail;
-+		type = *b++;
-+		len -= 1;
-+		memcpy(&bid, b, sizeof(bid));
-+		b += sizeof(bid);
-+		len -= sizeof(bid);
-+		peers[i].bgp_id = ntohl(bid);
-+
-+		if (type & MRT_DUMP_V2_PEER_BIT_I) {
-+			if (mrt_extract_addr(b, len, &peers[i].addr,
-+			    AF_INET6) == -1)
-+				goto fail;
-+			b += sizeof(struct in6_addr);
-+			len -= sizeof(struct in6_addr);
-+		} else {
-+			if (mrt_extract_addr(b, len, &peers[i].addr,
-+			    AF_INET) == -1)
-+				goto fail;
-+			b += sizeof(struct in_addr);
-+			len -= sizeof(struct in_addr);
-+		}
-+
-+		if (type & MRT_DUMP_V2_PEER_BIT_A) {
-+			memcpy(&as4, b, sizeof(as4));
-+			b += sizeof(as4);
-+			len -= sizeof(as4);
-+			as4 = ntohl(as4);
-+		} else {
-+			memcpy(&as2, b, sizeof(as2));
-+			b += sizeof(as2);
-+			len -= sizeof(as2);
-+			as4 = ntohs(as2);
-+		}
-+		peers[i].asnum = as4;
-+	}
-+	p->peers = peers;
-+	p->npeers = cnt;
-+	return (p);
-+fail:
-+	mrt_free_peers(p);
-+	return (NULL);
-+}
-+
-+struct mrt_rib *
-+mrt_parse_v2_rib(struct mrt_hdr *hdr, void *msg)
-+{
-+	struct mrt_rib_entry *entries;
-+	struct mrt_rib	*r;
-+	u_int8_t	*b = msg;
-+	u_int		len = ntohl(hdr->length);
-+	u_int32_t	snum;
-+	u_int16_t	cnt, i;
-+	u_int8_t	plen;
-+
-+	if (len < sizeof(snum) + 1)
-+		return NULL;
-+
-+	r = calloc(1, sizeof(struct mrt_rib));
-+	if (r == NULL)
-+		err(1, "calloc");
-+
-+	/* seq_num */
-+	memcpy(&snum, b, sizeof(snum));
-+	b += sizeof(snum);
-+	len -= sizeof(snum);
-+	r->seqnum = ntohl(snum);
-+
-+	switch (ntohs(hdr->subtype)) {
-+	case MRT_DUMP_V2_RIB_IPV4_UNICAST:
-+	case MRT_DUMP_V2_RIB_IPV4_MULTICAST:
-+		plen = *b++;
-+		len -= 1;
-+		if (len < MRT_PREFIX_LEN(plen))
-+			goto fail;
-+		r->prefix.sin.sin_family = AF_INET;
-+		r->prefix.sin.sin_len = sizeof(struct sockaddr_in);
-+		memcpy(&r->prefix.sin.sin_addr, b, MRT_PREFIX_LEN(plen));
-+		b += MRT_PREFIX_LEN(plen);
-+		len -= MRT_PREFIX_LEN(plen);
-+		r->prefixlen = plen;
-+		break;
-+	case MRT_DUMP_V2_RIB_IPV6_UNICAST:
-+	case MRT_DUMP_V2_RIB_IPV6_MULTICAST:
-+		plen = *b++;
-+		len -= 1;
-+		if (len < MRT_PREFIX_LEN(plen))
-+			goto fail;
-+		r->prefix.sin6.sin6_family = AF_INET6;
-+		r->prefix.sin6.sin6_len = sizeof(struct sockaddr_in6);
-+		memcpy(&r->prefix.sin6.sin6_addr, b, MRT_PREFIX_LEN(plen));
-+		b += MRT_PREFIX_LEN(plen);
-+		len -= MRT_PREFIX_LEN(plen);
-+		r->prefixlen = plen;
-+		break;
-+	case MRT_DUMP_V2_RIB_GENERIC:
-+		/* XXX unhandled */
-+		errx(1, "MRT_DUMP_V2_RIB_GENERIC subtype not yet implemented");
-+		goto fail;
-+	}
-+
-+	/* entries count */
-+	if (len < sizeof(cnt))
-+		goto fail;
-+	memcpy(&cnt, b, sizeof(cnt));
-+	b += sizeof(cnt);
-+	len -= sizeof(cnt);
-+	cnt = ntohs(cnt);
-+	r->nentries = cnt;
-+
-+	/* entries */
-+	if ((entries = calloc(cnt, sizeof(struct mrt_rib_entry))) == NULL)
-+		err(1, "calloc");
-+	for (i = 0; i < cnt; i++) {
-+		u_int32_t	otm;
-+		u_int16_t	pix, alen;
-+		if (len < 2 * sizeof(u_int16_t) + sizeof(u_int32_t))
-+			goto fail;
-+		/* peer index */
-+		memcpy(&pix, b, sizeof(pix));
-+		b += sizeof(pix);
-+		len -= sizeof(pix);
-+		entries[i].peer_idx = ntohs(pix);
-+
-+		/* originated */
-+		memcpy(&otm, b, sizeof(otm));
-+		b += sizeof(otm);
-+		len -= sizeof(otm);
-+		entries[i].originated = ntohl(otm);
-+
-+		/* attr_len */
-+		memcpy(&alen, b, sizeof(alen));
-+		b += sizeof(alen);
-+		len -= sizeof(alen);
-+		alen = ntohs(alen);
-+
-+		/* attr */
-+		if (len < alen)
-+			goto fail;
-+		if (mrt_extract_attr(&entries[i], b, alen,
-+		    r->prefix.sa.sa_family, 1) == -1)
-+			goto fail;
-+		b += alen;
-+		len -= alen;
-+	}
-+	r->entries = entries;
-+	return (r);
-+fail:
-+	mrt_free_rib(r);
-+	return (NULL);
-+}
-+
-+int
-+mrt_parse_dump(struct mrt_hdr *hdr, void *msg, struct mrt_peer **pp,
-+    struct mrt_rib **rp)
-+{
-+	struct mrt_peer		*p;
-+	struct mrt_rib		*r;
-+	struct mrt_rib_entry	*re;
-+	u_int8_t		*b = msg;
-+	u_int			 len = ntohl(hdr->length);
-+	u_int16_t		 asnum, alen;
-+
-+	if (*pp == NULL) {
-+		*pp = calloc(1, sizeof(struct mrt_peer));
-+		if (*pp == NULL)
-+			err(1, "calloc");
-+		(*pp)->peers = calloc(1, sizeof(struct mrt_peer_entry));
-+		if ((*pp)->peers == NULL)
-+			err(1, "calloc");
-+		(*pp)->npeers = 1;
-+	}
-+	p = *pp;
-+
-+	*rp = r = calloc(1, sizeof(struct mrt_rib));
-+	if (r == NULL)
-+		err(1, "calloc");
-+	re = calloc(1, sizeof(struct mrt_rib_entry));
-+	if (re == NULL)
-+		err(1, "calloc");
-+	r->nentries = 1;
-+	r->entries = re;
-+	
-+	if (len < 2 * sizeof(u_int16_t))
-+		goto fail;
-+	/* view */
-+	b += sizeof(u_int16_t);
-+	len -= sizeof(u_int16_t);
-+	/* seqnum */
-+	memcpy(&r->seqnum, b, sizeof(u_int16_t));
-+	b += sizeof(u_int16_t);
-+	len -= sizeof(u_int16_t);
-+	r->seqnum = ntohs(r->seqnum);
-+
-+	switch (ntohs(hdr->subtype)) {
-+	case MRT_DUMP_AFI_IP:
-+		if (mrt_extract_addr(b, len, &r->prefix, AF_INET) == -1)
-+			goto fail;
-+		b += sizeof(struct in_addr);
-+		len -= sizeof(struct in_addr);
-+		break;
-+	case MRT_DUMP_AFI_IPv6:
-+		if (mrt_extract_addr(b, len, &r->prefix, AF_INET6) == -1)
-+			goto fail;
-+		b += sizeof(struct in6_addr);
-+		len -= sizeof(struct in6_addr);
-+		break;
-+	}
-+	if (len < 2 * sizeof(u_int32_t) + 2 * sizeof(u_int16_t) + 2)
-+		goto fail;
-+	r->prefixlen = *b++;
-+	len -= 1;
-+	/* status */
-+	b += 1;
-+	len -= 1;
-+	/* originated */
-+	memcpy(&re->originated, b, sizeof(u_int32_t));
-+	b += sizeof(u_int32_t);
-+	len -= sizeof(u_int32_t);
-+	re->originated = ntohl(re->originated);
-+	/* peer ip */
-+	switch (ntohs(hdr->subtype)) {
-+	case MRT_DUMP_AFI_IP:
-+		if (mrt_extract_addr(b, len, &p->peers->addr, AF_INET) == -1)
-+			goto fail;
-+		b += sizeof(struct in_addr);
-+		len -= sizeof(struct in_addr);
-+		break;
-+	case MRT_DUMP_AFI_IPv6:
-+		if (mrt_extract_addr(b, len, &p->peers->addr, AF_INET6) == -1)
-+			goto fail;
-+		b += sizeof(struct in6_addr);
-+		len -= sizeof(struct in6_addr);
-+		break;
-+	}
-+	memcpy(&asnum, b, sizeof(asnum));
-+	b += sizeof(asnum);
-+	len -= sizeof(asnum);
-+	p->peers->asnum = ntohs(asnum);
-+
-+	memcpy(&alen, b, sizeof(alen));
-+	b += sizeof(alen);
-+	len -= sizeof(alen);
-+	alen = ntohs(alen);
-+
-+	/* attr */
-+	if (len < alen)
-+		goto fail;
-+	if (mrt_extract_attr(re, b, alen, r->prefix.sa.sa_family, 0) == -1)
-+		goto fail;
-+	b += alen;
-+	len -= alen;
-+
-+	return (0);
-+fail:
-+	mrt_free_rib(r);
-+	return (-1);
-+}
-+
-+int
-+mrt_parse_dump_mp(struct mrt_hdr *hdr, void *msg, struct mrt_peer **pp,
-+    struct mrt_rib **rp)
-+{
-+	struct mrt_peer		*p;
-+	struct mrt_rib		*r;
-+	struct mrt_rib_entry	*re;
-+	u_int8_t		*b = msg;
-+	u_int			 len = ntohl(hdr->length);
-+	u_int16_t		 asnum, alen, afi;
-+	u_int8_t		 safi, nhlen;
-+	sa_family_t		 af;
-+
-+	if (*pp == NULL) {
-+		*pp = calloc(1, sizeof(struct mrt_peer));
-+		if (*pp == NULL)
-+			err(1, "calloc");
-+		(*pp)->peers = calloc(1, sizeof(struct mrt_peer_entry));
-+		if ((*pp)->peers == NULL)
-+			err(1, "calloc");
-+		(*pp)->npeers = 1;
-+	}
-+	p = *pp;
-+
-+	*rp = r = calloc(1, sizeof(struct mrt_rib));
-+	if (r == NULL)
-+		err(1, "calloc");
-+	re = calloc(1, sizeof(struct mrt_rib_entry));
-+	if (re == NULL)
-+		err(1, "calloc");
-+	r->nentries = 1;
-+	r->entries = re;
-+	
-+	if (len < 4 * sizeof(u_int16_t))
-+		goto fail;
-+	/* source AS */
-+	b += sizeof(u_int16_t);
-+	len -= sizeof(u_int16_t);
-+	/* dest AS */
-+	memcpy(&asnum, b, sizeof(asnum));
-+	b += sizeof(asnum);
-+	len -= sizeof(asnum);
-+	p->peers->asnum = ntohs(asnum);
-+	/* iface index */
-+	b += sizeof(u_int16_t);
-+	len -= sizeof(u_int16_t);
-+	/* afi */
-+	memcpy(&afi, b, sizeof(afi));
-+	b += sizeof(afi);
-+	len -= sizeof(afi);
-+	afi = ntohs(afi);
-+
-+	/* source + dest ip */
-+	switch (afi) {
-+	case MRT_DUMP_AFI_IP:
-+		if (len < 2 * sizeof(struct in_addr))
-+			goto fail;
-+		/* source IP */
-+		b += sizeof(struct in_addr);
-+		len -= sizeof(struct in_addr);
-+		/* dest IP */
-+		if (mrt_extract_addr(b, len, &p->peers->addr, AF_INET) == -1)
-+			goto fail;
-+		b += sizeof(struct in_addr);
-+		len -= sizeof(struct in_addr);
-+		break;
-+	case MRT_DUMP_AFI_IPv6:
-+		if (len < 2 * sizeof(struct in6_addr))
-+			goto fail;
-+		/* source IP */
-+		b += sizeof(struct in6_addr);
-+		len -= sizeof(struct in6_addr);
-+		/* dest IP */
-+		if (mrt_extract_addr(b, len, &p->peers->addr, AF_INET6) == -1)
-+			goto fail;
-+		b += sizeof(struct in6_addr);
-+		len -= sizeof(struct in6_addr);
-+		break;
-+	}
-+	
-+	if (len < 2 * sizeof(u_int16_t) + 2 * sizeof(u_int32_t))
-+		goto fail;
-+	/* view + status */
-+	b += 2 * sizeof(u_int16_t);
-+	len -= 2 * sizeof(u_int16_t);
-+	/* originated */
-+	memcpy(&re->originated, b, sizeof(u_int32_t));
-+	b += sizeof(u_int32_t);
-+	len -= sizeof(u_int32_t);
-+	re->originated = ntohl(re->originated);
-+
-+	/* afi */
-+	memcpy(&afi, b, sizeof(afi));
-+	b += sizeof(afi);
-+	len -= sizeof(afi);
-+	afi = ntohs(afi);
-+	
-+	/* safi */
-+	safi = *b++;
-+	len -= 1;
-+
-+	switch (afi) {
-+	case MRT_DUMP_AFI_IP:
-+		if (safi == 1 || safi == 2) {
-+			af = AF_INET;
-+			break;
-+		} else if (safi == 128) {
-+			af = AF_VPNv4;
-+			break;
-+		}
-+		goto fail;
-+	case MRT_DUMP_AFI_IPv6:
-+		if (safi != 1 && safi != 2)
-+			goto fail;
-+		af = AF_INET6;
-+		break;
-+	default:
-+		goto fail;
-+	}
-+
-+	/* nhlen */
-+	nhlen = *b++;
-+	len -= 1;
-+
-+	/* nexthop */
-+	if (mrt_extract_addr(b, len, &re->nexthop, af) == -1)
-+		goto fail;
-+	if (len < nhlen)
-+		goto fail;
-+	b += nhlen;
-+	len -= nhlen;
-+
-+	if (len < 1)
-+		goto fail;
-+	r->prefixlen = *b++;
-+	len -= 1;
-+
-+	/* prefix */
-+	switch (af) {
-+	case AF_INET:
-+		if (len < MRT_PREFIX_LEN(r->prefixlen))
-+			goto fail;
-+		r->prefix.sin.sin_family = AF_INET;
-+		r->prefix.sin.sin_len = sizeof(struct sockaddr_in);
-+		memcpy(&r->prefix.sin.sin_addr, b,
-+		    MRT_PREFIX_LEN(r->prefixlen));
-+		b += MRT_PREFIX_LEN(r->prefixlen);
-+		len -= MRT_PREFIX_LEN(r->prefixlen);
-+		break;
-+	case AF_INET6:
-+		if (len < MRT_PREFIX_LEN(r->prefixlen))
-+			goto fail;
-+		r->prefix.sin6.sin6_family = AF_INET6;
-+		r->prefix.sin6.sin6_len = sizeof(struct sockaddr_in6);
-+		memcpy(&r->prefix.sin6.sin6_addr, b,
-+		    MRT_PREFIX_LEN(r->prefixlen));
-+		b += MRT_PREFIX_LEN(r->prefixlen);
-+		len -= MRT_PREFIX_LEN(r->prefixlen);
-+		break;
-+	case AF_VPNv4:
-+		if (len < MRT_PREFIX_LEN(r->prefixlen))
-+			goto fail;
-+		errx(1, "AF_VPNv4 handling not yet implemented");
-+		goto fail;
-+	}
-+
-+	memcpy(&alen, b, sizeof(alen));
-+	b += sizeof(alen);
-+	len -= sizeof(alen);
-+	alen = ntohs(alen);
-+
-+	/* attr */
-+	if (len < alen)
-+		goto fail;
-+	if (mrt_extract_attr(re, b, alen, r->prefix.sa.sa_family, 0) == -1)
-+		goto fail;
-+	b += alen;
-+	len -= alen;
-+
-+	return (0);
-+fail:
-+	mrt_free_rib(r);
-+	return (-1);
-+}
-+
-+int
-+mrt_extract_attr(struct mrt_rib_entry *re, u_char *a, int alen, sa_family_t af,
-+    int as4)
-+{
-+	struct mrt_attr	*ap;
-+	u_int32_t	tmp;
-+	u_int16_t	attr_len;
-+	u_int8_t	type, flags, *attr;
-+
-+	do {
-+		if (alen < 3)
-+			return (-1);
-+		attr = a;
-+		flags = *a++;
-+		alen -= 1;
-+		type = *a++;
-+		alen -= 1;
-+		
-+		if (flags & MRT_ATTR_EXTLEN) {
-+			if (alen < 2)
-+				return (-1);
-+			memcpy(&attr_len, a, sizeof(attr_len));
-+			attr_len = ntohs(attr_len);
-+			a += sizeof(attr_len);
-+			alen -= sizeof(attr_len);
-+		} else {
-+			attr_len = *a++;
-+			alen -= 1;
-+		}
-+		switch (type) {
-+		case MRT_ATTR_ORIGIN:
-+			if (attr_len != 1)
-+				return (-1);
-+			re->origin = *a;
-+			break;
-+		case MRT_ATTR_ASPATH:
-+			if (as4) {
-+				re->aspath_len = attr_len;
-+				if ((re->aspath = malloc(attr_len)) == NULL)
-+					err(1, "malloc");
-+				memcpy(re->aspath, a, attr_len);
-+			} else {
-+				re->aspath = mrt_aspath_inflate(a, attr_len,
-+				    &re->aspath_len);
-+				if (re->aspath == NULL)
-+					return (-1);
-+			}
-+			break;
-+		case MRT_ATTR_NEXTHOP:
-+			if (attr_len != 4)
-+				return (-1);
-+			if (af != AF_INET)
-+				break;
-+			memcpy(&tmp, a, sizeof(tmp));
-+			re->nexthop.sin.sin_len = sizeof(struct sockaddr_in);
-+			re->nexthop.sin.sin_family = AF_INET;
-+			re->nexthop.sin.sin_addr.s_addr = tmp;
-+			break;
-+		case MRT_ATTR_MED:
-+			if (attr_len != 4)
-+				return (-1);
-+			memcpy(&tmp, a, sizeof(tmp));
-+			re->med = ntohl(tmp);
-+			break;
-+		case MRT_ATTR_LOCALPREF:
-+			if (attr_len != 4)
-+				return (-1);
-+			memcpy(&tmp, a, sizeof(tmp));
-+			re->local_pref = ntohl(tmp);
-+			break;
-+		case MRT_ATTR_MP_REACH_NLRI:
-+			/*
-+			 * XXX horrible hack:
-+			 * Once again IETF and the real world differ in the
-+			 * implementation. In short the abbreviated MP_NLRI
-+			 * hack in the standard is not used in real life.
-+			 * Detect the two cases by looking at the first byte
-+			 * of the payload (either the nexthop addr length (RFC)
-+			 * or the high byte of the AFI (old form)). If the
-+			 * first byte matches the expected nexthop length it
-+			 * is expected to be the RFC 6396 encoding.
-+			 */
-+			if (*a != attr_len - 1) {
-+				a += 3;
-+				alen -= 3;
-+				attr_len -= 3;
-+			}
-+			switch (af) {
-+			case AF_INET6:
-+				if (attr_len < sizeof(struct in6_addr) + 1)
-+					return (-1);
-+				re->nexthop.sin6.sin6_len =
-+				    sizeof(struct sockaddr_in6);
-+				re->nexthop.sin6.sin6_family = AF_INET6;
-+				memcpy(&re->nexthop.sin6.sin6_addr, a + 1,
-+				    sizeof(struct in6_addr));
-+				break;
-+			case AF_VPNv4:
-+				if (attr_len < sizeof(u_int64_t) +
-+				    sizeof(struct in_addr))
-+					return (-1);
-+				re->nexthop.svpn4.sv_len =
-+				    sizeof(struct sockaddr_vpn4);
-+				re->nexthop.svpn4.sv_family = AF_VPNv4;
-+				memcpy(&tmp, a + 1 + sizeof(u_int64_t),
-+				    sizeof(tmp));
-+				re->nexthop.svpn4.sv_addr.s_addr = tmp;
-+				break;
-+			}
-+			break;
-+		case MRT_ATTR_AS4PATH:
-+			if (!as4) {
-+				if (re->aspath)
-+					free(re->aspath);
-+				re->aspath_len = attr_len;
-+				if ((re->aspath = malloc(attr_len)) == NULL)
-+					err(1, "malloc");
-+				memcpy(re->aspath, a, attr_len);
-+				break;
-+			}
-+			/* FALLTHROUGH */
-+		default:
-+			re->nattrs++;
-+			if (re->nattrs >= UCHAR_MAX)
-+				err(1, "too many attributes");
-+			ap = realloc(re->attrs,
-+			    re->nattrs * sizeof(struct mrt_attr));
-+			if (ap == NULL)
-+				err(1, "realloc");
-+			re->attrs = ap;
-+			ap = re->attrs + re->nattrs - 1;
-+			ap->attr_len = a + attr_len - attr;
-+			if ((ap->attr = malloc(ap->attr_len)) == NULL)
-+				err(1, "malloc");
-+			memcpy(ap->attr, attr, ap->attr_len);
-+			break;
-+		}
-+		a += attr_len;
-+		alen -= attr_len;
-+	} while (alen > 0);
-+
-+	return (0);
-+}
-+
-+void
-+mrt_free_peers(struct mrt_peer *p)
-+{
-+	free(p->peers);
-+	free(p->view);
-+	free(p);
-+}
-+
-+void
-+mrt_free_rib(struct mrt_rib *r)
-+{
-+	u_int16_t	i, j;
-+
-+	for (i = 0; i < r->nentries && r->entries; i++) {
-+		for (j = 0; j < r->entries[i].nattrs; j++)
-+			 free(r->entries[i].attrs[j].attr);
-+		free(r->entries[i].attrs);
-+		free(r->entries[i].aspath);
-+	}
-+
-+	free(r->entries);
-+	free(r);
-+}
-+
-+void
-+mrt_free_bgp_state(struct mrt_bgp_state *s)
-+{
-+	free(s);
-+}
-+
-+void
-+mrt_free_bgp_msg(struct mrt_bgp_msg *m)
-+{
-+	free(m->msg);
-+	free(m);
-+}
-+
-+u_char *
-+mrt_aspath_inflate(void *data, u_int16_t len, u_int16_t *newlen)
-+{
-+	u_int8_t	*seg, *nseg, *ndata;
-+	u_int16_t	 seg_size, olen, nlen;
-+	u_int8_t	 seg_len;
-+
-+	/* first calculate the length of the aspath */
-+	seg = data;
-+	nlen = 0;
-+	for (olen = len; olen > 0; olen -= seg_size, seg += seg_size) {
-+		seg_len = seg[1];
-+		seg_size = 2 + sizeof(u_int16_t) * seg_len;
-+		nlen += 2 + sizeof(u_int32_t) * seg_len;
-+
-+		if (seg_size > olen)
-+			return NULL;
-+	}
-+
-+	*newlen = nlen;
-+	if ((ndata = malloc(nlen)) == NULL)
-+		err(1, "malloc");
-+
-+	/* then copy the aspath */
-+	seg = data;
-+	for (nseg = ndata; nseg < ndata + nlen; ) {
-+		*nseg++ = *seg++;
-+		*nseg++ = seg_len = *seg++;
-+		for (; seg_len > 0; seg_len--) {
-+			*nseg++ = 0;
-+			*nseg++ = 0;
-+			*nseg++ = *seg++;
-+			*nseg++ = *seg++;
-+		}
-+	}
-+
-+	return (ndata);
-+}
-+
-+int
-+mrt_extract_addr(void *msg, u_int len, union mrt_addr *addr, sa_family_t af)
-+{
-+	u_int8_t	*b = msg;
-+
-+	switch (af) {
-+	case AF_INET:
-+		if (len < sizeof(struct in_addr))
-+			return (-1);
-+		addr->sin.sin_family = AF_INET;
-+		addr->sin.sin_len = sizeof(struct sockaddr_in);
-+		memcpy(&addr->sin.sin_addr, b, sizeof(struct in_addr));
-+		return sizeof(struct in_addr);
-+	case AF_INET6:
-+		if (len < sizeof(struct in6_addr))
-+			return (-1);
-+		addr->sin6.sin6_family = AF_INET6;
-+		addr->sin6.sin6_len = sizeof(struct sockaddr_in6);
-+		memcpy(&addr->sin6.sin6_addr, b, sizeof(struct in6_addr));
-+		return sizeof(struct in6_addr);
-+	case AF_VPNv4:
-+		if (len < sizeof(u_int64_t) + sizeof(struct in_addr))
-+			return (-1);
-+		addr->svpn4.sv_len = sizeof(struct sockaddr_vpn4);
-+		addr->svpn4.sv_family = AF_VPNv4;
-+		memcpy(&addr->svpn4.sv_addr, b + sizeof(u_int64_t),
-+		    sizeof(struct in_addr));
-+		return (sizeof(u_int64_t) + sizeof(struct in_addr));
-+	default:
-+		return (-1);
-+	}
-+}
diff --git a/net/openbgpd/files/patch-bgpctl_mrtparser.h b/net/openbgpd/files/patch-bgpctl_mrtparser.h
deleted file mode 100644
index 2f11567e54f1..000000000000
--- a/net/openbgpd/files/patch-bgpctl_mrtparser.h
+++ /dev/null
@@ -1,122 +0,0 @@
-Index: bgpctl/mrtparser.h
-===================================================================
-RCS file: bgpctl/mrtparser.h
-diff -N bgpctl/mrtparser.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ bgpctl/mrtparser.h	13 Oct 2012 18:22:53 -0000	1.1.1.1
-@@ -0,0 +1,115 @@
-+/*	$OpenBSD$ */
-+/*
-+ * Copyright (c) 2011 Claudio Jeker <claudio@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+struct sockaddr_vpn4 {
-+	u_int8_t		sv_len;
-+	sa_family_t		sv_family;
-+	u_int8_t		sv_labellen;
-+	u_int8_t		sv_pad;
-+	struct in_addr		sv_addr;
-+	u_int64_t		sv_rd;
-+	u_int8_t		sv_label[21];
-+	u_int8_t		sv_pad2[3];
-+};
-+
-+#define AF_VPNv4	250	/* XXX high enough to not cause issues */
-+
-+union mrt_addr {
-+	struct sockaddr_in6	sin6;
-+	struct sockaddr_in	sin;
-+	struct sockaddr_vpn4	svpn4;
-+	struct sockaddr		sa;
-+};
-+
-+/* data structures for the MSG_TABLE_DUMP_V2 format */
-+struct mrt_peer_entry {
-+	union mrt_addr		addr;
-+	u_int32_t		bgp_id;
-+	u_int32_t		asnum;
-+};
-+
-+struct mrt_peer {
-+	char			*view;
-+	struct mrt_peer_entry	*peers;
-+	u_int32_t		 bgp_id;
-+	u_int16_t		 npeers;
-+};
-+
-+struct mrt_attr {
-+	void	*attr;
-+	size_t	 attr_len;
-+};
-+
-+struct mrt_rib_entry {
-+	void		*aspath;
-+	struct mrt_attr	*attrs;
-+	union mrt_addr	 nexthop;
-+	time_t		 originated;
-+	u_int32_t	 local_pref;
-+	u_int32_t	 med;
-+	u_int16_t	 peer_idx;
-+	u_int16_t	 aspath_len;
-+	u_int16_t	 nattrs;
-+	u_int8_t	 origin;
-+};
-+
-+struct mrt_rib {
-+	struct mrt_rib_entry	*entries;
-+	union mrt_addr		 prefix;
-+	u_int32_t		 seqnum;
-+	u_int16_t		 nentries;
-+	u_int8_t		 prefixlen;
-+};
-+
-+/* data structures for the BGP4MP MESSAGE and STATE types */
-+struct mrt_bgp_state {
-+	union mrt_addr	src;
-+	union mrt_addr	dst;
-+	u_int32_t	src_as;
-+	u_int32_t	dst_as;
-+	u_int16_t	old_state;
-+	u_int16_t	new_state;
-+};
-+
-+struct mrt_bgp_msg {
-+	union mrt_addr	 src;
-+	union mrt_addr	 dst;
-+	u_int32_t	 src_as;
-+	u_int32_t	 dst_as;
-+	u_int16_t	 msg_len;
-+	void		*msg;
-+};
-+
-+#define MRT_ATTR_ORIGIN		1
-+#define MRT_ATTR_ASPATH		2
-+#define MRT_ATTR_NEXTHOP	3
-+#define MRT_ATTR_MED		4
-+#define MRT_ATTR_LOCALPREF	5
-+#define MRT_ATTR_MP_REACH_NLRI	14
-+#define MRT_ATTR_AS4PATH	17
-+#define MRT_ATTR_EXTLEN		0x10
-+
-+#define MRT_PREFIX_LEN(x)	((((u_int)x) + 7) / 8)
-+
-+struct mrt_parser {
-+	void	(*dump)(struct mrt_rib *, struct mrt_peer *, void *);
-+	void	(*state)(struct mrt_bgp_state *, void *);
-+	void	(*message)(struct mrt_bgp_msg *, void *);
-+	void	*arg;
-+};
-+
-+void	mrt_parse(int, struct mrt_parser *, int);
diff --git a/net/openbgpd/files/patch-bgpctl_parser.c b/net/openbgpd/files/patch-bgpctl_parser.c
deleted file mode 100644
index 0ce85818b1eb..000000000000
--- a/net/openbgpd/files/patch-bgpctl_parser.c
+++ /dev/null
@@ -1,400 +0,0 @@
-Index: bgpctl/parser.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/parser.c,v
-retrieving revision 1.1.1.6
-retrieving revision 1.7
-diff -u -p -r1.1.1.6 -r1.7
---- bgpctl/parser.c	14 Feb 2010 20:20:14 -0000	1.1.1.6
-+++ bgpctl/parser.c	13 Oct 2012 18:35:56 -0000	1.7
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: parser.c,v 1.54 2009/06/12 16:44:02 claudio Exp $ */
-+/*	$OpenBSD: parser.c,v 1.64 2012/03/27 18:24:11 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -16,11 +16,16 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#if defined(__FreeBSD__)        /* compat */
-+#include "openbsd-compat.h"
-+#endif /* defined(__FreeBSD__) */
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- 
- #include <err.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <limits.h>
- #include <netdb.h>
- #include <stdio.h>
-@@ -52,7 +57,9 @@ enum token_type {
- 	PREPSELF,
- 	WEIGHT,
- 	FAMILY,
--	GETOPT
-+	GETOPT,
-+	RTABLE,
-+	FILENAME
- };
- 
- enum getopts {
-@@ -72,14 +79,18 @@ static const struct token t_show[];
- static const struct token t_show_summary[];
- static const struct token t_show_fib[];
- static const struct token t_show_rib[];
-+static const struct token t_show_mrt[];
-+static const struct token t_show_mrt_file[];
- static const struct token t_show_rib_neigh[];
-+static const struct token t_show_mrt_neigh[];
- static const struct token t_show_rib_rib[];
- static const struct token t_show_neighbor[];
- static const struct token t_show_neighbor_modifiers[];
- static const struct token t_fib[];
- static const struct token t_neighbor[];
- static const struct token t_neighbor_modifiers[];
--static const struct token t_show_as[];
-+static const struct token t_show_rib_as[];
-+static const struct token t_show_mrt_as[];
- static const struct token t_show_prefix[];
- static const struct token t_show_ip[];
- static const struct token t_show_community[];
-@@ -97,6 +108,9 @@ static const struct token t_prepself[];
- static const struct token t_weight[];
- static const struct token t_irrfilter[];
- static const struct token t_irrfilter_opts[];
-+static const struct token t_log[];
-+static const struct token t_fib_table[];
-+static const struct token t_show_fib_table[];
- 
- static const struct token t_main[] = {
- 	{ KEYWORD,	"reload",	RELOAD,		NULL},
-@@ -105,6 +119,7 @@ static const struct token t_main[] = {
- 	{ KEYWORD,	"neighbor",	NEIGHBOR,	t_neighbor},
- 	{ KEYWORD,	"network",	NONE,		t_network},
- 	{ KEYWORD,	"irrfilter",	IRRFILTER,	t_irrfilter},
-+	{ KEYWORD,	"log",		NONE,		t_log},
- 	{ ENDTOKEN,	"",		NONE,		NULL}
- };
- 
-@@ -116,8 +131,10 @@ static const struct token t_show[] = {
- 	{ KEYWORD,	"network",	NETWORK_SHOW,	t_network_show},
- 	{ KEYWORD,	"nexthop",	SHOW_NEXTHOP,	NULL},
- 	{ KEYWORD,	"rib",		SHOW_RIB,	t_show_rib},
-+	{ KEYWORD,	"tables",	SHOW_FIB_TABLES, NULL},
- 	{ KEYWORD,	"ip",		NONE,		t_show_ip},
- 	{ KEYWORD,	"summary",	SHOW_SUMMARY,	t_show_summary},
-+	{ KEYWORD,	"mrt",		SHOW_MRT,	t_show_mrt},
- 	{ ENDTOKEN,	"",		NONE,		NULL}
- };
- 
-@@ -128,24 +145,26 @@ static const struct token t_show_summary
- };
- 
- static const struct token t_show_fib[] = {
--	{ NOTOKEN,	"",		NONE,			NULL},
--	{ FLAG,		"connected",	F_CONNECTED,		t_show_fib},
--	{ FLAG,		"static",	F_STATIC,		t_show_fib},
--	{ FLAG,		"bgp",		F_BGPD_INSERTED,	t_show_fib},
--	{ FLAG,		"nexthop",	F_NEXTHOP,		t_show_fib},
--	{ FAMILY,	"",		NONE,			t_show_fib},
--	{ ADDRESS,	"",		NONE,			NULL},
--	{ ENDTOKEN,	"",		NONE,			NULL}
-+	{ NOTOKEN,	"",		NONE,		 NULL},
-+	{ FLAG,		"connected",	F_CONNECTED,	 t_show_fib},
-+	{ FLAG,		"static",	F_STATIC,	 t_show_fib},
-+	{ FLAG,		"bgp",		F_BGPD_INSERTED, t_show_fib},
-+	{ FLAG,		"nexthop",	F_NEXTHOP,	 t_show_fib},
-+	{ KEYWORD,	"table",	NONE,		 t_show_fib_table},
-+	{ FAMILY,	"",		NONE,		 t_show_fib},
-+	{ ADDRESS,	"",		NONE,		 NULL},
-+	{ ENDTOKEN,	"",		NONE,		 NULL}
- };
- 
- static const struct token t_show_rib[] = {
- 	{ NOTOKEN,	"",		NONE,		NULL},
--	{ ASTYPE,	"as",		AS_ALL,		t_show_as},
--	{ ASTYPE,	"source-as",	AS_SOURCE,	t_show_as},
--	{ ASTYPE,	"transit-as",	AS_TRANSIT,	t_show_as},
--	{ ASTYPE,	"peer-as",	AS_PEER,	t_show_as},
-+	{ ASTYPE,	"as",		AS_ALL,		t_show_rib_as},
-+	{ ASTYPE,	"source-as",	AS_SOURCE,	t_show_rib_as},
-+	{ ASTYPE,	"transit-as",	AS_TRANSIT,	t_show_rib_as},
-+	{ ASTYPE,	"peer-as",	AS_PEER,	t_show_rib_as},
- 	{ ASTYPE,	"empty-as",	AS_EMPTY,	t_show_rib},
- 	{ KEYWORD,	"community",	NONE,		t_show_community},
-+	{ FLAG,		"selected",	F_CTL_ACTIVE,	t_show_rib},
- 	{ FLAG,		"detail",	F_CTL_DETAIL,	t_show_rib},
- 	{ FLAG,		"in",		F_CTL_ADJ_IN,	t_show_rib},
- 	{ FLAG,		"out",		F_CTL_ADJ_OUT,	t_show_rib},
-@@ -158,12 +177,38 @@ static const struct token t_show_rib[] =
- 	{ ENDTOKEN,	"",		NONE,		NULL}
- };
- 
-+
-+static const struct token t_show_mrt[] = {
-+	{ NOTOKEN,	"",		NONE,		NULL},
-+	{ ASTYPE,	"as",		AS_ALL,		t_show_mrt_as},
-+	{ ASTYPE,	"source-as",	AS_SOURCE,	t_show_mrt_as},
-+	{ ASTYPE,	"transit-as",	AS_TRANSIT,	t_show_mrt_as},
-+	{ ASTYPE,	"peer-as",	AS_PEER,	t_show_mrt_as},
-+	{ ASTYPE,	"empty-as",	AS_EMPTY,	t_show_mrt},
-+	{ FLAG,		"detail",	F_CTL_DETAIL,	t_show_mrt},
-+	{ KEYWORD,	"neighbor",	NONE,		t_show_mrt_neigh},
-+	{ KEYWORD,	"file",		NONE,		t_show_mrt_file},
-+	{ FAMILY,	"",		NONE,		t_show_mrt},
-+	{ PREFIX,	"",		NONE,		t_show_prefix},
-+	{ ENDTOKEN,	"",		NONE,		NULL}
-+};
-+
-+static const struct token t_show_mrt_file[] = {
-+	{ FILENAME,	"",		NONE,		t_show_mrt},
-+	{ ENDTOKEN,	"",		NONE,	NULL}
-+};
-+
- static const struct token t_show_rib_neigh[] = {
- 	{ PEERADDRESS,	"",		NONE,	t_show_rib},
- 	{ PEERDESC,	"",		NONE,	t_show_rib},
- 	{ ENDTOKEN,	"",		NONE,	NULL}
- };
- 
-+static const struct token t_show_mrt_neigh[] = {
-+	{ PEERADDRESS,	"",		NONE,	t_show_mrt},
-+	{ ENDTOKEN,	"",		NONE,	NULL}
-+};
-+
- static const struct token t_show_rib_rib[] = {
- 	{ RIBNAME,	"",		NONE,	t_show_rib},
- 	{ ENDTOKEN,	"",		NONE,	NULL}
-@@ -187,6 +232,7 @@ static const struct token t_show_neighbo
- static const struct token t_fib[] = {
- 	{ KEYWORD,	"couple",	FIB_COUPLE,	NULL},
- 	{ KEYWORD,	"decouple",	FIB_DECOUPLE,	NULL},
-+	{ KEYWORD,	"table",	NONE,		t_fib_table},
- 	{ ENDTOKEN,	"",		NONE,		NULL}
- };
- 
-@@ -204,11 +250,16 @@ static const struct token t_neighbor_mod
- 	{ ENDTOKEN,	"",		NONE,			NULL}
- };
- 
--static const struct token t_show_as[] = {
-+static const struct token t_show_rib_as[] = {
- 	{ ASNUM,	"",		NONE,		t_show_rib},
- 	{ ENDTOKEN,	"",		NONE,		NULL}
- };
- 
-+static const struct token t_show_mrt_as[] = {
-+	{ ASNUM,	"",		NONE,		t_show_mrt},
-+	{ ENDTOKEN,	"",		NONE,		NULL}
-+};
-+
- static const struct token t_show_prefix[] = {
- 	{ NOTOKEN,	"",		NONE,		NULL},
- 	{ FLAG,		"all",		F_LONGER,	NULL},
-@@ -231,6 +282,7 @@ static const struct token t_network[] = 
- 	{ KEYWORD,	"delete",	NETWORK_REMOVE,	t_prefix},
- 	{ KEYWORD,	"flush",	NETWORK_FLUSH,	NULL},
- 	{ KEYWORD,	"show",		NETWORK_SHOW,	t_network_show},
-+	{ KEYWORD,	"mrt",		NETWORK_MRT,	t_show_mrt},
- 	{ ENDTOKEN,	"",		NONE,		NULL}
- };
- 
-@@ -311,6 +363,22 @@ static const struct token t_irrfilter_op
- 	{ ENDTOKEN,	"",		NONE,			NULL}
- };
- 
-+static const struct token t_log[] = {
-+	{ KEYWORD,	"verbose",	LOG_VERBOSE,	NULL},
-+	{ KEYWORD,	"brief",	LOG_BRIEF,	NULL},
-+	{ ENDTOKEN,	"",		NONE,		NULL}
-+};
-+
-+static const struct token t_fib_table[] = {
-+	{ RTABLE,	"",			NONE,	t_fib},
-+	{ ENDTOKEN,	"",			NONE,	NULL}
-+};
-+
-+static const struct token t_show_fib_table[] = {
-+	{ RTABLE,	"",			NONE,	t_show_fib},
-+	{ ENDTOKEN,	"",			NONE,	NULL}
-+};
-+
- static struct parse_result	res;
- 
- const struct token	*match_token(int *argc, char **argv[],
-@@ -404,15 +472,22 @@ match_token(int *argc, char **argv[], co
- 		case FAMILY:
- 			if (word == NULL)
- 				break;
--			if (!strcmp(word, "inet") || !strcmp(word, "IPv4")) {
-+			if (!strcmp(word, "inet") ||
-+			    !strcasecmp(word, "IPv4")) {
- 				match++;
- 				t = &table[i];
--				res.af = AF_INET;
-+				res.aid = AID_INET;
- 			}
--			if (!strcmp(word, "inet6") || !strcmp(word, "IPv6")) {
-+			if (!strcmp(word, "inet6") ||
-+			    !strcasecmp(word, "IPv6")) {
- 				match++;
- 				t = &table[i];
--				res.af = AF_INET6;
-+				res.aid = AID_INET6;
-+			}
-+			if (!strcasecmp(word, "VPNv4")) {
-+				match++;
-+				t = &table[i];
-+				res.aid = AID_VPN_IPv4;
- 			}
- 			break;
- 		case ADDRESS:
-@@ -485,6 +560,7 @@ match_token(int *argc, char **argv[], co
- 		case PREPNBR:
- 		case PREPSELF:
- 		case WEIGHT:
-+		case RTABLE:
- 			if (word != NULL && strlen(word) > 0 &&
- 			    parse_number(word, &res, table[i].type)) {
- 				match++;
-@@ -518,6 +594,23 @@ match_token(int *argc, char **argv[], co
- 				t = &table[i];
- 			}
- 			break;
-+		case FILENAME:
-+			if (word != NULL && strlen(word) > 0) {
-+				if ((res.mrtfd = open(word, O_RDONLY)) == -1) {
-+					/*
-+					 * ignore error if path has no / and
-+					 * does not exist. In hope to print
-+					 * usage.
-+					 */
-+					if (errno == ENOENT &&
-+					    !strchr(word, '/'))
-+						break;
-+					err(1, "mrt open(%s)", word);
-+				}
-+				match++;
-+				t = &table[i];
-+			}
-+			break;
- 		case ENDTOKEN:
- 			break;
- 		}
-@@ -577,6 +670,9 @@ show_valid_args(const struct token table
- 		case WEIGHT:
- 			fprintf(stderr, "  <number>\n");
- 			break;
-+		case RTABLE:
-+			fprintf(stderr, "  <rtableid>\n");
-+			break;
- 		case NEXTHOP:
- 			fprintf(stderr, "  <address>\n");
- 			break;
-@@ -584,11 +680,14 @@ show_valid_args(const struct token table
- 			fprintf(stderr, "  <pftable>\n");
- 			break;
- 		case FAMILY:
--			fprintf(stderr, "  [ inet | inet6 | IPv4 | IPv6 ]\n");
-+			fprintf(stderr, "  [ inet | inet6 | IPv4 | IPv6 | VPNv4 ]\n");
- 			break;
- 		case GETOPT:
- 			fprintf(stderr, "  <options>\n");
- 			break;
-+		case FILENAME:
-+			fprintf(stderr, "  <filename>\n");
-+			break;
- 		case ENDTOKEN:
- 			break;
- 		}
-@@ -608,7 +707,7 @@ parse_addr(const char *word, struct bgpd
- 	bzero(&ina, sizeof(ina));
- 
- 	if (inet_net_pton(AF_INET, word, &ina, sizeof(ina)) != -1) {
--		addr->af = AF_INET;
-+		addr->aid = AID_INET;
- 		addr->v4 = ina;
- 		return (1);
- 	}
-@@ -618,13 +717,7 @@ parse_addr(const char *word, struct bgpd
- 	hints.ai_socktype = SOCK_DGRAM; /*dummy*/
- 	hints.ai_flags = AI_NUMERICHOST;
- 	if (getaddrinfo(word, "0", &hints, &r) == 0) {
--		addr->af = AF_INET6;
--		memcpy(&addr->v6,
--		    &((struct sockaddr_in6 *)r->ai_addr)->sin6_addr,
--		    sizeof(addr->v6));
--		addr->scope_id =
--		    ((struct sockaddr_in6 *)r->ai_addr)->sin6_scope_id;
--
-+		sa2addr(r->ai_addr, addr);
- 		freeaddrinfo(r);
- 		return (1);
- 	}
-@@ -647,7 +740,7 @@ parse_prefix(const char *word, struct bg
- 	if ((p = strrchr(word, '/')) != NULL) {
- 		mask = strtonum(p + 1, 0, 128, &errstr);
- 		if (errstr)
--			errx(1, "invalid netmask: %s", errstr);
-+			errx(1, "netmask %s", errstr);
- 
- 		if ((ps = malloc(strlen(word) - strlen(p) + 1)) == NULL)
- 			err(1, "parse_prefix: malloc");
-@@ -663,15 +756,15 @@ parse_prefix(const char *word, struct bg
- 		if (parse_addr(word, addr) == 0)
- 			return (0);
- 
--	switch (addr->af) {
--	case AF_INET:
-+	switch (addr->aid) {
-+	case AID_INET:
- 		if (mask == -1)
- 			mask = 32;
- 		if (mask > 32)
- 			errx(1, "invalid netmask: too large");
- 		addr->v4.s_addr = addr->v4.s_addr & htonl(prefixlen2mask(mask));
- 		break;
--	case AF_INET6:
-+	case AID_INET6:
- 		if (mask == -1)
- 			mask = 128;
- 		inet6applymask(&addr->v6, &addr->v6, mask);
-@@ -706,7 +799,7 @@ parse_asnum(const char *word, u_int32_t 
- 		if (errstr)
- 			errx(1, "AS number is %s: %s", errstr, word);
- 	} else {
--		uval = strtonum(word, 0, ASNUM_MAX - 1, &errstr);
-+		uval = strtonum(word, 0, UINT_MAX, &errstr);
- 		if (errstr)
- 			errx(1, "AS number is %s: %s", errstr, word);
- 	}
-@@ -730,6 +823,11 @@ parse_number(const char *word, struct pa
- 		errx(1, "number is %s: %s", errstr, word);
- 
- 	/* number was parseable */
-+	if (type == RTABLE) {
-+		r->rtableid = uval;
-+		return (1);
-+	}
-+
- 	if ((fs = calloc(1, sizeof(struct filter_set))) == NULL)
- 		err(1, NULL);
- 	switch (type) {
-@@ -882,8 +980,14 @@ bgpctl_getopt(int *argc, char **argv[], 
- 	int	  ch;
- 
- 	optind = optreset = 1;
--	while ((ch = getopt((*argc) + 1, (*argv) - 1, "o:")) != -1) {
-+	while ((ch = getopt((*argc) + 1, (*argv) - 1, "46o:")) != -1) {
- 		switch (ch) {
-+		case '4':
-+			res.flags = (res.flags | F_IPV4) & ~F_IPV6;
-+			break;
-+		case '6':
-+			res.flags = (res.flags | F_IPV6) & ~F_IPV4;
-+			break;
- 		case 'o':
- 			res.irr_outdir = optarg;
- 			break;
diff --git a/net/openbgpd/files/patch-bgpctl_parser.h b/net/openbgpd/files/patch-bgpctl_parser.h
deleted file mode 100644
index 1d570c747a7c..000000000000
--- a/net/openbgpd/files/patch-bgpctl_parser.h
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: bgpctl/parser.h
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/parser.h,v
-retrieving revision 1.1.1.6
-retrieving revision 1.1.1.9
-diff -u -p -r1.1.1.6 -r1.1.1.9
---- bgpctl/parser.h	14 Feb 2010 20:20:14 -0000	1.1.1.6
-+++ bgpctl/parser.h	13 Oct 2012 18:22:53 -0000	1.1.1.9
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: parser.h,v 1.19 2009/06/06 06:05:41 claudio Exp $ */
-+/*	$OpenBSD: parser.h,v 1.23 2011/09/21 10:37:51 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -29,7 +29,9 @@ enum actions {
- 	SHOW_NEIGHBOR_TIMERS,
- 	SHOW_NEIGHBOR_TERSE,
- 	SHOW_FIB,
-+	SHOW_FIB_TABLES,
- 	SHOW_RIB,
-+	SHOW_MRT,
- 	SHOW_RIB_MEM,
- 	SHOW_NEXTHOP,
- 	SHOW_INTERFACE,
-@@ -37,6 +39,8 @@ enum actions {
- 	FIB,
- 	FIB_COUPLE,
- 	FIB_DECOUPLE,
-+	LOG_VERBOSE,
-+	LOG_BRIEF,
- 	NEIGHBOR,
- 	NEIGHBOR_UP,
- 	NEIGHBOR_DOWN,
-@@ -46,6 +50,7 @@ enum actions {
- 	NETWORK_REMOVE,
- 	NETWORK_FLUSH,
- 	NETWORK_SHOW,
-+	NETWORK_MRT,
- 	IRRFILTER
- };
- 
-@@ -59,9 +64,11 @@ struct parse_result {
- 	char			 rib[PEER_DESCR_LEN];
- 	char			*irr_outdir;
- 	int			 flags;
--	enum actions		action;
-+	u_int			 rtableid;
-+	enum actions		 action;
- 	u_int8_t		 prefixlen;
--	sa_family_t		 af;
-+	u_int8_t		 aid;
-+	int			 mrtfd;
- };
- 
- __dead void		 usage(void);
diff --git a/net/openbgpd/files/patch-bgpctl_whois.c b/net/openbgpd/files/patch-bgpctl_whois.c
deleted file mode 100644
index 0e4b86c84b6e..000000000000
--- a/net/openbgpd/files/patch-bgpctl_whois.c
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: bgpctl/whois.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/whois.c,v
-retrieving revision 1.1.1.5
-retrieving revision 1.1.1.7
-diff -u -p -r1.1.1.5 -r1.1.1.7
---- bgpctl/whois.c	14 Feb 2010 20:20:14 -0000	1.1.1.5
-+++ bgpctl/whois.c	13 Oct 2012 18:22:54 -0000	1.1.1.7
-@@ -68,7 +68,8 @@ char *qtype_opts[] = {
- 	"",
- 	"-T aut-num",
- 	"-K -T as-set",
--	"-K -T route -i origin"
-+	"-K -T route -i origin",
-+	"-K -T route6 -i origin"
- };
- 
- char	*server = "whois.radb.net";
diff --git a/net/openbgpd/files/patch-bgpd_Makefile b/net/openbgpd/files/patch-bgpd_Makefile
deleted file mode 100644
index fc2701497ef1..000000000000
--- a/net/openbgpd/files/patch-bgpd_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- bgpd/Makefile.orig	2013-02-21 19:20:05.000000000 +0000
-+++ bgpd/Makefile	2013-02-21 19:20:54.000000000 +0000
-@@ -1,15 +1,25 @@
- #	$OpenBSD: Makefile,v 1.28 2009/06/25 14:14:54 deraadt Exp $
- 
-+.PATH:		${.CURDIR}/.. ${.CURDIR}/../openbsd-compat
-+
-+CONFFILE?=	${PREFIX}/etc/bgpd.conf
-+
- PROG=	bgpd
--SRCS=	bgpd.c buffer.c session.c log.c parse.y config.c imsg.c \
-+SRCS=	bgpd.c session.c log.c parse.y config.c \
- 	rde.c rde_rib.c rde_decide.c rde_prefix.c mrt.c kroute.c \
- 	control.c pfkey.c rde_update.c rde_attr.c printconf.c \
--	rde_filter.c pftable.c name2id.c util.c carp.c timer.c
-+	rde_filter.c pftable.c name2id.c util.c carp.c timer.c \
-+	imsg.c imsg-buffer.c
- CFLAGS+= -Wall -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../openbsd-compat
- CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
- CFLAGS+= -Wmissing-declarations
- CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
- CFLAGS+= -Wsign-compare
-+CFLAGS+= -DCONFFILE=\"${CONFFILE}\"
-+.if defined(IPV6_LINKLOCAL_PEER)
-+CFLAGS+= -DIPV6_LINKLOCAL_PEER
-+.endif
- YFLAGS=
- MAN= bgpd.8 bgpd.conf.5
- 
diff --git a/net/openbgpd/files/patch-bgpd_bgpd.8 b/net/openbgpd/files/patch-bgpd_bgpd.8
deleted file mode 100644
index f59cd5269f2c..000000000000
--- a/net/openbgpd/files/patch-bgpd_bgpd.8
+++ /dev/null
@@ -1,348 +0,0 @@
-Index: bgpd/bgpd.8
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.8,v
-retrieving revision 1.1.1.8
-retrieving revision 1.10
-diff -u -p -r1.1.1.8 -r1.10
---- bgpd/bgpd.8	14 Feb 2010 20:19:57 -0000	1.1.1.8
-+++ bgpd/bgpd.8	13 Oct 2012 18:36:00 -0000	1.10
-@@ -1,4 +1,4 @@
--.\" $OpenBSD: bgpd.8,v 1.28 2009/01/13 23:01:36 sthen Exp $
-+.\" $OpenBSD: bgpd.8,v 1.45 2012/08/24 20:13:03 jmc Exp $
- .\"
- .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
- .\"
-@@ -14,7 +14,7 @@
- .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- .\"
--.Dd $Mdocdate: January 13 2009 $
-+.Dd $Mdocdate: August 24 2012 $
- .Dt BGPD 8
- .Os
- .Sh NAME
-@@ -24,12 +24,8 @@
- .Nm bgpd
- .Bk -words
- .Op Fl cdnv
--.Oo Xo
--.Fl D Ar macro Ns = Ns Ar value Oc
--.Xc
-+.Op Fl D Ar macro Ns = Ns Ar value
- .Op Fl f Ar file
--.Op Fl r Ar path
--.Op Fl s Ar path
- .Ek
- .Sh DESCRIPTION
- .Nm
-@@ -42,15 +38,106 @@ concerning
- with other BGP systems.
- .Nm
- uses the Border Gateway Protocol, Version 4,
--as described in RFC 1771.
--Please refer to that document for more information about BGP.
-+as described in RFC 4271.
-+.Pp
-+BGP is an exterior gateway protocol using a multiple step decision process
-+to find the best path.
-+Advanced filtering can be used to influence the route
-+decision for traffic engineering.
-+The session engine of
-+.Nm
-+is responsible for maintaining the TCP session with each neighbor.
-+Updates are passed to the Route Decision Engine (RDE) where the paths
-+are filtered and used to compute a Routing Information Base (RIB).
-+The parent process is responsible for keeping the RIB in sync with
-+the kernel routing table.
-+.Pp
-+The route decision process selects the best path by evaluating all paths to
-+the same destination.
-+The decision process continues to the next step if paths have equal attributes.
-+Paths that are less preferred are taken out of consideration until there is
-+only one path left.
-+.Bl -enum -width 42 -offset bula
-+.It
-+All paths with errors or loops are not eligible.
-+.It
-+Paths with an unreachable nexthop are not eligible.
-+After this step all remaining paths are valid.
-+.It
-+The path with the highest
-+.Em LOCAL_PREF
-+is selected.
-+.It
-+The path with the shortest
-+.Em AS path
-+attribute is selected.
-+.It
-+The
-+.Em ORIGIN
-+attribute is compared.
-+The order is IGP before EGP before incomplete origins.
-+.It
-+The path with the lowest
-+.Em MULTI_EXIT_DISC
-+metric is selected.
-+Normally, this value is only considered when choosing between multiple
-+routes sent by the same neighbouring AS.
-+However, if
-+.Dq Li rde med compare always
-+is set in the configuration, the metric is compared for routes sent by any AS.
-+.It
-+Comparison of the BGP session type.
-+Paths learned over an external (EBGP) session are preferred over those
-+learned via an internal (IBGP) session.
-+.It
-+The path with the lowest local
-+.Em weight
-+is selected.
-+.It
-+If
-+.Dq Li rde route-age evaluate
-+is set then the oldest path is selected.
-+.It
-+The path coming from the neighbor with the lowest
-+.Em BGP ID
-+wins.
-+If the
-+.Em ORIGINATOR_ID
-+attribute is present that value will be used in the comparison instead.
-+.It
-+The path with the shortest
-+.Em CLUSTER_LIST
-+attribute is selected.
-+If it is not present then a length of 0 is used in the comparison.
-+.It
-+The path coming from the peer with the lowest IP address is selected.
-+IPv4 sessions will be preferred over IPv6 ones.
-+.It
-+In case of locally announced prefixes
-+.Nm
-+will prefer statically set prefixes over dynamically inserted ones.
-+.El
-+.Pp
-+Attributes set by filters can be used to tip the decision process to prefer
-+particular paths over others.
-+This can be achieved by changing the
-+.Em localpref ,
-+.Em med ,
-+or
-+.Em weight
-+attributes.
-+AS path prepending or changing the
-+.Em med
-+or
-+.Em origin
-+attribute can be used to influencing the routing behaviour on remote systems.
- .Pp
- .Nm
- is usually started at boot time, and can be enabled by
- setting the following in
--.Pa /etc/rc.conf.local :
-+.Pa /etc/rc.conf :
- .Pp
--.Dl bgpd_flags=\&"\&"
-+.Dl openbgpd_enable=\&"YES\&"
- .Pp
- See
- .Xr rc 8
-@@ -117,25 +204,16 @@ Use
- .Ar file
- as the configuration file,
- instead of the default
--.Pa /etc/bgpd.conf .
-+.Pa %%PREFIX%%/etc/bgpd.conf .
- .It Fl n
- Configtest mode.
- Only check the configuration file for validity.
--.It Fl r Ar path
--Open a second, restricted, control socket that
--.Xr bgpctl 8
--can use.
--Only
--.Em show
--requests are allowed on this socket.
--.It Fl s Ar path
--Use an alternate location for the default control socket.
- .It Fl v
- Produce more verbose output.
- .El
- .Sh FILES
- .Bl -tag -width "/var/run/bgpd.sockXXX" -compact
--.It Pa /etc/bgpd.conf
-+.It Pa %%PREFIX%%/etc/bgpd.conf
- default
- .Nm
- configuration file
-@@ -149,55 +227,144 @@ control socket
- .Xr bgpctl 8 ,
- .Xr bgplg 8 ,
- .Xr bgplgsh 8
-+.Sh STANDARDS
- .Rs
--.%R RFC 1771
--.%T "A Border Gateway Protocol 4 (BGP-4)"
--.%D March 1995
--.Re
--.Rs
--.%R RFC 1997
--.%T "BGP Communities Attribute"
-+.%A R. Chandra
-+.%A P. Traina
-+.%A "T. Li"
- .%D August 1996
-+.%R RFC 1997
-+.%T BGP Communities Attribute
- .Re
-+.Pp
- .Rs
--.%R RFC 2385
--.%T "Protection of BGP Sessions via the TCP MD5 Signature Option"
-+.%A A. Heffernan
- .%D August 1998
-+.%R RFC 2385
-+.%T Protection of BGP Sessions via the TCP MD5 Signature Option
- .Re
-+.Pp
- .Rs
--.%R RFC 2796
--.%T "BGP Route Reflection - An Alternative to Full Mesh IBGP"
--.%D April 2000
-+.%A P. Marques
-+.%A F. Dupont
-+.%D March 1999
-+.%R RFC 2545
-+.%T Use of BGP-4 Multiprotocol Extensions for IPv6 Inter-Domain Routing
- .Re
-+.Pp
- .Rs
--.%R RFC 2918
--.%T "Route Refresh Capability for BGP-4"
-+.%A E. Chen
- .%D September 2000
-+.%R RFC 2918
-+.%T Route Refresh Capability for BGP-4
- .Re
-+.Pp
- .Rs
--.%R RFC 3392
--.%T "Capabilities Advertisement with BGP-4"
--.%D January 1999
-+.%A G. Huston
-+.%D April 2004
-+.%R RFC 3765
-+.%T NOPEER Community for Border Gateway Protocol (BGP) Route Scope Control
- .Re
-+.Pp
- .Rs
--.%R RFC 3682
--.%T "The Generalized TTL Security Mechanism (GTSM)"
--.%D February 2004
-+.%A Y. Rekhter
-+.%A "T. Li"
-+.%A S. Hares
-+.%D January 2006
-+.%R RFC 4271
-+.%T A Border Gateway Protocol 4 (BGP-4)
- .Re
-+.Pp
- .Rs
--.%R RFC 3765
--.%T "NOPEER Community for Border Gateway Protocol"
--.%D April 2004
-+.%A S. Sangli
-+.%A D. Tappan
-+.%A Y. Rekhter
-+.%D February 2006
-+.%R RFC 4360
-+.%T BGP Extended Communities Attribute
- .Re
-+.Pp
- .Rs
--.%R RFC 4760
--.%T "Multiprotocol Extensions for BGP-4"
-+.%A E. Rosen
-+.%A Y. Rekhter
-+.%D February 2006
-+.%R RFC 4364
-+.%T BGP/MPLS IP Virtual Private Networks (VPNs)
-+.Re
-+.Pp
-+.Rs
-+.%A T. Bates
-+.%A E. Chen
-+.%A R. Chandra
-+.%D April 2006
-+.%R RFC 4456
-+.%T "BGP Route Reflection: An Alternative to Full Mesh Internal BGP (IBGP)"
-+.Re
-+.Pp
-+.Rs
-+.%A E. Chen
-+.%A V. Gillet
-+.%D April 2006
-+.%R RFC 4486
-+.%T Subcodes for BGP Cease Notification Message
-+.Re
-+.Pp
-+.Rs
-+.%A T. Bates
-+.%A R. Chandra
-+.%A D. Katz
-+.%A Y. Rekhter
- .%D January 2007
-+.%R RFC 4760
-+.%T Multiprotocol Extensions for BGP-4
- .Re
-+.Pp
- .Rs
--.%R RFC 4893
--.%T "BGP Support for Four-octet AS Number Space"
-+.%A Q. Vohra
-+.%A E. Chen
- .%D May 2007
-+.%R RFC 4893
-+.%T BGP Support for Four-octet AS Number Space
-+.Re
-+.Pp
-+.Rs
-+.%A V. Gill
-+.%A J. Heasley
-+.%A D. Meyer
-+.%A P. Savola
-+.%A C. Pignatoro
-+.%D October 2007
-+.%R RFC 5082
-+.%T The Generalized TTL Security Mechanism (GTSM)
-+.Re
-+.Pp
-+.Rs
-+.%A J. Scudder
-+.%A R. Chandra
-+.%D February 2009
-+.%R RFC 5492
-+.%T Capabilities Advertisement with BGP-4
-+.Re
-+.Pp
-+.Rs
-+.%D April 2009
-+.%R draft-ietf-idr-optional-transitive-00
-+.%T Error Handling for Optional Transitive BGP Attributes
-+.Re
-+.Pp
-+.Rs
-+.%D August 2011
-+.%R draft-ietf-grow-mrt-17
-+.%T MRT routing information export format
-+.Re
-+.Pp
-+.Rs
-+.%A J. Dong
-+.%A M. Chen
-+.%A A. Suryanarayana
-+.%D May 2012
-+.%R RFC 6608
-+.%T Subcodes for BGP Finite State Machine Error
- .Re
- .Sh HISTORY
- The
diff --git a/net/openbgpd/files/patch-bgpd_bgpd.c b/net/openbgpd/files/patch-bgpd_bgpd.c
deleted file mode 100644
index 322a8088a075..000000000000
--- a/net/openbgpd/files/patch-bgpd_bgpd.c
+++ /dev/null
@@ -1,693 +0,0 @@
-Index: bgpd/bgpd.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.1.1.12
-diff -u -p -r1.1.1.7 -r1.1.1.12
---- bgpd/bgpd.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/bgpd.c	8 Dec 2012 10:37:08 -0000	1.1.1.12
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: bgpd.c,v 1.148 2009/06/07 00:30:23 claudio Exp $ */
-+/*	$OpenBSD: bgpd.c,v 1.169 2012/09/18 09:45:51 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -32,8 +32,8 @@
- #include <string.h>
- #include <unistd.h>
- 
--#include "mrt.h"
- #include "bgpd.h"
-+#include "mrt.h"
- #include "session.h"
- 
- void		sighdlr(int);
-@@ -42,23 +42,23 @@ int		main(int, char *[]);
- int		check_child(pid_t, const char *);
- int		send_filterset(struct imsgbuf *, struct filter_set_head *);
- int		reconfigure(char *, struct bgpd_config *, struct mrt_head *,
--		    struct peer **, struct filter_head *);
-+		    struct peer **);
- int		dispatch_imsg(struct imsgbuf *, int);
-+int		control_setup(struct bgpd_config *);
- 
- int			 rfd = -1;
--int			 cflags = 0;
--struct filter_set_head	*connectset;
--struct filter_set_head	*connectset6;
--struct filter_set_head	*staticset;
--struct filter_set_head	*staticset6;
--volatile sig_atomic_t	 mrtdump = 0;
--volatile sig_atomic_t	 quit = 0;
--volatile sig_atomic_t	 sigchld = 0;
--volatile sig_atomic_t	 reconfig = 0;
--pid_t			 reconfpid = 0;
-+int			 cflags;
-+volatile sig_atomic_t	 mrtdump;
-+volatile sig_atomic_t	 quit;
-+volatile sig_atomic_t	 sigchld;
-+volatile sig_atomic_t	 reconfig;
-+pid_t			 reconfpid;
-+int			 reconfpending;
- struct imsgbuf		*ibuf_se;
- struct imsgbuf		*ibuf_rde;
- struct rib_names	 ribnames = SIMPLEQ_HEAD_INITIALIZER(ribnames);
-+char			*cname;
-+char			*rcname;
- 
- void
- sighdlr(int sig)
-@@ -86,8 +86,8 @@ usage(void)
- {
- 	extern char *__progname;
- 
--	fprintf(stderr, "usage: %s [-cdnv] ", __progname);
--	fprintf(stderr, "[-D macro=value] [-f file] [-r path] [-s path]\n");
-+	fprintf(stderr, "usage: %s [-cdnv] [-D macro=value] [-f file]\n",
-+	    __progname);
- 	exit(1);
- }
- 
-@@ -101,15 +101,10 @@ int
- main(int argc, char *argv[])
- {
- 	struct bgpd_config	 conf;
--	struct peer		*peer_l, *p;
- 	struct mrt_head		 mrt_l;
--	struct network_head	 net_l;
--	struct filter_head	*rules_l;
--	struct network		*net;
--	struct filter_rule	*r;
-+	struct peer		*peer_l, *p;
- 	struct mrt		*m;
- 	struct listen_addr	*la;
--	struct rde_rib		*rr;
- 	struct pollfd		 pfd[POLL_MAX];
- 	pid_t			 io_pid = 0, rde_pid = 0, pid;
- 	char			*conffile;
-@@ -124,18 +119,13 @@ main(int argc, char *argv[])
- 	bgpd_process = PROC_MAIN;
- 
- 	log_init(1);		/* log to stderr until daemonized */
--
--	if ((rules_l = calloc(1, sizeof(struct filter_head))) == NULL)
--		err(1, NULL);
-+	log_verbose(1);
- 
- 	bzero(&conf, sizeof(conf));
- 	LIST_INIT(&mrt_l);
--	TAILQ_INIT(&net_l);
--	TAILQ_INIT(rules_l);
- 	peer_l = NULL;
--	conf.csock = SOCKET_NAME;
- 
--	while ((ch = getopt(argc, argv, "cdD:f:nr:s:v")) != -1) {
-+	while ((ch = getopt(argc, argv, "cdD:f:nv")) != -1) {
- 		switch (ch) {
- 		case 'c':
- 			conf.opts |= BGPD_OPT_FORCE_DEMOTE;
-@@ -158,12 +148,7 @@ main(int argc, char *argv[])
- 			if (conf.opts & BGPD_OPT_VERBOSE)
- 				conf.opts |= BGPD_OPT_VERBOSE2;
- 			conf.opts |= BGPD_OPT_VERBOSE;
--			break;
--		case 'r':
--			conf.rcsock = optarg;
--			break;
--		case 's':
--			conf.csock = optarg;
-+			log_verbose(1);
- 			break;
- 		default:
- 			usage();
-@@ -176,24 +161,22 @@ main(int argc, char *argv[])
- 	if (argc > 0)
- 		usage();
- 
--	if (parse_config(conffile, &conf, &mrt_l, &peer_l, &net_l, rules_l)) {
--		free(rules_l);
--		exit(1);
--	}
--
- 	if (conf.opts & BGPD_OPT_NOACTION) {
-+		struct network_head	net_l;
-+		struct rdomain_head	rdom_l;
-+		struct filter_head	rules_l;
-+
-+		if (parse_config(conffile, &conf, &mrt_l, &peer_l, &net_l,
-+		    &rules_l, &rdom_l))
-+			exit(1);
-+
- 		if (conf.opts & BGPD_OPT_VERBOSE)
--			print_config(&conf, &ribnames, &net_l, peer_l, rules_l,
--			    &mrt_l);
-+			print_config(&conf, &ribnames, &net_l, peer_l, &rules_l,
-+			    &mrt_l, &rdom_l);
- 		else
- 			fprintf(stderr, "configuration OK\n");
- 		exit(0);
- 	}
--	cflags = conf.flags;
--	connectset = &conf.connectset;
--	staticset = &conf.staticset;
--	connectset6 = &conf.connectset6;
--	staticset6 = &conf.staticset6;
- 
- 	if (geteuid())
- 		errx(1, "need root privileges");
-@@ -202,6 +185,7 @@ main(int argc, char *argv[])
- 		errx(1, "unknown user %s", BGPD_USER);
- 
- 	log_init(debug);
-+	log_verbose(conf.opts & BGPD_OPT_VERBOSE);
- 
- 	if (!debug)
- 		daemon(1, 0);
-@@ -225,13 +209,9 @@ main(int argc, char *argv[])
- 	session_socket_blockmode(pipe_s2r_c[0], BM_NONBLOCK);
- 	session_socket_blockmode(pipe_s2r_c[1], BM_NONBLOCK);
- 
--	prepare_listeners(&conf);
--
- 	/* fork children */
--	rde_pid = rde_main(&conf, peer_l, &net_l, rules_l, &mrt_l, &ribnames,
--	    pipe_m2r, pipe_s2r, pipe_m2s, pipe_s2r_c, debug);
--	io_pid = session_main(&conf, peer_l, &net_l, rules_l, &mrt_l, &ribnames,
--	    pipe_m2s, pipe_s2r, pipe_m2r, pipe_s2r_c);
-+	rde_pid = rde_main(pipe_m2r, pipe_s2r, pipe_m2s, pipe_s2r_c, debug);
-+	io_pid = session_main(pipe_m2s, pipe_s2r, pipe_m2r, pipe_s2r_c);
- 
- 	setproctitle("parent");
- 
-@@ -254,33 +234,12 @@ main(int argc, char *argv[])
- 	imsg_init(ibuf_se, pipe_m2s[0]);
- 	imsg_init(ibuf_rde, pipe_m2r[0]);
- 	mrt_init(ibuf_rde, ibuf_se);
--	if ((rfd = kr_init(!(conf.flags & BGPD_FLAG_NO_FIB_UPDATE),
--	    conf.rtableid)) == -1)
-+	if ((rfd = kr_init()) == -1)
- 		quit = 1;
-+	quit = reconfigure(conffile, &conf, &mrt_l, &peer_l);
- 	if (pftable_clear_all() != 0)
- 		quit = 1;
- 
--	while ((net = TAILQ_FIRST(&net_l)) != NULL) {
--		TAILQ_REMOVE(&net_l, net, entry);
--		filterset_free(&net->net.attrset);
--		free(net);
--	}
--
--	while ((r = TAILQ_FIRST(rules_l)) != NULL) {
--		TAILQ_REMOVE(rules_l, r, entry);
--		free(r);
--	}
--	TAILQ_FOREACH(la, conf.listen_addrs, entry) {
--		close(la->fd);
--		la->fd = -1;
--	}
--	while ((rr = SIMPLEQ_FIRST(&ribnames))) {
--		SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
--		free(rr);
--	}
--
--	mrt_reconfigure(&mrt_l);
--
- 	while (quit == 0) {
- 		bzero(pfd, sizeof(pfd));
- 		pfd[PFD_PIPE_SESSION].fd = ibuf_se->fd;
-@@ -335,15 +294,16 @@ main(int argc, char *argv[])
- 			u_int	error;
- 
- 			reconfig = 0;
--			log_info("rereading config");
--			switch (reconfigure(conffile, &conf, &mrt_l, &peer_l,
--			    rules_l)) {
-+			switch (reconfigure(conffile, &conf, &mrt_l, &peer_l)) {
- 			case -1:	/* fatal error */
- 				quit = 1;
- 				break;
- 			case 0:		/* all OK */
- 				error = 0;
- 				break;
-+			case 2:
-+				error = CTL_RES_PENDING;
-+				break;
- 			default:	/* parse error */
- 				error = CTL_RES_PARSE_ERROR;
- 				break;
-@@ -389,13 +349,13 @@ main(int argc, char *argv[])
- 		LIST_REMOVE(m, entry);
- 		free(m);
- 	}
--	while ((la = TAILQ_FIRST(conf.listen_addrs)) != NULL) {
--		TAILQ_REMOVE(conf.listen_addrs, la, entry);
--		close(la->fd);
--		free(la);
--	}
-+	if (conf.listen_addrs)
-+		while ((la = TAILQ_FIRST(conf.listen_addrs)) != NULL) {
-+			TAILQ_REMOVE(conf.listen_addrs, la, entry);
-+			close(la->fd);
-+			free(la);
-+		}
- 
--	free(rules_l);
- 	control_cleanup(conf.csock);
- 	control_cleanup(conf.rcsock);
- 	carp_demote_shutdown();
-@@ -413,6 +373,8 @@ main(int argc, char *argv[])
- 	free(ibuf_se);
- 	msgbuf_clear(&ibuf_rde->w);
- 	free(ibuf_rde);
-+	free(rcname);
-+	free(cname);
- 
- 	log_info("Terminating");
- 	return (0);
-@@ -452,27 +414,33 @@ send_filterset(struct imsgbuf *i, struct
- 
- int
- reconfigure(char *conffile, struct bgpd_config *conf, struct mrt_head *mrt_l,
--    struct peer **peer_l, struct filter_head *rules_l)
-+    struct peer **peer_l)
- {
- 	struct network_head	 net_l;
--	struct network		*n;
-+	struct rdomain_head	 rdom_l;
-+	struct filter_head	 rules_l;
- 	struct peer		*p;
- 	struct filter_rule	*r;
- 	struct listen_addr	*la;
- 	struct rde_rib		*rr;
-+	struct rdomain		*rd;
- 
--	if (parse_config(conffile, conf, mrt_l, peer_l, &net_l, rules_l)) {
-+	if (reconfpending) {
-+		log_info("previous reload still running");
-+		return (2);
-+	}
-+	reconfpending = 2;	/* one per child */
-+
-+	log_info("rereading config");
-+	if (parse_config(conffile, conf, mrt_l, peer_l, &net_l, &rules_l,
-+	    &rdom_l)) {
- 		log_warnx("config file %s has errors, not reloading",
- 		    conffile);
-+		reconfpending = 0;
- 		return (1);
- 	}
- 
- 	cflags = conf->flags;
--	connectset = &conf->connectset;
--	staticset = &conf->staticset;
--	connectset6 = &conf->connectset6;
--	staticset6 = &conf->staticset6;
--
- 	prepare_listeners(conf);
- 
- 	/* start reconfiguration */
-@@ -483,12 +451,6 @@ reconfigure(char *conffile, struct bgpd_
- 	    conf, sizeof(struct bgpd_config)) == -1)
- 		return (-1);
- 
--	/* send peer list and listeners to the SE */
--	for (p = *peer_l; p != NULL; p = p->next)
--		if (imsg_compose(ibuf_se, IMSG_RECONF_PEER, p->conf.id, 0, -1,
--		    &p->conf, sizeof(struct peer_config)) == -1)
--			return (-1);
--
- 	TAILQ_FOREACH(la, conf->listen_addrs, entry) {
- 		if (imsg_compose(ibuf_se, IMSG_RECONF_LISTENER, 0, 0, la->fd,
- 		    la, sizeof(struct listen_addr)) == -1)
-@@ -496,51 +458,104 @@ reconfigure(char *conffile, struct bgpd_
- 		la->fd = -1;
- 	}
- 
-+	if (control_setup(conf) == -1)
-+		return (-1);
-+
-+	/* adjust fib syncing on reload */
-+	ktable_preload();
-+
- 	/* RIBs for the RDE */
- 	while ((rr = SIMPLEQ_FIRST(&ribnames))) {
- 		SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
-+		if (ktable_update(rr->rtableid, rr->name, NULL,
-+		    rr->flags) == -1) {
-+			log_warnx("failed to load rdomain %d",
-+			    rr->rtableid);
-+			return (-1);
-+		}
- 		if (imsg_compose(ibuf_rde, IMSG_RECONF_RIB, 0, 0, -1,
- 		    rr, sizeof(struct rde_rib)) == -1)
- 			return (-1);
- 		free(rr);
- 	}
- 
--	/* networks for the RDE */
--	while ((n = TAILQ_FIRST(&net_l)) != NULL) {
--		if (imsg_compose(ibuf_rde, IMSG_NETWORK_ADD, 0, 0, -1,
--		    &n->net, sizeof(struct network_config)) == -1)
--			return (-1);
--		if (send_filterset(ibuf_rde, &n->net.attrset) == -1)
--			return (-1);
--		if (imsg_compose(ibuf_rde, IMSG_NETWORK_DONE, 0, 0, -1,
--		    NULL, 0) == -1)
--			return (-1);
--		TAILQ_REMOVE(&net_l, n, entry);
--		filterset_free(&n->net.attrset);
--		free(n);
-+	/* send peer list and listeners to the SE and RDE */
-+	for (p = *peer_l; p != NULL; p = p->next) {
-+		if (imsg_compose(ibuf_se, IMSG_RECONF_PEER, p->conf.id, 0, -1,
-+		    &p->conf, sizeof(struct peer_config)) == -1)
-+			return (-1);
-+		if (imsg_compose(ibuf_rde, IMSG_RECONF_PEER, p->conf.id, 0, -1,
-+		    &p->conf, sizeof(struct peer_config)) == -1)
-+			return (-1);
- 	}
- 
--	/* redistribute list needs to be reloaded too */
--	if (kr_reload() == -1)
-+	/* networks go via kroute to the RDE */
-+	if (kr_net_reload(0, &net_l))
- 		return (-1);
- 
- 	/* filters for the RDE */
--	while ((r = TAILQ_FIRST(rules_l)) != NULL) {
-+	while ((r = TAILQ_FIRST(&rules_l)) != NULL) {
-+		TAILQ_REMOVE(&rules_l, r, entry);
- 		if (imsg_compose(ibuf_rde, IMSG_RECONF_FILTER, 0, 0, -1,
- 		    r, sizeof(struct filter_rule)) == -1)
- 			return (-1);
- 		if (send_filterset(ibuf_rde, &r->set) == -1)
- 			return (-1);
--		TAILQ_REMOVE(rules_l, r, entry);
- 		filterset_free(&r->set);
- 		free(r);
- 	}
- 
-+	while ((rd = SIMPLEQ_FIRST(&rdom_l)) != NULL) {
-+		SIMPLEQ_REMOVE_HEAD(&rdom_l, entry);
-+		if (ktable_update(rd->rtableid, rd->descr, rd->ifmpe,
-+		    rd->flags) == -1) {
-+			log_warnx("failed to load rdomain %d",
-+			    rd->rtableid);
-+			return (-1);
-+		}
-+		/* networks go via kroute to the RDE */
-+		if (kr_net_reload(rd->rtableid, &rd->net_l))
-+			return (-1);
-+
-+		if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN, 0, 0, -1,
-+		    rd, sizeof(*rd)) == -1)
-+			return (-1);
-+
-+		/* export targets */
-+		if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN_EXPORT, 0, 0,
-+		    -1, NULL, 0) == -1)
-+			return (-1);
-+		if (send_filterset(ibuf_rde, &rd->export) == -1)
-+			return (-1);
-+		filterset_free(&rd->export);
-+
-+		/* import targets */
-+		if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN_IMPORT, 0, 0,
-+		    -1, NULL, 0) == -1)
-+			return (-1);
-+		if (send_filterset(ibuf_rde, &rd->import) == -1)
-+			return (-1);
-+		filterset_free(&rd->import);
-+
-+		if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN_DONE, 0, 0,
-+		    -1, NULL, 0) == -1)
-+			return (-1);
-+
-+		free(rd);
-+	}
-+
- 	/* signal both childs to replace their config */
- 	if (imsg_compose(ibuf_se, IMSG_RECONF_DONE, 0, 0, -1, NULL, 0) == -1 ||
- 	    imsg_compose(ibuf_rde, IMSG_RECONF_DONE, 0, 0, -1, NULL, 0) == -1)
- 		return (-1);
- 
-+	/* fix kroute information */
-+	ktable_postload();
-+
-+	/* redistribute list needs to be reloaded too */
-+	if (kr_reload() == -1)
-+		return (-1);
-+
- 	/* mrt changes can be sent out of bound */
- 	mrt_reconfigure(mrt_l);
- 	return (0);
-@@ -550,8 +565,8 @@ int
- dispatch_imsg(struct imsgbuf *ibuf, int idx)
- {
- 	struct imsg		 imsg;
--	int			 n;
--	int			 rv;
-+	ssize_t			 n;
-+	int			 rv, verbose;
- 
- 	if ((n = imsg_read(ibuf)) == -1)
- 		return (-1);
-@@ -573,46 +588,39 @@ dispatch_imsg(struct imsgbuf *ibuf, int 
- 		case IMSG_KROUTE_CHANGE:
- 			if (idx != PFD_PIPE_ROUTE)
- 				log_warnx("route request not from RDE");
--			else if (kr_change(imsg.data))
-+			else if (imsg.hdr.len != IMSG_HEADER_SIZE +
-+			    sizeof(struct kroute_full))
-+				log_warnx("wrong imsg len");
-+			else if (kr_change(imsg.hdr.peerid, imsg.data))
- 				rv = -1;
- 			break;
- 		case IMSG_KROUTE_DELETE:
- 			if (idx != PFD_PIPE_ROUTE)
- 				log_warnx("route request not from RDE");
--			else if (kr_delete(imsg.data))
--				rv = -1;
--			break;
--		case IMSG_KROUTE6_CHANGE:
--			if (idx != PFD_PIPE_ROUTE)
--				log_warnx("route request not from RDE");
--			else if (kr6_change(imsg.data))
--				rv = -1;
--			break;
--		case IMSG_KROUTE6_DELETE:
--			if (idx != PFD_PIPE_ROUTE)
--				log_warnx("route request not from RDE");
--			else if (kr6_delete(imsg.data))
-+			else if (imsg.hdr.len != IMSG_HEADER_SIZE +
-+			    sizeof(struct kroute_full))
-+				log_warnx("wrong imsg len");
-+			else if (kr_delete(imsg.hdr.peerid, imsg.data))
- 				rv = -1;
- 			break;
- 		case IMSG_NEXTHOP_ADD:
- 			if (idx != PFD_PIPE_ROUTE)
- 				log_warnx("nexthop request not from RDE");
--			else
--				if (imsg.hdr.len != IMSG_HEADER_SIZE +
--				    sizeof(struct bgpd_addr))
--					log_warnx("wrong imsg len");
--				else if (kr_nexthop_add(imsg.data) == -1)
--					rv = -1;
-+			else if (imsg.hdr.len != IMSG_HEADER_SIZE +
-+			    sizeof(struct bgpd_addr))
-+				log_warnx("wrong imsg len");
-+			else if (kr_nexthop_add(imsg.hdr.peerid, imsg.data) ==
-+			    -1)
-+				rv = -1;
- 			break;
- 		case IMSG_NEXTHOP_REMOVE:
- 			if (idx != PFD_PIPE_ROUTE)
- 				log_warnx("nexthop request not from RDE");
-+			else if (imsg.hdr.len != IMSG_HEADER_SIZE +
-+			    sizeof(struct bgpd_addr))
-+				log_warnx("wrong imsg len");
- 			else
--				if (imsg.hdr.len != IMSG_HEADER_SIZE +
--				    sizeof(struct bgpd_addr))
--					log_warnx("wrong imsg len");
--				else
--					kr_nexthop_delete(imsg.data);
-+				kr_nexthop_delete(imsg.hdr.peerid, imsg.data);
- 			break;
- 		case IMSG_PFTABLE_ADD:
- 			if (idx != PFD_PIPE_ROUTE)
-@@ -646,26 +654,28 @@ dispatch_imsg(struct imsgbuf *ibuf, int 
- 		case IMSG_CTL_RELOAD:
- 			if (idx != PFD_PIPE_SESSION)
- 				log_warnx("reload request not from SE");
--			else
-+			else {
- 				reconfig = 1;
- 				reconfpid = imsg.hdr.pid;
-+			}
- 			break;
- 		case IMSG_CTL_FIB_COUPLE:
- 			if (idx != PFD_PIPE_SESSION)
- 				log_warnx("couple request not from SE");
- 			else
--				kr_fib_couple();
-+				kr_fib_couple(imsg.hdr.peerid);
- 			break;
- 		case IMSG_CTL_FIB_DECOUPLE:
- 			if (idx != PFD_PIPE_SESSION)
- 				log_warnx("decouple request not from SE");
- 			else
--				kr_fib_decouple();
-+				kr_fib_decouple(imsg.hdr.peerid);
- 			break;
- 		case IMSG_CTL_KROUTE:
- 		case IMSG_CTL_KROUTE_ADDR:
- 		case IMSG_CTL_SHOW_NEXTHOP:
- 		case IMSG_CTL_SHOW_INTERFACE:
-+		case IMSG_CTL_SHOW_FIB_TABLES:
- 			if (idx != PFD_PIPE_SESSION)
- 				log_warnx("kroute request not from SE");
- 			else
-@@ -692,6 +702,16 @@ dispatch_imsg(struct imsgbuf *ibuf, int 
- 				carp_demote_set(msg->demote_group, msg->level);
- 			}
- 			break;
-+		case IMSG_CTL_LOG_VERBOSE:
-+			/* already checked by SE */
-+			memcpy(&verbose, imsg.data, sizeof(verbose));
-+			log_verbose(verbose);
-+			break;
-+		case IMSG_RECONF_DONE:
-+			if (reconfpending == 0)
-+				log_warnx("unexpected RECONF_DONE received");
-+			reconfpending--;
-+			break;
- 		default:
- 			break;
- 		}
-@@ -707,7 +727,7 @@ send_nexthop_update(struct kroute_nextho
- {
- 	char	*gw = NULL;
- 
--	if (msg->gateway.af)
-+	if (msg->gateway.aid)
- 		if (asprintf(&gw, ": via %s",
- 		    log_addr(&msg->gateway)) == -1) {
- 			log_warn("send_nexthop_update");
-@@ -717,7 +737,7 @@ send_nexthop_update(struct kroute_nextho
- 	log_info("nexthop %s now %s%s%s", log_addr(&msg->nexthop),
- 	    msg->valid ? "valid" : "invalid",
- 	    msg->connected ? ": directly connected" : "",
--	    msg->gateway.af ? gw : "");
-+	    msg->gateway.aid ? gw : "");
- 
- 	free(gw);
- 
-@@ -733,56 +753,20 @@ send_imsg_session(int type, pid_t pid, v
- }
- 
- int
--bgpd_redistribute(int type, struct kroute *kr, struct kroute6 *kr6)
-+send_network(int type, struct network_config *net, struct filter_set_head *h)
- {
--	struct network_config	 net;
--	struct filter_set_head	*h;
--
--	if ((cflags & BGPD_FLAG_REDIST_CONNECTED) && kr &&
--	    (kr->flags & F_CONNECTED))
--		h = connectset;
--	else if ((cflags & BGPD_FLAG_REDIST_STATIC) && kr &&
--	    (kr->flags & F_STATIC))
--		h = staticset;
--	else if ((cflags & BGPD_FLAG_REDIST6_CONNECTED) && kr6 &&
--	    (kr6->flags & F_CONNECTED))
--		h = connectset6;
--	else if ((cflags & BGPD_FLAG_REDIST6_STATIC) && kr6 &&
--	    (kr6->flags & F_STATIC))
--		h = staticset6;
--	else
--		return (0);
--
--	bzero(&net, sizeof(net));
--	if (kr && kr6)
--		fatalx("bgpd_redistribute: unable to redistribute v4 and v6"
--		    "together");
--	if (kr != NULL) {
--		net.prefix.af = AF_INET;
--		net.prefix.v4.s_addr = kr->prefix.s_addr;
--		net.prefixlen = kr->prefixlen;
--	}
--	if (kr6 != NULL) {
--		net.prefix.af = AF_INET6;
--		memcpy(&net.prefix.v6, &kr6->prefix, sizeof(struct in6_addr));
--		net.prefixlen = kr6->prefixlen;
--	}
--
--
--	if (imsg_compose(ibuf_rde, type, 0, 0, -1, &net,
-+	if (imsg_compose(ibuf_rde, type, 0, 0, -1, net,
- 	    sizeof(struct network_config)) == -1)
- 		return (-1);
--
- 	/* networks that get deleted don't need to send the filter set */
- 	if (type == IMSG_NETWORK_REMOVE)
--		return (1);
--
-+		return (0);
- 	if (send_filterset(ibuf_rde, h) == -1)
- 		return (-1);
- 	if (imsg_compose(ibuf_rde, IMSG_NETWORK_DONE, 0, 0, -1, NULL, 0) == -1)
- 		return (-1);
- 
--	return (1);
-+	return (0);
- }
- 
- int
-@@ -810,3 +794,45 @@ bgpd_filternexthop(struct kroute *kr, st
- 
- 	return (1);
- }
-+
-+int
-+control_setup(struct bgpd_config *conf)
-+{
-+	int fd, restricted;
-+
-+	/* control socket is outside chroot */
-+	if (!cname || strcmp(cname, conf->csock)) {
-+		if (cname) {
-+			control_cleanup(cname);
-+			free(cname);
-+		}
-+		if ((cname = strdup(conf->csock)) == NULL)
-+			fatal("strdup");
-+		if ((fd = control_init(0, cname)) == -1)
-+			fatalx("control socket setup failed");
-+		restricted = 0;
-+		if (imsg_compose(ibuf_se, IMSG_RECONF_CTRL, 0, 0, fd,
-+		    &restricted, sizeof(restricted)) == -1)
-+			return (-1);
-+	}
-+	if (!conf->rcsock) {
-+		/* remove restricted socket */
-+		control_cleanup(rcname);
-+		free(rcname);
-+		rcname = NULL;
-+	} else if (!rcname || strcmp(rcname, conf->rcsock)) {
-+		if (rcname) {
-+			control_cleanup(rcname);
-+			free(rcname);
-+		}
-+		if ((rcname = strdup(conf->rcsock)) == NULL)
-+			fatal("strdup");
-+		if ((fd = control_init(1, rcname)) == -1)
-+			fatalx("control socket setup failed");
-+		restricted = 1;
-+		if (imsg_compose(ibuf_se, IMSG_RECONF_CTRL, 0, 0, fd,
-+		    &restricted, sizeof(restricted)) == -1)
-+			return (-1);
-+	}
-+	return (0);
-+}
diff --git a/net/openbgpd/files/patch-bgpd_bgpd.conf.5 b/net/openbgpd/files/patch-bgpd_bgpd.conf.5
deleted file mode 100644
index 32f4439fc0ab..000000000000
--- a/net/openbgpd/files/patch-bgpd_bgpd.conf.5
+++ /dev/null
@@ -1,746 +0,0 @@
-Index: bgpd/bgpd.conf.5
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.conf.5,v
-retrieving revision 1.1.1.7
-retrieving revision 1.10
-diff -u -p -r1.1.1.7 -r1.10
---- bgpd/bgpd.conf.5	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/bgpd.conf.5	8 Dec 2012 20:17:59 -0000	1.10
-@@ -1,4 +1,4 @@
--.\" $OpenBSD: bgpd.conf.5,v 1.94 2009/06/07 00:31:22 claudio Exp $
-+.\" $OpenBSD: bgpd.conf.5,v 1.122 2012/11/13 09:47:20 claudio Exp $
- .\"
- .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
- .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -16,7 +16,7 @@
- .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- .\"
--.Dd $Mdocdate: June 7 2009 $
-+.Dd $Mdocdate: November 13 2012 $
- .Dt BGPD.CONF 5
- .Os
- .Sh NAME
-@@ -26,11 +26,11 @@
- The
- .Xr bgpd 8
- daemon implements the Border Gateway Protocol version 4 as described
--in RFC 1771.
-+in RFC 4271.
- .Sh SECTIONS
- The
- .Nm
--config file is divided into four main sections.
-+config file is divided into five main sections.
- .Bl -tag -width xxxx
- .It Sy Macros
- User-defined variables may be defined and used later, simplifying the
-@@ -38,6 +38,8 @@ configuration file.
- .It Sy Global Configuration
- Global settings for
- .Xr bgpd 8 .
-+.It Sy Routing Domain Configuration
-+The definition and properties for BGP MPLS VPNs are set in this section.
- .It Sy Neighbors and Groups
- .Xr bgpd 8
- establishes sessions with
-@@ -54,9 +56,16 @@ the sections should be grouped and appea
- .Nm
- in the order shown above.
- .Pp
-+The current line can be extended over multiple lines using a backslash
-+.Pq Sq \e .
- Comments can be put anywhere in the file using a hash mark
- .Pq Sq # ,
- and extend to the end of the current line.
-+Care should be taken when commenting out multi-line text:
-+the comment is effective until the end of the entire block.
-+.Pp
-+Argument names not beginning with a letter, digit, or underscore
-+must be quoted.
- .Pp
- Additional configuration files can be included with the
- .Ic include
-@@ -66,8 +75,8 @@ include "/etc/bgpd/bgpd-10.0.0.1.filter"
- .Ed
- .Sh MACROS
- Macros can be defined that will later be expanded in context.
--Macro names must start with a letter, and may contain letters, digits
--and underscores.
-+Macro names must start with a letter, digit, or underscore,
-+and may contain any of those characters.
- Macro names may not be reserved words (for example,
- .Ic AS ,
- .Ic neighbor ,
-@@ -93,7 +102,7 @@ Set the local
- .Em autonomous system
- number to
- .Ar as-number .
--If the first AS number is a 4-byte AS it is possible to specifiy a secondary
-+If the first AS number is a 4-byte AS it is possible to specify a secondary
- 2-byte AS number which is used for neighbors which do not support 4-byte AS
- numbers.
- The default for the secondary AS is 23456.
-@@ -143,29 +152,33 @@ The default is 120 seconds.
- .It Xo
- .Ic dump
- .Op Ic rib Ar name
--.Pq Ic table Ns \&| Ns Ic table-mp
-+.Pq Ic table Ns | Ns Ic table-mp Ns | Ns Ic table-v2
- .Ar file Op Ar timeout
- .Xc
- .It Xo
- .Ic dump
--.Pq Ic all Ns \&| Ns Ic updates
--.Pq Ic in Ns \&| Ns Ic out
-+.Pq Ic all Ns | Ns Ic updates
-+.Pq Ic in Ns | Ns Ic out
- .Ar file Op Ar timeout
- .Xc
- Dump the RIB, a.k.a. the
- .Em routing information base ,
- and all BGP messages in Multi-threaded Routing Toolkit (MRT) format.
--Dumping the RIB is normally an expensive operation,
--but it should not influence the session handling.
- It is possible to dump alternate RIB with the use of
- .Ar name .
- .Pp
- For example, the following will dump the entire table to the
- .Xr strftime 3 Ns -expanded
- filename.
--The
-+Only the
-+.Ic table-v2
-+format is able to dump a multi-protocol RIB correctly.
-+Both
-+.Ic table
-+and
- .Ic table-mp
--format is multi-protocol capable but often not supported by 3rd-party tools.
-+formats are more or less limited when handling multi-protocol entries and
-+are only left around to support 3rd party tools not handling the new format.
- The timeout is optional:
- .Bd -literal -offset indent
- dump table "/tmp/rib-dump-%H%M" 300
-@@ -195,7 +208,7 @@ dump updates out "/tmp/updates-out-%H%M"
- .Pp
- .It Xo
- .Ic fib-update
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- If set to
- .Ic no ,
-@@ -242,12 +255,12 @@ Log received and sent updates.
- .Xc
- .It Xo
- .Ic network
--.Pq Ic inet Ns \&| Ns Ic inet6
-+.Pq Ic inet Ns | Ns Ic inet6
- .Ic static Op Ic set ...\&
- .Xc
- .It Xo
- .Ic network
--.Pq Ic inet Ns \&| Ns Ic inet6
-+.Pq Ic inet Ns | Ns Ic inet6
- .Ic connected Op Ic set ...\&
- .Xc
- Announce the specified network as belonging to our AS.
-@@ -278,7 +291,7 @@ section.
- .Ic nexthop
- .Ic qualify
- .Ic via
--.Pq Ic bgp Ns \&| Ns Ic default
-+.Pq Ic bgp Ns | Ns Ic default
- .Xc
- If set to
- .Ic bgp ,
-@@ -295,38 +308,47 @@ daemons like
- .Ic rde
- .Ic med
- .Ic compare
--.Pq Ic always Ns \&| Ns Ic strict
-+.Pq Ic always Ns | Ns Ic strict
- .Xc
- If set to
- .Ic always ,
- the
--.Em MED
-+.Em MULTI_EXIT_DISC
- attributes will always be compared.
- The default is
- .Ic strict ,
--where the
--.Em MED
--is only compared between peers belonging to the same AS.
-+where the metric is only compared between peers belonging to the same AS.
- .Pp
- .It Xo
- .Ic rde
- .Ic rib Ar name
- .Op Ic no Ic evaluate
- .Xc
--Creat an additional RIB named
-+.It Xo
-+.Ic rde
-+.Ic rib Ar name
-+.Op Ic rtable Ar number
-+.Xc
-+Create an additional RIB named
- .Ar name .
- It is possible to disable the decision process per RIB with the
- .Ic no Ic evaluate
- flag.
-+If a
-+.Ic rtable
-+is specified, routes will be exported to the given kernel routing table.
-+Currently the routing table must belong to the default routing domain and
-+nexthop verification happens on table 0.
-+Routes in the specified table will not be considered for nexthop verification.
- .Ic Adj-RIB-In
- and
- .Ic Loc-RIB
--are created automaticaly and used as default.
-+are created automatically and used as default.
- .Pp
- .It Xo
- .Ic rde
- .Ic route-age
--.Pq Ic ignore Ns \&| Ns Ic evaluate
-+.Pq Ic ignore Ns | Ns Ic evaluate
- .Xc
- If set to
- .Ic evaluate ,
-@@ -339,7 +361,7 @@ The default is
- .Pp
- .It Xo
- .Ic route-collector
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- If set to
- .Ic yes ,
-@@ -361,13 +383,24 @@ to the local machine.
- Work with the given kernel routing table
- instead of the default table,
- .Ar 0 .
--Note that this table is used for nexthop verification as well.
--Directly connected networks are always taken into account, even though
--their routes live in table 0.
-+Note that table 0 is used for nexthop verification.
-+Routes in the specified table will not be considered for nexthop verification.
-+This is the same as using the following syntax:
-+.Bd -literal -offset indent
-+rde rib Loc-RIB rtable number
-+.Ed
-+.Pp
-+.It Ic socket Qo Ar path Qc Op Ic restricted
-+Set the control socket location to
-+.Ar path .
-+If
-+.Ic restricted
-+is specified a restricted control socket will be created.
-+By default /var/run/bgpd.sock is used and no restricted socket is created.
- .Pp
- .It Xo
- .Ic transparent-as
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- If set to
- .Ic yes ,
-@@ -376,6 +409,110 @@ to EBGP neighbors are not prepended with
- The default is
- .Ic no .
- .El
-+.Sh ROUTING DOMAIN CONFIGURATION
-+.Xr bgpd 8
-+supports the setup and distribution of Virtual Private Networks.
-+It is possible to import and export prefixes between routing domains.
-+Each routing domain is specified by an
-+.Ic rdomain
-+section, which allows properties to be set specifically for that rdomain:
-+.Bd -literal -offset indent
-+rdomain 1 {
-+	descr "a rdomain"
-+	rd 65002:1
-+	import-target rt 65002:42
-+	export-target rt 65002:42
-+	network 192.168.1/24
-+	depend on mpe0
-+}
-+.Ed
-+.Pp
-+There are several routing domain properties:
-+.Pp
-+.Bl -tag -width Ds -compact
-+.It Ic depend on Ar interface
-+Routes added to the rdomain will use this interface as the outgoing interface.
-+Normally this will be an MPLS Provider Edge,
-+.Xr mpe 4 ,
-+interface that is part of the rdomain.
-+Local networks will be announced with the MPLS label specified on the interface.
-+.Pp
-+.It Ic descr Ar description
-+Add a description.
-+The description is used when logging but has no further meaning to
-+.Xr bgpd 8 .
-+.Pp
-+.It Ic export-target Ar subtype Ar as-number Ns Li : Ns Ar local
-+.It Ic export-target Ar subtype Ar IP Ns Li : Ns Ar local
-+Specify an extended community which will be attached to announced networks.
-+More than one
-+.Ic export-target
-+can be specified.
-+See also the
-+.Sx ATTRIBUTE SET
-+section for further information about the encoding.
-+The
-+.Ar subtype
-+should be set to
-+.Ar rt
-+for best compatibility with other implementations.
-+.Pp
-+.It Xo
-+.Ic fib-update
-+.Pq Ic yes Ns | Ns Ic no
-+.Xc
-+If set to
-+.Ic no ,
-+do not update the Forwarding Information Base, a.k.a. the kernel
-+routing table.
-+The default is
-+.Ic yes .
-+.Pp
-+.It Ic import-target Ar subtype Ar as-number Ns Li : Ns Ar local
-+.It Ic import-target Ar subtype Ar IP Ns Li : Ns Ar local
-+Only prefixes matching one of the specified
-+.Ic import-targets
-+will be imported into the rdomain.
-+More than one
-+.Ic import-target
-+can be specified.
-+See also the
-+.Sx ATTRIBUTE SET
-+section for further information about the encoding of extended communities.
-+The
-+.Ar subtype
-+should be set to
-+.Ar rt
-+for best compatibility with other implementations.
-+.Pp
-+.It Ic network Ar arguments ...
-+Define which networks should be exported into this VPN.
-+See also the
-+.Ic nexthop
-+section in
-+.Sx GLOBAL CONFIGURATION
-+for further information about the arguments.
-+.Pp
-+.It Ic rd Ar as-number Ns Li : Ns Ar local
-+.It Ic rd Ar IP Ns Li : Ns Ar local
-+The sole purpose of the Route Distinguisher
-+.Ic rd
-+is to ensure that possible common prefixes are destinct between VPNs.
-+The
-+.Ic rd
-+is neither used to identify the origin of the prefix nor to control into
-+which VPNs the prefix is distributed to.
-+The
-+.Ar as-number
-+or
-+.Ar IP
-+of a
-+.Ic rd
-+should be set to a number or IP that was assigned by an appropriate authority.
-+Whereas
-+.Ar local
-+can be chosen by the local operator.
-+.El
- .Sh NEIGHBORS AND GROUPS
- .Xr bgpd 8
- establishes TCP connections to other BGP speakers called
-@@ -470,21 +607,35 @@ The default for IBGP peers is
- .Pp
- .It Xo
- .Ic announce
--.Pq Ic IPv4 Ns \&| Ns Ic IPv6
--.Pq Ic none Ns \&| Ns Ic unicast
-+.Pq Ic IPv4 Ns | Ns Ic IPv6
-+.Pq Ic none Ns | Ns Ic unicast Ns | Ns Ic vpn
- .Xc
- For the given address family, control which subsequent address families
- (at the moment, only
- .Em none ,
--which disables the announcement of that address family, and
--.Em unicast
--are supported) are announced during the capabilities negotiation.
-+which disables the announcement of that address family,
-+.Em unicast ,
-+and
-+.Em vpn ,
-+which allows the distribution of BGP MPLS VPNs, are supported) are announced
-+during the capabilities negotiation.
- Only routes for that address family and subsequent address family will be
- announced and processed.
- .Pp
- .It Xo
-+.Ic announce as-4byte
-+.Pq Ic yes Ns | Ns Ic no
-+.Xc
-+If set to
-+.Ic no ,
-+the 4-byte AS capability is not announced and so native 4-byte AS support is
-+disabled.
-+The default is
-+.Ic yes .
-+.Pp
-+.It Xo
- .Ic announce capabilities
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- If set to
- .Ic no ,
-@@ -493,6 +644,29 @@ This can be helpful to connect to old or
- The default is
- .Ic yes .
- .Pp
-+.It Xo
-+.Ic announce refresh
-+.Pq Ic yes Ns | Ns Ic no
-+.Xc
-+If set to
-+.Ic no ,
-+the route refresh capability is not announced.
-+The default is
-+.Ic yes .
-+.Pp
-+.It Xo
-+.Ic announce restart
-+.Pq Ic yes Ns | Ns Ic no
-+.Xc
-+If set to
-+.Ic yes ,
-+the graceful restart capability is announced.
-+Currently only the End-of-RIB marker is supported and announced by the
-+.Ic restart
-+capability.
-+The default is
-+.Ic no .
-+.Pp
- .It Ic demote Ar group
- Increase the
- .Xr carp 4
-@@ -504,7 +678,7 @@ The demotion counter will be increased a
- .Xr bgpd 8
- starts and decreased
- 60 seconds after the session went to state
--.Em ESTABLISHED.
-+.Em ESTABLISHED .
- For neighbors added at runtime, the demotion counter is only increased after
- the session has been
- .Em ESTABLISHED
-@@ -548,8 +722,8 @@ Do not start the session when bgpd comes
- .Pp
- .It Xo
- .Ic dump
--.Pq Ic all Ns \&| Ns Ic updates
--.Pq Ic in Ns \&| Ns Ic out
-+.Pq Ic all Ns | Ns Ic updates
-+.Pq Ic in Ns | Ns Ic out
- .Ar file Op Ar timeout
- .Xc
- Do a peer specific MRT dump.
-@@ -564,7 +738,7 @@ section in
- .Pp
- .It Xo
- .Ic enforce neighbor-as
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- If set to
- .Ic yes ,
-@@ -589,10 +763,16 @@ Inherited from the global configuration 
- Set the minimal acceptable holdtime.
- Inherited from the global configuration if not given.
- .Pp
-+.It Ic interface Ar interface
-+Set an interface used for a nexthop with a link-local IPv6 address.
-+Note that if this is not specified and a link-local IPv6 address is
-+received as nexthop of the peer, it will be marked as invalid and
-+ignored.
-+.Pp
- .It Xo
- .Ic ipsec
--.Pq Ic ah Ns \&| Ns Ic esp
--.Pq Ic in Ns \&| Ns Ic out
-+.Pq Ic ah Ns | Ns Ic esp
-+.Pq Ic in Ns | Ns Ic out
- .Ic spi Ar spi-number authspec Op Ar encspec
- .Xc
- Enable IPsec with static keying.
-@@ -627,7 +807,7 @@ Keys must be given in hexadecimal format
- .Pp
- .It Xo
- .Ic ipsec
--.Pq Ic ah Ns \&| Ns Ic esp
-+.Pq Ic ah Ns | Ns Ic esp
- .Ic ike
- .Xc
- Enable IPsec with dynamic keying.
-@@ -639,11 +819,11 @@ is responsible for managing the session 
- With
- .Xr isakmpd 8 ,
- it is sufficient to copy the peer's public key, found in
--.Pa /etc/isakmpd/local.pub ,
-+.Pa %%PREFIX%%/etc/isakmpd/private/local.pub ,
- to the local machine.
- It must be stored in a file
- named after the peer's IP address and must be stored in
--.Pa /etc/isakmpd/pubkeys/ipv4/ .
-+.Pa %%PREFIX%%/etc/isakmpd/pubkeys/ipv4/ .
- The local public key must be copied to the peer in the same way.
- As
- .Xr bgpd 8
-@@ -698,11 +878,11 @@ Do not attempt to actively open a TCP co
- .It Ic remote-as Ar as-number
- Set the AS number of the remote system.
- .Pp
--.It rib .Ar name
-+.It Ic rib Ar name
- Bind the neighbor to the specified RIB.
- .Pp
- .It Ic route-reflector Op Ar address
--Act as an RFC 2796
-+Act as an RFC 4456
- .Em route-reflector
- for this neighbor.
- An optional cluster ID can be specified; otherwise the BGP ID will be used.
-@@ -732,8 +912,8 @@ These sets are rewritten into filter rul
- .Pp
- .It Xo
- .Ic softreconfig
--.Pq Ic in Ns \&| Ns Ic out
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic in Ns | Ns Ic out
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- Turn soft reconfiguration on or off for the specified direction.
- If soft reconfiguration is turned on, filter changes will be applied on
-@@ -760,7 +940,7 @@ tcp md5sig key deadbeef
- .Pp
- .It Xo
- .Ic transparent-as
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- If set to
- .Ic yes ,
-@@ -772,7 +952,7 @@ setting.
- .Pp
- .It Xo
- .Ic ttl-security
--.Pq Ic yes Ns \&| Ns Ic no
-+.Pq Ic yes Ns | Ns Ic no
- .Xc
- Enable or disable ttl-security.
- When enabled,
-@@ -849,6 +1029,10 @@ is matched against a part of the
- .Em AS path
- specified by the
- .Ar as-type .
-+.Ar as-number
-+may be set to
-+.Ic neighbor-as ,
-+which is expanded to the current neighbor remote AS number.
- .Ar as-type
- is one of the following operators:
- .Pp
-@@ -917,7 +1101,32 @@ may be set to
- which is expanded to the current neighbor remote AS number.
- .Pp
- .It Xo
--.Pq Ic from Ns \&| Ns Ic to
-+.Ic ext-community
-+.Ar subtype Ar as-number Ns Li : Ns Ar local
-+.Xc
-+.It Xo
-+.Ic ext-community
-+.Ar subtype Ar IP Ns Li : Ns Ar local
-+.Xc
-+.It Xo
-+.Ic ext-community
-+.Ar subtype Ar numvalue
-+.Xc
-+This rule applies only to
-+.Em UPDATES
-+where the
-+.Em extended community
-+path attribute is present and matches.
-+Extended Communities are specified by a
-+.Ar subtype
-+and normally two values, a globally unique part (e.g. the AS number) and a
-+local part.
-+See also the
-+.Sx ATTRIBUTE SET
-+section for further information about the encoding.
-+.Pp
-+.It Xo
-+.Pq Ic from Ns | Ns Ic to
- .Ar peer
- .Xc
- This rule applies only to
-@@ -945,7 +1154,7 @@ if enclosed in curly brackets:
- deny from { 128.251.16.1, 251.128.16.2, group hojo }
- .Ed
- .Pp
--.It Pq Ic inet Ns \&| Ns Ic inet6
-+.It Pq Ic inet Ns | Ns Ic inet6
- This rule applies only to routes matching the stated address family.
- The address family needs to be set only in rules that use
- .Ic prefixlen
-@@ -953,6 +1162,37 @@ without specifying a
- .Ic prefix
- beforehand.
- .Pp
-+.It Ic max-as-len Ar len
-+This rule applies only to
-+.Em UPDATES
-+where the
-+.Em AS path
-+has more than
-+.Ar len
-+elements.
-+.Pp
-+.It Ic max-as-seq Ar len
-+This rule applies only to
-+.Em UPDATES
-+where a single
-+.Em AS number
-+is repeated more than
-+.Ar len
-+times.
-+.Pp
-+.It Ic nexthop Ar address
-+This rule applies only to
-+.Em UPDATES
-+where the nexthop is equal to
-+.Ar address .
-+The
-+.Ar address
-+can be set to
-+.Em neighbor
-+in which case the nexthop is compared against the address of the neighbor.
-+Nexthop filtering is not supported on locally announced networks and one must
-+take into consideration previous rules overwriting nexthops.
-+.Pp
- .It Xo
- .Ic prefix
- .Ar address Ns Li / Ns Ar len
-@@ -1028,6 +1268,12 @@ matches a rule which has the
- option set, this rule is considered the last matching rule, and evaluation
- of subsequent rules is skipped.
- .Pp
-+.It Ic rib Ar name
-+Apply rule only to the specified RIB.
-+This only applies for received updates, so not for rules using the
-+.Ar to peer
-+parameter.
-+.Pp
- .It Ic set Ar attribute ...
- All matching rules can set the
- .Em AS path attributes
-@@ -1079,6 +1325,48 @@ Alternately, well-known communities may 
- or
- .Ic NO_PEER .
- .Pp
-+.It Xo
-+.Ic ext-community Op Ar delete
-+.Ar subtype Ar as-number Ns Li : Ns Ar local
-+.Xc
-+.It Xo
-+.Ic ext-community Op Ar delete
-+.Ar subtype Ar IP Ns Li : Ns Ar local
-+.Xc
-+.It Xo
-+.Ic ext-community Op Ar delete
-+.Ar subtype Ar numvalue
-+.Xc
-+Set or delete the
-+.Em Extended Community
-+AS path attribute.
-+Extended Communities are specified by a
-+.Ar subtype
-+and normally two values, a globally unique part (e.g. the AS number) and a
-+local part.
-+The type is selected depending on the encoding of the global part.
-+Two-octet AS Specific Extended Communities and Four-octet AS Specific Extended
-+Communities are encoded as
-+.Ar as-number Ns Li : Ns Ar local .
-+Four-octet encoding is used if the
-+.Ar as-number
-+is bigger then 65535 or if the AS_DOT encoding is used.
-+IPv4 Address Specific Extended Communities are encoded as
-+.Ar IP Ns Li : Ns Ar local .
-+Opaque Extended Communities are encoded with a single numeric value.
-+Currently the following subtypes are supported:
-+.Bd -literal -offset indent
-+rt       Route Target
-+soo      Source of Origin
-+odi      OSPF Domain Identifier
-+ort      OSPF Route Type
-+ori      OSPF Router ID
-+bdc      BGP Data Collection
-+.Ed
-+.Pp
-+Not all type and subtype value pairs are allowed by IANA and the parser
-+will ensure that no invalid combination is created.
-+.Pp
- .It Ic localpref Ar number
- Set the
- .Em LOCAL_PREF
-@@ -1108,6 +1396,20 @@ otherwise it will be set to
- .Ar number .
- .Pp
- .It Xo
-+.Ic origin
-+.Sm off
-+.Po Ic igp \*(Ba
-+.Ic egp \*(Ba
-+.Ic incomplete Pc
-+.Sm on
-+.Xc
-+Set the
-+.Em ORIGIN
-+AS path attribute to mark the source of this
-+route as being injected from an igp protocol, an egp protocol
-+or being an aggregated route.
-+.Pp
-+.It Xo
- .Ic nexthop
- .Sm off
- .Po Ar address \*(Ba
-@@ -1157,9 +1459,8 @@ times to the
- .Em AS path .
- .Pp
- .It Ic rtlabel Ar label
--Add the prefix with the specified
--.Ar label
--to the kernel routing table.
-+Add the prefix to the kernel routing table with the specified
-+.Ar label .
- .Pp
- .It Ic weight Ar number
- The
-@@ -1181,8 +1482,8 @@ For prefixes with equally long paths, th
- is selected.
- .El
- .Sh FILES
--.Bl -tag -width "/etc/bgpd.conf" -compact
--.It Pa /etc/bgpd.conf
-+.Bl -tag -width "%%PREFIX%%/etc/bgpd.conf" -compact
-+.It Pa %%PREFIX%%/etc/bgpd.conf
- .Xr bgpd 8
- configuration file
- .El
diff --git a/net/openbgpd/files/patch-bgpd_bgpd.h b/net/openbgpd/files/patch-bgpd_bgpd.h
deleted file mode 100644
index 2ce5fe58102f..000000000000
--- a/net/openbgpd/files/patch-bgpd_bgpd.h
+++ /dev/null
@@ -1,872 +0,0 @@
-Index: bgpd/bgpd.h
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.h,v
-retrieving revision 1.1.1.8
-retrieving revision 1.15
-diff -u -p -r1.1.1.8 -r1.15
---- bgpd/bgpd.h	14 Feb 2010 20:19:57 -0000	1.1.1.8
-+++ bgpd/bgpd.h	16 May 2014 00:36:26 -0000	1.15
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: bgpd.h,v 1.241 2009/06/12 16:42:53 claudio Exp $ */
-+/*	$OpenBSD: bgpd.h,v 1.273 2012/09/18 10:10:00 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -21,6 +21,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/queue.h>
-+#include <sys/tree.h>
- #include <net/route.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-@@ -30,11 +31,16 @@
- #include <poll.h>
- #include <stdarg.h>
- 
--#include <imsg.h>
-+#if defined(__FreeBSD__)	/* compat */
-+#include "openbsd-compat.h"
-+#endif /* defined(__FreeBSD__) */
-+#include "imsg.h"
- 
- #define	BGP_VERSION			4
- #define	BGP_PORT			179
-+#ifndef CONFFILE
- #define	CONFFILE			"/etc/bgpd.conf"
-+#endif /* !CONFFILE */
- #define	BGPD_USER			"_bgpd"
- #define	PEER_DESCR_LEN			32
- #define	PFTABLE_LEN			16
-@@ -42,8 +48,6 @@
- #define	IPSEC_ENC_KEY_LEN		32
- #define	IPSEC_AUTH_KEY_LEN		20
- 
--#define	ASNUM_MAX			0xffffffff
--
- #define	MAX_PKTSIZE			4096
- #define	MIN_HOLDTIME			3
- #define	READ_BUF_SIZE			65535
-@@ -55,13 +59,8 @@
- #define	BGPD_OPT_NOACTION		0x0004
- #define	BGPD_OPT_FORCE_DEMOTE		0x0008
- 
--#define	BGPD_FLAG_NO_FIB_UPDATE		0x0001
- #define	BGPD_FLAG_NO_EVALUATE		0x0002
- #define	BGPD_FLAG_REFLECTOR		0x0004
--#define	BGPD_FLAG_REDIST_STATIC		0x0008
--#define	BGPD_FLAG_REDIST_CONNECTED	0x0010
--#define	BGPD_FLAG_REDIST6_STATIC	0x0020
--#define	BGPD_FLAG_REDIST6_CONNECTED	0x0040
- #define	BGPD_FLAG_NEXTHOP_BGP		0x0080
- #define	BGPD_FLAG_NEXTHOP_DEFAULT	0x1000
- #define	BGPD_FLAG_DECISION_MASK		0x0f00
-@@ -83,9 +82,12 @@
- #define	F_REJECT		0x0080
- #define	F_BLACKHOLE		0x0100
- #define	F_LONGER		0x0200
-+#define	F_MPLS			0x0400
-+#define	F_REDISTRIBUTED		0x0800
- #define	F_CTL_DETAIL		0x1000	/* only used by bgpctl */
- #define	F_CTL_ADJ_IN		0x2000
- #define	F_CTL_ADJ_OUT		0x4000
-+#define	F_CTL_ACTIVE		0x8000
- 
- /*
-  * Limit the number of control messages generated by the RDE and queued in
-@@ -109,18 +111,75 @@ enum reconf_action {
- 	RECONF_DELETE
- };
- 
-+/* Address Family Numbers as per RFC 1700 */
-+#define	AFI_UNSPEC	0
-+#define	AFI_IPv4	1
-+#define	AFI_IPv6	2
-+
-+/* Subsequent Address Family Identifier as per RFC 4760 */
-+#define	SAFI_NONE	0
-+#define	SAFI_UNICAST	1
-+#define	SAFI_MULTICAST	2
-+#define	SAFI_MPLS	4
-+#define	SAFI_MPLSVPN	128
-+
-+struct aid {
-+	u_int16_t	 afi;
-+	sa_family_t	 af;
-+	u_int8_t	 safi;
-+	char		*name;
-+};
-+
-+extern const struct aid aid_vals[];
-+
-+#define	AID_UNSPEC	0
-+#define	AID_INET	1
-+#define	AID_INET6	2
-+#define	AID_VPN_IPv4	3
-+#define	AID_MAX		4
-+#define	AID_MIN		1	/* skip AID_UNSPEC since that is a dummy */
-+
-+#define AID_VALS	{					\
-+	/* afi, af, safii, name */				\
-+	{ AFI_UNSPEC, AF_UNSPEC, SAFI_NONE, "unspec"},		\
-+	{ AFI_IPv4, AF_INET, SAFI_UNICAST, "IPv4 unicast" },	\
-+	{ AFI_IPv6, AF_INET6, SAFI_UNICAST, "IPv6 unicast" },	\
-+	{ AFI_IPv4, AF_INET, SAFI_MPLSVPN, "IPv4 vpn" }		\
-+}
-+
-+#define AID_PTSIZE	{				\
-+	0,						\
-+	sizeof(struct pt_entry4), 			\
-+	sizeof(struct pt_entry6),			\
-+	sizeof(struct pt_entry_vpn4)			\
-+}
-+
-+struct vpn4_addr {
-+	u_int64_t	rd;
-+	struct in_addr	addr;
-+	u_int8_t	labelstack[21];	/* max that makes sense */
-+	u_int8_t	labellen;
-+	u_int8_t	pad1;
-+	u_int8_t	pad2;
-+};
-+
-+#define BGP_MPLS_BOS	0x01
-+
- struct bgpd_addr {
--	sa_family_t	af;
- 	union {
- 		struct in_addr		v4;
- 		struct in6_addr		v6;
--		u_int8_t		addr8[16];
--		u_int16_t		addr16[8];
--		u_int32_t		addr32[4];
-+		struct vpn4_addr	vpn4;
-+		/* maximum size for a prefix is 256 bits */
-+		u_int8_t		addr8[32];
-+		u_int16_t		addr16[16];
-+		u_int32_t		addr32[8];
- 	} ba;		    /* 128-bit address */
- 	u_int32_t	scope_id;	/* iface scope id for v6 */
-+	u_int8_t	aid;
- #define	v4	ba.v4
- #define	v6	ba.v6
-+#define	vpn4	ba.vpn4
- #define	addr8	ba.addr8
- #define	addr16	ba.addr16
- #define	addr32	ba.addr32
-@@ -141,17 +200,12 @@ TAILQ_HEAD(listen_addrs, listen_addr);
- TAILQ_HEAD(filter_set_head, filter_set);
- 
- struct bgpd_config {
--	struct filter_set_head			 connectset;
--	struct filter_set_head			 connectset6;
--	struct filter_set_head			 staticset;
--	struct filter_set_head			 staticset6;
- 	struct listen_addrs			*listen_addrs;
- 	char					*csock;
- 	char					*rcsock;
- 	int					 opts;
- 	int					 flags;
- 	int					 log;
--	u_int					 rtableid;
- 	u_int32_t				 bgpid;
- 	u_int32_t				 clusterid;
- 	u_int32_t				 as;
-@@ -205,12 +259,24 @@ struct peer_auth {
- };
- 
- struct capabilities {
--	u_int8_t	mp_v4;		/* multiprotocol extensions, RFC 4760 */
--	u_int8_t	mp_v6;
--	u_int8_t	refresh;	/* route refresh, RFC 2918 */
--	u_int8_t	restart;	/* graceful restart, RFC 4724 */
--	u_int8_t	as4byte;	/* draft-ietf-idr-as4bytes-13 */
--};
-+	struct {
-+		int16_t	timeout;	/* graceful restart timeout */
-+		int8_t	flags[AID_MAX];	/* graceful restart per AID flags */
-+		int8_t	restart;	/* graceful restart, RFC 4724 */
-+	}	grestart;
-+	int8_t	mp[AID_MAX];		/* multiprotocol extensions, RFC 4760 */
-+	int8_t	refresh;		/* route refresh, RFC 2918 */
-+	int8_t	as4byte;		/* 4-byte ASnum, RFC 4893 */
-+};
-+
-+#define	CAPA_GR_PRESENT		0x01
-+#define	CAPA_GR_RESTART		0x02
-+#define	CAPA_GR_FORWARD		0x04
-+#define	CAPA_GR_RESTARTING	0x08
-+
-+#define	CAPA_GR_TIMEMASK	0x0fff
-+#define	CAPA_GR_R_FLAG		0x8000
-+#define	CAPA_GR_F_FLAG		0x80
- 
- struct peer_config {
- 	struct bgpd_addr	 remote_addr;
-@@ -237,7 +303,7 @@ struct peer_config {
- 	u_int8_t		 template;
- 	u_int8_t		 remote_masklen;
- 	u_int8_t		 cloned;
--	u_int8_t		 ebgp;		/* 1 = ebgp, 0 = ibgp */
-+	u_int8_t		 ebgp;		/* 0 = ibgp else ebgp */
- 	u_int8_t		 distance;	/* 1 = direct, >1 = multihop */
- 	u_int8_t		 passive;
- 	u_int8_t		 down;
-@@ -248,21 +314,33 @@ struct peer_config {
- 	u_int8_t		 ttlsec;	/* TTL security hack */
- 	u_int8_t		 flags;
- 	u_int8_t		 pad[3];
-+	char			 lliface[IFNAMSIZ];
- };
- 
- #define PEERFLAG_TRANS_AS	0x01
- 
-+enum network_type {
-+	NETWORK_DEFAULT,
-+	NETWORK_STATIC,
-+	NETWORK_CONNECTED,
-+	NETWORK_MRTCLONE
-+};
-+
- struct network_config {
--	struct bgpd_addr	prefix;
--	struct filter_set_head	attrset;
--	u_int8_t		prefixlen;
-+	struct bgpd_addr	 prefix;
-+	struct filter_set_head	 attrset;
-+	struct rde_aspath	*asp;
-+	u_int			 rtableid;
-+	enum network_type	 type;
-+	u_int8_t		 prefixlen;
-+	u_int8_t		 old;	/* used for reloading */
- };
- 
- TAILQ_HEAD(network_head, network);
- 
- struct network {
--	struct network_config	net;
--	TAILQ_ENTRY(network)	entry;
-+	struct network_config		net;
-+	TAILQ_ENTRY(network)		entry;
- };
- 
- enum imsg_type {
-@@ -276,7 +354,6 @@ enum imsg_type {
- 	IMSG_CTL_NEIGHBOR_CLEAR,
- 	IMSG_CTL_NEIGHBOR_RREFRESH,
- 	IMSG_CTL_KROUTE,
--	IMSG_CTL_KROUTE6,
- 	IMSG_CTL_KROUTE_ADDR,
- 	IMSG_CTL_RESULT,
- 	IMSG_CTL_SHOW_NEIGHBOR,
-@@ -288,11 +365,14 @@ enum imsg_type {
- 	IMSG_CTL_SHOW_RIB_ATTR,
- 	IMSG_CTL_SHOW_RIB_COMMUNITY,
- 	IMSG_CTL_SHOW_NETWORK,
--	IMSG_CTL_SHOW_NETWORK6,
- 	IMSG_CTL_SHOW_RIB_MEM,
- 	IMSG_CTL_SHOW_TERSE,
- 	IMSG_CTL_SHOW_TIMER,
-+	IMSG_CTL_LOG_VERBOSE,
-+	IMSG_CTL_SHOW_FIB_TABLES,
- 	IMSG_NETWORK_ADD,
-+	IMSG_NETWORK_ASPATH,
-+	IMSG_NETWORK_ATTR,
- 	IMSG_NETWORK_REMOVE,
- 	IMSG_NETWORK_FLUSH,
- 	IMSG_NETWORK_DONE,
-@@ -302,19 +382,25 @@ enum imsg_type {
- 	IMSG_RECONF_PEER,
- 	IMSG_RECONF_FILTER,
- 	IMSG_RECONF_LISTENER,
-+	IMSG_RECONF_CTRL,
-+	IMSG_RECONF_RDOMAIN,
-+	IMSG_RECONF_RDOMAIN_EXPORT,
-+	IMSG_RECONF_RDOMAIN_IMPORT,
-+	IMSG_RECONF_RDOMAIN_DONE,
- 	IMSG_RECONF_DONE,
- 	IMSG_UPDATE,
- 	IMSG_UPDATE_ERR,
- 	IMSG_SESSION_ADD,
- 	IMSG_SESSION_UP,
- 	IMSG_SESSION_DOWN,
-+	IMSG_SESSION_STALE,
-+	IMSG_SESSION_FLUSH,
-+	IMSG_SESSION_RESTARTED,
- 	IMSG_MRT_OPEN,
- 	IMSG_MRT_REOPEN,
- 	IMSG_MRT_CLOSE,
- 	IMSG_KROUTE_CHANGE,
- 	IMSG_KROUTE_DELETE,
--	IMSG_KROUTE6_CHANGE,
--	IMSG_KROUTE6_DELETE,
- 	IMSG_NEXTHOP_ADD,
- 	IMSG_NEXTHOP_REMOVE,
- 	IMSG_NEXTHOP_UPDATE,
-@@ -337,6 +423,7 @@ enum ctl_results {
- 	CTL_RES_DENIED,
- 	CTL_RES_NOCAP,
- 	CTL_RES_PARSE_ERROR,
-+	CTL_RES_PENDING,
- 	CTL_RES_NOMEM
- };
- 
-@@ -379,9 +466,43 @@ enum suberr_cease {
- 	ERR_CEASE_RSRC_EXHAUST
- };
- 
-+struct kroute_node;
-+struct kroute6_node;
-+struct knexthop_node;
-+RB_HEAD(kroute_tree, kroute_node);
-+RB_HEAD(kroute6_tree, kroute6_node);
-+RB_HEAD(knexthop_tree, knexthop_node);
-+
-+struct ktable {
-+	char			 descr[PEER_DESCR_LEN];
-+	char			 ifmpe[IFNAMSIZ];
-+	struct kroute_tree	 krt;
-+	struct kroute6_tree	 krt6;
-+	struct knexthop_tree	 knt;
-+	struct network_head	 krn;
-+	u_int			 rtableid;
-+	u_int			 nhtableid; /* rdomain id for nexthop lookup */
-+	u_int			 ifindex;   /* ifindex of ifmpe */
-+	int			 nhrefcnt;  /* refcnt for nexthop table */
-+	enum reconf_action	 state;
-+	u_int8_t		 fib_conf;  /* configured FIB sync flag */
-+	u_int8_t		 fib_sync;  /* is FIB synced with kernel? */
-+};
-+
-+struct kroute_full {
-+	struct bgpd_addr	prefix;
-+	struct bgpd_addr	nexthop;
-+	char			label[RTLABEL_LEN];
-+	u_int16_t		flags;
-+	u_short			ifindex;
-+	u_int8_t		prefixlen;
-+	u_int8_t		priority;
-+};
-+
- struct kroute {
- 	struct in_addr	prefix;
- 	struct in_addr	nexthop;
-+	u_int32_t	mplslabel;
- 	u_int16_t	flags;
- 	u_int16_t	labelid;
- 	u_short		ifindex;
-@@ -400,14 +521,12 @@ struct kroute6 {
- };
- 
- struct kroute_nexthop {
--	union {
--		struct kroute		kr4;
--		struct kroute6		kr6;
--	} kr;
- 	struct bgpd_addr	nexthop;
- 	struct bgpd_addr	gateway;
-+	struct bgpd_addr	net;
- 	u_int8_t		valid;
- 	u_int8_t		connected;
-+	u_int8_t		netlen;
- };
- 
- struct kif {
-@@ -423,8 +542,7 @@ struct kif {
- struct session_up {
- 	struct bgpd_addr	local_addr;
- 	struct bgpd_addr	remote_addr;
--	struct capabilities	capa_announced;
--	struct capabilities	capa_received;
-+	struct capabilities	capa;
- 	u_int32_t		remote_bgpid;
- 	u_int16_t		short_as;
- };
-@@ -437,8 +555,13 @@ struct pftable_msg {
- 
- struct ctl_show_nexthop {
- 	struct bgpd_addr	addr;
--	u_int8_t		valid;
- 	struct kif		kif;
-+	union {
-+		struct kroute		kr4;
-+		struct kroute6		kr6;
-+	} kr;
-+	u_int8_t		valid;
-+	u_int8_t		krvalid;
- };
- 
- struct ctl_neighbor {
-@@ -447,20 +570,11 @@ struct ctl_neighbor {
- 	int			show_timers;
- };
- 
--struct kroute_label {
--	struct kroute	kr;
--	char		label[RTLABEL_LEN];
--};
--
--struct kroute6_label {
--	struct kroute6	kr;
--	char		label[RTLABEL_LEN];
--};
--
--#define	F_RIB_ELIGIBLE	0x01
--#define	F_RIB_ACTIVE	0x02
--#define	F_RIB_INTERNAL	0x04
--#define	F_RIB_ANNOUNCE	0x08
-+#define	F_PREF_ELIGIBLE	0x01
-+#define	F_PREF_ACTIVE	0x02
-+#define	F_PREF_INTERNAL	0x04
-+#define	F_PREF_ANNOUNCE	0x08
-+#define	F_PREF_STALE	0x10
- 
- struct ctl_show_rib {
- 	struct bgpd_addr	true_nexthop;
-@@ -472,9 +586,7 @@ struct ctl_show_rib {
- 	u_int32_t		remote_id;
- 	u_int32_t		local_pref;
- 	u_int32_t		med;
--	u_int32_t		prefix_cnt;
--	u_int32_t		active_cnt;
--	u_int32_t		rib_cnt;
-+	u_int32_t		weight;
- 	u_int16_t		aspath_len;
- 	u_int16_t		flags;
- 	u_int8_t		prefixlen;
-@@ -482,13 +594,6 @@ struct ctl_show_rib {
- 	/* plus a aspath_len bytes long aspath */
- };
- 
--struct ctl_show_rib_prefix {
--	struct bgpd_addr	prefix;
--	time_t			lastchange;
--	u_int16_t		flags;
--	u_int8_t		prefixlen;
--};
--
- enum as_spec {
- 	AS_NONE,
- 	AS_ALL,
-@@ -498,16 +603,52 @@ enum as_spec {
- 	AS_EMPTY
- };
- 
-+enum aslen_spec {
-+	ASLEN_NONE,
-+	ASLEN_MAX,
-+	ASLEN_SEQ
-+};
-+
- struct filter_as {
--	enum as_spec	type;
- 	u_int32_t	as;
-+	u_int16_t	flags;
-+	enum as_spec	type;
- };
- 
-+struct filter_aslen {
-+	u_int		aslen;
-+	enum aslen_spec	type;
-+};
-+
-+#define AS_FLAG_NEIGHBORAS	0x01
-+
- struct filter_community {
--	int			as;
--	int			type;
-+	int		as;
-+	int		type;
- };
- 
-+struct filter_extcommunity {
-+	u_int16_t	flags;
-+	u_int8_t	type;
-+	u_int8_t	subtype;	/* if extended type */
-+	union {
-+		struct ext_as {
-+			u_int16_t	as;
-+			u_int32_t	val;
-+		}		ext_as;
-+		struct ext_as4 {
-+			u_int32_t	as4;
-+			u_int16_t	val;
-+		}		ext_as4;
-+		struct ext_ip {
-+			struct in_addr	addr;
-+			u_int16_t	val;
-+		}		ext_ip;
-+		u_int64_t	ext_opaq;	/* only 48 bits */
-+	}		data;
-+};
-+
-+
- struct ctl_show_rib_request {
- 	char			rib[PEER_DESCR_LEN];
- 	struct ctl_neighbor	neighbor;
-@@ -518,8 +659,8 @@ struct ctl_show_rib_request {
- 	pid_t			pid;
- 	u_int16_t		flags;
- 	enum imsg_type		type;
--	sa_family_t		af;
- 	u_int8_t		prefixlen;
-+	u_int8_t		aid;
- };
- 
- enum filter_actions {
-@@ -585,6 +726,28 @@ struct filter_peers {
- #define EXT_COMMUNITY_OSPF_RTR_TYPE	6	/* RFC 4577 */
- #define EXT_COMMUNITY_OSPF_RTR_ID	7	/* RFC 4577 */
- #define EXT_COMMUNITY_BGP_COLLECT	8	/* RFC 4384 */
-+/* other handy defines */
-+#define EXT_COMMUNITY_OPAQUE_MAX	0xffffffffffffULL
-+#define EXT_COMMUNITY_FLAG_VALID	0x01
-+
-+struct ext_comm_pairs {
-+	u_int8_t	type;
-+	u_int8_t	subtype;
-+	u_int8_t	transitive;	/* transitive bit needs to be set */
-+};
-+
-+#define IANA_EXT_COMMUNITIES	{					\
-+	{ EXT_COMMUNITY_TWO_AS, EXT_COMMUNITY_ROUTE_TGT, 0 },		\
-+	{ EXT_COMMUNITY_TWO_AS, EXT_CUMMUNITY_ROUTE_ORIG, 0 },		\
-+	{ EXT_COMMUNITY_TWO_AS, EXT_COMMUNITY_OSPF_DOM_ID, 0 },		\
-+	{ EXT_COMMUNITY_TWO_AS, EXT_COMMUNITY_BGP_COLLECT, 0 },		\
-+	{ EXT_COMMUNITY_FOUR_AS, EXT_COMMUNITY_ROUTE_TGT, 0 },		\
-+	{ EXT_COMMUNITY_FOUR_AS, EXT_CUMMUNITY_ROUTE_ORIG, 0 },		\
-+	{ EXT_COMMUNITY_IPV4, EXT_COMMUNITY_ROUTE_TGT, 0 },		\
-+	{ EXT_COMMUNITY_IPV4, EXT_CUMMUNITY_ROUTE_ORIG, 0 },		\
-+	{ EXT_COMMUNITY_IPV4, EXT_COMMUNITY_OSPF_RTR_ID, 0 },		\
-+	{ EXT_COMMUNITY_OPAQUE, EXT_COMMUNITY_OSPF_RTR_TYPE, 0 }	\
-+}
- 
- 
- struct filter_prefix {
-@@ -592,18 +755,28 @@ struct filter_prefix {
- 	u_int8_t		len;
- };
- 
-+struct filter_nexthop {
-+	struct bgpd_addr	addr;
-+	u_int8_t		flags;
-+#define FILTER_NEXTHOP_ADDR	1
-+#define FILTER_NEXTHOP_NEIGHBOR	2
-+};
-+
- struct filter_prefixlen {
- 	enum comp_ops		op;
--	sa_family_t		af;
-+	u_int8_t		aid;
- 	u_int8_t		len_min;
- 	u_int8_t		len_max;
- };
- 
- struct filter_match {
--	struct filter_prefix	prefix;
--	struct filter_prefixlen	prefixlen;
--	struct filter_as	as;
--	struct filter_community	community;
-+	struct filter_prefix		prefix;
-+	struct filter_prefixlen		prefixlen;
-+	struct filter_nexthop		nexthop;
-+	struct filter_as		as;
-+	struct filter_aslen		aslen;
-+	struct filter_community		community;
-+	struct filter_extcommunity	ext_community;
- };
- 
- TAILQ_HEAD(filter_head, filter_rule);
-@@ -635,10 +808,13 @@ enum action_types {
- 	ACTION_SET_NEXTHOP_SELF,
- 	ACTION_SET_COMMUNITY,
- 	ACTION_DEL_COMMUNITY,
-+	ACTION_SET_EXT_COMMUNITY,
-+	ACTION_DEL_EXT_COMMUNITY,
- 	ACTION_PFTABLE,
- 	ACTION_PFTABLE_ID,
- 	ACTION_RTLABEL,
--	ACTION_RTLABEL_ID
-+	ACTION_RTLABEL_ID,
-+	ACTION_SET_ORIGIN
- };
- 
- struct filter_set {
-@@ -650,23 +826,53 @@ struct filter_set {
- 		int32_t			relative;
- 		struct bgpd_addr	nexthop;
- 		struct filter_community	community;
-+		struct filter_extcommunity	ext_community;
- 		char			pftable[PFTABLE_LEN];
- 		char			rtlabel[RTLABEL_LEN];
-+		u_int8_t		origin;
- 	} action;
- 	enum action_types		type;
- };
- 
--struct rrefresh {
--	u_int16_t	afi;
--	u_int8_t	safi;
-+struct rdomain {
-+	SIMPLEQ_ENTRY(rdomain)		entry;
-+	char				descr[PEER_DESCR_LEN];
-+	char				ifmpe[IFNAMSIZ];
-+	struct filter_set_head		import;
-+	struct filter_set_head		export;
-+	struct network_head		net_l;
-+	u_int64_t			rd;
-+	u_int				rtableid;
-+	u_int				label;
-+	int				flags;
- };
-+SIMPLEQ_HEAD(rdomain_head, rdomain);
-+
-+struct rde_rib {
-+	SIMPLEQ_ENTRY(rde_rib)	entry;
-+	char			name[PEER_DESCR_LEN];
-+	u_int			rtableid;
-+	u_int16_t		id;
-+	u_int16_t		flags;
-+};
-+SIMPLEQ_HEAD(rib_names, rde_rib);
-+extern struct rib_names ribnames;
-+
-+/* rde_rib flags */
-+#define F_RIB_ENTRYLOCK		0x0001
-+#define F_RIB_NOEVALUATE	0x0002
-+#define F_RIB_NOFIB		0x0004
-+#define F_RIB_NOFIBSYNC		0x0008
-+#define F_RIB_HASNOFIB		(F_RIB_NOFIB | F_RIB_NOEVALUATE)
-+
-+/* 4-byte magic AS number */
-+#define AS_TRANS	23456
- 
- struct rde_memstats {
- 	int64_t		path_cnt;
- 	int64_t		prefix_cnt;
- 	int64_t		rib_cnt;
--	int64_t		pt4_cnt;
--	int64_t		pt6_cnt;
-+	int64_t		pt_cnt[AID_MAX];
- 	int64_t		nexthop_cnt;
- 	int64_t		aspath_cnt;
- 	int64_t		aspath_size;
-@@ -677,82 +883,117 @@ struct rde_memstats {
- 	int64_t		attr_dcnt;
- };
- 
--struct rde_rib {
--	SIMPLEQ_ENTRY(rde_rib)	entry;
--	char			name[PEER_DESCR_LEN];
--	u_int16_t		id;
--	u_int16_t		flags;
-+/* macros for IPv6 link-local address */
-+#ifdef __KAME__
-+#define IN6_LINKLOCAL_IFINDEX(addr) \
-+        ((addr).s6_addr[2] << 8 | (addr).s6_addr[3])
-+
-+#define SET_IN6_LINKLOCAL_IFINDEX(addr, index) \
-+        do { \
-+                (addr).s6_addr[2] = ((index) >> 8) & 0xff; \
-+                (addr).s6_addr[3] = (index) & 0xff; \
-+        } while (0)
-+#endif
-+
-+#define	MRT_FILE_LEN	512
-+#define	MRT2MC(x)	((struct mrt_config *)(x))
-+#define	MRT_MAX_TIMEOUT	7200
-+
-+enum mrt_type {
-+	MRT_NONE,
-+	MRT_TABLE_DUMP,
-+	MRT_TABLE_DUMP_MP,
-+	MRT_TABLE_DUMP_V2,
-+	MRT_ALL_IN,
-+	MRT_ALL_OUT,
-+	MRT_UPDATE_IN,
-+	MRT_UPDATE_OUT
-+};
-+
-+enum mrt_state {
-+	MRT_STATE_RUNNING,
-+	MRT_STATE_OPEN,
-+	MRT_STATE_REOPEN,
-+	MRT_STATE_REMOVE
- };
--SIMPLEQ_HEAD(rib_names, rde_rib);
--extern struct rib_names ribnames;
- 
--/* Address Family Numbers as per RFC 1700 */
--#define	AFI_IPv4	1
--#define	AFI_IPv6	2
--#define	AFI_ALL		0xffff
--
--/* Subsequent Address Family Identifier as per RFC 4760 */
--#define	SAFI_NONE	0x00
--#define	SAFI_UNICAST	0x01
--#define	SAFI_MULTICAST	0x02
--#define	SAFI_ALL	0xff
-+struct mrt {
-+	char			rib[PEER_DESCR_LEN];
-+	struct msgbuf		wbuf;
-+	LIST_ENTRY(mrt)		entry;
-+	u_int32_t		peer_id;
-+	u_int32_t		group_id;
-+	enum mrt_type		type;
-+	enum mrt_state		state;
-+	u_int16_t		seqnum;
-+};
- 
--/* 4-byte magic AS number */
--#define AS_TRANS	23456
-+struct mrt_config {
-+	struct mrt		conf;
-+	char			name[MRT_FILE_LEN];	/* base file name */
-+	char			file[MRT_FILE_LEN];	/* actual file name */
-+	time_t			ReopenTimer;
-+	time_t			ReopenTimerInterval;
-+};
- 
- /* prototypes */
- /* bgpd.c */
- void		 send_nexthop_update(struct kroute_nexthop *);
- void		 send_imsg_session(int, pid_t, void *, u_int16_t);
--int		 bgpd_redistribute(int, struct kroute *, struct kroute6 *);
-+int		 send_network(int, struct network_config *,
-+		     struct filter_set_head *);
- int		 bgpd_filternexthop(struct kroute *, struct kroute6 *);
- 
--/* log.c */
--void		 log_init(int);
--void		 vlog(int, const char *, va_list);
--void		 log_peer_warn(const struct peer_config *, const char *, ...);
--void		 log_peer_warnx(const struct peer_config *, const char *, ...);
--void		 log_warn(const char *, ...);
--void		 log_warnx(const char *, ...);
--void		 log_info(const char *, ...);
--void		 log_debug(const char *, ...);
--void		 fatal(const char *) __dead;
--void		 fatalx(const char *) __dead;
--
--/* parse.y */
--int	 cmdline_symset(char *);
-+/* control.c */
-+void	control_cleanup(const char *);
-+int	control_imsg_relay(struct imsg *);
- 
- /* config.c */
- int	 host(const char *, struct bgpd_addr *, u_int8_t *);
- 
- /* kroute.c */
--int		 kr_init(int, u_int);
--int		 kr_change(struct kroute_label *);
--int		 kr_delete(struct kroute_label *);
--int		 kr6_change(struct kroute6_label *);
--int		 kr6_delete(struct kroute6_label *);
-+int		 kr_init(void);
-+int		 ktable_update(u_int, char *, char *, int);
-+void		 ktable_preload(void);
-+void		 ktable_postload(void);
-+int		 ktable_exists(u_int, u_int *);
-+int		 kr_change(u_int, struct kroute_full *);
-+int		 kr_delete(u_int, struct kroute_full *);
- void		 kr_shutdown(void);
--void		 kr_fib_couple(void);
--void		 kr_fib_decouple(void);
-+void		 kr_fib_couple(u_int);
-+void		 kr_fib_decouple(u_int);
- int		 kr_dispatch_msg(void);
--int		 kr_nexthop_add(struct bgpd_addr *);
--void		 kr_nexthop_delete(struct bgpd_addr *);
-+int		 kr_nexthop_add(u_int32_t, struct bgpd_addr *);
-+void		 kr_nexthop_delete(u_int32_t, struct bgpd_addr *);
- void		 kr_show_route(struct imsg *);
- void		 kr_ifinfo(char *);
-+int		 kr_net_reload(u_int, struct network_head *);
- int		 kr_reload(void);
- struct in6_addr	*prefixlen2mask6(u_int8_t prefixlen);
- 
--/* control.c */
--void	control_cleanup(const char *);
--int	control_imsg_relay(struct imsg *);
-+/* log.c */
-+void		 log_init(int);
-+void		 log_verbose(int);
-+void		 vlog(int, const char *, va_list);
-+void		 log_peer_warn(const struct peer_config *, const char *, ...);
-+void		 log_peer_warnx(const struct peer_config *, const char *, ...);
-+void		 log_warn(const char *, ...);
-+void		 log_warnx(const char *, ...);
-+void		 log_info(const char *, ...);
-+void		 log_debug(const char *, ...);
-+void		 fatal(const char *) __dead;
-+void		 fatalx(const char *) __dead;
- 
--/* pftable.c */
--int	pftable_exists(const char *);
--int	pftable_add(const char *);
--int	pftable_clear_all(void);
--int	pftable_addr_add(struct pftable_msg *);
--int	pftable_addr_remove(struct pftable_msg *);
--int	pftable_commit(void);
-+/* mrt.c */
-+void		 mrt_clear_seq(void);
-+void		 mrt_write(struct mrt *);
-+void		 mrt_clean(struct mrt *);
-+void		 mrt_init(struct imsgbuf *, struct imsgbuf *);
-+int		 mrt_timeout(struct mrt_head *);
-+void		 mrt_reconfigure(struct mrt_head *);
-+void		 mrt_handler(struct mrt_head *);
-+struct mrt	*mrt_get(struct mrt_head *, struct mrt *);
-+int		 mrt_mergeconfig(struct mrt_head *, struct mrt_head *);
- 
- /* name2id.c */
- u_int16_t	 rib_name2id(const char *);
-@@ -768,10 +1009,22 @@ const char	*pftable_id2name(u_int16_t);
- void		 pftable_unref(u_int16_t);
- void		 pftable_ref(u_int16_t);
- 
-+/* parse.y */
-+int	 cmdline_symset(char *);
-+
-+/* pftable.c */
-+int	pftable_exists(const char *);
-+int	pftable_add(const char *);
-+int	pftable_clear_all(void);
-+int	pftable_addr_add(struct pftable_msg *);
-+int	pftable_addr_remove(struct pftable_msg *);
-+int	pftable_commit(void);
- 
- /* rde_filter.c */
- void		 filterset_free(struct filter_set_head *);
- int		 filterset_cmp(struct filter_set *, struct filter_set *);
-+void		 filterset_move(struct filter_set_head *,
-+		    struct filter_set_head *);
- const char	*filterset_name(enum action_types);
- 
- /* util.c */
-@@ -779,11 +1032,24 @@ const char	*log_addr(const struct bgpd_a
- const char	*log_in6addr(const struct in6_addr *);
- const char	*log_sockaddr(struct sockaddr *);
- const char	*log_as(u_int32_t);
-+const char	*log_rd(u_int64_t);
-+const char	*log_ext_subtype(u_int8_t);
- int		 aspath_snprint(char *, size_t, void *, u_int16_t);
- int		 aspath_asprint(char **, void *, u_int16_t);
- size_t		 aspath_strlen(void *, u_int16_t);
-+int		 aspath_match(void *, u_int16_t, enum as_spec, u_int32_t);
-+u_int32_t	 aspath_extract(const void *, int);
-+int		 prefix_compare(const struct bgpd_addr *,
-+		    const struct bgpd_addr *, int);
- in_addr_t	 prefixlen2mask(u_int8_t);
- void		 inet6applymask(struct in6_addr *, const struct in6_addr *,
- 		    int);
-+const char	*aid2str(u_int8_t);
-+int		 aid2afi(u_int8_t, u_int16_t *, u_int8_t *);
-+int		 afi2aid(u_int16_t, u_int8_t, u_int8_t *);
-+sa_family_t	 aid2af(u_int8_t);
-+int		 af2aid(sa_family_t, u_int8_t, u_int8_t *);
-+struct sockaddr	*addr2sa(struct bgpd_addr *, u_int16_t);
-+void		 sa2addr(struct sockaddr *, struct bgpd_addr *);
- 
- #endif /* __BGPD_H__ */
diff --git a/net/openbgpd/files/patch-bgpd_buffer.c b/net/openbgpd/files/patch-bgpd_buffer.c
deleted file mode 100644
index 692fe85c1687..000000000000
--- a/net/openbgpd/files/patch-bgpd_buffer.c
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: bgpd/buffer.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/buffer.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.3
-diff -u -p -r1.1.1.7 -r1.3
---- bgpd/buffer.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/buffer.c	8 Dec 2012 20:17:59 -0000	1.3
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: buffer.c,v 1.43 2009/06/06 06:33:15 eric Exp $	*/
-+/*	$OpenBSD: buffer.c,v 1.44 2009/07/23 18:58:42 eric Exp $	*/
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -144,7 +144,7 @@ int
- buf_write(struct msgbuf *msgbuf)
- {
- 	struct iovec	 iov[IOV_MAX];
--	struct buf	*buf, *next;
-+	struct buf	*buf;
- 	unsigned int	 i = 0;
- 	ssize_t	n;
- 
-@@ -153,7 +153,7 @@ buf_write(struct msgbuf *msgbuf)
- 		if (i >= IOV_MAX)
- 			break;
- 		iov[i].iov_base = buf->buf + buf->rpos;
--		iov[i].iov_len = buf->size - buf->rpos;
-+		iov[i].iov_len = buf->wpos - buf->rpos;
- 		i++;
- 	}
- 
-@@ -170,17 +170,7 @@ buf_write(struct msgbuf *msgbuf)
- 		return (-2);
- 	}
- 
--	for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
--	    buf = next) {
--		next = TAILQ_NEXT(buf, entry);
--		if (buf->rpos + n >= buf->size) {
--			n -= buf->size - buf->rpos;
--			buf_dequeue(msgbuf, buf);
--		} else {
--			buf->rpos += n;
--			n = 0;
--		}
--	}
-+	msgbuf_drain(msgbuf, n);
- 
- 	return (0);
- }
-@@ -201,6 +191,24 @@ msgbuf_init(struct msgbuf *msgbuf)
- }
- 
- void
-+msgbuf_drain(struct msgbuf *msgbuf, size_t n)
-+{
-+	struct buf	*buf, *next;
-+
-+	for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
-+	    buf = next) {
-+		next = TAILQ_NEXT(buf, entry);
-+		if (buf->rpos + n >= buf->wpos) {
-+			n -= buf->wpos - buf->rpos;
-+			buf_dequeue(msgbuf, buf);
-+		} else {
-+			buf->rpos += n;
-+			n = 0;
-+		}
-+	}
-+}
-+
-+void
- msgbuf_clear(struct msgbuf *msgbuf)
- {
- 	struct buf	*buf;
-@@ -213,7 +221,7 @@ int
- msgbuf_write(struct msgbuf *msgbuf)
- {
- 	struct iovec	 iov[IOV_MAX];
--	struct buf	*buf, *next;
-+	struct buf	*buf;
- 	unsigned int	 i = 0;
- 	ssize_t		 n;
- 	struct msghdr	 msg;
-@@ -270,17 +278,7 @@ msgbuf_write(struct msgbuf *msgbuf)
- 		buf->fd = -1;
- 	}
- 
--	for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
--	    buf = next) {
--		next = TAILQ_NEXT(buf, entry);
--		if (buf->rpos + n >= buf->wpos) {
--			n -= buf->wpos - buf->rpos;
--			buf_dequeue(msgbuf, buf);
--		} else {
--			buf->rpos += n;
--			n = 0;
--		}
--	}
-+	msgbuf_drain(msgbuf, n);
- 
- 	return (0);
- }
diff --git a/net/openbgpd/files/patch-bgpd_carp.c b/net/openbgpd/files/patch-bgpd_carp.c
deleted file mode 100644
index 7ed50075cd5c..000000000000
--- a/net/openbgpd/files/patch-bgpd_carp.c
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: bgpd/carp.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/carp.c,v
-retrieving revision 1.1.1.6
-retrieving revision 1.4
-diff -u -p -r1.1.1.6 -r1.4
---- bgpd/carp.c	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ bgpd/carp.c	22 Oct 2009 15:10:02 -0000	1.4
-@@ -93,9 +93,8 @@ carp_demote_shutdown(void)
- 
- 	while ((c = TAILQ_FIRST(&carpgroups)) != NULL) {
- 		TAILQ_REMOVE(&carpgroups, c, entry);
--		for (; c->changed_by > 0; c->changed_by--)
--			if (c->do_demote)
--				carp_demote_ioctl(c->group, -1);
-+		if (c->do_demote && c->changed_by > 0)
-+			carp_demote_ioctl(c->group, -c->changed_by);
- 
- 		free(c->group);
- 		free(c);
-@@ -105,6 +104,9 @@ carp_demote_shutdown(void)
- int
- carp_demote_get(char *group)
- {
-+#if defined(__FreeBSD__)	/* FreeBSD does not have support for CARP */
-+	return (-1);
-+#else
- 	int			s;
- 	struct ifgroupreq	ifgr;
- 
-@@ -127,6 +129,7 @@ carp_demote_get(char *group)
- 
- 	close(s);
- 	return ((int)ifgr.ifgr_attrib.ifg_carp_demoted);
-+#endif /* defined(__FreeBSD__) */
- }
- 
- int
-@@ -159,6 +162,9 @@ carp_demote_set(char *group, int demote)
- int
- carp_demote_ioctl(char *group, int demote)
- {
-+#if defined(__FreeBSD__)	/* FreeBSD does not have support for CARP */
-+	return (-1);
-+#else
- 	int			s, res;
- 	struct ifgroupreq	ifgr;
- 
-@@ -181,4 +187,5 @@ carp_demote_ioctl(char *group, int demot
- 
- 	close(s);
- 	return (res);
-+#endif /* defined(__FreeBSD__) */
- }
diff --git a/net/openbgpd/files/patch-bgpd_config.c b/net/openbgpd/files/patch-bgpd_config.c
deleted file mode 100644
index fbd02e102483..000000000000
--- a/net/openbgpd/files/patch-bgpd_config.c
+++ /dev/null
@@ -1,109 +0,0 @@
-Index: bgpd/config.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/config.c,v
-retrieving revision 1.1.1.6
-retrieving revision 1.3
-diff -u -p -r1.1.1.6 -r1.3
---- bgpd/config.c	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ bgpd/config.c	13 Oct 2012 18:36:00 -0000	1.3
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: config.c,v 1.51 2009/01/26 23:10:02 claudio Exp $ */
-+/*	$OpenBSD: config.c,v 1.55 2010/09/02 14:03:21 sobrado Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
-@@ -20,6 +20,11 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#include <sys/ioctl.h>
-+
-+#if !defined(__FreeBSD__) /* FreeBSD has no mpls support. */
-+#include <netmpls/mpls.h>
-+#endif
- 
- #include <errno.h>
- #include <ifaddrs.h>
-@@ -47,8 +52,6 @@ merge_config(struct bgpd_config *xconf, 
- 
- 	/* preserve cmd line opts */
- 	conf->opts = xconf->opts;
--	conf->csock = xconf->csock;
--	conf->rcsock = xconf->rcsock;
- 
- 	if (!conf->as) {
- 		log_warnx("configuration error: AS not given");
-@@ -64,6 +67,9 @@ merge_config(struct bgpd_config *xconf, 
- 	if ((conf->flags & BGPD_FLAG_REFLECTOR) && conf->clusterid == 0)
- 		conf->clusterid = conf->bgpid;
- 
-+	free(xconf->csock);
-+	free(xconf->rcsock);
-+
- 	conf->listen_addrs = xconf->listen_addrs;
- 	memcpy(xconf, conf, sizeof(struct bgpd_config));
- 
-@@ -74,7 +80,7 @@ merge_config(struct bgpd_config *xconf, 
- 			nla->reconf = RECONF_REINIT;
- 
- 	} else {
--		/* 
-+		/*
- 		 * merge new listeners:
- 		 * -flag all existing ones as to be deleted
- 		 * -those that are in both new and old: flag to keep
-@@ -208,7 +214,7 @@ host_v4(const char *s, struct bgpd_addr 
- 			return (0);
- 	}
- 
--	h->af = AF_INET;
-+	h->aid = AID_INET;
- 	h->v4.s_addr = ina.s_addr;
- 	*len = bits;
- 
-@@ -225,13 +231,7 @@ host_v6(const char *s, struct bgpd_addr 
- 	hints.ai_socktype = SOCK_DGRAM; /*dummy*/
- 	hints.ai_flags = AI_NUMERICHOST;
- 	if (getaddrinfo(s, "0", &hints, &res) == 0) {
--		h->af = AF_INET6;
--		memcpy(&h->v6,
--		    &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr,
--		    sizeof(h->v6));
--		h->scope_id =
--		    ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id;
--
-+		sa2addr(res->ai_addr, h);
- 		freeaddrinfo(res);
- 		return (1);
- 	}
-@@ -317,3 +317,30 @@ prepare_listeners(struct bgpd_config *co
- 		}
- 	}
- }
-+
-+int
-+get_mpe_label(struct rdomain *r)
-+{
-+#if !defined(__FreeBSD__) /* FreeBSD has no mpls support. */
-+	struct  ifreq	ifr;
-+	struct shim_hdr	shim;
-+	int		s;
-+
-+	s = socket(AF_INET, SOCK_DGRAM, 0);
-+	if (s == -1)
-+		return (-1);
-+
-+	bzero(&shim, sizeof(shim));
-+	bzero(&ifr, sizeof(ifr));
-+	strlcpy(ifr.ifr_name, r->ifmpe, sizeof(ifr.ifr_name));
-+	ifr.ifr_data = (caddr_t)&shim;
-+
-+	if (ioctl(s, SIOCGETLABEL, (caddr_t)&ifr) == -1) {
-+		close(s);
-+		return (-1);
-+	}
-+	close(s);
-+	r->label = shim.shim_label;
-+#endif
-+	return (0);
-+}
diff --git a/net/openbgpd/files/patch-bgpd_control.c b/net/openbgpd/files/patch-bgpd_control.c
deleted file mode 100644
index 5d6bade713cc..000000000000
--- a/net/openbgpd/files/patch-bgpd_control.c
+++ /dev/null
@@ -1,171 +0,0 @@
-Index: bgpd/control.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/control.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.1.1.10
-diff -u -p -r1.1.1.7 -r1.1.1.10
---- bgpd/control.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/control.c	13 Oct 2012 18:22:41 -0000	1.1.1.10
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: control.c,v 1.61 2009/05/05 20:09:19 sthen Exp $ */
-+/*	$OpenBSD: control.c,v 1.71 2012/04/12 17:26:09 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -53,7 +53,7 @@ control_init(int restricted, char *path)
- 
- 	if (unlink(path) == -1)
- 		if (errno != ENOENT) {
--			log_warn("unlink %s", path);
-+			log_warn("control_init: unlink %s", path);
- 			close(fd);
- 			return (-1);
- 		}
-@@ -122,15 +122,18 @@ control_accept(int listenfd, int restric
- 	len = sizeof(sun);
- 	if ((connfd = accept(listenfd,
- 	    (struct sockaddr *)&sun, &len)) == -1) {
--		if (errno != EWOULDBLOCK && errno != EINTR)
--			log_warn("session_control_accept");
-+		if (errno == ENFILE || errno == EMFILE) {
-+			pauseaccept = getmonotime();
-+			return (0);
-+		} else if (errno != EWOULDBLOCK && errno != EINTR)
-+			log_warn("control_accept: accept");
- 		return (0);
- 	}
- 
- 	session_socket_blockmode(connfd, BM_NONBLOCK);
- 
--	if ((ctl_conn = malloc(sizeof(struct ctl_conn))) == NULL) {
--		log_warn("session_control_accept");
-+	if ((ctl_conn = calloc(1, sizeof(struct ctl_conn))) == NULL) {
-+		log_warn("control_accept");
- 		close(connfd);
- 		return (0);
- 	}
-@@ -182,7 +185,7 @@ control_close(int fd)
- 
- 	close(c->ibuf.fd);
- 	free(c);
--
-+	pauseaccept = 0;
- 	return (1);
- }
- 
-@@ -191,7 +194,8 @@ control_dispatch_msg(struct pollfd *pfd,
- {
- 	struct imsg		 imsg;
- 	struct ctl_conn		*c;
--	int			 n;
-+	ssize_t			 n;
-+	int			 verbose;
- 	struct peer		*p;
- 	struct ctl_neighbor	*neighbor;
- 	struct ctl_show_rib_request	*ribreq;
-@@ -305,7 +309,8 @@ control_dispatch_msg(struct pollfd *pfd,
- 			break;
- 		case IMSG_CTL_FIB_COUPLE:
- 		case IMSG_CTL_FIB_DECOUPLE:
--			imsg_compose_parent(imsg.hdr.type, 0, NULL, 0);
-+			imsg_compose_parent(imsg.hdr.type, imsg.hdr.peerid,
-+			    0, NULL, 0);
- 			break;
- 		case IMSG_CTL_NEIGHBOR_UP:
- 		case IMSG_CTL_NEIGHBOR_DOWN:
-@@ -328,13 +333,19 @@ control_dispatch_msg(struct pollfd *pfd,
- 					control_result(c, CTL_RES_OK);
- 					break;
- 				case IMSG_CTL_NEIGHBOR_DOWN:
--					bgp_fsm(p, EVNT_STOP);
-+					session_stop(p, ERR_CEASE_ADMIN_DOWN);
- 					control_result(c, CTL_RES_OK);
- 					break;
- 				case IMSG_CTL_NEIGHBOR_CLEAR:
--					bgp_fsm(p, EVNT_STOP);
--					timer_set(p, Timer_IdleHold,
--					    SESSION_CLEAR_DELAY);
-+					if (!p->conf.down) {
-+						session_stop(p,
-+						    ERR_CEASE_ADMIN_RESET);
-+						timer_set(p, Timer_IdleHold,
-+						    SESSION_CLEAR_DELAY);
-+					} else {
-+						session_stop(p,
-+						    ERR_CEASE_ADMIN_DOWN);
-+					}
- 					control_result(c, CTL_RES_OK);
- 					break;
- 				case IMSG_CTL_NEIGHBOR_RREFRESH:
-@@ -352,13 +363,19 @@ control_dispatch_msg(struct pollfd *pfd,
- 				    "wrong length");
- 			break;
- 		case IMSG_CTL_RELOAD:
-+		case IMSG_CTL_SHOW_INTERFACE:
-+		case IMSG_CTL_SHOW_FIB_TABLES:
-+			c->ibuf.pid = imsg.hdr.pid;
-+			imsg_compose_parent(imsg.hdr.type, 0, imsg.hdr.pid,
-+			    imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE);
-+			break;
- 		case IMSG_CTL_KROUTE:
- 		case IMSG_CTL_KROUTE_ADDR:
- 		case IMSG_CTL_SHOW_NEXTHOP:
--		case IMSG_CTL_SHOW_INTERFACE:
- 			c->ibuf.pid = imsg.hdr.pid;
--			imsg_compose_parent(imsg.hdr.type, imsg.hdr.pid,
--			    imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE);
-+			imsg_compose_parent(imsg.hdr.type, imsg.hdr.peerid,
-+			    imsg.hdr.pid, imsg.data, imsg.hdr.len -
-+			    IMSG_HEADER_SIZE);
- 			break;
- 		case IMSG_CTL_SHOW_RIB:
- 		case IMSG_CTL_SHOW_RIB_AS:
-@@ -370,7 +387,7 @@ control_dispatch_msg(struct pollfd *pfd,
- 				neighbor->descr[PEER_DESCR_LEN - 1] = 0;
- 				ribreq->peerid = 0;
- 				p = NULL;
--				if (neighbor->addr.af) {
-+				if (neighbor->addr.aid) {
- 					p = getpeerbyaddr(&neighbor->addr);
- 					if (p == NULL) {
- 						control_result(c,
-@@ -397,8 +414,7 @@ control_dispatch_msg(struct pollfd *pfd,
- 					break;
- 				}
- 				if ((imsg.hdr.type == IMSG_CTL_SHOW_RIB_PREFIX)
--				    && (ribreq->prefix.af != AF_INET)
--				    && (ribreq->prefix.af != AF_INET6)) {
-+				    && (ribreq->prefix.aid == AID_UNSPEC)) {
- 					/* malformed request, must specify af */
- 					control_result(c, CTL_RES_PARSE_ERROR);
- 					break;
-@@ -418,6 +434,8 @@ control_dispatch_msg(struct pollfd *pfd,
- 			    imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE);
- 			break;
- 		case IMSG_NETWORK_ADD:
-+		case IMSG_NETWORK_ASPATH:
-+		case IMSG_NETWORK_ATTR:
- 		case IMSG_NETWORK_REMOVE:
- 		case IMSG_NETWORK_FLUSH:
- 		case IMSG_NETWORK_DONE:
-@@ -425,6 +443,20 @@ control_dispatch_msg(struct pollfd *pfd,
- 			imsg_compose_rde(imsg.hdr.type, 0,
- 			    imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE);
- 			break;
-+		case IMSG_CTL_LOG_VERBOSE:
-+			if (imsg.hdr.len != IMSG_HEADER_SIZE +
-+			    sizeof(verbose))
-+				break;
-+
-+			/* forward to other processes */
-+			imsg_compose_parent(imsg.hdr.type, 0, imsg.hdr.pid,
-+			    imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE);
-+			imsg_compose_rde(imsg.hdr.type, 0,
-+			    imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE);
-+
-+			memcpy(&verbose, imsg.data, sizeof(verbose));
-+			log_verbose(verbose);
-+			break;
- 		default:
- 			break;
- 		}
diff --git a/net/openbgpd/files/patch-bgpd_imsg.c b/net/openbgpd/files/patch-bgpd_imsg.c
deleted file mode 100644
index 0ae6c8a603e7..000000000000
--- a/net/openbgpd/files/patch-bgpd_imsg.c
+++ /dev/null
@@ -1,275 +0,0 @@
-Index: bgpd/imsg.c
-===================================================================
-RCS file: bgpd/imsg.c
-diff -N bgpd/imsg.c
---- bgpd/imsg.c	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ /dev/null	1 Jan 1970 00:00:00 -0000
-@@ -1,268 +0,0 @@
--/*	$OpenBSD: imsg.c,v 1.47 2009/06/08 08:30:06 dlg Exp $	*/
--
--/*
-- * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- */
--
--#include <sys/param.h>
--#include <sys/queue.h>
--#include <sys/socket.h>
--#include <sys/uio.h>
--
--#include <errno.h>
--#include <stdlib.h>
--#include <string.h>
--#include <unistd.h>
--
--#include "imsg.h"
--
--int	 imsg_get_fd(struct imsgbuf *);
--
--void
--imsg_init(struct imsgbuf *ibuf, int fd)
--{
--	msgbuf_init(&ibuf->w);
--	bzero(&ibuf->r, sizeof(ibuf->r));
--	ibuf->fd = fd;
--	ibuf->w.fd = fd;
--	ibuf->pid = getpid();
--	TAILQ_INIT(&ibuf->fds);
--}
--
--ssize_t
--imsg_read(struct imsgbuf *ibuf)
--{
--	struct msghdr		 msg;
--	struct cmsghdr		*cmsg;
--	union {
--		struct cmsghdr hdr;
--		char	buf[CMSG_SPACE(sizeof(int) * 16)];
--	} cmsgbuf;
--	struct iovec		 iov;
--	ssize_t			 n;
--	int			 fd;
--	struct imsg_fd		*ifd;
--
--	bzero(&msg, sizeof(msg));
--
--	iov.iov_base = ibuf->r.buf + ibuf->r.wpos;
--	iov.iov_len = sizeof(ibuf->r.buf) - ibuf->r.wpos;
--	msg.msg_iov = &iov;
--	msg.msg_iovlen = 1;
--	msg.msg_control = &cmsgbuf.buf;
--	msg.msg_controllen = sizeof(cmsgbuf.buf);
--
--	if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) {
--		if (errno != EINTR && errno != EAGAIN) {
--			return (-1);
--		}
--		return (-2);
--	}
--
--	ibuf->r.wpos += n;
--
--	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
--	    cmsg = CMSG_NXTHDR(&msg, cmsg)) {
--		if (cmsg->cmsg_level == SOL_SOCKET &&
--		    cmsg->cmsg_type == SCM_RIGHTS) {
--			fd = (*(int *)CMSG_DATA(cmsg));
--			if ((ifd = calloc(1, sizeof(struct imsg_fd))) == NULL) {
--				/* XXX: this return can leak */
--				return (-1);
--			}
--			ifd->fd = fd;
--			TAILQ_INSERT_TAIL(&ibuf->fds, ifd, entry);
--		}
--		/* we do not handle other ctl data level */
--	}
--
--	return (n);
--}
--
--ssize_t
--imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
--{
--	size_t			 av, left, datalen;
--
--	av = ibuf->r.wpos;
--
--	if (IMSG_HEADER_SIZE > av)
--		return (0);
--
--	memcpy(&imsg->hdr, ibuf->r.buf, sizeof(imsg->hdr));
--	if (imsg->hdr.len < IMSG_HEADER_SIZE ||
--	    imsg->hdr.len > MAX_IMSGSIZE) {
--		errno = ERANGE;
--		return (-1);
--	}
--	if (imsg->hdr.len > av)
--		return (0);
--	datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
--	ibuf->r.rptr = ibuf->r.buf + IMSG_HEADER_SIZE;
--	if ((imsg->data = malloc(datalen)) == NULL)
--		return (-1);
--
--	if (imsg->hdr.flags & IMSGF_HASFD)
--		imsg->fd = imsg_get_fd(ibuf);
--	else
--		imsg->fd = -1;
--
--	memcpy(imsg->data, ibuf->r.rptr, datalen);
--
--	if (imsg->hdr.len < av) {
--		left = av - imsg->hdr.len;
--		memmove(&ibuf->r.buf, ibuf->r.buf + imsg->hdr.len, left);
--		ibuf->r.wpos = left;
--	} else
--		ibuf->r.wpos = 0;
--
--	return (datalen + IMSG_HEADER_SIZE);
--}
--
--int
--imsg_compose(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
--    pid_t pid, int fd, void *data, u_int16_t datalen)
--{
--	struct buf	*wbuf;
--
--	if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
--		return (-1);
--
--	if (imsg_add(wbuf, data, datalen) == -1)
--		return (-1);
--
--	wbuf->fd = fd;
--
--	imsg_close(ibuf, wbuf);
--
--	return (1);
--}
--
--int
--imsg_composev(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
--    pid_t pid, int fd, const struct iovec *iov, int iovcnt)
--{
--	struct buf	*wbuf;
--	int		 i, datalen = 0;
--
--	for (i = 0; i < iovcnt; i++)
--		datalen += iov[i].iov_len;
--
--	if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
--		return (-1);
--
--	for (i = 0; i < iovcnt; i++)
--		if (imsg_add(wbuf, iov[i].iov_base, iov[i].iov_len) == -1)
--			return (-1);
--
--	wbuf->fd = fd;
--
--	imsg_close(ibuf, wbuf);
--
--	return (1);
--}
--
--/* ARGSUSED */
--struct buf *
--imsg_create(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
--    pid_t pid, u_int16_t datalen)
--{
--	struct buf	*wbuf;
--	struct imsg_hdr	 hdr;
--
--	datalen += IMSG_HEADER_SIZE;
--	if (datalen > MAX_IMSGSIZE) {
--		errno = ERANGE;
--		return (NULL);
--	}
--
--	hdr.type = type;
--	hdr.flags = 0;
--	hdr.peerid = peerid;
--	if ((hdr.pid = pid) == 0)
--		hdr.pid = ibuf->pid;
--	if ((wbuf = buf_dynamic(datalen, MAX_IMSGSIZE)) == NULL) {
--		return (NULL);
--	}
--	if (imsg_add(wbuf, &hdr, sizeof(hdr)) == -1)
--		return (NULL);
--
--	return (wbuf);
--}
--
--int
--imsg_add(struct buf *msg, void *data, u_int16_t datalen)
--{
--	if (datalen)
--		if (buf_add(msg, data, datalen) == -1) {
--			buf_free(msg);
--			return (-1);
--		}
--	return (datalen);
--}
--
--void
--imsg_close(struct imsgbuf *ibuf, struct buf *msg)
--{
--	struct imsg_hdr	*hdr;
--
--	hdr = (struct imsg_hdr *)msg->buf;
--
--	hdr->flags &= ~IMSGF_HASFD;
--	if (msg->fd != -1)
--		hdr->flags |= IMSGF_HASFD;
--
--	hdr->len = (u_int16_t)msg->wpos;
--
--	buf_close(&ibuf->w, msg);
--}
--
--void
--imsg_free(struct imsg *imsg)
--{
--	free(imsg->data);
--}
--
--int
--imsg_get_fd(struct imsgbuf *ibuf)
--{
--	int		 fd;
--	struct imsg_fd	*ifd;
--
--	if ((ifd = TAILQ_FIRST(&ibuf->fds)) == NULL)
--		return (-1);
--
--	fd = ifd->fd;
--	TAILQ_REMOVE(&ibuf->fds, ifd, entry);
--	free(ifd);
--
--	return (fd);
--}
--
--int
--imsg_flush(struct imsgbuf *ibuf)
--{
--	while (ibuf->w.queued)
--		if (msgbuf_write(&ibuf->w) < 0)
--			return (-1);
--	return (0);
--}
--
--void
--imsg_clear(struct imsgbuf *ibuf)
--{
--	while (ibuf->w.queued)
--		msgbuf_clear(&ibuf->w);
--}
diff --git a/net/openbgpd/files/patch-bgpd_imsg.h b/net/openbgpd/files/patch-bgpd_imsg.h
deleted file mode 100644
index 09fe037f51eb..000000000000
--- a/net/openbgpd/files/patch-bgpd_imsg.h
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: bgpd/imsg.h
-===================================================================
-RCS file: bgpd/imsg.h
-diff -N bgpd/imsg.h
---- bgpd/imsg.h	14 Feb 2010 20:19:57 -0000	1.1.1.5
-+++ /dev/null	1 Jan 1970 00:00:00 -0000
-@@ -1,108 +0,0 @@
--/*	$OpenBSD: imsg.h,v 1.3 2009/06/07 05:56:24 eric Exp $	*/
--
--/*
-- * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
-- * Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
-- * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- */
--
--#include <sys/tree.h>
--
--#define READ_BUF_SIZE		65535
--#define IMSG_HEADER_SIZE	sizeof(struct imsg_hdr)
--#define MAX_IMSGSIZE		16384
--
--struct buf {
--	TAILQ_ENTRY(buf)	 entry;
--	u_char			*buf;
--	size_t			 size;
--	size_t			 max;
--	size_t			 wpos;
--	size_t			 rpos;
--	int			 fd;
--};
--
--struct msgbuf {
--	TAILQ_HEAD(, buf)	 bufs;
--	u_int32_t		 queued;
--	int			 fd;
--};
--
--struct buf_read {
--	u_char			 buf[READ_BUF_SIZE];
--	u_char			*rptr;
--	size_t			 wpos;
--};
--
--struct imsg_fd {
--	TAILQ_ENTRY(imsg_fd)	entry;
--	int			fd;
--};
--
--struct imsgbuf {
--	TAILQ_HEAD(, imsg_fd)	 fds;
--	struct buf_read		 r;
--	struct msgbuf		 w;
--	int			 fd;
--	pid_t			 pid;
--};
--
--#define IMSGF_HASFD	1
--
--struct imsg_hdr {
--	u_int32_t	 type;
--	u_int16_t	 len;
--	u_int16_t	 flags;
--	u_int32_t	 peerid;
--	u_int32_t	 pid;
--};
--
--struct imsg {
--	struct imsg_hdr	 hdr;
--	int		 fd;
--	void		*data;
--};
--
--
--/* buffer.c */
--struct buf	*buf_open(size_t);
--struct buf	*buf_dynamic(size_t, size_t);
--int		 buf_add(struct buf *, const void *, size_t);
--void		*buf_reserve(struct buf *, size_t);
--void		*buf_seek(struct buf *, size_t, size_t);
--size_t		 buf_size(struct buf *);
--size_t		 buf_left(struct buf *);
--void		 buf_close(struct msgbuf *, struct buf *);
--int		 buf_write(struct msgbuf *);
--void		 buf_free(struct buf *);
--void		 msgbuf_init(struct msgbuf *);
--void		 msgbuf_clear(struct msgbuf *);
--int		 msgbuf_write(struct msgbuf *);
--
--/* imsg.c */
--void	 imsg_init(struct imsgbuf *, int);
--ssize_t	 imsg_read(struct imsgbuf *);
--ssize_t	 imsg_get(struct imsgbuf *, struct imsg *);
--int	 imsg_compose(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
--	    int, void *, u_int16_t);
--int	 imsg_composev(struct imsgbuf *, u_int32_t, u_int32_t,  pid_t,
--	    int, const struct iovec *, int);
--struct buf *imsg_create(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
--	    u_int16_t);
--int	 imsg_add(struct buf *, void *, u_int16_t);
--void	 imsg_close(struct imsgbuf *, struct buf *);
--void	 imsg_free(struct imsg *);
--int	 imsg_flush(struct imsgbuf *);
--void	 imsg_clear(struct imsgbuf *);
diff --git a/net/openbgpd/files/patch-bgpd_kroute.c b/net/openbgpd/files/patch-bgpd_kroute.c
deleted file mode 100644
index 0b7f3943ac4a..000000000000
--- a/net/openbgpd/files/patch-bgpd_kroute.c
+++ /dev/null
@@ -1,3140 +0,0 @@
-Index: bgpd/kroute.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/kroute.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.15
-diff -u -p -r1.1.1.7 -r1.15
---- bgpd/kroute.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/kroute.c	16 May 2014 00:36:26 -0000	1.15
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: kroute.c,v 1.169 2009/06/25 15:54:22 claudio Exp $ */
-+/*	$OpenBSD: kroute.c,v 1.190 2012/07/13 16:57:35 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -27,6 +27,9 @@
- #include <net/if.h>
- #include <net/if_dl.h>
- #include <net/route.h>
-+#if !defined(__FreeBSD__) /* FreeBSD has no mpls support. */
-+#include <netmpls/mpls.h>
-+#endif
- #include <err.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -37,11 +40,12 @@
- 
- #include "bgpd.h"
- 
-+struct ktable		**krt;
-+u_int			  krt_size;
-+
- struct {
- 	u_int32_t		rtseq;
- 	pid_t			pid;
--	u_int			rtableid;
--	int			fib_sync;
- 	int			fd;
- } kr_state;
- 
-@@ -83,32 +87,52 @@ struct kif_node {
- 	struct kif_kr6_head	 kroute6_l;
- };
- 
--int	kr_redistribute(int, struct kroute *);
--int	kr_redistribute6(int, struct kroute6 *);
-+int	ktable_new(u_int, u_int, char *, char *, int);
-+void	ktable_free(u_int);
-+void	ktable_destroy(struct ktable *);
-+struct ktable	*ktable_get(u_int);
-+
-+int	kr4_change(struct ktable *, struct kroute_full *);
-+int	kr6_change(struct ktable *, struct kroute_full *);
-+int	krVPN4_change(struct ktable *, struct kroute_full *);
-+int	kr4_delete(struct ktable *, struct kroute_full *);
-+int	kr6_delete(struct ktable *, struct kroute_full *);
-+int	krVPN4_delete(struct ktable *, struct kroute_full *);
-+void	kr_net_delete(struct network *);
-+struct network *kr_net_match(struct ktable *, struct kroute *);
-+struct network *kr_net_match6(struct ktable *, struct kroute6 *);
-+struct network *kr_net_find(struct ktable *, struct network *);
-+int	kr_redistribute(int, struct ktable *, struct kroute *);
-+int	kr_redistribute6(int, struct ktable *, struct kroute6 *);
-+struct kroute_full *kr_tofull(struct kroute *);
-+struct kroute_full *kr6_tofull(struct kroute6 *);
- int	kroute_compare(struct kroute_node *, struct kroute_node *);
- int	kroute6_compare(struct kroute6_node *, struct kroute6_node *);
- int	knexthop_compare(struct knexthop_node *, struct knexthop_node *);
- int	kif_compare(struct kif_node *, struct kif_node *);
- 
--struct kroute_node	*kroute_find(in_addr_t, u_int8_t, u_int8_t);
-+struct kroute_node	*kroute_find(struct ktable *, in_addr_t, u_int8_t,
-+			    u_int8_t);
- struct kroute_node	*kroute_matchgw(struct kroute_node *,
- 			    struct sockaddr_in *);
--int			 kroute_insert(struct kroute_node *);
--int			 kroute_remove(struct kroute_node *);
--void			 kroute_clear(void);
-+int			 kroute_insert(struct ktable *, struct kroute_node *);
-+int			 kroute_remove(struct ktable *, struct kroute_node *);
-+void			 kroute_clear(struct ktable *);
- 
--struct kroute6_node	*kroute6_find(const struct in6_addr *, u_int8_t,
--			     u_int8_t);
-+struct kroute6_node	*kroute6_find(struct ktable *, const struct in6_addr *,
-+			    u_int8_t, u_int8_t);
- struct kroute6_node	*kroute6_matchgw(struct kroute6_node *,
- 			    struct sockaddr_in6 *);
--int			 kroute6_insert(struct kroute6_node *);
--int			 kroute6_remove(struct kroute6_node *);
--void			 kroute6_clear(void);
--
--struct knexthop_node	*knexthop_find(struct bgpd_addr *);
--int			 knexthop_insert(struct knexthop_node *);
--int			 knexthop_remove(struct knexthop_node *);
--void			 knexthop_clear(void);
-+int			 kroute6_insert(struct ktable *, struct kroute6_node *);
-+int			 kroute6_remove(struct ktable *, struct kroute6_node *);
-+void			 kroute6_clear(struct ktable *);
-+
-+struct knexthop_node	*knexthop_find(struct ktable *, struct bgpd_addr *);
-+int			 knexthop_insert(struct ktable *,
-+			    struct knexthop_node *);
-+int			 knexthop_remove(struct ktable *,
-+			    struct knexthop_node *);
-+void			 knexthop_clear(struct ktable *);
- 
- struct kif_node		*kif_find(int);
- int			 kif_insert(struct kif_node *);
-@@ -124,13 +148,16 @@ int			 kif_kr6_remove(struct kroute6_nod
- int			 kif_validate(struct kif *);
- int			 kroute_validate(struct kroute *);
- int			 kroute6_validate(struct kroute6 *);
--void			 knexthop_validate(struct knexthop_node *);
--void			 knexthop_track(void *);
--struct kroute_node	*kroute_match(in_addr_t, int);
--struct kroute6_node	*kroute6_match(struct in6_addr *, int);
--void			 kroute_detach_nexthop(struct knexthop_node *);
-+void			 knexthop_validate(struct ktable *,
-+			    struct knexthop_node *);
-+void			 knexthop_track(struct ktable *, void *);
-+void			 knexthop_send_update(struct knexthop_node *);
-+struct kroute_node	*kroute_match(struct ktable *, in_addr_t, int);
-+struct kroute6_node	*kroute6_match(struct ktable *, struct in6_addr *, int);
-+void			 kroute_detach_nexthop(struct ktable *,
-+			    struct knexthop_node *);
- 
--int		protect_lo(void);
-+int		protect_lo(struct ktable *);
- u_int8_t	prefixlen_classful(in_addr_t);
- u_int8_t	mask2prefixlen(in_addr_t);
- u_int8_t	mask2prefixlen6(struct sockaddr_in6 *);
-@@ -138,23 +165,20 @@ void		get_rtaddrs(int, struct sockaddr *
- void		if_change(u_short, int, struct if_data *);
- void		if_announce(void *);
- 
--int		send_rtmsg(int, int, struct kroute *);
--int		send_rt6msg(int, int, struct kroute6 *);
-+int		send_rtmsg(int, int, struct ktable *, struct kroute *);
-+int		send_rt6msg(int, int, struct ktable *, struct kroute6 *);
- int		dispatch_rtmsg(void);
--int		fetchtable(u_int, int);
-+int		fetchtable(struct ktable *);
- int		fetchifs(int);
- int		dispatch_rtmsg_addr(struct rt_msghdr *,
--		    struct sockaddr *[RTAX_MAX], int);
-+		    struct sockaddr *[RTAX_MAX], struct ktable *);
- 
--RB_HEAD(kroute_tree, kroute_node)	krt;
- RB_PROTOTYPE(kroute_tree, kroute_node, entry, kroute_compare)
- RB_GENERATE(kroute_tree, kroute_node, entry, kroute_compare)
- 
--RB_HEAD(kroute6_tree, kroute6_node)	krt6;
- RB_PROTOTYPE(kroute6_tree, kroute6_node, entry, kroute6_compare)
- RB_GENERATE(kroute6_tree, kroute6_node, entry, kroute6_compare)
- 
--RB_HEAD(knexthop_tree, knexthop_node)	knt;
- RB_PROTOTYPE(knexthop_tree, knexthop_node, entry, knexthop_compare)
- RB_GENERATE(knexthop_tree, knexthop_node, entry, knexthop_compare)
- 
-@@ -162,19 +186,21 @@ RB_HEAD(kif_tree, kif_node)		kit;
- RB_PROTOTYPE(kif_tree, kif_node, entry, kif_compare)
- RB_GENERATE(kif_tree, kif_node, entry, kif_compare)
- 
-+#define KT2KNT(x)	(&(ktable_get((x)->nhtableid)->knt))
-+
- /*
-  * exported functions
-  */
- 
- int
--kr_init(int fs, u_int rtableid)
-+kr_init(void)
- {
- 	int		opt = 0, rcvbuf, default_rcvbuf;
-+#if !defined(__FreeBSD__) /* FreeBSD does not have ROUTE_TABLEFILTER. */
-+	unsigned int	tid = RTABLE_ANY;
-+#endif
- 	socklen_t	optlen;
- 
--	kr_state.rtableid = rtableid;
--	kr_state.fib_sync = fs;
--
- 	if ((kr_state.fd = socket(AF_ROUTE, SOCK_RAW, 0)) == -1) {
- 		log_warn("kr_init: socket");
- 		return (-1);
-@@ -198,194 +224,533 @@ kr_init(int fs, u_int rtableid)
- 		    rcvbuf /= 2)
- 			;	/* nothing */
- 
-+#if !defined(__FreeBSD__) /* FreeBSD does not have ROUTE_TABLEFILTER. */
-+	if (setsockopt(kr_state.fd, AF_ROUTE, ROUTE_TABLEFILTER, &tid,
-+	    sizeof(tid)) == -1) {
-+		log_warn("kr_init: setsockopt AF_ROUTE ROUTE_TABLEFILTER");
-+		return (-1);
-+	}
-+#endif
-+
- 	kr_state.pid = getpid();
- 	kr_state.rtseq = 1;
- 
--	RB_INIT(&krt);
--	RB_INIT(&krt6);
--	RB_INIT(&knt);
- 	RB_INIT(&kit);
- 
- 	if (fetchifs(0) == -1)
- 		return (-1);
- 
--	if (fetchtable(kr_state.rtableid, 0) == -1)
--		return (-1);
--	if (kr_state.rtableid != 0)
--		if (fetchtable(0, 1) == -1)
-+	return (kr_state.fd);
-+}
-+
-+int
-+ktable_new(u_int rtableid, u_int rdomid, char *name, char *ifname, int fs)
-+{
-+	struct ktable	**xkrt;
-+	struct ktable	 *kt;
-+	size_t		  newsize, oldsize;
-+
-+	/* resize index table if needed */
-+	if (rtableid >= krt_size) {
-+		oldsize = sizeof(struct ktable *) * krt_size;
-+		newsize = sizeof(struct ktable *) * (rtableid + 1);
-+		if ((xkrt = realloc(krt, newsize)) == NULL) {
-+			log_warn("ktable_new");
- 			return (-1);
-+		}
-+		krt = xkrt;
-+		krt_size = rtableid + 1;
-+		bzero((char *)krt + oldsize, newsize - oldsize);
-+	}
-+
-+	if (krt[rtableid])
-+		fatalx("ktable_new: table already exists.");
- 
--	if (protect_lo() == -1)
-+	/* allocate new element */
-+	kt = krt[rtableid] = calloc(1, sizeof(struct ktable));
-+	if (kt == NULL) {
-+		log_warn("ktable_new");
- 		return (-1);
-+	}
- 
--	return (kr_state.fd);
-+	/* initialize structure ... */
-+	strlcpy(kt->descr, name, sizeof(kt->descr));
-+	RB_INIT(&kt->krt);
-+	RB_INIT(&kt->krt6);
-+	RB_INIT(&kt->knt);
-+	TAILQ_INIT(&kt->krn);
-+	kt->fib_conf = kt->fib_sync = fs;
-+	kt->rtableid = rtableid;
-+	kt->nhtableid = rdomid;
-+	/* bump refcount of rdomain table for the nexthop lookups */
-+	ktable_get(kt->nhtableid)->nhrefcnt++;
-+	if (ifname) {
-+		strlcpy(kt->ifmpe, ifname, IFNAMSIZ);
-+		kt->ifindex = if_nametoindex(ifname);
-+	}
-+
-+	/* ... and load it */
-+	if (fetchtable(kt) == -1)
-+		return (-1);
-+	if (protect_lo(kt) == -1)
-+		return (-1);
-+
-+	/* everything is up and running */
-+	kt->state = RECONF_REINIT;
-+	log_debug("new ktable %s for rtableid %d", name, rtableid);
-+	return (0);
-+}
-+
-+void
-+ktable_free(u_int rtableid)
-+{
-+	struct ktable	*kt, *nkt;
-+
-+	if ((kt = ktable_get(rtableid)) == NULL)
-+		return;
-+
-+	/* decouple from kernel, no new routes will be entered from here */
-+	kr_fib_decouple(kt->rtableid);
-+
-+	/* first unhook from the nexthop table */
-+	nkt = ktable_get(kt->nhtableid);
-+	nkt->nhrefcnt--;
-+
-+	/*
-+	 * Evil little details:
-+	 *   If kt->nhrefcnt > 0 then kt == nkt and nothing needs to be done.
-+	 *   If kt != nkt then kt->nhrefcnt must be 0 and kt must be killed.
-+	 *   If nkt is no longer referenced it must be killed (possible double
-+	 *   free so check that kt != nkt).
-+	 */
-+	if (kt != nkt && nkt->nhrefcnt <= 0)
-+		ktable_destroy(nkt);
-+	if (kt->nhrefcnt <= 0)
-+		ktable_destroy(kt);
-+}
-+
-+void
-+ktable_destroy(struct ktable *kt)
-+{
-+	/* decouple just to be sure, does not hurt */
-+	kr_fib_decouple(kt->rtableid);
-+
-+	log_debug("freeing ktable %s rtableid %u", kt->descr, kt->rtableid);
-+	knexthop_clear(kt);
-+	kroute_clear(kt);
-+	kroute6_clear(kt);
-+
-+	krt[kt->rtableid] = NULL;
-+	free(kt);
-+}
-+
-+struct ktable *
-+ktable_get(u_int rtableid)
-+{
-+	if (rtableid >= krt_size)
-+		return (NULL);
-+	return (krt[rtableid]);
-+}
-+
-+int
-+ktable_update(u_int rtableid, char *name, char *ifname, int flags)
-+{
-+	struct ktable	*kt, *rkt;
-+	u_int		 rdomid;
-+
-+	if (!ktable_exists(rtableid, &rdomid))
-+		fatalx("King Bula lost a table");	/* may not happen */
-+
-+	if (rdomid != rtableid || flags & F_RIB_NOFIB) {
-+		rkt = ktable_get(rdomid);
-+		if (rkt == NULL) {
-+			char buf[32];
-+			snprintf(buf, sizeof(buf), "rdomain_%d", rdomid);
-+			if (ktable_new(rdomid, rdomid, buf, NULL, 0))
-+				return (-1);
-+		} else {
-+			/* there is no need for full fib synchronisation if
-+			 * the table is only used for nexthop lookups.
-+			 */
-+			if (rkt->state == RECONF_DELETE) {
-+				rkt->fib_conf = 0;
-+				rkt->state = RECONF_KEEP;
-+			}
-+		}
-+	}
-+
-+	if (flags & (F_RIB_NOEVALUATE | F_RIB_NOFIB))
-+		/* only rdomain table must exist */
-+		return (0);
-+
-+	kt = ktable_get(rtableid);
-+	if (kt == NULL) {
-+		if (ktable_new(rtableid, rdomid, name, ifname,
-+		    !(flags & F_RIB_NOFIBSYNC)))
-+			return (-1);
-+	} else {
-+		/* fib sync has higher preference then no sync */
-+		if (kt->state == RECONF_DELETE) {
-+			kt->fib_conf = !(flags & F_RIB_NOFIBSYNC);
-+			kt->state = RECONF_KEEP;
-+		} else if (!kt->fib_conf)
-+			kt->fib_conf = !(flags & F_RIB_NOFIBSYNC);
-+
-+		strlcpy(kt->descr, name, sizeof(kt->descr));
-+	}
-+	return (0);
-+}
-+
-+void
-+ktable_preload(void)
-+{
-+	struct ktable 	*kt;
-+	u_int		 i;
-+
-+	for (i = 0; i < krt_size; i++) {
-+		if ((kt = ktable_get(i)) == NULL)
-+			continue;
-+		kt->state = RECONF_DELETE;
-+	}
-+}
-+
-+void
-+ktable_postload(void)
-+{
-+	struct ktable 	*kt;
-+	u_int		 i;
-+
-+	for (i = krt_size; i > 0; i--) {
-+		if ((kt = ktable_get(i - 1)) == NULL)
-+			continue;
-+		if (kt->state == RECONF_DELETE)
-+			ktable_free(i - 1);
-+		else if (kt->state == RECONF_REINIT)
-+			kt->fib_sync = kt->fib_conf;
-+	}
-+}
-+
-+int
-+ktable_exists(u_int rtableid, u_int *rdomid)
-+{
-+#if !defined(__FreeBSD__) /* FreeBSD does not have NET_RT_TABLE. */
-+	size_t			 len;
-+	struct rt_tableinfo	 info;
-+	int			 mib[6];
-+
-+	mib[0] = CTL_NET;
-+	mib[1] = AF_ROUTE;
-+	mib[2] = 0;
-+	mib[3] = 0;
-+	mib[4] = NET_RT_TABLE;
-+	mib[5] = rtableid;
-+
-+	len = sizeof(info);
-+	if (sysctl(mib, 6, &info, &len, NULL, 0) == -1) {
-+		if (errno == ENOENT)
-+			/* table nonexistent */
-+			return (0);
-+		log_warn("sysctl");
-+		/* must return 0 so that the table is considered non-existent */
-+		return (0);
-+	}
-+	if (rdomid)
-+		*rdomid = info.rti_domainid;
-+#else
-+	*rdomid = 0;
-+#endif
-+	return (1);
- }
- 
- int
--kr_change(struct kroute_label *kl)
-+kr_change(u_int rtableid, struct kroute_full *kl)
-+{
-+	struct ktable		*kt;
-+
-+	if ((kt = ktable_get(rtableid)) == NULL)
-+		/* too noisy during reloads, just ignore */
-+		return (0);
-+	switch (kl->prefix.aid) {
-+	case AID_INET:
-+		return (kr4_change(kt, kl));
-+	case AID_INET6:
-+		return (kr6_change(kt, kl));
-+	case AID_VPN_IPv4:
-+		return (krVPN4_change(kt, kl));
-+	}
-+	log_warnx("kr_change: not handled AID");
-+	return (-1);
-+}
-+
-+int
-+kr4_change(struct ktable *kt, struct kroute_full *kl)
- {
- 	struct kroute_node	*kr;
- 	int			 action = RTM_ADD;
-+	u_int16_t		 labelid;
- 
--	if ((kr = kroute_find(kl->kr.prefix.s_addr, kl->kr.prefixlen, RTP_BGP))
--	    != NULL)
-+	if ((kr = kroute_find(kt, kl->prefix.v4.s_addr, kl->prefixlen,
-+	    RTP_BGP)) != NULL)
- 		action = RTM_CHANGE;
- 
- 	/* nexthop within 127/8 -> ignore silently */
--	if ((kl->kr.nexthop.s_addr & htonl(IN_CLASSA_NET)) ==
-+	if ((kl->nexthop.v4.s_addr & htonl(IN_CLASSA_NET)) ==
- 	    htonl(INADDR_LOOPBACK & IN_CLASSA_NET))
- 		return (0);
- 
--	if (kr)
--		rtlabel_unref(kr->r.labelid);
--	kl->kr.labelid = rtlabel_name2id(kl->label);
-+	labelid = rtlabel_name2id(kl->label);
- 
- 	/* for blackhole and reject routes nexthop needs to be 127.0.0.1 */
--	if (kl->kr.flags & (F_BLACKHOLE|F_REJECT))
--		kl->kr.nexthop.s_addr = htonl(INADDR_LOOPBACK);
--
--	if (send_rtmsg(kr_state.fd, action, &kl->kr) == -1)
--		return (-1);
-+	if (kl->flags & (F_BLACKHOLE|F_REJECT))
-+		kl->nexthop.v4.s_addr = htonl(INADDR_LOOPBACK);
- 
- 	if (action == RTM_ADD) {
- 		if ((kr = calloc(1, sizeof(struct kroute_node))) == NULL) {
- 			log_warn("kr_change");
- 			return (-1);
- 		}
--		kr->r.prefix.s_addr = kl->kr.prefix.s_addr;
--		kr->r.prefixlen = kl->kr.prefixlen;
--		kr->r.nexthop.s_addr = kl->kr.nexthop.s_addr;
--		kr->r.flags = kl->kr.flags | F_BGPD_INSERTED;
-+		kr->r.prefix.s_addr = kl->prefix.v4.s_addr;
-+		kr->r.prefixlen = kl->prefixlen;
-+		kr->r.nexthop.s_addr = kl->nexthop.v4.s_addr;
-+		kr->r.flags = kl->flags | F_BGPD_INSERTED;
- 		kr->r.priority = RTP_BGP;
--		kr->r.labelid = kl->kr.labelid;
-+		kr->r.labelid = labelid;
- 
--		if (kroute_insert(kr) == -1)
-+		if (kroute_insert(kt, kr) == -1)
- 			free(kr);
- 	} else {
--		kr->r.nexthop.s_addr = kl->kr.nexthop.s_addr;
--		kr->r.labelid = kl->kr.labelid;
--		if (kl->kr.flags & F_BLACKHOLE)
-+		kr->r.nexthop.s_addr = kl->nexthop.v4.s_addr;
-+		rtlabel_unref(kr->r.labelid);
-+		kr->r.labelid = labelid;
-+		if (kl->flags & F_BLACKHOLE)
- 			kr->r.flags |= F_BLACKHOLE;
- 		else
- 			kr->r.flags &= ~F_BLACKHOLE;
--		if (kl->kr.flags & F_REJECT)
-+		if (kl->flags & F_REJECT)
- 			kr->r.flags |= F_REJECT;
- 		else
- 			kr->r.flags &= ~F_REJECT;
- 	}
- 
-+	if (send_rtmsg(kr_state.fd, action, kt, &kr->r) == -1)
-+		return (-1);
-+
- 	return (0);
- }
- 
- int
--kr_delete(struct kroute_label *kl)
-+kr6_change(struct ktable *kt, struct kroute_full *kl)
- {
--	struct kroute_node	*kr;
-+	struct kroute6_node	*kr6;
-+	struct in6_addr		 lo6 = IN6ADDR_LOOPBACK_INIT;
-+	int			 action = RTM_ADD;
-+	u_int16_t		 labelid;
- 
--	if ((kr = kroute_find(kl->kr.prefix.s_addr, kl->kr.prefixlen, RTP_BGP))
--	    == NULL)
--		return (0);
-+	if ((kr6 = kroute6_find(kt, &kl->prefix.v6, kl->prefixlen, RTP_BGP)) !=
-+	    NULL)
-+		action = RTM_CHANGE;
- 
--	if (!(kr->r.flags & F_BGPD_INSERTED))
-+	/* nexthop to loopback -> ignore silently */
-+	if (IN6_IS_ADDR_LOOPBACK(&kl->nexthop.v6))
- 		return (0);
- 
--	/* nexthop within 127/8 -> ignore silently */
--	if ((kl->kr.nexthop.s_addr & htonl(IN_CLASSA_NET)) ==
--	    htonl(INADDR_LOOPBACK & IN_CLASSA_NET))
--		return (0);
-+	labelid = rtlabel_name2id(kl->label);
- 
--	if (send_rtmsg(kr_state.fd, RTM_DELETE, &kl->kr) == -1)
--		return (-1);
-+	/* for blackhole and reject routes nexthop needs to be ::1 */
-+	if (kl->flags & (F_BLACKHOLE|F_REJECT))
-+		bcopy(&lo6, &kl->nexthop.v6, sizeof(kl->nexthop.v6));
- 
--	rtlabel_unref(kl->kr.labelid);
-+	if (action == RTM_ADD) {
-+		if ((kr6 = calloc(1, sizeof(struct kroute6_node))) == NULL) {
-+			log_warn("kr_change");
-+			return (-1);
-+		}
-+		memcpy(&kr6->r.prefix, &kl->prefix.v6, sizeof(struct in6_addr));
-+		kr6->r.prefixlen = kl->prefixlen;
-+		memcpy(&kr6->r.nexthop, &kl->nexthop.v6,
-+		    sizeof(struct in6_addr));
-+		kr6->r.flags = kl->flags | F_BGPD_INSERTED;
-+		kr6->r.priority = RTP_BGP;
-+		kr6->r.labelid = labelid;
- 
--	if (kroute_remove(kr) == -1)
-+		if (kroute6_insert(kt, kr6) == -1)
-+			free(kr6);
-+	} else {
-+		memcpy(&kr6->r.nexthop, &kl->nexthop.v6,
-+		    sizeof(struct in6_addr));
-+		rtlabel_unref(kr6->r.labelid);
-+		kr6->r.labelid = labelid;
-+		if (kl->flags & F_BLACKHOLE)
-+			kr6->r.flags |= F_BLACKHOLE;
-+		else
-+			kr6->r.flags &= ~F_BLACKHOLE;
-+		if (kl->flags & F_REJECT)
-+			kr6->r.flags |= F_REJECT;
-+		else
-+			kr6->r.flags &= ~F_REJECT;
-+	}
-+
-+	if (send_rt6msg(kr_state.fd, action, kt, &kr6->r) == -1)
- 		return (-1);
- 
- 	return (0);
- }
- 
- int
--kr6_change(struct kroute6_label *kl)
-+krVPN4_change(struct ktable *kt, struct kroute_full *kl)
- {
--	struct kroute6_node	*kr6;
-+	struct kroute_node	*kr;
- 	int			 action = RTM_ADD;
--	struct in6_addr		 lo6 = IN6ADDR_LOOPBACK_INIT;
-+	u_int32_t		 mplslabel = 0;
-+	u_int16_t		 labelid;
- 
--	if ((kr6 = kroute6_find(&kl->kr.prefix, kl->kr.prefixlen, RTP_BGP))
--	     != NULL)
-+	if ((kr = kroute_find(kt, kl->prefix.vpn4.addr.s_addr, kl->prefixlen,
-+	    RTP_BGP)) != NULL)
- 		action = RTM_CHANGE;
- 
--	/* nexthop to loopback -> ignore silently */
--	if (IN6_IS_ADDR_LOOPBACK(&kl->kr.nexthop))
-+	/* nexthop within 127/8 -> ignore silently */
-+	if ((kl->nexthop.v4.s_addr & htonl(IN_CLASSA_NET)) ==
-+	    htonl(INADDR_LOOPBACK & IN_CLASSA_NET))
- 		return (0);
- 
--	if (kr6)
--		rtlabel_unref(kr6->r.labelid);
--	kl->kr.labelid = rtlabel_name2id(kl->label);
-+	/* only single MPLS label are supported for now */
-+	if (kl->prefix.vpn4.labellen != 3) {
-+		log_warnx("krVPN4_change: %s/%u has not a single label",
-+		    log_addr(&kl->prefix), kl->prefixlen);
-+		return (0);
-+	}
-+	mplslabel = (kl->prefix.vpn4.labelstack[0] << 24) |
-+	    (kl->prefix.vpn4.labelstack[1] << 16) |
-+	    (kl->prefix.vpn4.labelstack[2] << 8);
-+	mplslabel = htonl(mplslabel);
- 
--	/* for blackhole and reject routes nexthop needs to be ::1 */
--	if (kl->kr.flags & (F_BLACKHOLE|F_REJECT))
--		bcopy(&lo6, &kl->kr.nexthop, sizeof(kl->kr.nexthop));
-+	labelid = rtlabel_name2id(kl->label);
- 
--	if (send_rt6msg(kr_state.fd, action, &kl->kr) == -1)
--		return (-1);
-+	/* for blackhole and reject routes nexthop needs to be 127.0.0.1 */
-+	if (kl->flags & (F_BLACKHOLE|F_REJECT))
-+		kl->nexthop.v4.s_addr = htonl(INADDR_LOOPBACK);
- 
- 	if (action == RTM_ADD) {
--		if ((kr6 = calloc(1, sizeof(struct kroute6_node))) == NULL) {
-+		if ((kr = calloc(1, sizeof(struct kroute_node))) == NULL) {
- 			log_warn("kr_change");
- 			return (-1);
- 		}
--		memcpy(&kr6->r.prefix, &kl->kr.prefix,
--		    sizeof(struct in6_addr));
--		kr6->r.prefixlen = kl->kr.prefixlen;
--		memcpy(&kr6->r.nexthop, &kl->kr.nexthop,
--		    sizeof(struct in6_addr));
--		kr6->r.flags = kl->kr.flags | F_BGPD_INSERTED;
--		kr6->r.priority = RTP_BGP;
--		kr6->r.labelid = kl->kr.labelid;
-+		kr->r.prefix.s_addr = kl->prefix.vpn4.addr.s_addr;
-+		kr->r.prefixlen = kl->prefixlen;
-+		kr->r.nexthop.s_addr = kl->nexthop.v4.s_addr;
-+		kr->r.flags = kl->flags | F_BGPD_INSERTED | F_MPLS;
-+		kr->r.priority = RTP_BGP;
-+		kr->r.labelid = labelid;
-+		kr->r.mplslabel = mplslabel;
- 
--		if (kroute6_insert(kr6) == -1)
--			free(kr6);
-+		if (kroute_insert(kt, kr) == -1)
-+			free(kr);
- 	} else {
--		memcpy(&kr6->r.nexthop, &kl->kr.nexthop,
--		    sizeof(struct in6_addr));
--		kr6->r.labelid = kl->kr.labelid;
--		if (kl->kr.flags & F_BLACKHOLE)
--			kr6->r.flags |= F_BLACKHOLE;
-+		kr->r.mplslabel = mplslabel;
-+		kr->r.nexthop.s_addr = kl->nexthop.v4.s_addr;
-+		rtlabel_unref(kr->r.labelid);
-+		kr->r.labelid = labelid;
-+		if (kl->flags & F_BLACKHOLE)
-+			kr->r.flags |= F_BLACKHOLE;
- 		else
--			kr6->r.flags &= ~F_BLACKHOLE;
--		if (kl->kr.flags & F_REJECT)
--			kr6->r.flags |= F_REJECT;
-+			kr->r.flags &= ~F_BLACKHOLE;
-+		if (kl->flags & F_REJECT)
-+			kr->r.flags |= F_REJECT;
- 		else
--			kr6->r.flags &= ~F_REJECT;
-+			kr->r.flags &= ~F_REJECT;
- 	}
- 
-+	if (send_rtmsg(kr_state.fd, action, kt, &kr->r) == -1)
-+		return (-1);
-+
- 	return (0);
- }
- 
- int
--kr6_delete(struct kroute6_label *kl)
-+kr_delete(u_int rtableid, struct kroute_full *kl)
-+{
-+	struct ktable		*kt;
-+
-+	if ((kt = ktable_get(rtableid)) == NULL)
-+		/* too noisy during reloads, just ignore */
-+		return (0);
-+
-+	switch (kl->prefix.aid) {
-+	case AID_INET:
-+		return (kr4_delete(kt, kl));
-+	case AID_INET6:
-+		return (kr6_delete(kt, kl));
-+	case AID_VPN_IPv4:
-+		return (krVPN4_delete(kt, kl));
-+	}
-+	log_warnx("kr_change: not handled AID");
-+	return (-1);
-+}
-+
-+int
-+kr4_delete(struct ktable *kt, struct kroute_full *kl)
-+{
-+	struct kroute_node	*kr;
-+
-+	if ((kr = kroute_find(kt, kl->prefix.v4.s_addr, kl->prefixlen,
-+	    RTP_BGP)) == NULL)
-+		return (0);
-+
-+	if (!(kr->r.flags & F_BGPD_INSERTED))
-+		return (0);
-+
-+	if (send_rtmsg(kr_state.fd, RTM_DELETE, kt, &kr->r) == -1)
-+		return (-1);
-+
-+	rtlabel_unref(kr->r.labelid);
-+
-+	if (kroute_remove(kt, kr) == -1)
-+		return (-1);
-+
-+	return (0);
-+}
-+
-+int
-+kr6_delete(struct ktable *kt, struct kroute_full *kl)
- {
- 	struct kroute6_node	*kr6;
- 
--	if ((kr6 = kroute6_find(&kl->kr.prefix, kl->kr.prefixlen, RTP_BGP))
--	    == NULL)
-+	if ((kr6 = kroute6_find(kt, &kl->prefix.v6, kl->prefixlen, RTP_BGP)) ==
-+	    NULL)
- 		return (0);
- 
- 	if (!(kr6->r.flags & F_BGPD_INSERTED))
- 		return (0);
- 
--	/* nexthop to loopback -> ignore silently */
--	if (IN6_IS_ADDR_LOOPBACK(&kl->kr.nexthop))
-+	if (send_rt6msg(kr_state.fd, RTM_DELETE, kt, &kr6->r) == -1)
-+		return (-1);
-+
-+	rtlabel_unref(kr6->r.labelid);
-+
-+	if (kroute6_remove(kt, kr6) == -1)
-+		return (-1);
-+
-+	return (0);
-+}
-+
-+int
-+krVPN4_delete(struct ktable *kt, struct kroute_full *kl)
-+{
-+	struct kroute_node	*kr;
-+
-+	if ((kr = kroute_find(kt, kl->prefix.vpn4.addr.s_addr, kl->prefixlen,
-+	    RTP_BGP)) == NULL)
- 		return (0);
- 
--	if (send_rt6msg(kr_state.fd, RTM_DELETE, &kl->kr) == -1)
-+	if (!(kr->r.flags & F_BGPD_INSERTED))
-+		return (0);
-+
-+	if (send_rtmsg(kr_state.fd, RTM_DELETE, kt, &kr->r) == -1)
- 		return (-1);
- 
--	rtlabel_unref(kl->kr.labelid);
-+	rtlabel_unref(kr->r.labelid);
- 
--	if (kroute6_remove(kr6) == -1)
-+	if (kroute_remove(kt, kr) == -1)
- 		return (-1);
- 
- 	return (0);
-@@ -394,53 +759,63 @@ kr6_delete(struct kroute6_label *kl)
- void
- kr_shutdown(void)
- {
--	kr_fib_decouple();
--	knexthop_clear();
--	kroute_clear();
--	kroute6_clear();
-+	u_int	i;
-+
-+	for (i = krt_size; i > 0; i--)
-+		ktable_free(i - 1);
- 	kif_clear();
- }
- 
- void
--kr_fib_couple(void)
-+kr_fib_couple(u_int rtableid)
- {
-+	struct ktable		*kt;
- 	struct kroute_node	*kr;
- 	struct kroute6_node	*kr6;
- 
--	if (kr_state.fib_sync == 1)	/* already coupled */
-+	if ((kt = ktable_get(rtableid)) == NULL)  /* table does not exist */
- 		return;
- 
--	kr_state.fib_sync = 1;
-+	if (kt->fib_sync)	/* already coupled */
-+		return;
- 
--	RB_FOREACH(kr, kroute_tree, &krt)
-+	kt->fib_sync = 1;
-+
-+	RB_FOREACH(kr, kroute_tree, &kt->krt)
- 		if ((kr->r.flags & F_BGPD_INSERTED))
--			send_rtmsg(kr_state.fd, RTM_ADD, &kr->r);
--	RB_FOREACH(kr6, kroute6_tree, &krt6)
-+			send_rtmsg(kr_state.fd, RTM_ADD, kt, &kr->r);
-+	RB_FOREACH(kr6, kroute6_tree, &kt->krt6)
- 		if ((kr6->r.flags & F_BGPD_INSERTED))
--			send_rt6msg(kr_state.fd, RTM_ADD, &kr6->r);
-+			send_rt6msg(kr_state.fd, RTM_ADD, kt, &kr6->r);
- 
--	log_info("kernel routing table coupled");
-+	log_info("kernel routing table %u (%s) coupled", kt->rtableid,
-+	    kt->descr);
- }
- 
- void
--kr_fib_decouple(void)
-+kr_fib_decouple(u_int rtableid)
- {
-+	struct ktable		*kt;
- 	struct kroute_node	*kr;
- 	struct kroute6_node	*kr6;
- 
--	if (kr_state.fib_sync == 0)	/* already decoupled */
-+	if ((kt = ktable_get(rtableid)) == NULL)  /* table does not exist */
-+		return;
-+
-+	if (!kt->fib_sync)	/* already decoupled */
- 		return;
- 
--	RB_FOREACH(kr, kroute_tree, &krt)
-+	RB_FOREACH(kr, kroute_tree, &kt->krt)
- 		if ((kr->r.flags & F_BGPD_INSERTED))
--			send_rtmsg(kr_state.fd, RTM_DELETE, &kr->r);
--	RB_FOREACH(kr6, kroute6_tree, &krt6)
-+			send_rtmsg(kr_state.fd, RTM_DELETE, kt, &kr->r);
-+	RB_FOREACH(kr6, kroute6_tree, &kt->krt6)
- 		if ((kr6->r.flags & F_BGPD_INSERTED))
--			send_rt6msg(kr_state.fd, RTM_DELETE, &kr6->r);
-+			send_rt6msg(kr_state.fd, RTM_DELETE, kt, &kr6->r);
- 
--	kr_state.fib_sync = 0;
-+	kt->fib_sync = 0;
- 
--	log_info("kernel routing table decoupled");
-+	log_info("kernel routing table %u (%s) decoupled", kt->rtableid,
-+	    kt->descr);
- }
- 
- int
-@@ -450,41 +825,18 @@ kr_dispatch_msg(void)
- }
- 
- int
--kr_nexthop_add(struct bgpd_addr *addr)
-+kr_nexthop_add(u_int rtableid, struct bgpd_addr *addr)
- {
-+	struct ktable		*kt;
- 	struct knexthop_node	*h;
- 
--	if ((h = knexthop_find(addr)) != NULL) {
-+	if ((kt = ktable_get(rtableid)) == NULL) {
-+		log_warnx("kr_nexthop_add: non-existent rtableid %d", rtableid);
-+		return (0);
-+	}
-+	if ((h = knexthop_find(kt, addr)) != NULL) {
- 		/* should not happen... this is actually an error path */
--		struct kroute_nexthop	 nh;
--		struct kroute_node	*k;
--		struct kroute6_node	*k6;
--
--		bzero(&nh, sizeof(nh));
--		memcpy(&nh.nexthop, addr, sizeof(nh.nexthop));
--		nh.valid = 1;
--		if (h->kroute != NULL && addr->af == AF_INET) {
--			k = h->kroute;
--			nh.connected = k->r.flags & F_CONNECTED;
--			if (k->r.nexthop.s_addr != 0) {
--				nh.gateway.af = AF_INET;
--				nh.gateway.v4.s_addr =
--				    k->r.nexthop.s_addr;
--			}
--			memcpy(&nh.kr.kr4, &k->r, sizeof(nh.kr.kr4));
--		} else if (h->kroute != NULL && addr->af == AF_INET6) {
--			k6 = h->kroute;
--			nh.connected = k6->r.flags & F_CONNECTED;
--			if (memcmp(&k6->r.nexthop, &in6addr_any,
--			    sizeof(struct in6_addr)) != 0) {
--				nh.gateway.af = AF_INET6;
--				memcpy(&nh.gateway.v6, &k6->r.nexthop,
--				    sizeof(struct in6_addr));
--			}
--			memcpy(&nh.kr.kr6, &k6->r, sizeof(nh.kr.kr6));
--		}
--
--		send_nexthop_update(&nh);
-+		knexthop_send_update(h);
- 	} else {
- 		if ((h = calloc(1, sizeof(struct knexthop_node))) == NULL) {
- 			log_warn("kr_nexthop_add");
-@@ -492,7 +844,7 @@ kr_nexthop_add(struct bgpd_addr *addr)
- 		}
- 		memcpy(&h->nexthop, addr, sizeof(h->nexthop));
- 
--		if (knexthop_insert(h) == -1)
-+		if (knexthop_insert(kt, h) == -1)
- 			return (-1);
- 	}
- 
-@@ -500,19 +852,26 @@ kr_nexthop_add(struct bgpd_addr *addr)
- }
- 
- void
--kr_nexthop_delete(struct bgpd_addr *addr)
-+kr_nexthop_delete(u_int rtableid, struct bgpd_addr *addr)
- {
-+	struct ktable		*kt;
- 	struct knexthop_node	*kn;
- 
--	if ((kn = knexthop_find(addr)) == NULL)
-+	if ((kt = ktable_get(rtableid)) == NULL) {
-+		log_warnx("kr_nexthop_delete: non-existent rtableid %d",
-+		    rtableid);
-+		return;
-+	}
-+	if ((kn = knexthop_find(kt, addr)) == NULL)
- 		return;
- 
--	knexthop_remove(kn);
-+	knexthop_remove(kt, kn);
- }
- 
- void
- kr_show_route(struct imsg *imsg)
- {
-+	struct ktable		*kt;
- 	struct kroute_node	*kr, *kn;
- 	struct kroute6_node	*kr6, *kn6;
- 	struct bgpd_addr	*addr;
-@@ -521,6 +880,7 @@ kr_show_route(struct imsg *imsg)
- 	struct ctl_show_nexthop	 snh;
- 	struct knexthop_node	*h;
- 	struct kif_node		*kif;
-+	u_int			 i;
- 	u_short			 ifindex = 0;
- 
- 	switch (imsg->hdr.type) {
-@@ -528,70 +888,96 @@ kr_show_route(struct imsg *imsg)
- 		if (imsg->hdr.len != IMSG_HEADER_SIZE + sizeof(flags) +
- 		    sizeof(af)) {
- 			log_warnx("kr_show_route: wrong imsg len");
--			return;
-+			break;
-+		}
-+		kt = ktable_get(imsg->hdr.peerid);
-+		if (kt == NULL) {
-+			log_warnx("kr_show_route: table %u does not exist",
-+			    imsg->hdr.peerid);
-+			break;
- 		}
- 		memcpy(&flags, imsg->data, sizeof(flags));
- 		memcpy(&af, (char *)imsg->data + sizeof(flags), sizeof(af));
- 		if (!af || af == AF_INET)
--			RB_FOREACH(kr, kroute_tree, &krt)
--				if (!flags || kr->r.flags & flags) {
--					kn = kr;
--					do {
--						send_imsg_session(
--						    IMSG_CTL_KROUTE,
--						    imsg->hdr.pid, &kn->r,
--						    sizeof(kn->r));
--					} while ((kn = kn->next) != NULL);
--				}
-+			RB_FOREACH(kr, kroute_tree, &kt->krt) {
-+				if (flags && (kr->r.flags & flags) == 0)
-+					continue;
-+				kn = kr;
-+				do {
-+					send_imsg_session(IMSG_CTL_KROUTE,
-+					    imsg->hdr.pid, kr_tofull(&kn->r),
-+					    sizeof(struct kroute_full));
-+				} while ((kn = kn->next) != NULL);
-+			}
- 		if (!af || af == AF_INET6)
--			RB_FOREACH(kr6, kroute6_tree, &krt6)
--				if (!flags || kr6->r.flags & flags) {
--					kn6 = kr6;
--					do {
--						send_imsg_session(
--						    IMSG_CTL_KROUTE6,
--						    imsg->hdr.pid, &kn6->r,
--						    sizeof(kn6->r));
--					} while ((kn6 = kn6->next) != NULL);
--				}
-+			RB_FOREACH(kr6, kroute6_tree, &kt->krt6) {
-+				if (flags && (kr6->r.flags & flags) == 0)
-+					continue;
-+				kn6 = kr6;
-+				do {
-+					send_imsg_session(IMSG_CTL_KROUTE,
-+					    imsg->hdr.pid, kr6_tofull(&kn6->r),
-+					    sizeof(struct kroute_full));
-+				} while ((kn6 = kn6->next) != NULL);
-+			}
- 		break;
- 	case IMSG_CTL_KROUTE_ADDR:
- 		if (imsg->hdr.len != IMSG_HEADER_SIZE +
- 		    sizeof(struct bgpd_addr)) {
- 			log_warnx("kr_show_route: wrong imsg len");
--			return;
-+			break;
-+		}
-+		kt = ktable_get(imsg->hdr.peerid);
-+		if (kt == NULL) {
-+			log_warnx("kr_show_route: table %u does not exist",
-+			    imsg->hdr.peerid);
-+			break;
- 		}
- 		addr = imsg->data;
- 		kr = NULL;
--		switch (addr->af) {
--		case AF_INET:
--			kr = kroute_match(addr->v4.s_addr, 1);
-+		switch (addr->aid) {
-+		case AID_INET:
-+			kr = kroute_match(kt, addr->v4.s_addr, 1);
- 			if (kr != NULL)
- 				send_imsg_session(IMSG_CTL_KROUTE,
--				    imsg->hdr.pid, &kr->r, sizeof(kr->r));
-+				    imsg->hdr.pid, kr_tofull(&kr->r),
-+				    sizeof(struct kroute_full));
- 			break;
--		case AF_INET6:
--			kr6 = kroute6_match(&addr->v6, 1);
-+		case AID_INET6:
-+			kr6 = kroute6_match(kt, &addr->v6, 1);
- 			if (kr6 != NULL)
--				send_imsg_session(IMSG_CTL_KROUTE6,
--				    imsg->hdr.pid, &kr6->r, sizeof(kr6->r));
-+				send_imsg_session(IMSG_CTL_KROUTE,
-+				    imsg->hdr.pid, kr6_tofull(&kr6->r),
-+				    sizeof(struct kroute_full));
- 			break;
- 		}
- 		break;
- 	case IMSG_CTL_SHOW_NEXTHOP:
--		RB_FOREACH(h, knexthop_tree, &knt) {
-+		kt = ktable_get(imsg->hdr.peerid);
-+		if (kt == NULL) {
-+			log_warnx("kr_show_route: table %u does not exist",
-+			    imsg->hdr.peerid);
-+			break;
-+		}
-+		RB_FOREACH(h, knexthop_tree, KT2KNT(kt)) {
- 			bzero(&snh, sizeof(snh));
- 			memcpy(&snh.addr, &h->nexthop, sizeof(snh.addr));
- 			if (h->kroute != NULL) {
--				switch (h->nexthop.af) {
--				case AF_INET:
-+				switch (h->nexthop.aid) {
-+				case AID_INET:
- 					kr = h->kroute;
- 					snh.valid = kroute_validate(&kr->r);
-+					snh.krvalid = 1;
-+					memcpy(&snh.kr.kr4, &kr->r,
-+					    sizeof(snh.kr.kr4));
- 					ifindex = kr->r.ifindex;
- 					break;
--				case AF_INET6:
-+				case AID_INET6:
- 					kr6 = h->kroute;
- 					snh.valid = kroute6_validate(&kr6->r);
-+					snh.krvalid = 1;
-+					memcpy(&snh.kr.kr6, &kr6->r,
-+					    sizeof(snh.kr.kr6));
- 					ifindex = kr6->r.ifindex;
- 					break;
- 				}
-@@ -608,41 +994,190 @@ kr_show_route(struct imsg *imsg)
- 			send_imsg_session(IMSG_CTL_SHOW_INTERFACE,
- 			    imsg->hdr.pid, &kif->k, sizeof(kif->k));
- 		break;
-+	case IMSG_CTL_SHOW_FIB_TABLES:
-+		for (i = 0; i < krt_size; i++) {
-+			struct ktable	ktab;
-+
-+			if ((kt = ktable_get(i)) == NULL)
-+				continue;
-+
-+			ktab = *kt;
-+			/* do not leak internal information */
-+			RB_INIT(&ktab.krt);
-+			RB_INIT(&ktab.krt6);
-+			RB_INIT(&ktab.knt);
-+			TAILQ_INIT(&ktab.krn);
-+
-+			send_imsg_session(IMSG_CTL_SHOW_FIB_TABLES,
-+			    imsg->hdr.pid, &ktab, sizeof(ktab));
-+		}
-+		break;
- 	default:	/* nada */
- 		break;
- 	}
--
--	send_imsg_session(IMSG_CTL_END, imsg->hdr.pid, NULL, 0);
-+
-+	send_imsg_session(IMSG_CTL_END, imsg->hdr.pid, NULL, 0);
-+}
-+
-+void
-+kr_ifinfo(char *ifname)
-+{
-+	struct kif_node	*kif;
-+
-+	RB_FOREACH(kif, kif_tree, &kit)
-+		if (!strcmp(ifname, kif->k.ifname)) {
-+			send_imsg_session(IMSG_IFINFO, 0,
-+			    &kif->k, sizeof(kif->k));
-+			return;
-+		}
-+}
-+
-+void
-+kr_net_delete(struct network *n)
-+{
-+	filterset_free(&n->net.attrset);
-+	free(n);
-+}
-+
-+struct network *
-+kr_net_match(struct ktable *kt, struct kroute *kr)
-+{
-+	struct network		*xn;
-+
-+	TAILQ_FOREACH(xn, &kt->krn, entry) {
-+		if (xn->net.prefix.aid != AID_INET)
-+			continue;
-+		switch (xn->net.type) {
-+		case NETWORK_DEFAULT:
-+			if (xn->net.prefixlen == kr->prefixlen &&
-+			    xn->net.prefix.v4.s_addr == kr->prefix.s_addr)
-+				/* static match already redistributed */
-+				return (NULL);
-+			break;
-+		case NETWORK_STATIC:
-+			if (kr->flags & F_STATIC)
-+				return (xn);
-+			break;
-+		case NETWORK_CONNECTED:
-+			if (kr->flags & F_CONNECTED)
-+				return (xn);
-+			break;
-+		case NETWORK_MRTCLONE:
-+			/* can not happen */
-+			break;
-+		}
-+	}
-+	return (NULL);
- }
- 
--void
--kr_ifinfo(char *ifname)
-+struct network *
-+kr_net_match6(struct ktable *kt, struct kroute6 *kr6)
- {
--	struct kif_node	*kif;
-+	struct network		*xn;
- 
--	RB_FOREACH(kif, kif_tree, &kit)
--		if (!strcmp(ifname, kif->k.ifname)) {
--			send_imsg_session(IMSG_IFINFO, 0,
--			    &kif->k, sizeof(kif->k));
--			return;
-+	TAILQ_FOREACH(xn, &kt->krn, entry) {
-+		if (xn->net.prefix.aid != AID_INET6)
-+			continue;
-+		switch (xn->net.type) {
-+		case NETWORK_DEFAULT:
-+			if (xn->net.prefixlen == kr6->prefixlen &&
-+			    memcmp(&xn->net.prefix.v6, &kr6->prefix,
-+			    sizeof(struct in6_addr)) == 0)
-+				/* static match already redistributed */
-+				return (NULL);
-+			break;
-+		case NETWORK_STATIC:
-+			if (kr6->flags & F_STATIC)
-+				return (xn);
-+			break;
-+		case NETWORK_CONNECTED:
-+			if (kr6->flags & F_CONNECTED)
-+				return (xn);
-+			break;
-+		case NETWORK_MRTCLONE:
-+			/* can not happen */
-+			break;
- 		}
-+	}
-+	return (NULL);
- }
- 
--struct redist_node {
--	LIST_ENTRY(redist_node)	 entry;
--	struct kroute		*kr;
--	struct kroute6		*kr6;
--};
-+struct network *
-+kr_net_find(struct ktable *kt, struct network *n)
-+{
-+	struct network		*xn;
-+
-+	TAILQ_FOREACH(xn, &kt->krn, entry) {
-+		if (n->net.type != xn->net.type ||
-+		    n->net.prefixlen != xn->net.prefixlen ||
-+		    n->net.rtableid != xn->net.rtableid)
-+			continue;
-+		if (memcmp(&n->net.prefix, &xn->net.prefix,
-+		    sizeof(n->net.prefix)) == 0)
-+			return (xn);
-+	}
-+	return (NULL);
-+}
-+
-+int
-+kr_net_reload(u_int rtableid, struct network_head *nh)
-+{
-+	struct network		*n, *xn;
-+	struct ktable		*kt;
-+
-+	if ((kt = ktable_get(rtableid)) == NULL) {
-+		log_warnx("kr_net_reload: non-existent rtableid %d", rtableid);
-+		return (-1);
-+	}
-+
-+	TAILQ_FOREACH(n, &kt->krn, entry)
-+		n->net.old = 1;
-+
-+	while ((n = TAILQ_FIRST(nh)) != NULL) {
-+		TAILQ_REMOVE(nh, n, entry);
-+		n->net.old = 0;
-+		n->net.rtableid = rtableid;
-+		xn = kr_net_find(kt, n);
-+		if (xn) {
-+			xn->net.old = 0;
-+			filterset_free(&xn->net.attrset);
-+			filterset_move(&n->net.attrset, &xn->net.attrset);
-+			kr_net_delete(n);
-+		} else
-+			TAILQ_INSERT_TAIL(&kt->krn, n, entry);
-+	}
- 
-+	for (n = TAILQ_FIRST(&kt->krn); n != NULL; n = xn) {
-+		xn = TAILQ_NEXT(n, entry);
-+		if (n->net.old) {
-+			if (n->net.type == NETWORK_DEFAULT)
-+				if (send_network(IMSG_NETWORK_REMOVE, &n->net,
-+				    NULL))
-+					return (-1);
-+			TAILQ_REMOVE(&kt->krn, n, entry);
-+			kr_net_delete(n);
-+		}
-+	}
- 
--LIST_HEAD(, redist_node) redistlist;
-+	return (0);
-+}
- 
- int
--kr_redistribute(int type, struct kroute *kr)
-+kr_redistribute(int type, struct ktable *kt, struct kroute *kr)
- {
--	struct redist_node	*rn;
-+	struct network		*match;
-+	struct network_config	 net;
- 	u_int32_t		 a;
- 
-+	/* shortcut for removals */
-+	if (type == IMSG_NETWORK_REMOVE) {
-+		if (!(kr->flags & F_REDISTRIBUTED))
-+			return (0);	/* no match, don't redistribute */
-+		kr->flags &= ~F_REDISTRIBUTED;
-+		match = NULL;
-+		goto sendit;
-+	}
-+
- 	if (!(kr->flags & F_KERNEL))
- 		return (0);
- 
-@@ -670,41 +1205,40 @@ kr_redistribute(int type, struct kroute 
- 	if (kr->prefix.s_addr == INADDR_ANY && kr->prefixlen == 0)
- 		return (0);
- 
--	/* Add or delete kr from list ... */
--	LIST_FOREACH(rn, &redistlist, entry)
--	    if (rn->kr == kr)
--		    break;
--
--	switch (type) {
--	case IMSG_NETWORK_ADD:
--		if (rn == NULL) {
--			if ((rn = calloc(1, sizeof(struct redist_node))) ==
--			    NULL) {
--				log_warn("kr_redistribute");
--				return (-1);
--			}
--			rn->kr = kr;
--			LIST_INSERT_HEAD(&redistlist, rn, entry);
--		}
--		break;
--	case IMSG_NETWORK_REMOVE:
--		if (rn != NULL) {
--			LIST_REMOVE(rn, entry);
--			free(rn);
--		}
--		break;
--	default:
--		errno = EINVAL;
--		return (-1);
--	}
--
--	return (bgpd_redistribute(type, kr, NULL));
-+	match = kr_net_match(kt, kr);
-+	if (match == NULL) {
-+		if (!(kr->flags & F_REDISTRIBUTED))
-+			return (0);	/* no match, don't redistribute */
-+		/* route no longer matches but is redistributed, so remove */
-+		kr->flags &= ~F_REDISTRIBUTED;
-+		type = IMSG_NETWORK_REMOVE;
-+	} else
-+		kr->flags |= F_REDISTRIBUTED;
-+
-+sendit:
-+	bzero(&net, sizeof(net));
-+	net.prefix.aid = AID_INET;
-+	net.prefix.v4.s_addr = kr->prefix.s_addr;
-+	net.prefixlen = kr->prefixlen;
-+	net.rtableid = kt->rtableid;
-+
-+	return (send_network(type, &net, match ? &match->net.attrset : NULL));
- }
- 
- int
--kr_redistribute6(int type, struct kroute6 *kr6)
--{
--	struct redist_node	*rn;
-+kr_redistribute6(int type, struct ktable *kt, struct kroute6 *kr6)
-+{
-+	struct network		*match;
-+	struct network_config	 net;
-+
-+	/* shortcut for removals */
-+	if (type == IMSG_NETWORK_REMOVE) {
-+		if (!(kr6->flags & F_REDISTRIBUTED))
-+			return (0);	/* no match, don't redistribute */
-+		kr6->flags &= ~F_REDISTRIBUTED;
-+		match = NULL;
-+		goto sendit;
-+	}
- 
- 	if (!(kr6->flags & F_KERNEL))
- 		return (0);
-@@ -736,60 +1270,107 @@ kr_redistribute6(int type, struct kroute
- 	 * never allow ::/0 the default route can only be redistributed
- 	 * with announce default.
- 	 */
--	if (memcmp(&kr6->prefix, &in6addr_any, sizeof(struct in6_addr)) == 0 &&
--	    kr6->prefixlen == 0)
-+	if (kr6->prefixlen == 0 &&
-+	    memcmp(&kr6->prefix, &in6addr_any, sizeof(struct in6_addr)) == 0)
- 		return (0);
- 
--	/* Add or delete kr from list ...
--	 * using a linear list to store the redistributed networks will hurt
--	 * as soon as redistribute ospf comes but until then keep it simple.
--	 */
--	LIST_FOREACH(rn, &redistlist, entry)
--	    if (rn->kr6 == kr6)
--		    break;
--
--	switch (type) {
--	case IMSG_NETWORK_ADD:
--		if (rn == NULL) {
--			if ((rn = calloc(1, sizeof(struct redist_node))) ==
--			    NULL) {
--				log_warn("kr_redistribute");
--				return (-1);
--			}
--			rn->kr6 = kr6;
--			LIST_INSERT_HEAD(&redistlist, rn, entry);
--		}
--		break;
--	case IMSG_NETWORK_REMOVE:
--		if (rn != NULL) {
--			LIST_REMOVE(rn, entry);
--			free(rn);
--		}
--		break;
--	default:
--		errno = EINVAL;
--		return (-1);
--	}
-+	match = kr_net_match6(kt, kr6);
-+	if (match == NULL) {
-+		if (!(kr6->flags & F_REDISTRIBUTED))
-+			return (0);	/* no match, don't redistribute */
-+		/* route no longer matches but is redistributed, so remove */
-+		kr6->flags &= ~F_REDISTRIBUTED;
-+		type = IMSG_NETWORK_REMOVE;
-+	} else
-+		kr6->flags |= F_REDISTRIBUTED;
-+sendit:
-+	bzero(&net, sizeof(net));
-+	net.prefix.aid = AID_INET6;
-+	memcpy(&net.prefix.v6, &kr6->prefix, sizeof(struct in6_addr));
-+	net.prefixlen = kr6->prefixlen;
-+	net.rtableid = kt->rtableid;
- 
--	return (bgpd_redistribute(type, NULL, kr6));
-+	return (send_network(type, &net, match ? &match->net.attrset : NULL));
- }
- 
- int
- kr_reload(void)
- {
--	struct redist_node	*rn;
-+	struct ktable		*kt;
-+	struct kroute_node	*kr;
-+	struct kroute6_node	*kr6;
- 	struct knexthop_node	*nh;
-+	struct network		*n;
-+	u_int			 rid;
-+	int			 hasdyn = 0;
- 
--	LIST_FOREACH(rn, &redistlist, entry)
--		if (bgpd_redistribute(IMSG_NETWORK_ADD, rn->kr, rn->kr6) == -1)
--			return (-1);
-+	for (rid = 0; rid < krt_size; rid++) {
-+		if ((kt = ktable_get(rid)) == NULL)
-+			continue;
- 
--	RB_FOREACH(nh, knexthop_tree, &knt)
--		knexthop_validate(nh);
-+		RB_FOREACH(nh, knexthop_tree, KT2KNT(kt))
-+			knexthop_validate(kt, nh);
-+
-+		TAILQ_FOREACH(n, &kt->krn, entry)
-+			if (n->net.type == NETWORK_DEFAULT) {
-+				if (send_network(IMSG_NETWORK_ADD, &n->net,
-+				    &n->net.attrset))
-+					return (-1);
-+			} else
-+				hasdyn = 1;
-+
-+		if (hasdyn) {
-+			/* only evaluate the full tree if we need */
-+			RB_FOREACH(kr, kroute_tree, &kt->krt)
-+				kr_redistribute(IMSG_NETWORK_ADD, kt, &kr->r);
-+			RB_FOREACH(kr6, kroute6_tree, &kt->krt6)
-+				kr_redistribute6(IMSG_NETWORK_ADD, kt, &kr6->r);
-+		}
-+	}
- 
- 	return (0);
- }
- 
-+struct kroute_full *
-+kr_tofull(struct kroute *kr)
-+{
-+	static struct kroute_full	kf;
-+
-+	bzero(&kf, sizeof(kf));
-+
-+	kf.prefix.aid = AID_INET;
-+	kf.prefix.v4.s_addr = kr->prefix.s_addr;
-+	kf.nexthop.aid = AID_INET;
-+	kf.nexthop.v4.s_addr = kr->nexthop.s_addr;
-+	strlcpy(kf.label, rtlabel_id2name(kr->labelid), sizeof(kf.label));
-+	kf.flags = kr->flags;
-+	kf.ifindex = kr->ifindex;
-+	kf.prefixlen = kr->prefixlen;
-+	kf.priority = kr->priority;
-+
-+	return (&kf);
-+}
-+
-+struct kroute_full *
-+kr6_tofull(struct kroute6 *kr6)
-+{
-+	static struct kroute_full	kf;
-+
-+	bzero(&kf, sizeof(kf));
-+
-+	kf.prefix.aid = AID_INET6;
-+	memcpy(&kf.prefix.v6, &kr6->prefix, sizeof(struct in6_addr));
-+	kf.nexthop.aid = AID_INET6;
-+	memcpy(&kf.nexthop.v6, &kr6->nexthop, sizeof(struct in6_addr));
-+	strlcpy(kf.label, rtlabel_id2name(kr6->labelid), sizeof(kf.label));
-+	kf.flags = kr6->flags;
-+	kf.ifindex = kr6->ifindex;
-+	kf.prefixlen = kr6->prefixlen;
-+	kf.priority = kr6->priority;
-+
-+	return (&kf);
-+}
-+
- /*
-  * RB-tree compare functions
-  */
-@@ -846,26 +1427,28 @@ kroute6_compare(struct kroute6_node *a, 
- int
- knexthop_compare(struct knexthop_node *a, struct knexthop_node *b)
- {
--	u_int32_t	r;
-+	int	i;
- 
--	if (a->nexthop.af != b->nexthop.af)
--		return (b->nexthop.af - a->nexthop.af);
-+	if (a->nexthop.aid != b->nexthop.aid)
-+		return (b->nexthop.aid - a->nexthop.aid);
- 
--	switch (a->nexthop.af) {
--	case AF_INET:
--		if ((r = b->nexthop.addr32[0] - a->nexthop.addr32[0]) != 0)
--			return (r);
-+	switch (a->nexthop.aid) {
-+	case AID_INET:
-+		if (ntohl(a->nexthop.v4.s_addr) < ntohl(b->nexthop.v4.s_addr))
-+			return (-1);
-+		if (ntohl(a->nexthop.v4.s_addr) > ntohl(b->nexthop.v4.s_addr))
-+			return (1);
- 		break;
--	case AF_INET6:
--		if ((r = b->nexthop.addr32[3] - a->nexthop.addr32[3]) != 0)
--			return (r);
--		if ((r = b->nexthop.addr32[2] - a->nexthop.addr32[2]) != 0)
--			return (r);
--		if ((r = b->nexthop.addr32[1] - a->nexthop.addr32[1]) != 0)
--			return (r);
--		if ((r = b->nexthop.addr32[0] - a->nexthop.addr32[0]) != 0)
--			return (r);
-+	case AID_INET6:
-+		for (i = 0; i < 16; i++) {
-+			if (a->nexthop.v6.s6_addr[i] < b->nexthop.v6.s6_addr[i])
-+				return (-1);
-+			if (a->nexthop.v6.s6_addr[i] > b->nexthop.v6.s6_addr[i])
-+				return (1);
-+		}
- 		break;
-+	default:
-+		fatalx("knexthop_compare: unknown AF");
- 	}
- 
- 	return (0);
-@@ -883,7 +1466,8 @@ kif_compare(struct kif_node *a, struct k
-  */
- 
- struct kroute_node *
--kroute_find(in_addr_t prefix, u_int8_t prefixlen, u_int8_t prio)
-+kroute_find(struct ktable *kt, in_addr_t prefix, u_int8_t prefixlen,
-+    u_int8_t prio)
- {
- 	struct kroute_node	s;
- 	struct kroute_node	*kn, *tmp;
-@@ -892,15 +1476,15 @@ kroute_find(in_addr_t prefix, u_int8_t p
- 	s.r.prefixlen = prefixlen;
- 	s.r.priority = prio;
- 
--	kn = RB_FIND(kroute_tree, &krt, &s);
-+	kn = RB_FIND(kroute_tree, &kt->krt, &s);
- 	if (kn && prio == RTP_ANY) {
--		tmp = RB_PREV(kroute_tree, &krt, kn);
-+		tmp = RB_PREV(kroute_tree, &kt->krt, kn);
- 		while (tmp) {
- 			if (kroute_compare(&s, tmp) == 0)
- 				kn = tmp;
- 			else
- 				break;
--			tmp = RB_PREV(kroute_tree, &krt, kn);
-+			tmp = RB_PREV(kroute_tree, &kt->krt, kn);
- 		}
- 	}
- 	return (kn);
-@@ -927,13 +1511,13 @@ kroute_matchgw(struct kroute_node *kr, s
- }
- 
- int
--kroute_insert(struct kroute_node *kr)
-+kroute_insert(struct ktable *kt, struct kroute_node *kr)
- {
- 	struct kroute_node	*krm;
- 	struct knexthop_node	*h;
- 	in_addr_t		 mask, ina;
- 
--	if ((krm = RB_INSERT(kroute_tree, &krt, kr)) != NULL) {
-+	if ((krm = RB_INSERT(kroute_tree, &kt->krt, kr)) != NULL) {
- 		/* multipath route, add at end of list */
- 		while (krm->next != NULL)
- 			krm = krm->next;
-@@ -941,13 +1525,14 @@ kroute_insert(struct kroute_node *kr)
- 		kr->next = NULL; /* to be sure */
- 	}
- 
-+	/* XXX this is wrong for nexthop validated via BGP */
- 	if (kr->r.flags & F_KERNEL) {
- 		mask = prefixlen2mask(kr->r.prefixlen);
- 		ina = ntohl(kr->r.prefix.s_addr);
--		RB_FOREACH(h, knexthop_tree, &knt)
--			if (h->nexthop.af == AF_INET &&
-+		RB_FOREACH(h, knexthop_tree, KT2KNT(kt))
-+			if (h->nexthop.aid == AID_INET &&
- 			    (ntohl(h->nexthop.v4.s_addr) & mask) == ina)
--				knexthop_validate(h);
-+				knexthop_validate(kt, h);
- 
- 		if (kr->r.flags & F_CONNECTED)
- 			if (kif_kr_insert(kr) == -1)
-@@ -955,19 +1540,19 @@ kroute_insert(struct kroute_node *kr)
- 
- 		if (krm == NULL)
- 			/* redistribute multipath routes only once */
--			kr_redistribute(IMSG_NETWORK_ADD, &kr->r);
-+			kr_redistribute(IMSG_NETWORK_ADD, kt, &kr->r);
- 	}
- 	return (0);
- }
- 
- 
- int
--kroute_remove(struct kroute_node *kr)
-+kroute_remove(struct ktable *kt, struct kroute_node *kr)
- {
- 	struct kroute_node	*krm;
- 	struct knexthop_node	*s;
- 
--	if ((krm = RB_FIND(kroute_tree, &krt, kr)) == NULL) {
-+	if ((krm = RB_FIND(kroute_tree, &kt->krt, kr)) == NULL) {
- 		log_warnx("kroute_remove failed to find %s/%u",
- 		    inet_ntoa(kr->r.prefix), kr->r.prefixlen);
- 		return (-1);
-@@ -975,13 +1560,14 @@ kroute_remove(struct kroute_node *kr)
- 
- 	if (krm == kr) {
- 		/* head element */
--		if (RB_REMOVE(kroute_tree, &krt, kr) == NULL) {
-+		if (RB_REMOVE(kroute_tree, &kt->krt, kr) == NULL) {
- 			log_warnx("kroute_remove failed for %s/%u",
- 			    inet_ntoa(kr->r.prefix), kr->r.prefixlen);
- 			return (-1);
- 		}
- 	       	if (kr->next != NULL) {
--			if (RB_INSERT(kroute_tree, &krt, kr->next) != NULL) {
-+			if (RB_INSERT(kroute_tree, &kt->krt, kr->next) !=
-+			    NULL) {
- 				log_warnx("kroute_remove failed to add %s/%u",
- 				    inet_ntoa(kr->r.prefix), kr->r.prefixlen);
- 				return (-1);
-@@ -1001,14 +1587,14 @@ kroute_remove(struct kroute_node *kr)
- 	}
- 
- 	/* check whether a nexthop depends on this kroute */
--	if ((kr->r.flags & F_KERNEL) && (kr->r.flags & F_NEXTHOP))
--		RB_FOREACH(s, knexthop_tree, &knt)
-+	if (kr->r.flags & F_NEXTHOP)
-+		RB_FOREACH(s, knexthop_tree, KT2KNT(kt))
- 			if (s->kroute == kr)
--				knexthop_validate(s);
-+				knexthop_validate(kt, s);
- 
- 	if (kr->r.flags & F_KERNEL && kr == krm && kr->next == NULL)
- 		/* again remove only once */
--		kr_redistribute(IMSG_NETWORK_REMOVE, &kr->r);
-+		kr_redistribute(IMSG_NETWORK_REMOVE, kt, &kr->r);
- 
- 	if (kr->r.flags & F_CONNECTED)
- 		if (kif_kr_remove(kr) == -1) {
-@@ -1021,16 +1607,17 @@ kroute_remove(struct kroute_node *kr)
- }
- 
- void
--kroute_clear(void)
-+kroute_clear(struct ktable *kt)
- {
- 	struct kroute_node	*kr;
- 
--	while ((kr = RB_MIN(kroute_tree, &krt)) != NULL)
--		kroute_remove(kr);
-+	while ((kr = RB_MIN(kroute_tree, &kt->krt)) != NULL)
-+		kroute_remove(kt, kr);
- }
- 
- struct kroute6_node *
--kroute6_find(const struct in6_addr *prefix, u_int8_t prefixlen, u_int8_t prio)
-+kroute6_find(struct ktable *kt, const struct in6_addr *prefix,
-+    u_int8_t prefixlen, u_int8_t prio)
- {
- 	struct kroute6_node	s;
- 	struct kroute6_node	*kn6, *tmp;
-@@ -1039,15 +1626,15 @@ kroute6_find(const struct in6_addr *pref
- 	s.r.prefixlen = prefixlen;
- 	s.r.priority = prio;
- 
--	kn6 = RB_FIND(kroute6_tree, &krt6, &s);
-+	kn6 = RB_FIND(kroute6_tree, &kt->krt6, &s);
- 	if (kn6 && prio == RTP_ANY) {
--		tmp = RB_PREV(kroute6_tree, &krt6, kn6);
-+		tmp = RB_PREV(kroute6_tree, &kt->krt6, kn6);
- 		while (tmp) {
- 			if (kroute6_compare(&s, tmp) == 0)
- 				kn6 = tmp;
--			else 
-+			else
- 				break;
--			tmp = RB_PREV(kroute6_tree, &krt6, kn6);
-+			tmp = RB_PREV(kroute6_tree, &kt->krt6, kn6);
- 		}
- 	}
- 	return (kn6);
-@@ -1056,17 +1643,29 @@ kroute6_find(const struct in6_addr *pref
- struct kroute6_node *
- kroute6_matchgw(struct kroute6_node *kr, struct sockaddr_in6 *sa_in6)
- {
--	struct in6_addr	nexthop;
-+	struct sockaddr_in6	nexthop;
- 
- 	if (sa_in6 == NULL) {
- 		log_warnx("kroute6_matchgw: no nexthop defined");
- 		return (NULL);
- 	}
--	memcpy(&nexthop, &sa_in6->sin6_addr, sizeof(nexthop));
-+	memcpy(&nexthop, sa_in6, sizeof(nexthop));
-+#if defined(__KAME__) && defined(IPV6_LINKLOCAL_PEER)
-+	if (IN6_IS_ADDR_LINKLOCAL(&nexthop.sin6_addr)) {
-+		/* Embed scope id and set sin6_scope_id. */
-+		if (nexthop.sin6_scope_id == 0)
-+			nexthop.sin6_scope_id =
-+			    IN6_LINKLOCAL_IFINDEX(nexthop.sin6_addr);
-+		else
-+			SET_IN6_LINKLOCAL_IFINDEX(nexthop.sin6_addr,
-+			    nexthop.sin6_scope_id);
-+	}
-+#endif
- 
- 	while (kr) {
--		if (memcmp(&kr->r.nexthop, &nexthop, sizeof(nexthop)) == NULL)
--			return (kr);
-+		if (memcmp(&kr->r.nexthop, &nexthop.sin6_addr,
-+		    sizeof(nexthop.sin6_addr)) == 0)
-+				return (kr);
- 		kr = kr->next;
- 	}
- 
-@@ -1074,13 +1673,13 @@ kroute6_matchgw(struct kroute6_node *kr,
- }
- 
- int
--kroute6_insert(struct kroute6_node *kr)
-+kroute6_insert(struct ktable *kt, struct kroute6_node *kr)
- {
- 	struct kroute6_node	*krm;
- 	struct knexthop_node	*h;
- 	struct in6_addr		 ina, inb;
- 
--	if ((krm = RB_INSERT(kroute6_tree, &krt6, kr)) != NULL) {
-+	if ((krm = RB_INSERT(kroute6_tree, &kt->krt6, kr)) != NULL) {
- 		/* multipath route, add at end of list */
- 		while (krm->next != NULL)
- 			krm = krm->next;
-@@ -1088,14 +1687,15 @@ kroute6_insert(struct kroute6_node *kr)
- 		kr->next = NULL; /* to be sure */
- 	}
- 
-+	/* XXX this is wrong for nexthop validated via BGP */
- 	if (kr->r.flags & F_KERNEL) {
- 		inet6applymask(&ina, &kr->r.prefix, kr->r.prefixlen);
--		RB_FOREACH(h, knexthop_tree, &knt)
--			if (h->nexthop.af == AF_INET6) {
-+		RB_FOREACH(h, knexthop_tree, KT2KNT(kt))
-+			if (h->nexthop.aid == AID_INET6) {
- 				inet6applymask(&inb, &h->nexthop.v6,
- 				    kr->r.prefixlen);
- 				if (memcmp(&ina, &inb, sizeof(ina)) == 0)
--					knexthop_validate(h);
-+					knexthop_validate(kt, h);
- 			}
- 
- 		if (kr->r.flags & F_CONNECTED)
-@@ -1104,19 +1704,19 @@ kroute6_insert(struct kroute6_node *kr)
- 
- 		if (krm == NULL)
- 			/* redistribute multipath routes only once */
--			kr_redistribute6(IMSG_NETWORK_ADD, &kr->r);
-+			kr_redistribute6(IMSG_NETWORK_ADD, kt, &kr->r);
- 	}
- 
- 	return (0);
- }
- 
- int
--kroute6_remove(struct kroute6_node *kr)
-+kroute6_remove(struct ktable *kt, struct kroute6_node *kr)
- {
- 	struct kroute6_node	*krm;
- 	struct knexthop_node	*s;
- 
--	if ((krm = RB_FIND(kroute6_tree, &krt6, kr)) == NULL) {
-+	if ((krm = RB_FIND(kroute6_tree, &kt->krt6, kr)) == NULL) {
- 		log_warnx("kroute6_remove failed for %s/%u",
- 		    log_in6addr(&kr->r.prefix), kr->r.prefixlen);
- 		return (-1);
-@@ -1124,13 +1724,14 @@ kroute6_remove(struct kroute6_node *kr)
- 
- 	if (krm == kr) {
- 		/* head element */
--		if (RB_REMOVE(kroute6_tree, &krt6, kr) == NULL) {
-+		if (RB_REMOVE(kroute6_tree, &kt->krt6, kr) == NULL) {
- 			log_warnx("kroute6_remove failed for %s/%u",
- 			    log_in6addr(&kr->r.prefix), kr->r.prefixlen);
- 			return (-1);
- 		}
- 	       	if (kr->next != NULL) {
--			if (RB_INSERT(kroute6_tree, &krt6, kr->next) != NULL) {
-+			if (RB_INSERT(kroute6_tree, &kt->krt6, kr->next) !=
-+			    NULL) {
- 				log_warnx("kroute6_remove failed to add %s/%u",
- 				    log_in6addr(&kr->r.prefix),
- 				    kr->r.prefixlen);
-@@ -1151,14 +1752,14 @@ kroute6_remove(struct kroute6_node *kr)
- 	}
- 
- 	/* check whether a nexthop depends on this kroute */
--	if ((kr->r.flags & F_KERNEL) && (kr->r.flags & F_NEXTHOP))
--		RB_FOREACH(s, knexthop_tree, &knt)
-+	if (kr->r.flags & F_NEXTHOP)
-+		RB_FOREACH(s, knexthop_tree, KT2KNT(kt))
- 			if (s->kroute == kr)
--				knexthop_validate(s);
-+				knexthop_validate(kt, s);
- 
- 	if (kr->r.flags & F_KERNEL && kr == krm && kr->next == NULL)
- 		/* again remove only once */
--		kr_redistribute6(IMSG_NETWORK_REMOVE, &kr->r);
-+		kr_redistribute6(IMSG_NETWORK_REMOVE, kt, &kr->r);
- 
- 	if (kr->r.flags & F_CONNECTED)
- 		if (kif_kr6_remove(kr) == -1) {
-@@ -1171,45 +1772,46 @@ kroute6_remove(struct kroute6_node *kr)
- }
- 
- void
--kroute6_clear(void)
-+kroute6_clear(struct ktable *kt)
- {
- 	struct kroute6_node	*kr;
- 
--	while ((kr = RB_MIN(kroute6_tree, &krt6)) != NULL)
--		kroute6_remove(kr);
-+	while ((kr = RB_MIN(kroute6_tree, &kt->krt6)) != NULL)
-+		kroute6_remove(kt, kr);
- }
- 
- struct knexthop_node *
--knexthop_find(struct bgpd_addr *addr)
-+knexthop_find(struct ktable *kt, struct bgpd_addr *addr)
- {
- 	struct knexthop_node	s;
- 
-+	bzero(&s, sizeof(s));
- 	memcpy(&s.nexthop, addr, sizeof(s.nexthop));
- 
--	return (RB_FIND(knexthop_tree, &knt, &s));
-+	return (RB_FIND(knexthop_tree, KT2KNT(kt), &s));
- }
- 
- int
--knexthop_insert(struct knexthop_node *kn)
-+knexthop_insert(struct ktable *kt, struct knexthop_node *kn)
- {
--	if (RB_INSERT(knexthop_tree, &knt, kn) != NULL) {
-+	if (RB_INSERT(knexthop_tree, KT2KNT(kt), kn) != NULL) {
- 		log_warnx("knexthop_tree insert failed for %s",
- 			    log_addr(&kn->nexthop));
- 		free(kn);
- 		return (-1);
- 	}
- 
--	knexthop_validate(kn);
-+	knexthop_validate(kt, kn);
- 
- 	return (0);
- }
- 
- int
--knexthop_remove(struct knexthop_node *kn)
-+knexthop_remove(struct ktable *kt, struct knexthop_node *kn)
- {
--	kroute_detach_nexthop(kn);
-+	kroute_detach_nexthop(kt, kn);
- 
--	if (RB_REMOVE(knexthop_tree, &knt, kn) == NULL) {
-+	if (RB_REMOVE(knexthop_tree, KT2KNT(kt), kn) == NULL) {
- 		log_warnx("knexthop_remove failed for %s",
- 		    log_addr(&kn->nexthop));
- 		return (-1);
-@@ -1220,12 +1822,12 @@ knexthop_remove(struct knexthop_node *kn
- }
- 
- void
--knexthop_clear(void)
-+knexthop_clear(struct ktable *kt)
- {
- 	struct knexthop_node	*kn;
- 
--	while ((kn = RB_MIN(knexthop_tree, &knt)) != NULL)
--		knexthop_remove(kn);
-+	while ((kn = RB_MIN(knexthop_tree, KT2KNT(kt))) != NULL)
-+		knexthop_remove(kt, kn);
- }
- 
- struct kif_node *
-@@ -1257,6 +1859,7 @@ kif_insert(struct kif_node *kif)
- int
- kif_remove(struct kif_node *kif)
- {
-+	struct ktable	*kt;
- 	struct kif_kr	*kkr;
- 	struct kif_kr6	*kkr6;
- 
-@@ -1265,20 +1868,23 @@ kif_remove(struct kif_node *kif)
- 		return (-1);
- 	}
- 
-+	if ((kt = ktable_get(/* XXX */ 0)) == NULL)
-+		goto done;
-+
- 	while ((kkr = LIST_FIRST(&kif->kroute_l)) != NULL) {
- 		LIST_REMOVE(kkr, entry);
- 		kkr->kr->r.flags &= ~F_NEXTHOP;
--		kroute_remove(kkr->kr);
-+		kroute_remove(kt, kkr->kr);
- 		free(kkr);
- 	}
- 
- 	while ((kkr6 = LIST_FIRST(&kif->kroute6_l)) != NULL) {
- 		LIST_REMOVE(kkr6, entry);
- 		kkr6->kr->r.flags &= ~F_NEXTHOP;
--		kroute6_remove(kkr6->kr);
-+		kroute6_remove(kt, kkr6->kr);
- 		free(kkr6);
- 	}
--
-+done:
- 	free(kif);
- 	return (0);
- }
-@@ -1473,113 +2079,109 @@ kroute6_validate(struct kroute6 *kr)
- }
- 
- void
--knexthop_validate(struct knexthop_node *kn)
-+knexthop_validate(struct ktable *kt, struct knexthop_node *kn)
- {
-+	void			*oldk;
- 	struct kroute_node	*kr;
- 	struct kroute6_node	*kr6;
--	struct kroute_nexthop	 n;
--	int			 was_valid = 0;
- 
--	if (kn->nexthop.af == AF_INET && (kr = kn->kroute) != NULL)
--		was_valid = kroute_validate(&kr->r);
--	if (kn->nexthop.af == AF_INET6 && (kr6 = kn->kroute) != NULL)
--		was_valid = kroute6_validate(&kr6->r);
-+	oldk = kn->kroute;
-+	kroute_detach_nexthop(kt, kn);
- 
--	bzero(&n, sizeof(n));
--	memcpy(&n.nexthop, &kn->nexthop, sizeof(n.nexthop));
--	kroute_detach_nexthop(kn);
--
--	switch (kn->nexthop.af) {
--	case AF_INET:
--		if ((kr = kroute_match(kn->nexthop.v4.s_addr, 0)) == NULL) {
--			if (was_valid)
--				send_nexthop_update(&n);
--		} else {					/* match */
--			if (kroute_validate(&kr->r)) {		/* valid */
--				n.valid = 1;
--				n.connected = kr->r.flags & F_CONNECTED;
--				if ((n.gateway.v4.s_addr =
--				    kr->r.nexthop.s_addr) != 0)
--					n.gateway.af = AF_INET;
--				memcpy(&n.kr.kr4, &kr->r, sizeof(n.kr.kr4));
--				send_nexthop_update(&n);
--			} else					/* down */
--				if (was_valid)
--					send_nexthop_update(&n);
-+	switch (kn->nexthop.aid) {
-+	case AID_INET:
-+		kr = kroute_match(kt, kn->nexthop.v4.s_addr, 0);
- 
-+		if (kr) {
- 			kn->kroute = kr;
- 			kr->r.flags |= F_NEXTHOP;
- 		}
-+
-+		/*
-+		 * Send update if nexthop route changed under us if
-+		 * the route remains the same then the NH state has not
-+		 * changed. State changes are tracked by knexthop_track().
-+		 */
-+		if (kr != oldk)
-+			knexthop_send_update(kn);
- 		break;
--	case AF_INET6:
--		if ((kr6 = kroute6_match(&kn->nexthop.v6, 0)) == NULL) {
--			if (was_valid)
--				send_nexthop_update(&n);
--		} else {					/* match */
--			if (kroute6_validate(&kr6->r)) {	/* valid */
--				n.valid = 1;
--				n.connected = kr6->r.flags & F_CONNECTED;
--				if (memcmp(&kr6->r.nexthop, &in6addr_any,
--				    sizeof(struct in6_addr)) != 0) {
--					n.gateway.af = AF_INET6;
--					memcpy(&n.gateway.v6, &kr6->r.nexthop,
--					    sizeof(struct in6_addr));
--				}
--				memcpy(&n.kr.kr6, &kr6->r, sizeof(n.kr.kr6));
--				send_nexthop_update(&n);
--			} else					/* down */
--				if (was_valid)
--					send_nexthop_update(&n);
-+	case AID_INET6:
-+		kr6 = kroute6_match(kt, &kn->nexthop.v6, 0);
- 
-+		if (kr6) {
- 			kn->kroute = kr6;
- 			kr6->r.flags |= F_NEXTHOP;
- 		}
-+
-+		if (kr6 != oldk)
-+			knexthop_send_update(kn);
- 		break;
- 	}
- }
- 
- void
--knexthop_track(void *krn)
-+knexthop_track(struct ktable *kt, void *krp)
- {
- 	struct knexthop_node	*kn;
-+
-+	RB_FOREACH(kn, knexthop_tree, KT2KNT(kt))
-+		if (kn->kroute == krp)
-+			knexthop_send_update(kn);
-+}
-+
-+void
-+knexthop_send_update(struct knexthop_node *kn)
-+{
-+	struct kroute_nexthop	 n;
- 	struct kroute_node	*kr;
- 	struct kroute6_node	*kr6;
--	struct kroute_nexthop	 n;
- 
--	RB_FOREACH(kn, knexthop_tree, &knt)
--		if (kn->kroute == krn) {
--			bzero(&n, sizeof(n));
--			memcpy(&n.nexthop, &kn->nexthop, sizeof(n.nexthop));
-+	bzero(&n, sizeof(n));
-+	memcpy(&n.nexthop, &kn->nexthop, sizeof(n.nexthop));
- 
--			switch (kn->nexthop.af) {
--			case AF_INET:
--				kr = krn;
--				n.valid = 1;
--				n.connected = kr->r.flags & F_CONNECTED;
--				if ((n.gateway.v4.s_addr =
--				    kr->r.nexthop.s_addr) != 0)
--					n.gateway.af = AF_INET;
--				memcpy(&n.kr.kr4, &kr->r, sizeof(n.kr.kr4));
--				break;
--			case AF_INET6:
--				kr6 = krn;
--				n.valid = 1;
--				n.connected = kr6->r.flags & F_CONNECTED;
--				if (memcmp(&kr6->r.nexthop, &in6addr_any,
--				    sizeof(struct in6_addr)) != 0) {
--					n.gateway.af = AF_INET6;
--					memcpy(&n.gateway.v6, &kr6->r.nexthop,
--					    sizeof(struct in6_addr));
--				}
--				memcpy(&n.kr.kr6, &kr6->r, sizeof(n.kr.kr6));
--				break;
--			}
--			send_nexthop_update(&n);
-+	if (kn->kroute == NULL) {
-+		n.valid = 0;	/* NH is not valid */
-+		send_nexthop_update(&n);
-+		return;
-+	}
-+
-+	switch (kn->nexthop.aid) {
-+	case AID_INET:
-+		kr = kn->kroute;
-+		n.valid = kroute_validate(&kr->r);
-+		n.connected = kr->r.flags & F_CONNECTED;
-+		if ((n.gateway.v4.s_addr =
-+		    kr->r.nexthop.s_addr) != 0)
-+			n.gateway.aid = AID_INET;
-+		if (n.connected) {
-+			n.net.aid = AID_INET;
-+			n.net.v4.s_addr = kr->r.prefix.s_addr;
-+			n.netlen = kr->r.prefixlen;
- 		}
-+		break;
-+	case AID_INET6:
-+		kr6 = kn->kroute;
-+		n.valid = kroute6_validate(&kr6->r);
-+		n.connected = kr6->r.flags & F_CONNECTED;
-+		if (memcmp(&kr6->r.nexthop, &in6addr_any,
-+		    sizeof(struct in6_addr)) != 0) {
-+			n.gateway.aid = AID_INET6;
-+			memcpy(&n.gateway.v6, &kr6->r.nexthop,
-+			    sizeof(struct in6_addr));
-+		}
-+		if (n.connected) {
-+			n.net.aid = AID_INET6;
-+			memcpy(&n.net.v6, &kr6->r.nexthop,
-+			    sizeof(struct in6_addr));
-+			n.netlen = kr6->r.prefixlen;
-+		}
-+		break;
-+	}
-+	send_nexthop_update(&n);
- }
- 
- struct kroute_node *
--kroute_match(in_addr_t key, int matchall)
-+kroute_match(struct ktable *kt, in_addr_t key, int matchall)
- {
- 	int			 i;
- 	struct kroute_node	*kr;
-@@ -1589,13 +2191,13 @@ kroute_match(in_addr_t key, int matchall
- 
- 	/* we will never match the default route */
- 	for (i = 32; i > 0; i--)
--		if ((kr = kroute_find(htonl(ina & prefixlen2mask(i)), i,
-+		if ((kr = kroute_find(kt, htonl(ina & prefixlen2mask(i)), i,
- 		    RTP_ANY)) != NULL)
- 			if (matchall || bgpd_filternexthop(&kr->r, NULL) == 0)
- 			    return (kr);
- 
- 	/* if we don't have a match yet, try to find a default route */
--	if ((kr = kroute_find(0, 0, RTP_ANY)) != NULL)
-+	if ((kr = kroute_find(kt, 0, 0, RTP_ANY)) != NULL)
- 		if (matchall || bgpd_filternexthop(&kr->r, NULL) == 0)
- 			return (kr);
- 
-@@ -1603,7 +2205,7 @@ kroute_match(in_addr_t key, int matchall
- }
- 
- struct kroute6_node *
--kroute6_match(struct in6_addr *key, int matchall)
-+kroute6_match(struct ktable *kt, struct in6_addr *key, int matchall)
- {
- 	int			 i;
- 	struct kroute6_node	*kr6;
-@@ -1612,13 +2214,13 @@ kroute6_match(struct in6_addr *key, int 
- 	/* we will never match the default route */
- 	for (i = 128; i > 0; i--) {
- 		inet6applymask(&ina, key, i);
--		if ((kr6 = kroute6_find(&ina, i, RTP_ANY)) != NULL)
-+		if ((kr6 = kroute6_find(kt, &ina, i, RTP_ANY)) != NULL)
- 			if (matchall || bgpd_filternexthop(NULL, &kr6->r) == 0)
- 				return (kr6);
- 	}
- 
- 	/* if we don't have a match yet, try to find a default route */
--	if ((kr6 = kroute6_find(&in6addr_any, 0, RTP_ANY)) != NULL)
-+	if ((kr6 = kroute6_find(kt, &in6addr_any, 0, RTP_ANY)) != NULL)
- 		if (matchall || bgpd_filternexthop(NULL, &kr6->r) == 0)
- 			return (kr6);
- 
-@@ -1626,31 +2228,30 @@ kroute6_match(struct in6_addr *key, int 
- }
- 
- void
--kroute_detach_nexthop(struct knexthop_node *kn)
-+kroute_detach_nexthop(struct ktable *kt, struct knexthop_node *kn)
- {
- 	struct knexthop_node	*s;
- 	struct kroute_node	*k;
- 	struct kroute6_node	*k6;
- 
-+	if (kn->kroute == NULL)
-+		return;
-+
- 	/*
- 	 * check whether there's another nexthop depending on this kroute
- 	 * if not remove the flag
- 	 */
--
--	if (kn->kroute == NULL)
--		return;
--
--	for (s = RB_MIN(knexthop_tree, &knt); s != NULL &&
--	    s->kroute != kn->kroute; s = RB_NEXT(knexthop_tree, &knt, s))
--		;	/* nothing */
-+	RB_FOREACH(s, knexthop_tree, KT2KNT(kt))
-+		if (s->kroute == kn->kroute && s != kn)
-+			break;
- 
- 	if (s == NULL) {
--		switch (kn->nexthop.af) {
--		case AF_INET:
-+		switch (kn->nexthop.aid) {
-+		case AID_INET:
- 			k = kn->kroute;
- 			k->r.flags &= ~F_NEXTHOP;
- 			break;
--		case AF_INET6:
-+		case AID_INET6:
- 			k6 = kn->kroute;
- 			k6->r.flags &= ~F_NEXTHOP;
- 			break;
-@@ -1665,7 +2266,7 @@ kroute_detach_nexthop(struct knexthop_no
-  */
- 
- int
--protect_lo(void)
-+protect_lo(struct ktable *kt)
- {
- 	struct kroute_node	*kr;
- 	struct kroute6_node	*kr6;
-@@ -1675,11 +2276,11 @@ protect_lo(void)
- 		log_warn("protect_lo");
- 		return (-1);
- 	}
--	kr->r.prefix.s_addr = htonl(INADDR_LOOPBACK);
-+	kr->r.prefix.s_addr = htonl(INADDR_LOOPBACK & IN_CLASSA_NET);
- 	kr->r.prefixlen = 8;
- 	kr->r.flags = F_KERNEL|F_CONNECTED;
- 
--	if (RB_INSERT(kroute_tree, &krt, kr) != NULL)
-+	if (RB_INSERT(kroute_tree, &kt->krt, kr) != NULL)
- 		free(kr);	/* kernel route already there, no problem */
- 
- 	/* special protection for loopback */
-@@ -1689,9 +2290,9 @@ protect_lo(void)
- 	}
- 	memcpy(&kr6->r.prefix, &in6addr_loopback, sizeof(kr6->r.prefix));
- 	kr6->r.prefixlen = 128;
--	kr->r.flags = F_KERNEL|F_CONNECTED;
-+	kr6->r.flags = F_KERNEL|F_CONNECTED;
- 
--	if (RB_INSERT(kroute6_tree, &krt6, kr6) != NULL)
-+	if (RB_INSERT(kroute6_tree, &kt->krt6, kr6) != NULL)
- 		free(kr6);	/* kernel route already there, no problem */
- 
- 	return (0);
-@@ -1726,17 +2327,17 @@ mask2prefixlen(in_addr_t ina)
- u_int8_t
- mask2prefixlen6(struct sockaddr_in6 *sa_in6)
- {
--	u_int8_t	 l = 0, i, len;
-+	u_int8_t	 l = 0, *ap, *ep;
- 
- 	/*
- 	 * sin6_len is the size of the sockaddr so substract the offset of
- 	 * the possibly truncated sin6_addr struct.
- 	 */
--	len = sa_in6->sin6_len -
--	    (u_int8_t)(&((struct sockaddr_in6 *)NULL)->sin6_addr);
--	for (i = 0; i < len; i++) {
-+	ap = (u_int8_t *)&sa_in6->sin6_addr;
-+	ep = (u_int8_t *)sa_in6 + sa_in6->sin6_len;
-+	for (; ap < ep; ap++) {
- 		/* this "beauty" is adopted from sbin/route/show.c ... */
--		switch (sa_in6->sin6_addr.s6_addr[i]) {
-+		switch (*ap) {
- 		case 0xff:
- 			l += 8;
- 			break;
-@@ -1764,7 +2365,7 @@ mask2prefixlen6(struct sockaddr_in6 *sa_
- 		case 0x00:
- 			return (l);
- 		default:
--			fatalx("non continguous inet6 netmask");
-+			fatalx("non contiguous inet6 netmask");
- 		}
- 	}
- 
-@@ -1788,7 +2389,7 @@ prefixlen2mask6(u_int8_t prefixlen)
- }
- 
- #define	ROUNDUP(a)	\
--    (((a) & ((sizeof(long)) - 1)) ? (1 + ((a) | ((sizeof(long)) - 1))) : (a))
-+    (((a) & (sizeof(long) - 1)) ? (1 + ((a) | (sizeof(long) - 1))) : (a))
- 
- void
- get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
-@@ -1808,11 +2409,10 @@ get_rtaddrs(int addrs, struct sockaddr *
- void
- if_change(u_short ifindex, int flags, struct if_data *ifd)
- {
-+	struct ktable		*kt;
- 	struct kif_node		*kif;
- 	struct kif_kr		*kkr;
- 	struct kif_kr6		*kkr6;
--	struct kroute_nexthop	 nh;
--	struct knexthop_node	*n;
- 	u_int8_t		 reachable;
- 
- 	if ((kif = kif_find(ifindex)) == NULL) {
-@@ -1833,28 +2433,18 @@ if_change(u_short ifindex, int flags, st
- 
- 	kif->k.nh_reachable = reachable;
- 
-+	kt = ktable_get(/* XXX */ 0);
-+
- 	LIST_FOREACH(kkr, &kif->kroute_l, entry) {
- 		if (reachable)
- 			kkr->kr->r.flags &= ~F_DOWN;
- 		else
- 			kkr->kr->r.flags |= F_DOWN;
- 
--		RB_FOREACH(n, knexthop_tree, &knt)
--			if (n->kroute == kkr->kr) {
--				bzero(&nh, sizeof(nh));
--				memcpy(&nh.nexthop, &n->nexthop,
--				    sizeof(nh.nexthop));
--				if (kroute_validate(&kkr->kr->r)) {
--					nh.valid = 1;
--					nh.connected = 1;
--					if ((nh.gateway.v4.s_addr =
--					    kkr->kr->r.nexthop.s_addr) != 0)
--						nh.gateway.af = AF_INET;
--				}
--				memcpy(&nh.kr.kr4, &kkr->kr->r,
--				    sizeof(nh.kr.kr4));
--				send_nexthop_update(&nh);
--			}
-+		if (kt == NULL)
-+			continue;
-+
-+		knexthop_track(kt, kkr->kr);
- 	}
- 	LIST_FOREACH(kkr6, &kif->kroute6_l, entry) {
- 		if (reachable)
-@@ -1862,27 +2452,10 @@ if_change(u_short ifindex, int flags, st
- 		else
- 			kkr6->kr->r.flags |= F_DOWN;
- 
--		RB_FOREACH(n, knexthop_tree, &knt)
--			if (n->kroute == kkr6->kr) {
--				bzero(&nh, sizeof(nh));
--				memcpy(&nh.nexthop, &n->nexthop,
--				    sizeof(nh.nexthop));
--				if (kroute6_validate(&kkr6->kr->r)) {
--					nh.valid = 1;
--					nh.connected = 1;
--					if (memcmp(&kkr6->kr->r.nexthop,
--					    &in6addr_any, sizeof(struct
--					    in6_addr))) {
--						nh.gateway.af = AF_INET6;
--						memcpy(&nh.gateway.v6,
--						    &kkr6->kr->r.nexthop,
--						    sizeof(struct in6_addr));
--					}
--				}
--				memcpy(&nh.kr.kr6, &kkr6->kr->r,
--				    sizeof(nh.kr.kr6));
--				send_nexthop_update(&nh);
--			}
-+		if (kt == NULL)
-+			continue;
-+
-+		knexthop_track(kt, kkr6->kr);
- 	}
- }
- 
-@@ -1917,25 +2490,38 @@ if_announce(void *msg)
-  */
- 
- int
--send_rtmsg(int fd, int action, struct kroute *kroute)
-+send_rtmsg(int fd, int action, struct ktable *kt, struct kroute *kroute)
- {
--	struct iovec		iov[5];
-+	struct iovec		iov[7];
- 	struct rt_msghdr	hdr;
- 	struct sockaddr_in	prefix;
- 	struct sockaddr_in	nexthop;
- 	struct sockaddr_in	mask;
-+	struct {
-+		struct sockaddr_dl	dl;
-+		char			pad[sizeof(long)];
-+	}			ifp;
-+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling. */
-+	struct sockaddr_mpls	mpls;
- 	struct sockaddr_rtlabel	label;
-+#endif /* !defined(__FreeBSD__) */
- 	int			iovcnt = 0;
- 
--	if (kr_state.fib_sync == 0)
-+	if (!kt->fib_sync)
- 		return (0);
- 
- 	/* initialize header */
- 	bzero(&hdr, sizeof(hdr));
- 	hdr.rtm_version = RTM_VERSION;
- 	hdr.rtm_type = action;
--	hdr.rtm_tableid = kr_state.rtableid;
-+#if !defined(__FreeBSD__) /* XXX: FreeBSD has no multiple routing tables */
-+	hdr.rtm_tableid = kt->rtableid;
-+#endif /* !defined(__FreeBSD__) */
-+#if !defined(__FreeBSD__) /* XXX: FreeBSD has no rtm_priority */
- 	hdr.rtm_priority = RTP_BGP;
-+#else
-+	hdr.rtm_flags = RTF_PROTO1;
-+#endif /* !defined(__FreeBSD__) */
- 	if (kroute->flags & F_BLACKHOLE)
- 		hdr.rtm_flags |= RTF_BLACKHOLE;
- 	if (kroute->flags & F_REJECT)
-@@ -1984,6 +2570,37 @@ send_rtmsg(int fd, int action, struct kr
- 	iov[iovcnt].iov_base = &mask;
- 	iov[iovcnt++].iov_len = sizeof(mask);
- 
-+	if (kt->ifindex) {
-+		bzero(&ifp, sizeof(ifp));
-+		ifp.dl.sdl_len = sizeof(struct sockaddr_dl);
-+		ifp.dl.sdl_family = AF_LINK;
-+		ifp.dl.sdl_index = kt->ifindex;
-+		/* adjust header */
-+		hdr.rtm_addrs |= RTA_IFP;
-+		hdr.rtm_msglen += ROUNDUP(sizeof(struct sockaddr_dl));
-+		/* adjust iovec */
-+		iov[iovcnt].iov_base = &ifp;
-+		iov[iovcnt++].iov_len = ROUNDUP(sizeof(struct sockaddr_dl));
-+	}
-+
-+#if !defined(__FreeBSD__) /* FreeBSD has no mpls support. */
-+	if (kroute->flags & F_MPLS) {
-+		bzero(&mpls, sizeof(mpls));
-+		mpls.smpls_len = sizeof(mpls);
-+		mpls.smpls_family = AF_MPLS;
-+		mpls.smpls_label = kroute->mplslabel;
-+		/* adjust header */
-+		hdr.rtm_flags |= RTF_MPLS;
-+		hdr.rtm_mpls = MPLS_OP_PUSH;
-+		hdr.rtm_addrs |= RTA_SRC;
-+		hdr.rtm_msglen += sizeof(mpls);
-+		/* adjust iovec */
-+		iov[iovcnt].iov_base = &mpls;
-+		iov[iovcnt++].iov_len = sizeof(mpls);
-+	}
-+#endif
-+
-+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling. */
- 	if (kroute->labelid) {
- 		bzero(&label, sizeof(label));
- 		label.sr_len = sizeof(label);
-@@ -1996,11 +2613,11 @@ send_rtmsg(int fd, int action, struct kr
- 		iov[iovcnt].iov_base = &label;
- 		iov[iovcnt++].iov_len = sizeof(label);
- 	}
-+#endif /* !defined(__FreeBSD__) */
- 
- retry:
- 	if (writev(fd, iov, iovcnt) == -1) {
--		switch (errno) {
--		case ESRCH:
-+		if (errno == ESRCH) {
- 			if (hdr.rtm_type == RTM_CHANGE) {
- 				hdr.rtm_type = RTM_ADD;
- 				goto retry;
-@@ -2009,27 +2626,18 @@ retry:
- 				    inet_ntoa(kroute->prefix),
- 				    kroute->prefixlen);
- 				return (0);
--			} else {
--				log_warnx("send_rtmsg: action %u, "
--				    "prefix %s/%u: %s", hdr.rtm_type,
--				    inet_ntoa(kroute->prefix),
--				    kroute->prefixlen, strerror(errno));
--				return (0);
- 			}
--			break;
--		default:
--			log_warnx("send_rtmsg: action %u, prefix %s/%u: %s",
--			    hdr.rtm_type, inet_ntoa(kroute->prefix),
--			    kroute->prefixlen, strerror(errno));
--			return (0);
- 		}
-+		log_warn("send_rtmsg: action %u, prefix %s/%u", hdr.rtm_type,
-+		    inet_ntoa(kroute->prefix), kroute->prefixlen);
-+		return (0);
- 	}
- 
- 	return (0);
- }
- 
- int
--send_rt6msg(int fd, int action, struct kroute6 *kroute)
-+send_rt6msg(int fd, int action, struct ktable *kt, struct kroute6 *kroute)
- {
- 	struct iovec		iov[5];
- 	struct rt_msghdr	hdr;
-@@ -2037,17 +2645,23 @@ send_rt6msg(int fd, int action, struct k
- 		struct sockaddr_in6	addr;
- 		char			pad[sizeof(long)];
- 	} prefix, nexthop, mask;
-+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling. */
- 	struct sockaddr_rtlabel	label;
-+#endif /* !defined(__FreeBSD__) */
- 	int			iovcnt = 0;
- 
--	if (kr_state.fib_sync == 0)
-+	if (!kt->fib_sync)
- 		return (0);
- 
- 	/* initialize header */
- 	bzero(&hdr, sizeof(hdr));
- 	hdr.rtm_version = RTM_VERSION;
- 	hdr.rtm_type = action;
-+#if !defined(__FreeBSD__) /* XXX: FreeBSD has no multiple routing tables */ 
- 	hdr.rtm_tableid = kr_state.rtableid;
-+#else
-+	hdr.rtm_flags = RTF_PROTO1;
-+#endif /* !defined(__FreeBSD__) */
- 	if (kroute->flags & F_BLACKHOLE)
- 		hdr.rtm_flags |= RTF_BLACKHOLE;
- 	if (kroute->flags & F_REJECT)
-@@ -2100,6 +2714,7 @@ send_rt6msg(int fd, int action, struct k
- 	iov[iovcnt].iov_base = &mask;
- 	iov[iovcnt++].iov_len = ROUNDUP(sizeof(struct sockaddr_in6));
- 
-+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling. */
- 	if (kroute->labelid) {
- 		bzero(&label, sizeof(label));
- 		label.sr_len = sizeof(label);
-@@ -2112,11 +2727,11 @@ send_rt6msg(int fd, int action, struct k
- 		iov[iovcnt].iov_base = &label;
- 		iov[iovcnt++].iov_len = sizeof(label);
- 	}
-+#endif /* !defined(__FreeBSD__) */
- 
- retry:
- 	if (writev(fd, iov, iovcnt) == -1) {
--		switch (errno) {
--		case ESRCH:
-+		if (errno == ESRCH) {
- 			if (hdr.rtm_type == RTM_CHANGE) {
- 				hdr.rtm_type = RTM_ADD;
- 				goto retry;
-@@ -2125,31 +2740,26 @@ retry:
- 				    log_in6addr(&kroute->prefix),
- 				    kroute->prefixlen);
- 				return (0);
--			} else {
--				log_warnx("send_rt6msg: action %u, "
--				    "prefix %s/%u: %s", hdr.rtm_type,
--				    log_in6addr(&kroute->prefix),
--				    kroute->prefixlen, strerror(errno));
--				return (0);
- 			}
--			break;
--		default:
--			log_warnx("send_rt6msg: action %u, prefix %s/%u: %s",
--			    hdr.rtm_type, log_in6addr(&kroute->prefix),
--			    kroute->prefixlen, strerror(errno));
--			return (0);
- 		}
-+		log_warn("send_rt6msg: action %u, prefix %s/%u", hdr.rtm_type,
-+		    log_in6addr(&kroute->prefix), kroute->prefixlen);
-+		return (0);
- 	}
- 
- 	return (0);
- }
- 
- int
--fetchtable(u_int rtableid, int connected_only)
-+fetchtable(struct ktable *kt)
- {
- 	size_t			 len;
-+#if !defined(__FreeBSD__) /* FreeBSD has no table id. */
- 	int			 mib[7];
--	char			*buf, *next, *lim;
-+#else
-+	int			mib[6];
-+#endif
-+	char			*buf = NULL, *next, *lim;
- 	struct rt_msghdr	*rtm;
- 	struct sockaddr		*sa, *gw, *rti_info[RTAX_MAX];
- 	struct sockaddr_in	*sa_in;
-@@ -2163,22 +2773,35 @@ fetchtable(u_int rtableid, int connected
- 	mib[3] = 0;
- 	mib[4] = NET_RT_DUMP;
- 	mib[5] = 0;
--	mib[6] = rtableid;
-+#if !defined(__FreeBSD__) /* FreeBSD has no table id. */
-+	mib[6] = kt->rtableid;
-+#endif
- 
-+#if !defined(__FreeBSD__) /* FreeBSD has no table id. */
- 	if (sysctl(mib, 7, NULL, &len, NULL, 0) == -1) {
--		if (rtableid != 0 && errno == EINVAL)	/* table nonexistent */
-+#else
-+	if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1) {
-+#endif
-+		if (kt->rtableid != 0 && errno == EINVAL)
-+			/* table nonexistent */
- 			return (0);
- 		log_warn("sysctl");
- 		return (-1);
- 	}
--	if ((buf = malloc(len)) == NULL) {
--		log_warn("fetchtable");
--		return (-1);
--	}
--	if (sysctl(mib, 7, buf, &len, NULL, 0) == -1) {
--		log_warn("sysctl");
--		free(buf);
--		return (-1);
-+	if (len > 0) {
-+		if ((buf = malloc(len)) == NULL) {
-+			log_warn("fetchtable");
-+			return (-1);
-+		}
-+#if !defined(__FreeBSD__) /* FreeBSD has no table id. */
-+		if (sysctl(mib, 7, buf, &len, NULL, 0) == -1) {
-+#else
-+		if (sysctl(mib, 6, buf, &len, NULL, 0) == -1) {
-+#endif
-+			log_warn("sysctl2");
-+			free(buf);
-+			return (-1);
-+		}
- 	}
- 
- 	lim = buf + len;
-@@ -2186,7 +2809,11 @@ fetchtable(u_int rtableid, int connected
- 		rtm = (struct rt_msghdr *)next;
- 		if (rtm->rtm_version != RTM_VERSION)
- 			continue;
-+#if !defined(__FreeBSD__)
- 		sa = (struct sockaddr *)(next + rtm->rtm_hdrlen);
-+#else
-+		sa = (struct sockaddr *)(next + sizeof(struct rt_msghdr));
-+#endif
- 		get_rtaddrs(rtm->rtm_addrs, sa, rti_info);
- 
- 		if ((sa = rti_info[RTAX_DST]) == NULL)
-@@ -2205,7 +2832,11 @@ fetchtable(u_int rtableid, int connected
- 			}
- 
- 			kr->r.flags = F_KERNEL;
-+#if defined(__FreeBSD__)	/* no rtm_priority on FreeBSD */
-+			kr->r.priority = RTP_BGP;
-+#else
- 			kr->r.priority = rtm->rtm_priority;
-+#endif
- 			kr->r.ifindex = rtm->rtm_index;
- 			kr->r.prefix.s_addr =
- 			    ((struct sockaddr_in *)sa)->sin_addr.s_addr;
-@@ -2223,8 +2854,12 @@ fetchtable(u_int rtableid, int connected
- 					break;
- 				kr->r.prefixlen =
- 				    mask2prefixlen(sa_in->sin_addr.s_addr);
--			} else if (rtm->rtm_flags & RTF_HOST)
-+			} else if (rtm->rtm_flags & RTF_HOST) {
- 				kr->r.prefixlen = 32;
-+#if defined(__FreeBSD__)	/* RTF_HOST means connected route */
-+				kr->r.flags |= F_CONNECTED;
-+#endif
-+			}
- 			else
- 				kr->r.prefixlen =
- 				    prefixlen_classful(kr->r.prefix.s_addr);
-@@ -2238,11 +2873,25 @@ fetchtable(u_int rtableid, int connected
- 			}
- 
- 			kr6->r.flags = F_KERNEL;
-+#if defined(__FreeBSD__)	/* no rtm_priority on FreeBSD */
-+			kr6->r.priority = RTP_BGP;
-+#else
- 			kr6->r.priority = rtm->rtm_priority;
-+#endif
- 			kr6->r.ifindex = rtm->rtm_index;
- 			memcpy(&kr6->r.prefix,
- 			    &((struct sockaddr_in6 *)sa)->sin6_addr,
- 			    sizeof(kr6->r.prefix));
-+#if defined(__KAME__) && defined(IPV6_LINKLOCAL_PEER)
-+			if (IN6_IS_ADDR_LINKLOCAL(&kr6->r.prefix)) {
-+				if (((struct sockaddr_in6 *)sa)->sin6_scope_id !=0)
-+					SET_IN6_LINKLOCAL_IFINDEX(kr6->r.prefix,
-+					    ((struct sockaddr_in6 *)sa)->sin6_scope_id);
-+				else
-+					SET_IN6_LINKLOCAL_IFINDEX(kr6->r.prefix,
-+					    rtm->rtm_index);
-+			}
-+#endif
- 
- 			sa_in6 = (struct sockaddr_in6 *)rti_info[RTAX_NETMASK];
- 			if (rtm->rtm_flags & RTF_STATIC)
-@@ -2257,8 +2906,12 @@ fetchtable(u_int rtableid, int connected
- 				if (sa_in6->sin6_len == 0)
- 					break;
- 				kr6->r.prefixlen = mask2prefixlen6(sa_in6);
--			} else if (rtm->rtm_flags & RTF_HOST)
-+			} else if (rtm->rtm_flags & RTF_HOST) {
- 				kr6->r.prefixlen = 128;
-+#if defined(__FreeBSD__)	/* RTF_HOST means connected route */
-+				kr6->r.flags |= F_CONNECTED;
-+#endif
-+			}
- 			else
- 				fatalx("INET6 route without netmask");
- 			break;
-@@ -2280,6 +2933,13 @@ fetchtable(u_int rtableid, int connected
- 				memcpy(&kr6->r.nexthop,
- 				    &((struct sockaddr_in6 *)gw)->sin6_addr,
- 				    sizeof(kr6->r.nexthop));
-+#if defined(__KAME__) && defined(IPV6_LINKLOCAL_PEER)
-+				if (IN6_IS_ADDR_LINKLOCAL(&kr6->r.nexthop) &&
-+				    ((struct sockaddr_in6 *)gw)->sin6_scope_id != 0) {
-+					SET_IN6_LINKLOCAL_IFINDEX(kr6->r.nexthop,
-+					    ((struct sockaddr_in6 *)gw)->sin6_scope_id);
-+				}
-+#endif
- 				break;
- 			case AF_LINK:
- 				if (sa->sa_family == AF_INET)
-@@ -2290,23 +2950,28 @@ fetchtable(u_int rtableid, int connected
- 			}
- 
- 		if (sa->sa_family == AF_INET) {
-+#if !defined(__FreeBSD__)	/* no rtm_priority on FreeBSD */
- 			if (rtm->rtm_priority == RTP_BGP)  {
--				send_rtmsg(kr_state.fd, RTM_DELETE, &kr->r);
--				free(kr);
--			} else if (connected_only &&
--			    !(kr->r.flags & F_CONNECTED))
-+#else
-+			/* never delete route */
-+			if (0) {
-+#endif
-+				send_rtmsg(kr_state.fd, RTM_DELETE, kt, &kr->r);
- 				free(kr);
--			else
--				kroute_insert(kr);
-+			} else
-+				kroute_insert(kt, kr);
- 		} else if (sa->sa_family == AF_INET6) {
-+#if !defined(__FreeBSD__)	/* no rtm_priority on FreeBSD */
- 			if (rtm->rtm_priority == RTP_BGP)  {
--				send_rt6msg(kr_state.fd, RTM_DELETE, &kr6->r);
--				free(kr6);
--			} else if (connected_only &&
--			    !(kr6->r.flags & F_CONNECTED))
-+#else
-+			/* never delete route */
-+			if (0) {
-+#endif
-+				send_rt6msg(kr_state.fd, RTM_DELETE, kt,
-+				    &kr6->r);
- 				free(kr6);
--			else
--				kroute6_insert(kr6);
-+			} else
-+				kroute6_insert(kt, kr6);
- 		}
- 	}
- 	free(buf);
-@@ -2327,7 +2992,7 @@ fetchifs(int ifindex)
- 	mib[0] = CTL_NET;
- 	mib[1] = AF_ROUTE;
- 	mib[2] = 0;
--	mib[3] = AF_INET;
-+	mib[3] = AF_INET;	/* AF does not matter but AF_INET is shorter */
- 	mib[4] = NET_RT_IFLIST;
- 	mib[5] = ifindex;
- 
-@@ -2396,7 +3061,7 @@ dispatch_rtmsg(void)
- 	struct rt_msghdr	*rtm;
- 	struct if_msghdr	 ifm;
- 	struct sockaddr		*sa, *rti_info[RTAX_MAX];
--	int			 connected_only;
-+	struct ktable		*kt;
- 
- 	if ((n = read(kr_state.fd, &buf, sizeof(buf))) == -1) {
- 		log_warn("dispatch_rtmsg: read error");
-@@ -2418,7 +3083,11 @@ dispatch_rtmsg(void)
- 		case RTM_ADD:
- 		case RTM_CHANGE:
- 		case RTM_DELETE:
-+#if !defined(__FreeBSD__)
- 			sa = (struct sockaddr *)(next + rtm->rtm_hdrlen);
-+#else
-+			sa = (struct sockaddr *)(next + sizeof(struct rt_msghdr));
-+#endif
- 			get_rtaddrs(rtm->rtm_addrs, sa, rti_info);
- 
- 			if (rtm->rtm_pid == kr_state.pid) /* cause by us */
-@@ -2430,16 +3099,14 @@ dispatch_rtmsg(void)
- 			if (rtm->rtm_flags & RTF_LLINFO) /* arp cache */
- 				continue;
- 
--			connected_only = 0;
--			if (rtm->rtm_tableid != kr_state.rtableid) {
--				if (rtm->rtm_tableid == 0)
--					connected_only = 1;
--				else
--					continue;
--			}
-+#if !defined(__FreeBSD__) /* FreeBSD has no rtm_tableid. */
-+			if ((kt = ktable_get(rtm->rtm_tableid)) == NULL)
-+#else
-+			if ((kt = ktable_get(0)) == NULL)
-+#endif
-+				continue;
- 
--			if (dispatch_rtmsg_addr(rtm, rti_info,
--			    connected_only) == -1)
-+			if (dispatch_rtmsg_addr(rtm, rti_info, kt) == -1)
- 				return (-1);
- 			break;
- 		case RTM_IFINFO:
-@@ -2460,7 +3127,7 @@ dispatch_rtmsg(void)
- 
- int
- dispatch_rtmsg_addr(struct rt_msghdr *rtm, struct sockaddr *rti_info[RTAX_MAX],
--    int connected_only)
-+    struct ktable *kt)
- {
- 	struct sockaddr		*sa;
- 	struct sockaddr_in	*sa_in;
-@@ -2468,7 +3135,7 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
- 	struct kroute_node	*kr;
- 	struct kroute6_node	*kr6;
- 	struct bgpd_addr	 prefix;
--	int			 flags, oflags, mpath = 0;
-+	int			 flags, oflags, mpath = 0, changed = 0;
- 	u_int16_t		 ifindex;
- 	u_int8_t		 prefixlen;
- 	u_int8_t		 prio;
-@@ -2494,31 +3161,54 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
- 		mpath = 1;
- #endif
- 
-+#if !defined(__FreeBSD__)	/* no rtm_priority on FreeBSD */
- 	prio = rtm->rtm_priority;
--	prefix.af = sa->sa_family;
--	switch (prefix.af) {
-+#else
-+	prio = RTP_BGP;
-+#endif
-+	switch (sa->sa_family) {
- 	case AF_INET:
-+		prefix.aid = AID_INET;
- 		prefix.v4.s_addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr;
- 		sa_in = (struct sockaddr_in *)rti_info[RTAX_NETMASK];
- 		if (sa_in != NULL) {
- 			if (sa_in->sin_len != 0)
- 				prefixlen = mask2prefixlen(
- 				    sa_in->sin_addr.s_addr);
--		} else if (rtm->rtm_flags & RTF_HOST)
-+		} else if (rtm->rtm_flags & RTF_HOST) {
- 			prefixlen = 32;
-+#if defined(__FreeBSD__)	/* RTF_HOST means connected route */
-+			flags |= F_CONNECTED;
-+#endif
-+		}
- 		else
- 			prefixlen =
- 			    prefixlen_classful(prefix.v4.s_addr);
- 		break;
- 	case AF_INET6:
-+		prefix.aid = AID_INET6;
- 		memcpy(&prefix.v6, &((struct sockaddr_in6 *)sa)->sin6_addr,
- 		    sizeof(struct in6_addr));
-+#if defined(__KAME__) && defined(IPV6_LINKLOCAL_PEER)
-+		if (IN6_IS_ADDR_LINKLOCAL(&prefix.v6) != 0) {
-+			if (((struct sockaddr_in6 *)sa)->sin6_scope_id !=0)
-+				SET_IN6_LINKLOCAL_IFINDEX(prefix.v6,
-+				    ((struct sockaddr_in6 *)sa)->sin6_scope_id);
-+			else
-+				SET_IN6_LINKLOCAL_IFINDEX(prefix.v6,
-+				    rtm->rtm_index);
-+		}
-+#endif              
- 		sa_in6 = (struct sockaddr_in6 *)rti_info[RTAX_NETMASK];
- 		if (sa_in6 != NULL) {
- 			if (sa_in6->sin6_len != 0)
- 				prefixlen = mask2prefixlen6(sa_in6);
--		} else if (rtm->rtm_flags & RTF_HOST)
-+		} else if (rtm->rtm_flags & RTF_HOST) {
- 			prefixlen = 128;
-+#if defined(__FreeBSD__)	/* RTF_HOST means connected route */
-+			flags |= F_CONNECTED;
-+#endif
-+		}
- 		else
- 			fatalx("in6 net addr without netmask");
- 		break;
-@@ -2537,10 +3227,10 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
- 		}
- 
- 	if (rtm->rtm_type == RTM_DELETE) {
--		switch (prefix.af) {
--		case AF_INET:
-+		switch (prefix.aid) {
-+		case AID_INET:
- 			sa_in = (struct sockaddr_in *)sa;
--			if ((kr = kroute_find(prefix.v4.s_addr,
-+			if ((kr = kroute_find(kt, prefix.v4.s_addr,
- 			    prefixlen, prio)) == NULL)
- 				return (0);
- 			if (!(kr->r.flags & F_KERNEL))
-@@ -2554,12 +3244,12 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
- 					return (0);
- 				}
- 
--			if (kroute_remove(kr) == -1)
-+			if (kroute_remove(kt, kr) == -1)
- 				return (-1);
- 			break;
--		case AF_INET6:
-+		case AID_INET6:
- 			sa_in6 = (struct sockaddr_in6 *)sa;
--			if ((kr6 = kroute6_find(&prefix.v6, prefixlen,
-+			if ((kr6 = kroute6_find(kt, &prefix.v6, prefixlen,
- 			    prio)) == NULL)
- 				return (0);
- 			if (!(kr6->r.flags & F_KERNEL))
-@@ -2574,26 +3264,23 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
- 					return (0);
- 				}
- 
--			if (kroute6_remove(kr6) == -1)
-+			if (kroute6_remove(kt, kr6) == -1)
- 				return (-1);
- 			break;
- 		}
- 		return (0);
- 	}
- 
--	if (connected_only && !(flags & F_CONNECTED))
--		return (0);
--
- 	if (sa == NULL && !(flags & F_CONNECTED)) {
- 		log_warnx("dispatch_rtmsg no nexthop for %s/%u",
- 		    log_addr(&prefix), prefixlen);
- 		return (0);
- 	}
- 
--	switch (prefix.af) {
--	case AF_INET:
-+	switch (prefix.aid) {
-+	case AID_INET:
- 		sa_in = (struct sockaddr_in *)sa;
--		if ((kr = kroute_find(prefix.v4.s_addr, prefixlen,
-+		if ((kr = kroute_find(kt, prefix.v4.s_addr, prefixlen,
- 		    prio)) != NULL) {
- 			if (kr->r.flags & F_KERNEL) {
- 				/* get the correct route */
-@@ -2605,30 +3292,38 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
- 				} else if (mpath && rtm->rtm_type == RTM_ADD)
- 					goto add4;
- 
--				if (sa_in != NULL)
-+				if (sa_in != NULL) {
-+					if (kr->r.nexthop.s_addr !=
-+					    sa_in->sin_addr.s_addr)
-+						changed = 1;
- 					kr->r.nexthop.s_addr =
- 					    sa_in->sin_addr.s_addr;
--				else
-+				} else {
-+					if (kr->r.nexthop.s_addr != 0)
-+						changed = 1;
- 					kr->r.nexthop.s_addr = 0;
-+				}
- 
- 				if (kr->r.flags & F_NEXTHOP)
- 					flags |= F_NEXTHOP;
- 				oflags = kr->r.flags;
-+				if (flags != oflags)
-+					changed = 1;
- 				kr->r.flags = flags;
- 				if ((oflags & F_CONNECTED) &&
- 				    !(flags & F_CONNECTED)) {
- 					kif_kr_remove(kr);
- 					kr_redistribute(IMSG_NETWORK_REMOVE,
--					    &kr->r);
-+					    kt, &kr->r);
- 				}
- 				if ((flags & F_CONNECTED) &&
- 				    !(oflags & F_CONNECTED)) {
- 					kif_kr_insert(kr);
- 					kr_redistribute(IMSG_NETWORK_ADD,
--					    &kr->r);
-+					    kt, &kr->r);
- 				}
--				if (kr->r.flags & F_NEXTHOP)
--					knexthop_track(kr);
-+				if (kr->r.flags & F_NEXTHOP && changed)
-+					knexthop_track(kt, kr);
- 			}
- 		} else if (rtm->rtm_type == RTM_CHANGE) {
- 			log_warnx("change req for %s/%u: not in table",
-@@ -2651,50 +3346,62 @@ add4:
- 			kr->r.ifindex = ifindex;
- 			kr->r.priority = prio;
- 
--			kroute_insert(kr);
-+			kroute_insert(kt, kr);
- 		}
- 		break;
--	case AF_INET6:
-+	case AID_INET6:
- 		sa_in6 = (struct sockaddr_in6 *)sa;
--		if ((kr6 = kroute6_find(&prefix.v6, prefixlen, prio)) != NULL) {
-+		if ((kr6 = kroute6_find(kt, &prefix.v6, prefixlen, prio)) !=
-+		    NULL) {
- 			if (kr6->r.flags & F_KERNEL) {
- 				/* get the correct route */
- 				if (mpath && rtm->rtm_type == RTM_CHANGE &&
- 				    (kr6 = kroute6_matchgw(kr6, sa_in6)) ==
- 				    NULL) {
- 					log_warnx("dispatch_rtmsg[change] "
--					    "mpath route not found");
-+					    "IPv6 mpath route not found");
- 					return (-1);
- 				} else if (mpath && rtm->rtm_type == RTM_ADD)
- 					goto add6;
- 
--				if (sa_in6 != NULL)
-+				if (sa_in6 != NULL) {
-+					if (memcmp(&kr6->r.nexthop,
-+					    &sa_in6->sin6_addr,
-+					    sizeof(struct in6_addr)))
-+						changed = 1;
- 					memcpy(&kr6->r.nexthop,
- 					    &sa_in6->sin6_addr,
- 					    sizeof(struct in6_addr));
--				else
-+				} else {
-+					if (memcmp(&kr6->r.nexthop,
-+					    &in6addr_any,
-+					    sizeof(struct in6_addr)))
-+						changed = 1;
- 					memcpy(&kr6->r.nexthop,
- 					    &in6addr_any,
- 					    sizeof(struct in6_addr));
-+				}
- 
- 				if (kr6->r.flags & F_NEXTHOP)
- 					flags |= F_NEXTHOP;
- 				oflags = kr6->r.flags;
-+				if (flags != oflags)
-+					changed = 1;
- 				kr6->r.flags = flags;
- 				if ((oflags & F_CONNECTED) &&
- 				    !(flags & F_CONNECTED)) {
- 					kif_kr6_remove(kr6);
- 					kr_redistribute6(IMSG_NETWORK_REMOVE,
--					    &kr6->r);
-+					    kt, &kr6->r);
- 				}
- 				if ((flags & F_CONNECTED) &&
- 				    !(oflags & F_CONNECTED)) {
- 					kif_kr6_insert(kr6);
- 					kr_redistribute6(IMSG_NETWORK_ADD,
--					    &kr6->r);
-+					    kt, &kr6->r);
- 				}
--				if (kr6->r.flags & F_NEXTHOP)
--					knexthop_track(kr6);
-+				if (kr6->r.flags & F_NEXTHOP && changed)
-+					knexthop_track(kt, kr6);
- 			}
- 		} else if (rtm->rtm_type == RTM_CHANGE) {
- 			log_warnx("change req for %s/%u: not in table",
-@@ -2719,8 +3426,12 @@ add6:
- 			kr6->r.flags = flags;
- 			kr6->r.ifindex = ifindex;
- 			kr6->r.priority = prio;
--
--			kroute6_insert(kr6);
-+#if defined(__KAME__) && defined(IPV6_LINKLOCAL_PEER)
-+			if (IN6_IS_ADDR_LINKLOCAL(&kr6->r.nexthop))
-+				SET_IN6_LINKLOCAL_IFINDEX(kr6->r.nexthop,
-+				    ifindex);
-+#endif
-+			kroute6_insert(kt, kr6);
- 		}
- 		break;
- 	}
diff --git a/net/openbgpd/files/patch-bgpd_log.c b/net/openbgpd/files/patch-bgpd_log.c
deleted file mode 100644
index 6860c0f7f940..000000000000
--- a/net/openbgpd/files/patch-bgpd_log.c
+++ /dev/null
@@ -1,117 +0,0 @@
-Index: bgpd/log.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/log.c,v
-retrieving revision 1.1.1.5
-retrieving revision 1.1.1.8
-diff -u -p -r1.1.1.5 -r1.1.1.8
---- bgpd/log.c	14 Feb 2010 20:19:57 -0000	1.1.1.5
-+++ bgpd/log.c	13 Oct 2012 18:22:43 -0000	1.1.1.8
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: log.c,v 1.50 2007/04/23 13:04:24 claudio Exp $ */
-+/*	$OpenBSD: log.c,v 1.55 2011/08/20 19:02:28 sthen Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -32,6 +32,7 @@
- #include "log.h"
- 
- int	debug;
-+int	verbose;
- 
- void	 logit(int, const char *, ...);
- 
-@@ -42,8 +43,9 @@ log_fmt_peer(const struct peer_config *p
- 	char		*pfmt, *p;
- 
- 	ip = log_addr(&peer->remote_addr);
--	if ((peer->remote_addr.af == AF_INET && peer->remote_masklen != 32) ||
--	    (peer->remote_addr.af == AF_INET6 && peer->remote_masklen != 128)) {
-+	if ((peer->remote_addr.aid == AID_INET && peer->remote_masklen != 32) ||
-+	    (peer->remote_addr.aid == AID_INET6 &&
-+	    peer->remote_masklen != 128)) {
- 		if (asprintf(&p, "%s/%u", ip, peer->remote_masklen) == -1)
- 			fatal(NULL);
- 	} else {
-@@ -77,6 +79,12 @@ log_init(int n_debug)
- }
- 
- void
-+log_verbose(int v)
-+{
-+	verbose = v;
-+}
-+
-+void
- logit(int pri, const char *fmt, ...)
- {
- 	va_list	ap;
-@@ -193,7 +201,7 @@ log_debug(const char *emsg, ...)
- {
- 	va_list	 ap;
- 
--	if (debug) {
-+	if (verbose) {
- 		va_start(ap, emsg);
- 		vlog(LOG_DEBUG, emsg, ap);
- 		va_end(ap);
-@@ -250,7 +258,7 @@ log_statechange(struct peer *peer, enum 
- 
- void
- log_notification(const struct peer *peer, u_int8_t errcode, u_int8_t subcode,
--    u_char *data, u_int16_t datalen)
-+    u_char *data, u_int16_t datalen, const char *dir)
- {
- 	char		*p;
- 	const char	*suberrname = NULL;
-@@ -283,27 +291,31 @@ log_notification(const struct peer *peer
- 			suberrname = suberr_cease_names[subcode];
- 		break;
- 	case ERR_HOLDTIMEREXPIRED:
--	case ERR_FSM:
- 		uk = 1;
- 		break;
-+	case ERR_FSM:
-+		if (subcode >= sizeof(suberr_fsm_names)/sizeof(char *))
-+			uk = 1;
-+		else
-+			suberrname = suberr_fsm_names[subcode];
-+		break;
- 	default:
--		logit(LOG_CRIT, "%s: received notification, unknown errcode "
--		    "%u, subcode %u", p, errcode, subcode);
-+		logit(LOG_CRIT, "%s: %s notification, unknown errcode "
-+		    "%u, subcode %u", p, dir, errcode, subcode);
- 		free(p);
- 		return;
- 	}
- 
- 	if (uk)
--		logit(LOG_CRIT,
--		    "%s: received notification: %s, unknown subcode %u",
--		    p, errnames[errcode], subcode);
-+		logit(LOG_CRIT, "%s: %s notification: %s, unknown subcode %u",
-+		    p, dir, errnames[errcode], subcode);
- 	else {
- 		if (suberrname == NULL)
--			logit(LOG_CRIT, "%s: received notification: %s",
--			    p, errnames[errcode]);
-+			logit(LOG_CRIT, "%s: %s notification: %s", p,
-+			    dir, errnames[errcode]);
- 		else
--			logit(LOG_CRIT, "%s: received notification: %s, %s",
--			    p, errnames[errcode], suberrname);
-+			logit(LOG_CRIT, "%s: %s notification: %s, %s",
-+			    p, dir, errnames[errcode], suberrname);
- 	}
- 	free(p);
- }
-@@ -318,6 +330,9 @@ log_conn_attempt(const struct peer *peer
- 		b = log_sockaddr(sa);
- 		logit(LOG_INFO, "connection from non-peer %s refused", b);
- 	} else {
-+		/* only log if there is a chance that the session may come up */
-+		if (peer->conf.down && peer->state == STATE_IDLE)
-+			return;
- 		p = log_fmt_peer(&peer->conf);
- 		logit(LOG_INFO, "Connection attempt from %s while session is "
- 		    "in state %s", p, statenames[peer->state]);
diff --git a/net/openbgpd/files/patch-bgpd_log.h b/net/openbgpd/files/patch-bgpd_log.h
deleted file mode 100644
index 3d0d94de2a2e..000000000000
--- a/net/openbgpd/files/patch-bgpd_log.h
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: bgpd/log.h
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/log.h,v
-retrieving revision 1.1.1.2
-retrieving revision 1.1.1.3
-diff -u -p -r1.1.1.2 -r1.1.1.3
---- bgpd/log.h	9 Jul 2009 16:49:54 -0000	1.1.1.2
-+++ bgpd/log.h	13 Oct 2012 18:22:43 -0000	1.1.1.3
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: log.h,v 1.11 2008/09/11 14:49:58 henning Exp $ */
-+/*	$OpenBSD: log.h,v 1.13 2012/06/10 11:16:08 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -71,6 +71,13 @@ static const char * const suberr_open_na
- 	"unsupported capability"
- };
- 
-+static const char * const suberr_fsm_names[] = {
-+	"unspecified error",
-+	"received unexpected message in OpenSent",
-+	"received unexpected message in OpenConfirm",
-+	"received unexpected message in Established"
-+};
-+
- static const char * const suberr_update_names[] = {
- 	"none",
- 	"attribute list error",
-@@ -109,7 +116,9 @@ static const char * const ctl_res_strerr
- 	"no such neighbor",
- 	"permission denied",
- 	"neighbor does not have this capability",
--	"config file has errors, reload failed"
-+	"config file has errors, reload failed",
-+	"previous reload still running",
-+	"out of memory"
- };
- 
- static const char * const timernames[] = {
diff --git a/net/openbgpd/files/patch-bgpd_mrt.c b/net/openbgpd/files/patch-bgpd_mrt.c
deleted file mode 100644
index 31546fcf96d0..000000000000
--- a/net/openbgpd/files/patch-bgpd_mrt.c
+++ /dev/null
@@ -1,864 +0,0 @@
-Index: bgpd/mrt.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/mrt.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.1.1.11
-diff -u -p -r1.1.1.7 -r1.1.1.11
---- bgpd/mrt.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/mrt.c	8 Dec 2012 10:37:09 -0000	1.1.1.11
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: mrt.c,v 1.63 2009/06/29 12:22:16 claudio Exp $ */
-+/*	$OpenBSD: mrt.c,v 1.72 2011/11/06 10:29:05 guenther Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -21,6 +21,7 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
-@@ -32,20 +33,22 @@
- 
- #include "mrt.h"
- 
--int mrt_attr_dump(struct buf *, struct rde_aspath *, struct bgpd_addr *);
-+int mrt_attr_dump(struct ibuf *, struct rde_aspath *, struct bgpd_addr *, int);
- int mrt_dump_entry_mp(struct mrt *, struct prefix *, u_int16_t,
-     struct rde_peer*);
- int mrt_dump_entry(struct mrt *, struct prefix *, u_int16_t, struct rde_peer*);
--int mrt_dump_hdr_se(struct buf **, struct peer *, u_int16_t, u_int16_t,
-+int mrt_dump_entry_v2(struct mrt *, struct rib_entry *, u_int32_t);
-+int mrt_dump_peer(struct ibuf *, struct rde_peer *);
-+int mrt_dump_hdr_se(struct ibuf **, struct peer *, u_int16_t, u_int16_t,
-     u_int32_t, int);
--int mrt_dump_hdr_rde(struct buf **, u_int16_t type, u_int16_t, u_int32_t);
-+int mrt_dump_hdr_rde(struct ibuf **, u_int16_t type, u_int16_t, u_int32_t);
- int mrt_open(struct mrt *, time_t);
- 
- #define DUMP_BYTE(x, b)							\
- 	do {								\
- 		u_char		t = (b);				\
--		if (buf_add((x), &t, sizeof(t)) == -1) {		\
--			log_warnx("mrt_dump1: buf_add error");		\
-+		if (ibuf_add((x), &t, sizeof(t)) == -1) {		\
-+			log_warn("mrt_dump1: ibuf_add error");		\
- 			goto fail;					\
- 		}							\
- 	} while (0)
-@@ -54,8 +57,8 @@ int mrt_open(struct mrt *, time_t);
- 	do {								\
- 		u_int16_t	t;					\
- 		t = htons((s));						\
--		if (buf_add((x), &t, sizeof(t)) == -1) {		\
--			log_warnx("mrt_dump2: buf_add error");		\
-+		if (ibuf_add((x), &t, sizeof(t)) == -1) {		\
-+			log_warn("mrt_dump2: ibuf_add error");		\
- 			goto fail;					\
- 		}							\
- 	} while (0)
-@@ -64,8 +67,8 @@ int mrt_open(struct mrt *, time_t);
- 	do {								\
- 		u_int32_t	t;					\
- 		t = htonl((l));						\
--		if (buf_add((x), &t, sizeof(t)) == -1) {		\
--			log_warnx("mrt_dump3: buf_add error");		\
-+		if (ibuf_add((x), &t, sizeof(t)) == -1) {		\
-+			log_warn("mrt_dump3: ibuf_add error");		\
- 			goto fail;					\
- 		}							\
- 	} while (0)
-@@ -73,8 +76,8 @@ int mrt_open(struct mrt *, time_t);
- #define DUMP_NLONG(x, l)						\
- 	do {								\
- 		u_int32_t	t = (l);				\
--		if (buf_add((x), &t, sizeof(t)) == -1) {		\
--			log_warnx("mrt_dump4: buf_add error");		\
-+		if (ibuf_add((x), &t, sizeof(t)) == -1) {		\
-+			log_warn("mrt_dump4: ibuf_add error");		\
- 			goto fail;					\
- 		}							\
- 	} while (0)
-@@ -83,55 +86,64 @@ void
- mrt_dump_bgp_msg(struct mrt *mrt, void *pkg, u_int16_t pkglen,
-     struct peer *peer)
- {
--	struct buf	*buf;
-+	struct ibuf	*buf;
- 	int		 incoming = 0;
-+	u_int16_t	 subtype = BGP4MP_MESSAGE;
-+
-+	if (peer->capa.neg.as4byte)
-+		subtype = BGP4MP_MESSAGE_AS4;
- 
- 	/* get the direction of the message to swap address and AS fields */
- 	if (mrt->type == MRT_ALL_IN || mrt->type == MRT_UPDATE_IN)
- 		incoming = 1;
- 
--	if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, BGP4MP_MESSAGE,
-+	if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, subtype,
- 	    pkglen, incoming) == -1)
- 		return;
- 
--	if (buf_add(buf, pkg, pkglen) == -1) {
--		log_warnx("mrt_dump_bgp_msg: buf_add error");
--		buf_free(buf);
-+	if (ibuf_add(buf, pkg, pkglen) == -1) {
-+		log_warn("mrt_dump_bgp_msg: ibuf_add error");
-+		ibuf_free(buf);
- 		return;
- 	}
- 
--	buf_close(&mrt->wbuf, buf);
-+	ibuf_close(&mrt->wbuf, buf);
- }
- 
- void
- mrt_dump_state(struct mrt *mrt, u_int16_t old_state, u_int16_t new_state,
-     struct peer *peer)
- {
--	struct buf	*buf;
-+	struct ibuf	*buf;
-+	u_int16_t	 subtype = BGP4MP_STATE_CHANGE;
-+
-+	if (peer->capa.neg.as4byte)
-+		subtype = BGP4MP_STATE_CHANGE_AS4;
- 
--	if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, BGP4MP_MESSAGE,
-+	if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, subtype,
- 	    2 * sizeof(short), 0) == -1)
- 		return;
- 
- 	DUMP_SHORT(buf, old_state);
- 	DUMP_SHORT(buf, new_state);
- 
--	buf_close(&mrt->wbuf, buf);
-+	ibuf_close(&mrt->wbuf, buf);
- 	return;
- 
- fail:
--	buf_free(buf);
-+	ibuf_free(buf);
- }
- 
- int
--mrt_attr_dump(struct buf *buf, struct rde_aspath *a, struct bgpd_addr *nexthop)
-+mrt_attr_dump(struct ibuf *buf, struct rde_aspath *a, struct bgpd_addr *nexthop,
-+    int v2)
- {
- 	struct attr	*oa;
- 	u_char		*pdata;
- 	u_int32_t	 tmp;
- 	int		 neednewpath = 0;
--	u_int16_t	 plen;
--	u_int8_t	 l;
-+	u_int16_t	 plen, afi;
-+	u_int8_t	 l, safi;
- 
- 	/* origin */
- 	if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_ORIGIN,
-@@ -140,12 +152,16 @@ mrt_attr_dump(struct buf *buf, struct rd
- 
- 	/* aspath */
- 	pdata = aspath_prepend(a->aspath, rde_local_as(), 0, &plen);
--	pdata = aspath_deflate(pdata, &plen, &neednewpath);
--	if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_ASPATH, pdata, plen) == -1)
-+	if (!v2)
-+		pdata = aspath_deflate(pdata, &plen, &neednewpath);
-+	if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_ASPATH, pdata,
-+	    plen) == -1) {
-+		free(pdata);
- 		return (-1);
-+	}
- 	free(pdata);
- 
--	if (nexthop) {
-+	if (nexthop && nexthop->aid == AID_INET) {
- 		/* nexthop, already network byte order */
- 		if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_NEXTHOP,
- 		    &nexthop->v4.s_addr, 4) ==	-1)
-@@ -159,7 +175,7 @@ mrt_attr_dump(struct buf *buf, struct rd
- 			return (-1);
- 	}
- 
--	/* local preference, only valid for ibgp */
-+	/* local preference */
- 	tmp = htonl(a->lpref);
- 	if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_LOCALPREF, &tmp, 4) == -1)
- 		return (-1);
-@@ -173,12 +189,51 @@ mrt_attr_dump(struct buf *buf, struct rd
- 			return (-1);
- 	}
- 
-+	if (nexthop && nexthop->aid != AID_INET) {
-+		struct ibuf *nhbuf;
-+
-+		if ((nhbuf = ibuf_dynamic(0, UCHAR_MAX)) == NULL)
-+			return (-1);
-+		if (!v2) {
-+			if (aid2afi(nexthop->aid, &afi, &safi))
-+				return (-1);
-+			DUMP_SHORT(nhbuf, afi);
-+			DUMP_BYTE(nhbuf, safi);
-+		}
-+		switch (nexthop->aid) {
-+		case AID_INET6:
-+			DUMP_BYTE(nhbuf, sizeof(struct in6_addr));
-+			if (ibuf_add(nhbuf, &nexthop->v6,
-+			    sizeof(struct in6_addr)) == -1) {
-+			}
-+			break;
-+		case AID_VPN_IPv4:
-+			DUMP_BYTE(nhbuf, sizeof(u_int64_t) +
-+			    sizeof(struct in_addr));
-+			DUMP_NLONG(nhbuf, 0);	/* set RD to 0 */
-+			DUMP_NLONG(nhbuf, 0);
-+			DUMP_NLONG(nhbuf, nexthop->v4.s_addr);
-+			break;
-+		}
-+		if (!v2)
-+			DUMP_BYTE(nhbuf, 0);
-+		if (attr_writebuf(buf, ATTR_OPTIONAL, ATTR_MP_REACH_NLRI,
-+		    nhbuf->buf, ibuf_size(nhbuf)) == -1) {
-+fail:
-+			ibuf_free(nhbuf);
-+			return (-1);
-+		}
-+		ibuf_free(nhbuf);
-+	}
-+
- 	if (neednewpath) {
- 		pdata = aspath_prepend(a->aspath, rde_local_as(), 0, &plen);
- 		if (plen != 0)
- 			if (attr_writebuf(buf, ATTR_OPTIONAL|ATTR_TRANSITIVE,
--			    ATTR_AS4_PATH, pdata, plen) == -1)
-+			    ATTR_AS4_PATH, pdata, plen) == -1) {
-+				free(pdata);
- 				return (-1);
-+			}
- 		free(pdata);
- 	}
- 
-@@ -189,28 +244,26 @@ int
- mrt_dump_entry_mp(struct mrt *mrt, struct prefix *p, u_int16_t snum,
-     struct rde_peer *peer)
- {
--	struct buf	*buf, *hbuf = NULL, *h2buf = NULL;
--	void		*bptr;
-+	struct ibuf	*buf, *hbuf = NULL, *h2buf = NULL;
- 	struct bgpd_addr addr, nexthop, *nh;
- 	u_int16_t	 len;
--	u_int8_t	 p_len;
--	sa_family_t	 af;
-+	u_int8_t	 aid;
- 
--	if ((buf = buf_dynamic(0, MAX_PKTSIZE)) == NULL) {
--		log_warn("mrt_dump_entry_mp: buf_dynamic");
-+	if ((buf = ibuf_dynamic(0, MAX_PKTSIZE)) == NULL) {
-+		log_warn("mrt_dump_entry_mp: ibuf_dynamic");
- 		return (-1);
- 	}
- 
--	if (mrt_attr_dump(buf, p->aspath, NULL) == -1) {
-+	if (mrt_attr_dump(buf, p->aspath, NULL, 0) == -1) {
- 		log_warnx("mrt_dump_entry_mp: mrt_attr_dump error");
- 		goto fail;
- 	}
--	len = buf_size(buf);
-+	len = ibuf_size(buf);
- 
--	if ((h2buf = buf_dynamic(MRT_BGP4MP_IPv4_HEADER_SIZE +
-+	if ((h2buf = ibuf_dynamic(MRT_BGP4MP_IPv4_HEADER_SIZE +
- 	    MRT_BGP4MP_IPv4_ENTRY_SIZE, MRT_BGP4MP_IPv6_HEADER_SIZE +
- 	    MRT_BGP4MP_IPv6_ENTRY_SIZE + MRT_BGP4MP_MAX_PREFIXLEN)) == NULL) {
--		log_warn("mrt_dump_entry_mp: buf_dynamic");
-+		log_warn("mrt_dump_entry_mp: ibuf_dynamic");
- 		goto fail;
- 	}
- 
-@@ -219,25 +272,26 @@ mrt_dump_entry_mp(struct mrt *mrt, struc
- 	DUMP_SHORT(h2buf, /* ifindex */ 0);
- 
- 	/* XXX is this for peer self? */
--	af = peer->remote_addr.af == 0 ? p->prefix->af : peer->remote_addr.af;
--	switch (af) {
--	case AF_INET:
-+	aid = peer->remote_addr.aid == AID_UNSPEC ? p->prefix->aid :
-+	     peer->remote_addr.aid;
-+	switch (aid) {
-+	case AID_INET:
- 		DUMP_SHORT(h2buf, AFI_IPv4);
- 		DUMP_NLONG(h2buf, peer->local_v4_addr.v4.s_addr);
- 		DUMP_NLONG(h2buf, peer->remote_addr.v4.s_addr);
- 		break;
--	case AF_INET6:
-+	case AID_INET6:
- 		DUMP_SHORT(h2buf, AFI_IPv6);
--		if (buf_add(h2buf, &peer->local_v6_addr.v6,
-+		if (ibuf_add(h2buf, &peer->local_v6_addr.v6,
- 		    sizeof(struct in6_addr)) == -1 ||
--		    buf_add(h2buf, &peer->remote_addr.v6,
-+		    ibuf_add(h2buf, &peer->remote_addr.v6,
- 		    sizeof(struct in6_addr)) == -1) {
--			log_warnx("mrt_dump_entry_mp: buf_add error");
-+			log_warn("mrt_dump_entry_mp: ibuf_add error");
- 			goto fail;
- 		}
- 		break;
- 	default:
--		log_warnx("king bula found new AF %d in mrt_dump_entry_mp", af);
-+		log_warnx("king bula found new AF in mrt_dump_entry_mp");
- 		goto fail;
- 	}
- 
-@@ -247,25 +301,25 @@ mrt_dump_entry_mp(struct mrt *mrt, struc
- 
- 	if (p->aspath->nexthop == NULL) {
- 		bzero(&nexthop, sizeof(struct bgpd_addr));
--		nexthop.af = addr.af;
-+		nexthop.aid = addr.aid;
- 		nh = &nexthop;
- 	} else
- 		nh = &p->aspath->nexthop->exit_nexthop;
- 
- 	pt_getaddr(p->prefix, &addr);
--	switch (addr.af) {
--	case AF_INET:
-+	switch (addr.aid) {
-+	case AID_INET:
- 		DUMP_SHORT(h2buf, AFI_IPv4);	/* afi */
- 		DUMP_BYTE(h2buf, SAFI_UNICAST);	/* safi */
- 		DUMP_BYTE(h2buf, 4);		/* nhlen */
- 		DUMP_NLONG(h2buf, nh->v4.s_addr);	/* nexthop */
- 		break;
--	case AF_INET6:
-+	case AID_INET6:
- 		DUMP_SHORT(h2buf, AFI_IPv6);	/* afi */
- 		DUMP_BYTE(h2buf, SAFI_UNICAST);	/* safi */
- 		DUMP_BYTE(h2buf, 16);		/* nhlen */
--		if (buf_add(h2buf, &nh->v6, sizeof(struct in6_addr)) == -1) {
--			log_warnx("mrt_dump_entry_mp: buf_add error");
-+		if (ibuf_add(h2buf, &nh->v6, sizeof(struct in6_addr)) == -1) {
-+			log_warn("mrt_dump_entry_mp: ibuf_add error");
- 			goto fail;
- 		}
- 		break;
-@@ -274,35 +328,30 @@ mrt_dump_entry_mp(struct mrt *mrt, struc
- 		goto fail;
- 	}
- 
--	p_len = PREFIX_SIZE(p->prefix->prefixlen);
--	if ((bptr = buf_reserve(h2buf, p_len)) == NULL) {
--		log_warnx("mrt_dump_entry_mp: buf_reserve error");
--		goto fail;
--	}
--	if (prefix_write(bptr, p_len, &addr, p->prefix->prefixlen) == -1) {
--		log_warnx("mrt_dump_entry_mp: prefix_write error");
-+	if (prefix_writebuf(h2buf, &addr, p->prefix->prefixlen) == -1) {
-+		log_warn("mrt_dump_entry_mp: prefix_writebuf error");
- 		goto fail;
- 	}
- 
- 	DUMP_SHORT(h2buf, len);
--	len += buf_size(h2buf);
-+	len += ibuf_size(h2buf);
- 
- 	if (mrt_dump_hdr_rde(&hbuf, MSG_PROTOCOL_BGP4MP, BGP4MP_ENTRY,
- 	    len) == -1)
- 		goto fail;
- 
--	buf_close(&mrt->wbuf, hbuf);
--	buf_close(&mrt->wbuf, h2buf);
--	buf_close(&mrt->wbuf, buf);
-+	ibuf_close(&mrt->wbuf, hbuf);
-+	ibuf_close(&mrt->wbuf, h2buf);
-+	ibuf_close(&mrt->wbuf, buf);
- 
- 	return (len + MRT_HEADER_SIZE);
- 
- fail:
- 	if (hbuf)
--		buf_free(hbuf);
--	if (h2buf);
--		buf_free(h2buf);
--	buf_free(buf);
-+		ibuf_free(hbuf);
-+	if (h2buf)
-+		ibuf_free(h2buf);
-+	ibuf_free(buf);
- 	return (-1);
- }
- 
-@@ -310,34 +359,37 @@ int
- mrt_dump_entry(struct mrt *mrt, struct prefix *p, u_int16_t snum,
-     struct rde_peer *peer)
- {
--	struct buf	*buf, *hbuf;
-+	struct ibuf	*buf, *hbuf;
- 	struct bgpd_addr addr, *nh;
- 	size_t		 len;
-+	u_int16_t	 subtype;
-+	u_int8_t	 dummy;
- 
--	if (p->prefix->af != AF_INET && peer->remote_addr.af == AF_INET)
--		/* only able to dump IPv4 */
-+	if (p->prefix->aid != peer->remote_addr.aid &&
-+	    p->prefix->aid != AID_INET && p->prefix->aid != AID_INET6)
-+		/* only able to dump pure IPv4/IPv6 */
- 		return (0);
- 
--	if ((buf = buf_dynamic(0, MAX_PKTSIZE)) == NULL) {
--		log_warnx("mrt_dump_entry: buf_dynamic");
-+	if ((buf = ibuf_dynamic(0, MAX_PKTSIZE)) == NULL) {
-+		log_warn("mrt_dump_entry: ibuf_dynamic");
- 		return (-1);
- 	}
- 
- 	if (p->aspath->nexthop == NULL) {
- 		bzero(&addr, sizeof(struct bgpd_addr));
--		addr.af = AF_INET;
-+		addr.aid = p->prefix->aid;
- 		nh = &addr;
- 	} else
- 		nh = &p->aspath->nexthop->exit_nexthop;
--	if (mrt_attr_dump(buf, p->aspath, nh) == -1) {
-+	if (mrt_attr_dump(buf, p->aspath, nh, 0) == -1) {
- 		log_warnx("mrt_dump_entry: mrt_attr_dump error");
--		buf_free(buf);
-+		ibuf_free(buf);
- 		return (-1);
- 	}
--	len = buf_size(buf);
--
--	if (mrt_dump_hdr_rde(&hbuf, MSG_TABLE_DUMP, AFI_IPv4, len) == -1) {
--		buf_free(buf);
-+	len = ibuf_size(buf);
-+	aid2afi(p->prefix->aid, &subtype, &dummy);
-+	if (mrt_dump_hdr_rde(&hbuf, MSG_TABLE_DUMP, subtype, len) == -1) {
-+		ibuf_free(buf);
- 		return (-1);
- 	}
- 
-@@ -345,23 +397,241 @@ mrt_dump_entry(struct mrt *mrt, struct p
- 	DUMP_SHORT(hbuf, snum);
- 
- 	pt_getaddr(p->prefix, &addr);
--	DUMP_NLONG(hbuf, addr.v4.s_addr);
-+	switch (p->prefix->aid) {
-+	case AID_INET:
-+		DUMP_NLONG(hbuf, addr.v4.s_addr);
-+		break;
-+	case AID_INET6:
-+		if (ibuf_add(hbuf, &addr.v6, sizeof(struct in6_addr)) == -1) {
-+			log_warn("mrt_dump_entry: ibuf_add error");
-+			goto fail;
-+		}
-+		break;
-+	}
- 	DUMP_BYTE(hbuf, p->prefix->prefixlen);
- 
- 	DUMP_BYTE(hbuf, 1);		/* state */
- 	DUMP_LONG(hbuf, p->lastchange);	/* originated */
--	DUMP_NLONG(hbuf, peer->remote_addr.v4.s_addr);
-+	switch (p->prefix->aid) {
-+	case AID_INET:
-+		DUMP_NLONG(hbuf, peer->remote_addr.v4.s_addr);
-+		break;
-+	case AID_INET6:
-+		if (ibuf_add(hbuf, &peer->remote_addr.v6,
-+		    sizeof(struct in6_addr)) == -1) {
-+			log_warn("mrt_dump_entry: ibuf_add error");
-+			goto fail;
-+		}
-+		break;
-+	}
- 	DUMP_SHORT(hbuf, peer->short_as);
- 	DUMP_SHORT(hbuf, len);
- 
--	buf_close(&mrt->wbuf, hbuf);
--	buf_close(&mrt->wbuf, buf);
-+	ibuf_close(&mrt->wbuf, hbuf);
-+	ibuf_close(&mrt->wbuf, buf);
- 
- 	return (len + MRT_HEADER_SIZE);
- 
- fail:
--	buf_free(hbuf);
--	buf_free(buf);
-+	ibuf_free(hbuf);
-+	ibuf_free(buf);
-+	return (-1);
-+}
-+
-+int
-+mrt_dump_entry_v2(struct mrt *mrt, struct rib_entry *re, u_int32_t snum)
-+{
-+	struct ibuf	*buf, *hbuf = NULL;
-+	struct prefix	*p;
-+	struct bgpd_addr addr;
-+	size_t		 len, off;
-+	u_int16_t	 subtype, nump;
-+
-+	switch (re->prefix->aid) {
-+	case AID_INET:
-+		subtype = MRT_DUMP_V2_RIB_IPV4_UNICAST;
-+		break;
-+	case AID_INET6:
-+		subtype = MRT_DUMP_V2_RIB_IPV6_UNICAST;
-+		break;
-+	default:
-+		subtype = MRT_DUMP_V2_RIB_GENERIC;
-+		break;
-+	}
-+
-+	if ((buf = ibuf_dynamic(0, UINT_MAX)) == NULL) {
-+		log_warn("mrt_dump_entry: ibuf_dynamic");
-+		return (-1);
-+	}
-+
-+	DUMP_LONG(buf, snum);
-+	pt_getaddr(re->prefix, &addr);
-+	if (subtype == MRT_DUMP_V2_RIB_GENERIC) {
-+		u_int16_t afi;
-+		u_int8_t safi;
-+
-+		aid2afi(re->prefix->aid, &afi, &safi);
-+		DUMP_SHORT(buf, afi);
-+		DUMP_BYTE(buf, safi);
-+	}
-+	if (prefix_writebuf(buf, &addr, re->prefix->prefixlen) == -1) {
-+		log_warn("mrt_dump_entry_mp: prefix_writebuf error");
-+		goto fail;
-+	}
-+
-+	off = ibuf_size(buf);
-+	if (ibuf_reserve(buf, sizeof(nump)) == NULL) {
-+		log_warn("mrt_dump_v2_hdr: ibuf_reserve error");
-+		goto fail;
-+	}
-+	nump = 0;
-+	LIST_FOREACH(p, &re->prefix_h, rib_l) {
-+		struct bgpd_addr	*nh;
-+		struct ibuf		*tbuf;
-+
-+		if (p->aspath->nexthop == NULL) {
-+			bzero(&addr, sizeof(struct bgpd_addr));
-+			addr.aid = p->prefix->aid;
-+			nh = &addr;
-+		} else
-+			nh = &p->aspath->nexthop->exit_nexthop;
-+
-+		DUMP_SHORT(buf, p->aspath->peer->mrt_idx);
-+		DUMP_LONG(buf, p->lastchange); /* originated */
-+
-+		if ((tbuf = ibuf_dynamic(0, MAX_PKTSIZE)) == NULL) {
-+			log_warn("mrt_dump_entry_v2: ibuf_dynamic");
-+			return (-1);
-+		}
-+		if (mrt_attr_dump(tbuf, p->aspath, nh, 1) == -1) {
-+			log_warnx("mrt_dump_entry_v2: mrt_attr_dump error");
-+			ibuf_free(buf);
-+			return (-1);
-+		}
-+		len = ibuf_size(tbuf);
-+		DUMP_SHORT(buf, (u_int16_t)len);
-+		if (ibuf_add(buf, tbuf->buf, ibuf_size(tbuf)) == -1) {
-+			log_warn("mrt_dump_entry_v2: ibuf_add error");
-+			ibuf_free(tbuf);
-+			return (-1);
-+		}
-+		ibuf_free(tbuf);
-+		nump++;
-+	}
-+	nump = htons(nump);
-+	memcpy(ibuf_seek(buf, off, sizeof(nump)), &nump, sizeof(nump));
-+
-+	len = ibuf_size(buf);
-+	if (mrt_dump_hdr_rde(&hbuf, MSG_TABLE_DUMP_V2, subtype, len) == -1) {
-+		ibuf_free(buf);
-+		return (-1);
-+	}
-+
-+	ibuf_close(&mrt->wbuf, hbuf);
-+	ibuf_close(&mrt->wbuf, buf);
-+
-+	return (0);
-+fail:
-+	if (hbuf)
-+		ibuf_free(hbuf);
-+	ibuf_free(buf);
-+	return (-1);
-+}
-+
-+int
-+mrt_dump_v2_hdr(struct mrt *mrt, struct bgpd_config *conf,
-+    struct rde_peer_head *ph)
-+{
-+	struct rde_peer	*peer;
-+	struct ibuf	*buf, *hbuf = NULL;
-+	size_t		 len, off;
-+	u_int16_t	 nlen, nump;
-+
-+	if ((buf = ibuf_dynamic(0, UINT_MAX)) == NULL) {
-+		log_warn("mrt_dump_v2_hdr: ibuf_dynamic");
-+		return (-1);
-+	}
-+
-+	DUMP_NLONG(buf, conf->bgpid);
-+	nlen = strlen(mrt->rib);
-+	if (nlen > 0)
-+		nlen += 1;
-+	DUMP_SHORT(buf, nlen);
-+	if (ibuf_add(buf, mrt->rib, nlen) == -1) {
-+		log_warn("mrt_dump_v2_hdr: ibuf_add error");
-+		goto fail;
-+	}
-+
-+	off = ibuf_size(buf);
-+	if (ibuf_reserve(buf, sizeof(nump)) == NULL) {
-+		log_warn("mrt_dump_v2_hdr: ibuf_reserve error");
-+		goto fail;
-+	}
-+	nump = 0;
-+	LIST_FOREACH(peer, ph, peer_l) {
-+		peer->mrt_idx = nump;
-+		if (mrt_dump_peer(buf, peer) == -1)
-+			goto fail;
-+		nump++;
-+	}
-+	nump = htons(nump);
-+	memcpy(ibuf_seek(buf, off, sizeof(nump)), &nump, sizeof(nump));
-+
-+	len = ibuf_size(buf);
-+	if (mrt_dump_hdr_rde(&hbuf, MSG_TABLE_DUMP_V2,
-+	    MRT_DUMP_V2_PEER_INDEX_TABLE, len) == -1)
-+		goto fail;
-+
-+	ibuf_close(&mrt->wbuf, hbuf);
-+	ibuf_close(&mrt->wbuf, buf);
-+
-+	return (0);
-+fail:
-+	if (hbuf)
-+		ibuf_free(hbuf);
-+	ibuf_free(buf);
-+	return (-1);
-+}
-+
-+int
-+mrt_dump_peer(struct ibuf *buf, struct rde_peer *peer)
-+{
-+	u_int8_t	type = 0;
-+
-+	if (peer->capa.as4byte)
-+		type |= MRT_DUMP_V2_PEER_BIT_A;
-+	if (peer->remote_addr.aid == AID_INET6)
-+		type |= MRT_DUMP_V2_PEER_BIT_I;
-+
-+	DUMP_BYTE(buf, type);
-+	DUMP_LONG(buf, peer->remote_bgpid);
-+
-+	switch (peer->remote_addr.aid) {
-+	case AID_INET:
-+		DUMP_NLONG(buf, peer->remote_addr.v4.s_addr);
-+		break;
-+	case AID_INET6:
-+		if (ibuf_add(buf, &peer->remote_addr.v6,
-+		    sizeof(struct in6_addr)) == -1) {
-+			log_warn("mrt_dump_peer: ibuf_add error");
-+			goto fail;
-+		}
-+		break;
-+	case AID_UNSPEC: /* XXX special handling for peer_self? */
-+		DUMP_NLONG(buf, 0);
-+		break;
-+	default:
-+		log_warnx("king bula found new AF in mrt_dump_entry_mp");
-+		goto fail;
-+	}
-+
-+	if (peer->capa.as4byte)
-+		DUMP_LONG(buf, peer->conf.remote_as);
-+	else
-+		DUMP_SHORT(buf, peer->short_as);
-+
-+	return (0);
-+fail:
- 	return (-1);
- }
- 
-@@ -371,6 +641,11 @@ mrt_dump_upcall(struct rib_entry *re, vo
- 	struct mrt		*mrtbuf = ptr;
- 	struct prefix		*p;
- 
-+	if (mrtbuf->type == MRT_TABLE_DUMP_V2) {
-+		mrt_dump_entry_v2(mrtbuf, re, mrtbuf->seqnum++);
-+		return;
-+	}
-+
- 	/*
- 	 * dump all prefixes even the inactive ones. That is the way zebra
- 	 * dumps the table so we do the same. If only the active route should
-@@ -387,7 +662,7 @@ mrt_dump_upcall(struct rib_entry *re, vo
- }
- 
- void
--mrt_dump_done(void *ptr)
-+mrt_done(void *ptr)
- {
- 	struct mrt		*mrtbuf = ptr;
- 
-@@ -395,14 +670,14 @@ mrt_dump_done(void *ptr)
- }
- 
- int
--mrt_dump_hdr_se(struct buf ** bp, struct peer *peer, u_int16_t type,
-+mrt_dump_hdr_se(struct ibuf ** bp, struct peer *peer, u_int16_t type,
-     u_int16_t subtype, u_int32_t len, int swap)
- {
- 	time_t	 	now;
- 
--	if ((*bp = buf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE +
-+	if ((*bp = ibuf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE +
- 	    MRT_BGP4MP_AS4_IPv6_HEADER_SIZE + len)) == NULL) {
--		log_warnx("mrt_dump_hdr_se: buf_open error");
-+		log_warn("mrt_dump_hdr_se: ibuf_dynamic error");
- 		return (-1);
- 	}
- 
-@@ -468,23 +743,23 @@ mrt_dump_hdr_se(struct buf ** bp, struct
- 	case AF_INET6:
- 		DUMP_SHORT(*bp, AFI_IPv6);
- 		if (!swap)
--			if (buf_add(*bp, &((struct sockaddr_in6 *)
-+			if (ibuf_add(*bp, &((struct sockaddr_in6 *)
- 			    &peer->sa_local)->sin6_addr,
- 			    sizeof(struct in6_addr)) == -1) {
--				log_warnx("mrt_dump_hdr_se: buf_add error");
-+				log_warn("mrt_dump_hdr_se: ibuf_add error");
- 				goto fail;
- 			}
--		if (buf_add(*bp,
-+		if (ibuf_add(*bp,
- 		    &((struct sockaddr_in6 *)&peer->sa_remote)->sin6_addr,
- 		    sizeof(struct in6_addr)) == -1) {
--			log_warnx("mrt_dump_hdr_se: buf_add error");
-+			log_warn("mrt_dump_hdr_se: ibuf_add error");
- 			goto fail;
- 		}
- 		if (swap)
--			if (buf_add(*bp, &((struct sockaddr_in6 *)
-+			if (ibuf_add(*bp, &((struct sockaddr_in6 *)
- 			    &peer->sa_local)->sin6_addr,
- 			    sizeof(struct in6_addr)) == -1) {
--				log_warnx("mrt_dump_hdr_se: buf_add error");
-+				log_warn("mrt_dump_hdr_se: ibuf_add error");
- 				goto fail;
- 			}
- 		break;
-@@ -493,20 +768,20 @@ mrt_dump_hdr_se(struct buf ** bp, struct
- 	return (0);
- 
- fail:
--	buf_free(*bp);
-+	ibuf_free(*bp);
- 	return (-1);
- }
- 
- int
--mrt_dump_hdr_rde(struct buf **bp, u_int16_t type, u_int16_t subtype,
-+mrt_dump_hdr_rde(struct ibuf **bp, u_int16_t type, u_int16_t subtype,
-     u_int32_t len)
- {
- 	time_t		 now;
- 
--	if ((*bp = buf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE +
-+	if ((*bp = ibuf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE +
- 	    MRT_BGP4MP_AS4_IPv6_HEADER_SIZE + MRT_BGP4MP_IPv6_ENTRY_SIZE)) ==
- 	    NULL) {
--		log_warnx("mrt_dump_hdr_rde: buf_dynamic error");
-+		log_warn("mrt_dump_hdr_rde: ibuf_dynamic error");
- 		return (-1);
- 	}
- 
-@@ -517,19 +792,28 @@ mrt_dump_hdr_rde(struct buf **bp, u_int1
- 
- 	switch (type) {
- 	case MSG_TABLE_DUMP:
--		DUMP_LONG(*bp, MRT_DUMP_HEADER_SIZE + len);
-+		switch (subtype) {
-+		case AFI_IPv4:
-+			len += MRT_DUMP_HEADER_SIZE;
-+			break;
-+		case AFI_IPv6:
-+			len += MRT_DUMP_HEADER_SIZE_V6;
-+			break;
-+		}
-+		DUMP_LONG(*bp, len);
- 		break;
- 	case MSG_PROTOCOL_BGP4MP:
-+	case MSG_TABLE_DUMP_V2:
- 		DUMP_LONG(*bp, len);
- 		break;
- 	default:
- 		log_warnx("mrt_dump_hdr_rde: unsupported type");
- 		goto fail;
--	}	
-+	}
- 	return (0);
- 
- fail:
--	buf_free(*bp);
-+	ibuf_free(*bp);
- 	return (-1);
- }
- 
-@@ -538,21 +822,22 @@ mrt_write(struct mrt *mrt)
- {
- 	int	r;
- 
--	if ((r = buf_write(&mrt->wbuf)) < 0) {
-+	if ((r = ibuf_write(&mrt->wbuf)) < 0) {
- 		log_warn("mrt dump aborted, mrt_write");
- 		mrt_clean(mrt);
-+		mrt_done(mrt);
- 	}
- }
- 
- void
- mrt_clean(struct mrt *mrt)
- {
--	struct buf	*b;
-+	struct ibuf	*b;
- 
- 	close(mrt->wbuf.fd);
- 	while ((b = TAILQ_FIRST(&mrt->wbuf.bufs))) {
- 		TAILQ_REMOVE(&mrt->wbuf.bufs, b, entry);
--		buf_free(b);
-+		ibuf_free(b);
- 	}
- 	mrt->wbuf.queued = 0;
- }
-@@ -590,7 +875,8 @@ mrt_open(struct mrt *mrt, time_t now)
- 	else
- 		type = IMSG_MRT_REOPEN;
- 
--	if (mrt->type == MRT_TABLE_DUMP || mrt->type == MRT_TABLE_DUMP_MP)
-+	if (mrt->type == MRT_TABLE_DUMP || mrt->type == MRT_TABLE_DUMP_MP ||
-+	    mrt->type == MRT_TABLE_DUMP_V2)
- 		i = 0;
- 
- 	if (imsg_compose(mrt_imsgbuf[i], type, 0, 0, fd,
-@@ -659,7 +945,9 @@ mrt_handler(struct mrt_head *mrt)
- 	LIST_FOREACH(m, mrt, entry) {
- 		if (m->state == MRT_STATE_RUNNING &&
- 		    (MRT2MC(m)->ReopenTimerInterval != 0 ||
--		     m->type == MRT_TABLE_DUMP)) {
-+		     m->type == MRT_TABLE_DUMP ||
-+		     m->type == MRT_TABLE_DUMP_MP ||
-+		     m->type == MRT_TABLE_DUMP_V2)) {
- 			if (mrt_open(m, now) == -1)
- 				continue;
- 			MRT2MC(m)->ReopenTimer =
diff --git a/net/openbgpd/files/patch-bgpd_mrt.h b/net/openbgpd/files/patch-bgpd_mrt.h
deleted file mode 100644
index 0c9d835f5b78..000000000000
--- a/net/openbgpd/files/patch-bgpd_mrt.h
+++ /dev/null
@@ -1,287 +0,0 @@
-Index: bgpd/mrt.h
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/mrt.h,v
-retrieving revision 1.1.1.6
-retrieving revision 1.1.1.9
-diff -u -p -r1.1.1.6 -r1.1.1.9
---- bgpd/mrt.h	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ bgpd/mrt.h	13 Oct 2012 18:22:43 -0000	1.1.1.9
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: mrt.h,v 1.23 2009/06/29 12:22:16 claudio Exp $ */
-+/*	$OpenBSD: mrt.h,v 1.30 2011/09/18 09:31:25 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -18,12 +18,10 @@
- #ifndef __MRT_H__
- #define __MRT_H__
- 
--#include "bgpd.h"
--
- /*
-  * MRT binary packet format
-  * For more info see:
-- * draft-ietf-grow-mrt-04.txt, "MRT routing information export format"
-+ * draft-ietf-grow-mrt-11.txt, "MRT routing information export format"
-  * http://www.quagga.net/docs/docs-multi/Packet-Binary-Dump-Format.html
-  */
- 
-@@ -37,11 +35,18 @@
-  * |               length              | length of packet excluding this header
-  * +--------+--------+--------+--------+
-  *
-- * ET types include an additional 32bit microsecond field comming after the
-- * length field.
-+ * ET types include an additional 32bit microsecond field coming after the
-+ * length field. Which is accounted in the length field.
-  */
- #define MRT_HEADER_SIZE		12
- 
-+struct mrt_hdr {
-+	u_int32_t	timestamp;
-+	u_int16_t	type;
-+	u_int16_t	subtype;
-+	u_int32_t	length;
-+} __packed;
-+
- enum MRT_MSG_TYPES {
- 	MSG_NULL,		/*  0 empty msg (deprecated) */
- 	MSG_START,		/*  1 sender is starting up */
-@@ -70,13 +75,15 @@ enum MRT_MSG_TYPES {
-  * that are normaly saved as MSG_TABLE_DUMP.
-  * In most cases this is the format to choose to dump updates et al.
-  */
--enum MRT_BGP4MP_TYPES {
-+enum MRT_BGP4MP_SUBTYPES {
- 	BGP4MP_STATE_CHANGE,	/* state change */
- 	BGP4MP_MESSAGE,		/* bgp message */
- 	BGP4MP_ENTRY,		/* table dumps (deprecated) */
- 	BGP4MP_SNAPSHOT,	/* file name for dump (deprecated) */
-+	BGP4MP_MESSAGE_AS4,	/* same as BGP4MP_MESSAGE with 4byte AS */
- 	BGP4MP_STATE_CHANGE_AS4,
--	BGP4MP_MESSAGE_AS4	/* same as BGP4MP_MESSAGE with 4byte AS */
-+	BGP4MP_MESSAGE_LOCAL,	  /* same as BGP4MP_MESSAGE but for self */
-+	BGP4MP_MESSAGE_AS4_LOCAL  /* originated updates. Not implemented */
- };
- 
- /* size of the BGP4MP headers without payload */
-@@ -104,6 +111,7 @@ enum MRT_BGP4MP_TYPES {
-  *
-  * The source_ip and dest_ip are dependant of the afi type. For IPv6 source_ip
-  * and dest_ip are both 16 bytes long.
-+ * For the AS4 types the source_as and dest_as numbers are both 4 bytes long.
-  *
-  * Payload of a BGP4MP_STATE_CHANGE packet:
-  *
-@@ -155,6 +163,98 @@ enum MRT_BGP4MP_TYPES {
-  */
- 
- /*
-+ * New MRT dump format MSG_TABLE_DUMP_V2, the dump is implemented with
-+ * sub-tables for peers and NLRI entries just use the index into the peer
-+ * table.
-+ */
-+enum MRT_DUMP_V2_SUBTYPES {
-+	MRT_DUMP_V2_PEER_INDEX_TABLE=1,
-+	MRT_DUMP_V2_RIB_IPV4_UNICAST=2,
-+	MRT_DUMP_V2_RIB_IPV4_MULTICAST=3,
-+	MRT_DUMP_V2_RIB_IPV6_UNICAST=4,
-+	MRT_DUMP_V2_RIB_IPV6_MULTICAST=5,
-+	MRT_DUMP_V2_RIB_GENERIC=6
-+};
-+
-+/*
-+ * Format of the MRT_DUMP_V2_PEER_INDEX_TABLE:
-+ * If there is no view_name, view_name_len must be set to 0
-+ *
-+ * +--------+--------+--------+--------+
-+ * |         collector_bgp_id          |
-+ * +--------+--------+--------+--------+
-+ * |  view_name_len  |    view_name
-+ * +--------+--------+--------+--------+
-+ *        view_name (variable) ...     |
-+ * +--------+--------+--------+--------+
-+ * |   peer_count    |   peer_entries
-+ * +--------+--------+--------+--------+
-+ *       peer_entries (variable) ...
-+ * +--------+--------+--------+--------+
-+ *
-+ * The format of a peer_entry is the following:
-+ *
-+ * +--------+
-+ * |  type  |    
-+ * +--------+--------+--------+--------+
-+ * |            peer_bgp_id            |
-+ * +--------+--------+--------+--------+
-+ * |       peer_ip_addr (variable)     |
-+ * +--------+--------+--------+--------+
-+ * |            peer_as (variable)     |
-+ * +--------+--------+--------+--------+
-+ *
-+ * The message is packed a bit strangely. The type byte defines what size
-+ * the peer addr and peer AS have.
-+ * The position of a peer in the PEER_INDEX_TABLE is used as the index for
-+ * the other messages.
-+ */
-+#define MRT_DUMP_V2_PEER_BIT_I	0x1	/* set for IPv6 addrs */
-+#define MRT_DUMP_V2_PEER_BIT_A	0x2	/* set for 32 bits AS number */
-+
-+/*
-+ * AFI/SAFI specific RIB Subtypes are special to save a few bytes.
-+ * 
-+ * +--------+--------+--------+--------+
-+ * |              seq_num              |
-+ * +--------+--------+--------+--------+
-+ * |  plen  |  prefix (variable)
-+ * +--------+--------+--------+--------+
-+ * |     #entry      | rib entries (variable)
-+ * +--------+--------+--------+--------+
-+ *
-+ * The RIB_GENERIC subtype is needed for the less common AFI/SAFI pairs
-+ *
-+ * +--------+--------+--------+--------+
-+ * |              seq_num              |
-+ * +--------+--------+--------+--------+
-+ * |       AFI       |  SAFI  |  NLRI
-+ * +--------+--------+--------+--------+
-+ *     NLRI (variable) ...
-+ * +--------+--------+--------+--------+
-+ * |     #entry      | rib entries (variable)
-+ * +--------+--------+--------+--------+
-+ */
-+
-+/*
-+ * The RIB entries have the following form.
-+ *
-+ * +--------+--------+
-+ * |   peer index    |
-+ * +--------+--------+--------+--------+
-+ * |          originated_time          |
-+ * +--------+--------+--------+--------+
-+ * |    attr_len     |   bgp_attrs
-+ * +--------+--------+--------+--------+
-+ *      bgp_attrs (variable) ...
-+ * +--------+--------+--------+--------+
-+ *
-+ * Some BGP path attributes need special encoding:
-+ *  - the AS_PATH attribute MUST be encoded as 4-Byte AS
-+ *  - the MP_REACH_NLRI only consists of the nexthop len and nexthop address
-+ */
-+
-+/*
-  * Format for routing table dumps in "old" mrt format.
-  * Type MSG_TABLE_DUMP and subtype is AFI_IPv4 (1) for IPv4 and AFI_IPv6 (2)
-  * for IPv6. In the IPv6 case prefix and peer_ip are both 16 bytes long.
-@@ -182,8 +282,14 @@ enum MRT_BGP4MP_TYPES {
-  * The status field is unused and should be set to 1.
-  */
- 
-+enum MRT_DUMP_SUBTYPES {
-+	MRT_DUMP_AFI_IP=1,
-+	MRT_DUMP_AFI_IPv6=2
-+};
-+
- /* size of the dump header until attr_len */
- #define MRT_DUMP_HEADER_SIZE	22
-+#define MRT_DUMP_HEADER_SIZE_V6	46
- 
- /*
-  * OLD MRT message headers. These structs are here for completion but
-@@ -192,7 +298,7 @@ enum MRT_BGP4MP_TYPES {
-  * Only for bgp messages (type 5, 9 and 10)
-  * Nota bene for bgp dumps MSG_PROTOCOL_BGP4MP should be used.
-  */
--enum MRT_BGP_TYPES {
-+enum MRT_BGP_SUBTYPES {
- 	MSG_BGP_NULL,
- 	MSG_BGP_UPDATE,		/* raw update packet (contains both withdraws
- 				   and announcements) */
-@@ -221,10 +327,8 @@ enum MRT_BGP_TYPES {
-  *
-  * For IPv6 the type is MSG_PROTOCOL_BGP4PLUS and the subtype remains
-  * MSG_BGP_UPDATE. The source_ip and dest_ip are again extended to 16 bytes.
-- */
--
--/*
-- * For subtype MSG_BGP_STATECHANGE (for all BGP types or just for the
-+ *
-+ * For subtype MSG_BGP_STATE_CHANGE (for all BGP types or just for the
-  * MSG_PROTOCOL_BGP4PLUS case? Unclear.)
-  *
-  * +--------+--------+--------+--------+
-@@ -235,7 +339,7 @@ enum MRT_BGP_TYPES {
-  * |    new_state    |
-  * +--------+--------+
-  *
-- * State are defined in RFC 1771.
-+ * States are defined in RFC 1771/4271.
-  */
- 
- /*
-@@ -251,66 +355,4 @@ enum MRT_BGP_TYPES {
-  *    terminated ... |   0    |
-  * +--------+--------+--------+
-  */
--
--#define	MRT_FILE_LEN	512
--enum mrt_type {
--	MRT_NONE,
--	MRT_TABLE_DUMP,
--	MRT_TABLE_DUMP_MP,
--	MRT_ALL_IN,
--	MRT_ALL_OUT,
--	MRT_UPDATE_IN,
--	MRT_UPDATE_OUT
--};
--
--enum mrt_state {
--	MRT_STATE_RUNNING,
--	MRT_STATE_OPEN,
--	MRT_STATE_REOPEN,
--	MRT_STATE_REMOVE
--};
--
--struct mrt {
--	char			rib[PEER_DESCR_LEN];
--	struct msgbuf		wbuf;
--	LIST_ENTRY(mrt)		entry;
--	u_int32_t		peer_id;
--	u_int32_t		group_id;
--	enum mrt_type		type;
--	enum mrt_state		state;
--	u_int16_t		seqnum;
--};
--
--struct mrt_config {
--	struct mrt		conf;
--	char			name[MRT_FILE_LEN];	/* base file name */
--	char			file[MRT_FILE_LEN];	/* actual file name */
--	time_t			ReopenTimer;
--	time_t			ReopenTimerInterval;
--};
--
--#define	MRT2MC(x)	((struct mrt_config *)(x))
--#define	MRT_MAX_TIMEOUT	7200
--
--struct peer;
--struct prefix;
--struct rib_entry;
--
--/* prototypes */
--void		 mrt_dump_bgp_msg(struct mrt *, void *, u_int16_t,
--		     struct peer *);
--void		 mrt_dump_state(struct mrt *, u_int16_t, u_int16_t,
--		     struct peer *);
--void		 mrt_clear_seq(void);
--void		 mrt_dump_upcall(struct rib_entry *, void *);
--void		 mrt_dump_done(void *);
--void		 mrt_write(struct mrt *);
--void		 mrt_clean(struct mrt *);
--void		 mrt_init(struct imsgbuf *, struct imsgbuf *);
--int		 mrt_timeout(struct mrt_head *);
--void		 mrt_reconfigure(struct mrt_head *);
--void		 mrt_handler(struct mrt_head *);
--struct mrt	*mrt_get(struct mrt_head *, struct mrt *);
--int		 mrt_mergeconfig(struct mrt_head *, struct mrt_head *);
--
- #endif
diff --git a/net/openbgpd/files/patch-bgpd_name2id.c b/net/openbgpd/files/patch-bgpd_name2id.c
deleted file mode 100644
index bf6cfbd067a8..000000000000
--- a/net/openbgpd/files/patch-bgpd_name2id.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: bgpd/name2id.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/name2id.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.1.1.3
-diff -u -p -r1.1.1.2 -r1.1.1.3
---- bgpd/name2id.c	9 Jul 2009 16:49:54 -0000	1.1.1.2
-+++ bgpd/name2id.c	13 Oct 2012 18:22:43 -0000	1.1.1.3
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: name2id.c,v 1.9 2009/06/04 04:46:42 claudio Exp $ */
-+/*	$OpenBSD: name2id.c,v 1.8 2009/05/17 12:25:15 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2004, 2005 Henning Brauer <henning@openbsd.org>
diff --git a/net/openbgpd/files/patch-bgpd_parse.y b/net/openbgpd/files/patch-bgpd_parse.y
deleted file mode 100644
index 0f9160187aac..000000000000
--- a/net/openbgpd/files/patch-bgpd_parse.y
+++ /dev/null
@@ -1,1626 +0,0 @@
-Index: bgpd/parse.y
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/parse.y,v
-retrieving revision 1.1.1.8
-retrieving revision 1.12
-diff -u -p -r1.1.1.8 -r1.12
---- bgpd/parse.y	14 Feb 2010 20:19:57 -0000	1.1.1.8
-+++ bgpd/parse.y	8 Dec 2012 20:17:59 -0000	1.12
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: parse.y,v 1.231 2009/06/06 01:10:29 claudio Exp $ */
-+/*	$OpenBSD: parse.y,v 1.264 2012/09/23 09:39:17 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -25,7 +25,10 @@
- #include <sys/stat.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--
-+#if !defined(__FreeBSD__) /* FreeBSD has no mpls support. */
-+#include <netmpls/mpls.h>
-+#endif
-+	
- #include <ctype.h>
- #include <err.h>
- #include <unistd.h>
-@@ -33,6 +36,9 @@
- #include <limits.h>
- #include <stdarg.h>
- #include <stdio.h>
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#endif
- #include <string.h>
- #include <syslog.h>
- 
-@@ -74,10 +80,12 @@ char		*symget(const char *);
- 
- static struct bgpd_config	*conf;
- static struct mrt_head		*mrtconf;
--static struct network_head	*netconf;
-+static struct network_head	*netconf, *gnetconf;
- static struct peer		*peer_l, *peer_l_old;
- static struct peer		*curpeer;
- static struct peer		*curgroup;
-+static struct rdomain		*currdom;
-+static struct rdomain_head	*rdom_l;
- static struct filter_head	*filter_l;
- static struct filter_head	*peerfilter_l;
- static struct filter_head	*groupfilter_l;
-@@ -105,7 +113,7 @@ struct filter_match_l {
- 	struct filter_match	 m;
- 	struct filter_prefix_l	*prefix_l;
- 	struct filter_as_l	*as_l;
--	sa_family_t		 af;
-+	u_int8_t		 aid;
- } fmopts;
- 
- struct peer	*alloc_peer(void);
-@@ -113,8 +121,8 @@ struct peer	*new_peer(void);
- struct peer	*new_group(void);
- int		 add_mrtconfig(enum mrt_type, char *, time_t, struct peer *,
- 		    char *);
--int		 add_rib(char *, u_int16_t);
--int		 find_rib(char *);
-+int		 add_rib(char *, u_int, u_int16_t);
-+struct rde_rib	*find_rib(char *);
- int		 get_id(struct peer *);
- int		 expand_rule(struct filter_rule *, struct filter_peers_l *,
- 		    struct filter_match_l *, struct filter_set_head *);
-@@ -123,12 +131,14 @@ int		 neighbor_consistent(struct peer *)
- int		 merge_filterset(struct filter_set_head *, struct filter_set *);
- void		 copy_filterset(struct filter_set_head *,
- 		    struct filter_set_head *);
--void		 move_filterset(struct filter_set_head *,
--		    struct filter_set_head *);
- struct filter_rule	*get_rule(enum action_types);
- 
- int		 getcommunity(char *);
--int		 parsecommunity(char *, int *, int *);
-+int		 parsecommunity(struct filter_community *, char *);
-+int		 parsesubtype(char *);
-+int		 parseextvalue(char *, u_int32_t *);
-+int		 parseextcommunity(struct filter_extcommunity *, char *,
-+		    char *);
- 
- typedef struct {
- 	union {
-@@ -159,29 +169,33 @@ typedef struct {
- %}
- 
- %token	AS ROUTERID HOLDTIME YMIN LISTEN ON FIBUPDATE RTABLE
-+%token	RDOMAIN RD EXPORTTRGT IMPORTTRGT
- %token	RDE RIB EVALUATE IGNORE COMPARE
- %token	GROUP NEIGHBOR NETWORK
--%token	REMOTEAS DESCR LOCALADDR MULTIHOP PASSIVE MAXPREFIX RESTART
--%token	ANNOUNCE DEMOTE CONNECTRETRY
--%token	ENFORCE NEIGHBORAS CAPABILITIES REFLECTOR DEPEND DOWN SOFTRECONFIG
--%token	DUMP IN OUT
-+%token	REMOTEAS DESCR LLIFACE LOCALADDR MULTIHOP PASSIVE MAXPREFIX RESTART
-+%token	ANNOUNCE CAPABILITIES REFRESH AS4BYTE CONNECTRETRY
-+%token	DEMOTE ENFORCE NEIGHBORAS REFLECTOR DEPEND DOWN SOFTRECONFIG
-+%token	DUMP IN OUT SOCKET RESTRICTED
- %token	LOG ROUTECOLL TRANSPARENT
- %token	TCP MD5SIG PASSWORD KEY TTLSECURITY
- %token	ALLOW DENY MATCH
- %token	QUICK
- %token	FROM TO ANY
- %token	CONNECTED STATIC
--%token	PREFIX PREFIXLEN SOURCEAS TRANSITAS PEERAS COMMUNITY DELETE
-+%token	COMMUNITY EXTCOMMUNITY
-+%token	PREFIX PREFIXLEN SOURCEAS TRANSITAS PEERAS DELETE MAXASLEN MAXASSEQ
- %token	SET LOCALPREF MED METRIC NEXTHOP REJECT BLACKHOLE NOMODIFY SELF
--%token	PREPEND_SELF PREPEND_PEER PFTABLE WEIGHT RTLABEL
-+%token	PREPEND_SELF PREPEND_PEER PFTABLE WEIGHT RTLABEL ORIGIN
- %token	ERROR INCLUDE
- %token	IPSEC ESP AH SPI IKE
- %token	IPV4 IPV6
- %token	QUALIFY VIA
-+%token	NE LE GE XRANGE
- %token	<v.string>		STRING
- %token	<v.number>		NUMBER
--%type	<v.number>		asnumber as4number optnumber yesno inout
--%type	<v.number>		espah family restart
-+%type	<v.number>		asnumber as4number optnumber
-+%type	<v.number>		espah family restart origincode nettype
-+%type	<v.number>		yesno inout restricted
- %type	<v.string>		string filter_rib
- %type	<v.addr>		address
- %type	<v.prefix>		prefix addrspec
-@@ -204,6 +218,7 @@ grammar		: /* empty */
- 		| grammar include '\n'
- 		| grammar conf_main '\n'
- 		| grammar varset '\n'
-+		| grammar rdomain '\n'
- 		| grammar neighbor '\n'
- 		| grammar group '\n'
- 		| grammar filterrule '\n'
-@@ -211,8 +226,12 @@ grammar		: /* empty */
- 		;
- 
- asnumber	: NUMBER			{
--			if ($1 < 0 || $1 >= ASNUM_MAX) {
--				yyerror("AS too big: max %u", ASNUM_MAX - 1);
-+			/*
-+			 * Accroding to iana 65535 and 4294967295 are reserved
-+			 * but enforcing this is not duty of the parser.
-+			 */
-+			if ($1 < 0 || $1 > UINT_MAX) {
-+				yyerror("AS too big: max %u", UINT_MAX);
- 				YYERROR;
- 			}
- 		}
-@@ -274,6 +293,8 @@ yesno		:  STRING			{
- 			else if (!strcmp($1, "no"))
- 				$$ = 0;
- 			else {
-+				yyerror("syntax error, "
-+				    "either yes or no expected");
- 				free($1);
- 				YYERROR;
- 			}
-@@ -318,7 +339,7 @@ conf_main	: AS as4number		{
- 			conf->short_as = $3;
- 		}
- 		| ROUTERID address		{
--			if ($2.af != AF_INET) {
-+			if ($2.aid != AID_INET) {
- 				yyerror("router-id must be an IPv4 address");
- 				YYERROR;
- 			}
-@@ -342,42 +363,25 @@ conf_main	: AS as4number		{
- 		}
- 		| LISTEN ON address	{
- 			struct listen_addr	*la;
--			struct sockaddr_in	*in;
--			struct sockaddr_in6	*in6;
- 
- 			if ((la = calloc(1, sizeof(struct listen_addr))) ==
- 			    NULL)
- 				fatal("parse conf_main listen on calloc");
- 
- 			la->fd = -1;
--			la->sa.ss_family = $3.af;
--			switch ($3.af) {
--			case AF_INET:
--				la->sa.ss_len = sizeof(struct sockaddr_in);
--				in = (struct sockaddr_in *)&la->sa;
--				in->sin_addr.s_addr = $3.v4.s_addr;
--				in->sin_port = htons(BGP_PORT);
--				break;
--			case AF_INET6:
--				la->sa.ss_len = sizeof(struct sockaddr_in6);
--				in6 = (struct sockaddr_in6 *)&la->sa;
--				memcpy(&in6->sin6_addr, &$3.v6,
--				    sizeof(in6->sin6_addr));
--				in6->sin6_port = htons(BGP_PORT);
--				break;
--			default:
--				yyerror("king bula does not like family %u",
--				    $3.af);
--				YYERROR;
--			}
--
-+			memcpy(&la->sa, addr2sa(&$3, BGP_PORT), sizeof(la->sa));
- 			TAILQ_INSERT_TAIL(listen_addrs, la, entry);
- 		}
- 		| FIBUPDATE yesno		{
-+			struct rde_rib *rr;
-+			rr = find_rib("Loc-RIB");
-+			if (rr == NULL)
-+				fatalx("RTABLE can not find the main RIB!");
-+
- 			if ($2 == 0)
--				conf->flags |= BGPD_FLAG_NO_FIB_UPDATE;
-+				rr->flags |= F_RIB_NOFIBSYNC;
- 			else
--				conf->flags &= ~BGPD_FLAG_NO_FIB_UPDATE;
-+				rr->flags &= ~F_RIB_NOFIBSYNC;
- 		}
- 		| ROUTECOLL yesno	{
- 			if ($2 == 1)
-@@ -386,7 +390,7 @@ conf_main	: AS as4number		{
- 				conf->flags &= ~BGPD_FLAG_NO_EVALUATE;
- 		}
- 		| RDE RIB STRING {
--			if (add_rib($3, F_RIB_NOFIB)) {
-+			if (add_rib($3, 0, F_RIB_NOFIB)) {
- 				free($3);
- 				YYERROR;
- 			}
-@@ -395,9 +399,27 @@ conf_main	: AS as4number		{
- 		| RDE RIB STRING yesno EVALUATE {
- 			if ($4) {
- 				free($3);
-+				yyerror("bad rde rib definition");
- 				YYERROR;
- 			}
--			if (!add_rib($3, F_RIB_NOEVALUATE)) {
-+			if (add_rib($3, 0, F_RIB_NOFIB | F_RIB_NOEVALUATE)) {
-+				free($3);
-+				YYERROR;
-+			}
-+			free($3);
-+		}
-+		| RDE RIB STRING RTABLE NUMBER {
-+			if (add_rib($3, $5, 0)) {
-+				free($3);
-+				YYERROR;
-+			}
-+			free($3);
-+		}
-+		| RDE RIB STRING RTABLE NUMBER FIBUPDATE yesno {
-+			int	flags = 0;
-+			if ($7 == 0)
-+				flags = F_RIB_NOFIBSYNC;
-+			if (add_rib($3, $5, flags)) {
- 				free($3);
- 				YYERROR;
- 			}
-@@ -418,59 +440,7 @@ conf_main	: AS as4number		{
- 			}
- 			free($2);
- 		}
--		| NETWORK prefix filter_set	{
--			struct network	*n;
--
--			if ((n = calloc(1, sizeof(struct network))) == NULL)
--				fatal("new_network");
--			memcpy(&n->net.prefix, &$2.prefix,
--			    sizeof(n->net.prefix));
--			n->net.prefixlen = $2.len;
--			move_filterset($3, &n->net.attrset);
--			free($3);
--
--			TAILQ_INSERT_TAIL(netconf, n, entry);
--		}
--		| NETWORK family STATIC filter_set	{
--			if ($2 == AFI_IPv4) {
--				conf->flags |= BGPD_FLAG_REDIST_STATIC;
--				move_filterset($4, &conf->staticset);
--			} else if ($2 == AFI_IPv6) {
--				conf->flags |= BGPD_FLAG_REDIST6_STATIC;
--				move_filterset($4, &conf->staticset6);
--			} else {
--				yyerror("unknown family");
--				free($4);
--				YYERROR;
--			}
--			free($4);
--		}
--		| NETWORK family CONNECTED filter_set	{
--			if ($2 == AFI_IPv4) {
--				conf->flags |= BGPD_FLAG_REDIST_CONNECTED;
--				move_filterset($4, &conf->connectset);
--			} else if ($2 == AFI_IPv6) {
--				conf->flags |= BGPD_FLAG_REDIST6_CONNECTED;
--				move_filterset($4, &conf->connectset6);
--			} else {
--				yyerror("unknown family");
--				free($4);
--				YYERROR;
--			}
--			free($4);
--		}
--		| NETWORK STATIC filter_set	{
--			/* keep for compatibility till after next release */
--			conf->flags |= BGPD_FLAG_REDIST_STATIC;
--			move_filterset($3, &conf->staticset);
--			free($3);
--		}
--		| NETWORK CONNECTED filter_set	{
--			/* keep for compatibility till after next release */
--			conf->flags |= BGPD_FLAG_REDIST_CONNECTED;
--			move_filterset($3, &conf->connectset);
--			free($3);
--		}
-+		| network
- 		| DUMP STRING STRING optnumber		{
- 			int action;
- 
-@@ -484,6 +454,8 @@ conf_main	: AS as4number		{
- 				action = MRT_TABLE_DUMP;
- 			else if (!strcmp($2, "table-mp"))
- 				action = MRT_TABLE_DUMP_MP;
-+			else if (!strcmp($2, "table-v2"))
-+				action = MRT_TABLE_DUMP_V2;
- 			else {
- 				yyerror("unknown mrt dump type");
- 				free($2);
-@@ -511,6 +483,8 @@ conf_main	: AS as4number		{
- 				action = MRT_TABLE_DUMP;
- 			else if (!strcmp($4, "table-mp"))
- 				action = MRT_TABLE_DUMP_MP;
-+			else if (!strcmp($4, "table-v2"))
-+				action = MRT_TABLE_DUMP_V2;
- 			else {
- 				yyerror("unknown mrt dump type");
- 				free($3);
-@@ -575,11 +549,20 @@ conf_main	: AS as4number		{
- 			free($4);
- 		}
- 		| RTABLE NUMBER {
--			if ($2 > RT_TABLEID_MAX || $2 < 0) {
--				yyerror("invalid rtable id");
-+#if defined(__FreeBSD__)	/* FreeBSD does not support RTABLE */
-+			yyerror("rtable id not supported in FreeBSD, yet");
-+			YYERROR;
-+#else
-+			struct rde_rib *rr;
-+			if (ktable_exists($2, NULL) != 1) {
-+				yyerror("rtable id %lld does not exist", $2);
- 				YYERROR;
- 			}
--			conf->rtableid = $2;
-+			rr = find_rib("Loc-RIB");
-+			if (rr == NULL)
-+				fatalx("RTABLE can not find the main RIB!");
-+			rr->rtableid = $2;
-+#endif /* defined(__FreeBSD__) */
- 		}
- 		| CONNECTRETRY NUMBER {
- 			if ($2 > USHRT_MAX || $2 < 1) {
-@@ -588,6 +571,15 @@ conf_main	: AS as4number		{
- 			}
- 			conf->connectretry = $2;
- 		}
-+		| SOCKET STRING	restricted {
-+			if ($3) {
-+				free(conf->rcsock);
-+				conf->rcsock = $2;
-+			} else {
-+				free(conf->csock);
-+				conf->csock = $2;
-+			}
-+		}
- 		;
- 
- mrtdump		: DUMP STRING inout STRING optnumber	{
-@@ -620,10 +612,47 @@ mrtdump		: DUMP STRING inout STRING optn
- 		}
- 		;
- 
-+network		: NETWORK prefix filter_set	{
-+			struct network	*n;
-+
-+			if ((n = calloc(1, sizeof(struct network))) == NULL)
-+				fatal("new_network");
-+			memcpy(&n->net.prefix, &$2.prefix,
-+			    sizeof(n->net.prefix));
-+			n->net.prefixlen = $2.len;
-+			filterset_move($3, &n->net.attrset);
-+			free($3);
-+
-+			TAILQ_INSERT_TAIL(netconf, n, entry);
-+		}
-+		| NETWORK family nettype filter_set	{
-+			struct network	*n;
-+
-+			if ((n = calloc(1, sizeof(struct network))) == NULL)
-+				fatal("new_network");
-+			if (afi2aid($2, SAFI_UNICAST, &n->net.prefix.aid) ==
-+			    -1) {
-+				yyerror("unknown family");
-+				filterset_free($4);
-+				free($4);
-+				YYERROR;
-+			}
-+			n->net.type = $3 ? NETWORK_STATIC : NETWORK_CONNECTED;
-+			filterset_move($4, &n->net.attrset);
-+			free($4);
-+
-+			TAILQ_INSERT_TAIL(netconf, n, entry);
-+		}
-+		;
-+
- inout		: IN		{ $$ = 1; }
- 		| OUT		{ $$ = 0; }
- 		;
- 
-+restricted	: RESTRICTED	{ $$ = 1; }
-+		| /* nothing */	{ $$ = 0; }
-+		;
-+
- address		: STRING		{
- 			u_int8_t	len;
- 
-@@ -635,11 +664,11 @@ address		: STRING		{
- 			}
- 			free($1);
- 
--			if (($$.af == AF_INET && len != 32) ||
--			    ($$.af == AF_INET6 && len != 128)) {
-+			if (($$.aid == AID_INET && len != 32) ||
-+			    ($$.aid == AID_INET6 && len != 128)) {
- 				/* unreachable */
- 				yyerror("got prefixlen %u, expected %u",
--				    len, $$.af == AF_INET ? 32 : 128);
-+				    len, $$.aid == AID_INET ? 32 : 128);
- 				YYERROR;
- 			}
- 		}
-@@ -653,7 +682,7 @@ prefix		: STRING '/' NUMBER	{
- 				free($1);
- 				YYERROR;
- 			}
--			if (asprintf(&s, "%s/%lld", $1, $3) == -1)
-+			if (asprintf(&s, "%s/%lld", $1, (long long int)$3) == -1)
- 				fatal(NULL);
- 			free($1);
- 
-@@ -672,7 +701,7 @@ prefix		: STRING '/' NUMBER	{
- 				yyerror("bad prefix %lld/%lld", $1, $3);
- 				YYERROR;
- 			}
--			if (asprintf(&s, "%lld/%lld", $1, $3) == -1)
-+			if (asprintf(&s, "%lld/%lld", (long long int)$1, (long long int)$3) == -1)
- 				fatal(NULL);
- 
- 			if (!host(s, &$$.prefix, &$$.len)) {
-@@ -686,7 +715,7 @@ prefix		: STRING '/' NUMBER	{
- 
- addrspec	: address	{
- 			memcpy(&$$.prefix, &$1, sizeof(struct bgpd_addr));
--			if ($$.prefix.af == AF_INET)
-+			if ($$.prefix.aid == AID_INET)
- 				$$.len = 32;
- 			else
- 				$$.len = 128;
-@@ -705,14 +734,150 @@ optnumber	: /* empty */		{ $$ = 0; }
- 		| NUMBER
- 		;
- 
-+rdomain		: RDOMAIN NUMBER optnl '{' optnl	{
-+			if (ktable_exists($2, NULL) != 1) {
-+				yyerror("rdomain %lld does not exist", $2);
-+				YYERROR;
-+			}
-+			if (!(currdom = calloc(1, sizeof(struct rdomain))))
-+				fatal(NULL);
-+			currdom->rtableid = $2;
-+			TAILQ_INIT(&currdom->import);
-+			TAILQ_INIT(&currdom->export);
-+			TAILQ_INIT(&currdom->net_l);
-+			netconf = &currdom->net_l;
-+		}
-+		    rdomainopts_l '}' {
-+			/* insert into list */
-+			SIMPLEQ_INSERT_TAIL(rdom_l, currdom, entry);
-+			currdom = NULL;
-+			netconf = gnetconf;
-+		}
-+
-+rdomainopts_l	: rdomainopts_l rdomainoptsl
-+		| rdomainoptsl
-+		;
-+
-+rdomainoptsl	: rdomainopts nl
-+		;
-+
-+rdomainopts	: RD STRING {
-+			struct filter_extcommunity	ext;
-+			u_int64_t			rd;
-+
-+			if (parseextcommunity(&ext, "rt", $2) == -1) {
-+				free($2);
-+				YYERROR;
-+			}
-+			free($2);
-+			/*
-+			 * RD is almost encode like an ext-community,
-+			 * but only almost so convert here.
-+			 */
-+			if (community_ext_conv(&ext, 0, &rd)) {
-+				yyerror("bad encoding of rd");
-+				YYERROR;
-+			}
-+			rd = betoh64(rd) & 0xffffffffffffULL;
-+			switch (ext.type) {
-+			case EXT_COMMUNITY_TWO_AS:
-+				rd |= (0ULL << 48);
-+				break;
-+			case EXT_COMMUNITY_IPV4:
-+				rd |= (1ULL << 48);
-+				break;
-+			case EXT_COMMUNITY_FOUR_AS:
-+				rd |= (2ULL << 48);
-+				break;
-+			default:
-+				yyerror("bad encoding of rd");
-+				YYERROR;
-+			}
-+			currdom->rd = htobe64(rd);
-+		}
-+		| EXPORTTRGT STRING STRING	{
-+			struct filter_set	*set;
-+
-+			if ((set = calloc(1, sizeof(struct filter_set))) ==
-+			    NULL)
-+				fatal(NULL);
-+			set->type = ACTION_SET_EXT_COMMUNITY;
-+			if (parseextcommunity(&set->action.ext_community,
-+			    $2, $3) == -1) {
-+				free($3);
-+				free($2);
-+				free(set);
-+				YYERROR;
-+			}
-+			free($3);
-+			free($2);
-+			TAILQ_INSERT_TAIL(&currdom->export, set, entry);
-+		}
-+		| IMPORTTRGT STRING STRING	{
-+			struct filter_set	*set;
-+
-+			if ((set = calloc(1, sizeof(struct filter_set))) ==
-+			    NULL)
-+				fatal(NULL);
-+			set->type = ACTION_SET_EXT_COMMUNITY;
-+			if (parseextcommunity(&set->action.ext_community,
-+			    $2, $3) == -1) {
-+				free($3);
-+				free($2);
-+				free(set);
-+				YYERROR;
-+			}
-+			free($3);
-+			free($2);
-+			TAILQ_INSERT_TAIL(&currdom->import, set, entry);
-+		}
-+		| DESCR string		{
-+			if (strlcpy(currdom->descr, $2,
-+			    sizeof(currdom->descr)) >=
-+			    sizeof(currdom->descr)) {
-+				yyerror("descr \"%s\" too long: max %u",
-+				    $2, sizeof(currdom->descr) - 1);
-+				free($2);
-+				YYERROR;
-+			}
-+			free($2);
-+		}
-+		| FIBUPDATE yesno		{
-+			if ($2 == 0)
-+				currdom->flags |= F_RIB_NOFIBSYNC;
-+			else
-+				currdom->flags &= ~F_RIB_NOFIBSYNC;
-+		}
-+		| network
-+		| DEPEND ON STRING	{
-+			/* XXX this is a hack */
-+			if (if_nametoindex($3) == 0) {
-+				yyerror("interface %s does not exist", $3);
-+				free($3);
-+				YYERROR;
-+			}
-+			strlcpy(currdom->ifmpe, $3, IFNAMSIZ);
-+			free($3);
-+			if (get_mpe_label(currdom)) {
-+				yyerror("failed to get mpls label from %s",
-+				    currdom->ifmpe);
-+				YYERROR;
-+			}
-+		}
-+		;
-+
- neighbor	: {	curpeer = new_peer(); }
- 		    NEIGHBOR addrspec {
- 			memcpy(&curpeer->conf.remote_addr, &$3.prefix,
- 			    sizeof(curpeer->conf.remote_addr));
- 			curpeer->conf.remote_masklen = $3.len;
--			if (($3.prefix.af == AF_INET && $3.len != 32) ||
--			    ($3.prefix.af == AF_INET6 && $3.len != 128))
-+			if (($3.prefix.aid == AID_INET && $3.len != 32) ||
-+			    ($3.prefix.aid == AID_INET6 && $3.len != 128))
- 				curpeer->conf.template = 1;
-+			if (curpeer->conf.capabilities.mp[
-+			    curpeer->conf.remote_addr.aid] == -1)
-+				curpeer->conf.capabilities.mp[
-+				    curpeer->conf.remote_addr.aid] = 1;
- 			if (get_id(curpeer)) {
- 				yyerror("get_id failed");
- 				YYERROR;
-@@ -802,6 +967,17 @@ peeropts	: REMOTEAS as4number	{
- 			}
- 			free($2);
- 		}
-+		| LLIFACE string	{
-+			if (strlcpy(curpeer->conf.lliface, $2,
-+			    sizeof(curpeer->conf.lliface)) >=
-+			    sizeof(curpeer->conf.lliface)) {
-+				yyerror("lliface \"%s\" too long: max %u",
-+				    $2, sizeof(curpeer->conf.lliface) - 1);
-+				free($2);
-+				YYERROR;
-+			}
-+			free($2);
-+	        }
- 		| LOCALADDR address	{
- 			memcpy(&curpeer->conf.local_addr, &$2,
- 			    sizeof(curpeer->conf.local_addr));
-@@ -852,13 +1028,17 @@ peeropts	: REMOTEAS as4number	{
- 			curpeer->conf.min_holdtime = $3;
- 		}
- 		| ANNOUNCE family STRING {
--			u_int8_t	safi;
-+			u_int8_t	aid, safi;
-+			int8_t		val = 1;
- 
--			if (!strcmp($3, "none"))
--				safi = SAFI_NONE;
--			else if (!strcmp($3, "unicast"))
-+			if (!strcmp($3, "none")) {
- 				safi = SAFI_UNICAST;
--			else {
-+				val = 0;
-+			} else if (!strcmp($3, "unicast")) {
-+				safi = SAFI_UNICAST;
-+			} else if (!strcmp($3, "vpn")) {
-+				safi = SAFI_MPLSVPN;
-+			} else {
- 				yyerror("unknown/unsupported SAFI \"%s\"",
- 				    $3);
- 				free($3);
-@@ -866,25 +1046,31 @@ peeropts	: REMOTEAS as4number	{
- 			}
- 			free($3);
- 
--			switch ($2) {
--			case AFI_IPv4:
--				curpeer->conf.capabilities.mp_v4 = safi;
--				break;
--			case AFI_IPv6:
--				curpeer->conf.capabilities.mp_v6 = safi;
--				break;
--			default:
--				fatal("king bula sees borked AFI");
-+			if (afi2aid($2, safi, &aid) == -1) {
-+				yyerror("unknown AFI/SAFI pair");
-+				YYERROR;
- 			}
-+			curpeer->conf.capabilities.mp[aid] = val;
- 		}
- 		| ANNOUNCE CAPABILITIES yesno {
- 			curpeer->conf.announce_capa = $3;
- 		}
-+		| ANNOUNCE REFRESH yesno {
-+			curpeer->conf.capabilities.refresh = $3;
-+		}
-+		| ANNOUNCE RESTART yesno {
-+			curpeer->conf.capabilities.grestart.restart = $3;
-+		}
-+		| ANNOUNCE AS4BYTE yesno {
-+			curpeer->conf.capabilities.as4byte = $3;
-+		}
- 		| ANNOUNCE SELF {
- 			curpeer->conf.announce_type = ANNOUNCE_SELF;
- 		}
- 		| ANNOUNCE STRING {
--			if (!strcmp($2, "none"))
-+			if (!strcmp($2, "self"))
-+				curpeer->conf.announce_type = ANNOUNCE_SELF;
-+			else if (!strcmp($2, "none"))
- 				curpeer->conf.announce_type = ANNOUNCE_NONE;
- 			else if (!strcmp($2, "all"))
- 				curpeer->conf.announce_type = ANNOUNCE_ALL;
-@@ -1083,7 +1269,7 @@ peeropts	: REMOTEAS as4number	{
- 			curpeer->conf.reflector_client = 1;
- 		}
- 		| REFLECTOR address	{
--			if ($2.af != AF_INET) {
-+			if ($2.aid != AID_INET) {
- 				yyerror("route reflector cluster-id must be "
- 				    "an IPv4 address");
- 				YYERROR;
-@@ -1157,6 +1343,10 @@ family		: IPV4	{ $$ = AFI_IPv4; }
- 		| IPV6	{ $$ = AFI_IPv6; }
- 		;
- 
-+nettype		: STATIC { $$ = 1; },
-+		| CONNECTED { $$ = 0; }
-+		;
-+
- espah		: ESP		{ $$ = 1; }
- 		| AH		{ $$ = 0; }
- 		;
-@@ -1336,12 +1526,12 @@ filter_prefix_l	: filter_prefix				{ $$ 
- 		;
- 
- filter_prefix	: prefix				{
--			if (fmopts.af && fmopts.af != $1.prefix.af) {
-+			if (fmopts.aid && fmopts.aid != $1.prefix.aid) {
- 				yyerror("rules with mixed address families "
- 				    "are not allowed");
- 				YYERROR;
- 			} else
--				fmopts.af = $1.prefix.af;
-+				fmopts.aid = $1.prefix.aid;
- 			if (($$ = calloc(1, sizeof(struct filter_prefix_l))) ==
- 			    NULL)
- 				fatal(NULL);
-@@ -1410,6 +1600,12 @@ filter_as	: as4number		{
- 				fatal(NULL);
- 			$$->a.as = $1;
- 		}
-+		| NEIGHBORAS		{
-+			if (($$ = calloc(1, sizeof(struct filter_as_l))) ==
-+			    NULL)
-+				fatal(NULL);
-+			$$->a.flags = AS_FLAG_NEIGHBORAS;
-+		}
- 		;
- 
- filter_match_h	: /* empty */			{
-@@ -1437,18 +1633,18 @@ filter_elm	: filter_prefix_h	{
- 			fmopts.prefix_l = $1;
- 		}
- 		| PREFIXLEN prefixlenop		{
--			if (fmopts.af == 0) {
-+			if (fmopts.aid == 0) {
- 				yyerror("address family needs to be specified "
- 				    "before \"prefixlen\"");
- 				YYERROR;
- 			}
--			if (fmopts.m.prefixlen.af) {
-+			if (fmopts.m.prefixlen.aid) {
- 				yyerror("\"prefixlen\" already specified");
- 				YYERROR;
- 			}
- 			memcpy(&fmopts.m.prefixlen, &$2,
- 			    sizeof(fmopts.m.prefixlen));
--			fmopts.m.prefixlen.af = fmopts.af;
-+			fmopts.m.prefixlen.aid = fmopts.aid;
- 		}
- 		| filter_as_h		{
- 			if (fmopts.as_l != NULL) {
-@@ -1457,32 +1653,93 @@ filter_elm	: filter_prefix_h	{
- 			}
- 			fmopts.as_l = $1;
- 		}
-+		| MAXASLEN NUMBER	{
-+			if (fmopts.m.aslen.type != ASLEN_NONE) {
-+				yyerror("AS length filters already specified");
-+				YYERROR;
-+			}
-+			if ($2 < 0 || $2 > UINT_MAX) {
-+				yyerror("bad max-as-len %lld", $2);
-+				YYERROR;
-+			}
-+			fmopts.m.aslen.type = ASLEN_MAX;
-+			fmopts.m.aslen.aslen = $2;
-+		}
-+		| MAXASSEQ NUMBER	{
-+			if (fmopts.m.aslen.type != ASLEN_NONE) {
-+				yyerror("AS length filters already specified");
-+				YYERROR;
-+			}
-+			if ($2 < 0 || $2 > UINT_MAX) {
-+				yyerror("bad max-as-seq %lld", $2);
-+				YYERROR;
-+			}
-+			fmopts.m.aslen.type = ASLEN_SEQ;
-+			fmopts.m.aslen.aslen = $2;
-+		}
- 		| COMMUNITY STRING	{
- 			if (fmopts.m.community.as != COMMUNITY_UNSET) {
- 				yyerror("\"community\" already specified");
- 				free($2);
- 				YYERROR;
- 			}
--			if (parsecommunity($2, &fmopts.m.community.as,
--			    &fmopts.m.community.type) == -1) {
-+			if (parsecommunity(&fmopts.m.community, $2) == -1) {
- 				free($2);
- 				YYERROR;
- 			}
- 			free($2);
- 		}
-+		| EXTCOMMUNITY STRING STRING {
-+			if (fmopts.m.ext_community.flags &
-+			    EXT_COMMUNITY_FLAG_VALID) {
-+				yyerror("\"ext-community\" already specified");
-+				free($2);
-+				free($3);
-+				YYERROR;
-+			}
-+
-+			if (parseextcommunity(&fmopts.m.ext_community,
-+			    $2, $3) == -1) {
-+				free($2);
-+				free($3);
-+				YYERROR;
-+			}
-+			free($2);
-+			free($3);
-+		}
- 		| IPV4			{
--			if (fmopts.af) {
-+			if (fmopts.aid) {
- 				yyerror("address family already specified");
- 				YYERROR;
- 			}
--			fmopts.af = AF_INET;
-+			fmopts.aid = AID_INET;
- 		}
- 		| IPV6			{
--			if (fmopts.af) {
-+			if (fmopts.aid) {
- 				yyerror("address family already specified");
- 				YYERROR;
- 			}
--			fmopts.af = AF_INET6;
-+			fmopts.aid = AID_INET6;
-+		}
-+		| NEXTHOP address 	{
-+			if (fmopts.m.nexthop.flags) {
-+				yyerror("nexthop already specified");
-+				YYERROR;
-+			}
-+			if (fmopts.aid && fmopts.aid != $2.aid) {
-+				yyerror("nexthop address family doesn't match "
-+				    "rule address family");
-+				YYERROR;
-+			}
-+			fmopts.m.nexthop.addr = $2;
-+			fmopts.m.nexthop.flags = FILTER_NEXTHOP_ADDR;
-+		}
-+		| NEXTHOP NEIGHBOR 	{
-+			if (fmopts.m.nexthop.flags) {
-+				yyerror("nexthop already specified");
-+				YYERROR;
-+			}
-+			fmopts.m.nexthop.flags = FILTER_NEXTHOP_NEIGHBOR;
- 		}
- 		;
- 
-@@ -1588,7 +1845,7 @@ filter_set_opt	: LOCALPREF NUMBER		{
- 			}
- 			if (($$ = calloc(1, sizeof(struct filter_set))) == NULL)
- 				fatal(NULL);
--			if ($2 > 0) {
-+			if ($2 >= 0) {
- 				$$->type = ACTION_SET_MED;
- 				$$->action.metric = $2;
- 			} else {
-@@ -1623,7 +1880,7 @@ filter_set_opt	: LOCALPREF NUMBER		{
- 			}
- 			if (($$ = calloc(1, sizeof(struct filter_set))) == NULL)
- 				fatal(NULL);
--			if ($2 > 0) {
-+			if ($2 >= 0) {
- 				$$->type = ACTION_SET_MED;
- 				$$->action.metric = $2;
- 			} else {
-@@ -1782,8 +2039,7 @@ filter_set_opt	: LOCALPREF NUMBER		{
- 			else
- 				$$->type = ACTION_SET_COMMUNITY;
- 
--			if (parsecommunity($3, &$$->action.community.as,
--			    &$$->action.community.type) == -1) {
-+			if (parsecommunity(&$$->action.community, $3) == -1) {
- 				free($3);
- 				free($$);
- 				YYERROR;
-@@ -1796,40 +2052,62 @@ filter_set_opt	: LOCALPREF NUMBER		{
- 				free($$);
- 				YYERROR;
- 			}
--			/* Don't allow setting of unknown well-known types */
--			if ($$->action.community.as == COMMUNITY_WELLKNOWN) {
--				switch ($$->action.community.type) {
--				case COMMUNITY_NO_EXPORT:
--				case COMMUNITY_NO_ADVERTISE:
--				case COMMUNITY_NO_EXPSUBCONFED:
--				case COMMUNITY_NO_PEER:
--					/* valid */
--					break;
--				default:
--					/* unknown */
--					yyerror("Invalid well-known community");
--					free($$);
--					YYERROR;
--					break;
--				}
-+		}
-+		| EXTCOMMUNITY delete STRING STRING {
-+			if (($$ = calloc(1, sizeof(struct filter_set))) == NULL)
-+				fatal(NULL);
-+			if ($2)
-+				$$->type = ACTION_DEL_EXT_COMMUNITY;
-+			else
-+				$$->type = ACTION_SET_EXT_COMMUNITY;
-+
-+			if (parseextcommunity(&$$->action.ext_community,
-+			    $3, $4) == -1) {
-+				free($3);
-+				free($4);
-+				free($$);
-+				YYERROR;
- 			}
-+			free($3);
-+			free($4);
-+		}
-+		| ORIGIN origincode {
-+			if (($$ = calloc(1, sizeof(struct filter_set))) == NULL)
-+				fatal(NULL);
-+			$$->type = ACTION_SET_ORIGIN;
-+			$$->action.origin = $2;
- 		}
- 		;
- 
-+origincode	: string {
-+			if (!strcmp($1, "egp"))
-+				$$ = ORIGIN_EGP;
-+			else if (!strcmp($1, "igp"))
-+				$$ = ORIGIN_IGP;
-+			else if (!strcmp($1, "incomplete"))
-+				$$ = ORIGIN_INCOMPLETE;
-+			else {
-+				yyerror("unknown origin \"%s\"", $1);
-+				free($1);
-+				YYERROR;
-+			}
-+			free($1);
-+		};
-+
- comma		: ","
- 		| /* empty */
- 		;
- 
- unaryop		: '='		{ $$ = OP_EQ; }
--		| '!' '='	{ $$ = OP_NE; }
--		| '<' '='	{ $$ = OP_LE; }
-+		| NE		{ $$ = OP_NE; }
-+		| LE		{ $$ = OP_LE; }
- 		| '<'		{ $$ = OP_LT; }
--		| '>' '='	{ $$ = OP_GE; }
-+		| GE		{ $$ = OP_GE; }
- 		| '>'		{ $$ = OP_GT; }
- 		;
- 
- binaryop	: '-'		{ $$ = OP_RANGE; }
--		| '>' '<'	{ $$ = OP_XRANGE; }
-+		| XRANGE	{ $$ = OP_XRANGE; }
- 		;
- 
- %%
-@@ -1873,6 +2151,7 @@ lookup(char *s)
- 		{ "allow",		ALLOW},
- 		{ "announce",		ANNOUNCE},
- 		{ "any",		ANY},
-+		{ "as-4byte",		AS4BYTE },
- 		{ "blackhole",		BLACKHOLE},
- 		{ "capabilities",	CAPABILITIES},
- 		{ "community",		COMMUNITY},
-@@ -1889,16 +2168,22 @@ lookup(char *s)
- 		{ "enforce",		ENFORCE},
- 		{ "esp",		ESP},
- 		{ "evaluate",		EVALUATE},
-+		{ "export-target",	EXPORTTRGT},
-+		{ "ext-community",	EXTCOMMUNITY},
- 		{ "fib-update",		FIBUPDATE},
- 		{ "from",		FROM},
- 		{ "group",		GROUP},
- 		{ "holdtime",		HOLDTIME},
- 		{ "ignore",		IGNORE},
- 		{ "ike",		IKE},
-+		{ "import-target",	IMPORTTRGT},
- 		{ "in",			IN},
- 		{ "include",		INCLUDE},
- 		{ "inet",		IPV4},
- 		{ "inet6",		IPV6},
-+#if defined(IPV6_LINKLOCAL_PEER)
-+		{ "interface",		LLIFACE},
-+#endif
- 		{ "ipsec",		IPSEC},
- 		{ "key",		KEY},
- 		{ "listen",		LISTEN},
-@@ -1906,6 +2191,8 @@ lookup(char *s)
- 		{ "localpref",		LOCALPREF},
- 		{ "log",		LOG},
- 		{ "match",		MATCH},
-+		{ "max-as-len",		MAXASLEN},
-+		{ "max-as-seq",		MAXASSEQ},
- 		{ "max-prefix",		MAXPREFIX},
- 		{ "md5sig",		MD5SIG},
- 		{ "med",		MED},
-@@ -1918,6 +2205,7 @@ lookup(char *s)
- 		{ "nexthop",		NEXTHOP},
- 		{ "no-modify",		NOMODIFY},
- 		{ "on",			ON},
-+		{ "origin",		ORIGIN},
- 		{ "out",		OUT},
- 		{ "passive",		PASSIVE},
- 		{ "password",		PASSWORD},
-@@ -1929,10 +2217,14 @@ lookup(char *s)
- 		{ "prepend-self",	PREPEND_SELF},
- 		{ "qualify",		QUALIFY},
- 		{ "quick",		QUICK},
-+		{ "rd",			RD},
- 		{ "rde",		RDE},
-+		{ "rdomain",		RDOMAIN},
-+		{ "refresh",		REFRESH },
- 		{ "reject",		REJECT},
- 		{ "remote-as",		REMOTEAS},
- 		{ "restart",		RESTART},
-+		{ "restricted",		RESTRICTED},
- 		{ "rib",		RIB},
- 		{ "route-collector",	ROUTECOLL},
- 		{ "route-reflector",	REFLECTOR},
-@@ -1941,6 +2233,7 @@ lookup(char *s)
- 		{ "rtlabel",		RTLABEL},
- 		{ "self",		SELF},
- 		{ "set",		SET},
-+		{ "socket",		SOCKET },
- 		{ "softreconfig",	SOFTRECONFIG},
- 		{ "source-as",		SOURCEAS},
- 		{ "spi",		SPI},
-@@ -2117,9 +2410,10 @@ top:
- 					return (0);
- 				if (next == quotec || c == ' ' || c == '\t')
- 					c = next;
--				else if (next == '\n')
-+				else if (next == '\n') {
-+					file->lineno++;
- 					continue;
--				else
-+				} else
- 					lungetc(next);
- 			} else if (c == quotec) {
- 				*p = '\0';
-@@ -2135,6 +2429,26 @@ top:
- 		if (yylval.v.string == NULL)
- 			fatal("yylex: strdup");
- 		return (STRING);
-+	case '!':
-+		next = lgetc(0);
-+		if (next == '=')
-+			return (NE);
-+		lungetc(next);
-+		break;
-+	case '<':
-+		next = lgetc(0);
-+		if (next == '=')
-+			return (LE);
-+		lungetc(next);
-+		break;
-+	case '>':
-+		next = lgetc(0);
-+		if (next == '<')
-+			return (XRANGE);
-+		else if (next == '=')
-+			return (GE);
-+		lungetc(next);
-+		break;
- 	}
- 
- #define allowed_to_end_number(x) \
-@@ -2274,18 +2588,21 @@ popfile(void)
- int
- parse_config(char *filename, struct bgpd_config *xconf,
-     struct mrt_head *xmconf, struct peer **xpeers, struct network_head *nc,
--    struct filter_head *xfilter_l)
-+    struct filter_head *xfilter_l, struct rdomain_head *xrdom_l)
- {
- 	struct sym		*sym, *next;
- 	struct peer		*p, *pnext;
- 	struct listen_addr	*la;
- 	struct network		*n;
- 	struct filter_rule	*r;
-+	struct rde_rib		*rr;
-+	struct rdomain		*rd;
- 	int			 errors = 0;
- 
- 	if ((conf = calloc(1, sizeof(struct bgpd_config))) == NULL)
- 		fatal(NULL);
- 	conf->opts = xconf->opts;
-+	conf->csock = strdup(SOCKET_NAME);
- 
- 	if ((file = pushfile(filename, 1)) == NULL) {
- 		free(conf);
-@@ -2316,13 +2633,15 @@ parse_config(char *filename, struct bgpd
- 	id = 1;
- 
- 	/* network list is always empty in the parent */
--	netconf = nc;
-+	gnetconf = netconf = nc;
- 	TAILQ_INIT(netconf);
- 	/* init the empty filter list for later */
- 	TAILQ_INIT(xfilter_l);
-+	SIMPLEQ_INIT(xrdom_l);
-+	rdom_l = xrdom_l;
- 
--	add_rib("Adj-RIB-In", F_RIB_NOEVALUATE);
--	add_rib("Loc-RIB", 0);
-+	add_rib("Adj-RIB-In", 0, F_RIB_NOFIB | F_RIB_NOEVALUATE);
-+	add_rib("Loc-RIB", 0, 0);
- 
- 	yyparse();
- 	errors = file->errors;
-@@ -2344,6 +2663,9 @@ parse_config(char *filename, struct bgpd
- 
- 	if (errors) {
- 		/* XXX more leaks in this case */
-+		free(conf->csock);
-+		free(conf->rcsock);
-+
- 		while ((la = TAILQ_FIRST(listen_addrs)) != NULL) {
- 			TAILQ_REMOVE(listen_addrs, la, entry);
- 			free(la);
-@@ -2357,23 +2679,44 @@ parse_config(char *filename, struct bgpd
- 
- 		while ((n = TAILQ_FIRST(netconf)) != NULL) {
- 			TAILQ_REMOVE(netconf, n, entry);
-+			filterset_free(&n->net.attrset);
- 			free(n);
- 		}
- 
- 		while ((r = TAILQ_FIRST(filter_l)) != NULL) {
- 			TAILQ_REMOVE(filter_l, r, entry);
-+			filterset_free(&r->set);
- 			free(r);
- 		}
- 
- 		while ((r = TAILQ_FIRST(peerfilter_l)) != NULL) {
- 			TAILQ_REMOVE(peerfilter_l, r, entry);
-+			filterset_free(&r->set);
- 			free(r);
- 		}
- 
- 		while ((r = TAILQ_FIRST(groupfilter_l)) != NULL) {
- 			TAILQ_REMOVE(groupfilter_l, r, entry);
-+			filterset_free(&r->set);
- 			free(r);
- 		}
-+		while ((rr = SIMPLEQ_FIRST(&ribnames)) != NULL) {
-+			SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
-+			free(rr);
-+		}
-+		while ((rd = SIMPLEQ_FIRST(rdom_l)) != NULL) {
-+			SIMPLEQ_REMOVE_HEAD(rdom_l, entry);
-+			filterset_free(&rd->export);
-+			filterset_free(&rd->import);
-+
-+			while ((n = TAILQ_FIRST(&rd->net_l)) != NULL) {
-+				TAILQ_REMOVE(&rd->net_l, n, entry);
-+				filterset_free(&n->net.attrset);
-+				free(n);
-+			}
-+
-+			free(rd);
-+		}
- 	} else {
- 		errors += merge_config(xconf, conf, peer_l, listen_addrs);
- 		errors += mrt_mergeconfig(xmconf, mrtconf);
-@@ -2505,27 +2848,27 @@ getcommunity(char *s)
- }
- 
- int
--parsecommunity(char *s, int *as, int *type)
-+parsecommunity(struct filter_community *c, char *s)
- {
- 	char *p;
--	int i;
-+	int i, as;
- 
- 	/* Well-known communities */
- 	if (strcasecmp(s, "NO_EXPORT") == 0) {
--		*as = COMMUNITY_WELLKNOWN;
--		*type = COMMUNITY_NO_EXPORT;
-+		c->as = COMMUNITY_WELLKNOWN;
-+		c->type = COMMUNITY_NO_EXPORT;
- 		return (0);
- 	} else if (strcasecmp(s, "NO_ADVERTISE") == 0) {
--		*as = COMMUNITY_WELLKNOWN;
--		*type = COMMUNITY_NO_ADVERTISE;
-+		c->as = COMMUNITY_WELLKNOWN;
-+		c->type = COMMUNITY_NO_ADVERTISE;
- 		return (0);
- 	} else if (strcasecmp(s, "NO_EXPORT_SUBCONFED") == 0) {
--		*as = COMMUNITY_WELLKNOWN;
--		*type = COMMUNITY_NO_EXPSUBCONFED;
-+		c->as = COMMUNITY_WELLKNOWN;
-+		c->type = COMMUNITY_NO_EXPSUBCONFED;
- 		return (0);
- 	} else if (strcasecmp(s, "NO_PEER") == 0) {
--		*as = COMMUNITY_WELLKNOWN;
--		*type = COMMUNITY_NO_PEER;
-+		c->as = COMMUNITY_WELLKNOWN;
-+		c->type = COMMUNITY_NO_PEER;
- 		return (0);
- 	}
- 
-@@ -2537,23 +2880,176 @@ parsecommunity(char *s, int *as, int *ty
- 
- 	if ((i = getcommunity(s)) == COMMUNITY_ERROR)
- 		return (-1);
--	if (i == USHRT_MAX) {
-+	if (i == COMMUNITY_WELLKNOWN) {
- 		yyerror("Bad community AS number");
- 		return (-1);
- 	}
--	*as = i;
-+	as = i;
- 
- 	if ((i = getcommunity(p)) == COMMUNITY_ERROR)
- 		return (-1);
--	*type = i;
-+	c->as = as;
-+	c->type = i;
- 
- 	return (0);
- }
- 
-+int
-+parsesubtype(char *type)
-+{
-+	/* this has to be sorted always */
-+	static const struct keywords keywords[] = {
-+		{ "bdc",	EXT_COMMUNITY_BGP_COLLECT },
-+		{ "odi",	EXT_COMMUNITY_OSPF_DOM_ID },
-+		{ "ori",	EXT_COMMUNITY_OSPF_RTR_ID },
-+		{ "ort",	EXT_COMMUNITY_OSPF_RTR_TYPE },
-+		{ "rt",		EXT_COMMUNITY_ROUTE_TGT },
-+		{ "soo",	EXT_CUMMUNITY_ROUTE_ORIG }
-+	};
-+	const struct keywords	*p;
-+
-+	p = bsearch(type, keywords, sizeof(keywords)/sizeof(keywords[0]),
-+	    sizeof(keywords[0]), kw_cmp);
-+
-+	if (p)
-+		return (p->k_val);
-+	else
-+		return (-1);
-+}
-+
-+int
-+parseextvalue(char *s, u_int32_t *v)
-+{
-+	const char 	*errstr;
-+	char		*p;
-+	struct in_addr	 ip;
-+	u_int32_t	 uvalh = 0, uval;
-+
-+	if ((p = strchr(s, '.')) == NULL) {
-+		/* AS_PLAIN number (4 or 2 byte) */
-+		uval = strtonum(s, 0, UINT_MAX, &errstr);
-+		if (errstr) {
-+			yyerror("Bad ext-community %s is %s", s, errstr);
-+			return (-1);
-+		}
-+		*v = uval;
-+		if (uval > USHRT_MAX)
-+			return (EXT_COMMUNITY_FOUR_AS);
-+		else
-+			return (EXT_COMMUNITY_TWO_AS);
-+	} else if (strchr(p + 1, '.') == NULL) {
-+		/* AS_DOT number (4-byte) */
-+		*p++ = '\0';
-+		uvalh = strtonum(s, 0, USHRT_MAX, &errstr);
-+		if (errstr) {
-+			yyerror("Bad ext-community %s is %s", s, errstr);
-+			return (-1);
-+		}
-+		uval = strtonum(p, 0, USHRT_MAX, &errstr);
-+		if (errstr) {
-+			yyerror("Bad ext-community %s is %s", p, errstr);
-+			return (-1);
-+		}
-+		*v = uval | (uvalh << 16);
-+		return (EXT_COMMUNITY_FOUR_AS);
-+	} else {
-+		/* more then one dot -> IP address */
-+		if (inet_aton(s, &ip) == 0) {
-+			yyerror("Bad ext-community %s not parseable", s);
-+			return (-1);
-+		}
-+		*v = ip.s_addr;
-+		return (EXT_COMMUNITY_IPV4);
-+	}
-+	return (-1);
-+}
-+
-+int
-+parseextcommunity(struct filter_extcommunity *c, char *t, char *s)
-+{
-+	const struct ext_comm_pairs	 iana[] = IANA_EXT_COMMUNITIES;
-+	const char 	*errstr;
-+	u_int64_t	 ullval = 0;
-+	u_int32_t	 uval;
-+	char		*p, *ep;
-+	unsigned int	 i;
-+	int		 type, subtype;
-+
-+	if ((subtype = parsesubtype(t)) == -1) {
-+		yyerror("Bad ext-community unknown type");
-+		return (-1);
-+	}
-+
-+	if ((p = strchr(s, ':')) == NULL) {
-+		type = EXT_COMMUNITY_OPAQUE,
-+		errno = 0;
-+		ullval = strtoull(s, &ep, 0);
-+		if (s[0] == '\0' || *ep != '\0') {
-+			yyerror("Bad ext-community bad value");
-+			return (-1);
-+		}
-+		if (errno == ERANGE && ullval > EXT_COMMUNITY_OPAQUE_MAX) {
-+			yyerror("Bad ext-community value to big");
-+			return (-1);
-+		}
-+		c->data.ext_opaq = ullval;
-+	} else {
-+		*p++ = '\0';
-+		if ((type = parseextvalue(s, &uval)) == -1)
-+			return (-1);
-+		switch (type) {
-+		case EXT_COMMUNITY_TWO_AS:
-+			ullval = strtonum(p, 0, UINT_MAX, &errstr);
-+			break;
-+		case EXT_COMMUNITY_IPV4:
-+		case EXT_COMMUNITY_FOUR_AS:
-+			ullval = strtonum(p, 0, USHRT_MAX, &errstr);
-+			break;
-+		default:
-+			fatalx("parseextcommunity: unexpected result");
-+		}
-+		if (errstr) {
-+			yyerror("Bad ext-community %s is %s", p,
-+			    errstr);
-+			return (-1);
-+		}
-+		switch (type) {
-+		case EXT_COMMUNITY_TWO_AS:
-+			c->data.ext_as.as = uval;
-+			c->data.ext_as.val = ullval;
-+			break;
-+		case EXT_COMMUNITY_IPV4:
-+			c->data.ext_ip.addr.s_addr = uval;
-+			c->data.ext_ip.val = ullval;
-+			break;
-+		case EXT_COMMUNITY_FOUR_AS:
-+			c->data.ext_as4.as4 = uval;
-+			c->data.ext_as4.val = ullval;
-+			break;
-+		}
-+	}
-+	c->type = type;
-+	c->subtype = subtype;
-+
-+	/* verify type/subtype combo */
-+	for (i = 0; i < sizeof(iana)/sizeof(iana[0]); i++) {
-+		if (iana[i].type == type && iana[i].subtype == subtype) {
-+			if (iana[i].transitive)
-+				c->type |= EXT_COMMUNITY_TRANSITIVE;
-+			c->flags |= EXT_COMMUNITY_FLAG_VALID;
-+			return (0);
-+		}
-+	}
-+
-+	yyerror("Bad ext-community bad format for type");
-+	return (-1);
-+}
-+
- struct peer *
- alloc_peer(void)
- {
- 	struct peer	*p;
-+	u_int8_t	 i;
- 
- 	if ((p = calloc(1, sizeof(struct peer))) == NULL)
- 		fatal("new_peer");
-@@ -2564,11 +3060,11 @@ alloc_peer(void)
- 	p->conf.distance = 1;
- 	p->conf.announce_type = ANNOUNCE_UNDEF;
- 	p->conf.announce_capa = 1;
--	p->conf.capabilities.mp_v4 = SAFI_UNICAST;
--	p->conf.capabilities.mp_v6 = SAFI_NONE;
-+	for (i = 0; i < AID_MAX; i++)
-+		p->conf.capabilities.mp[i] = -1;
- 	p->conf.capabilities.refresh = 1;
--	p->conf.capabilities.restart = 0;
--	p->conf.capabilities.as4byte = 0;
-+	p->conf.capabilities.grestart.restart = 1;
-+	p->conf.capabilities.as4byte = 1;
- 	p->conf.local_as = conf->as;
- 	p->conf.local_short_as = conf->short_as;
- 	p->conf.softreconfig_in = 1;
-@@ -2592,6 +3088,9 @@ new_peer(void)
- 		if (strlcpy(p->conf.descr, curgroup->conf.descr,
- 		    sizeof(p->conf.descr)) >= sizeof(p->conf.descr))
- 			fatalx("new_peer descr strlcpy");
-+		if (strlcpy(p->conf.lliface, curgroup->conf.lliface,
-+		    sizeof(p->conf.lliface)) >= sizeof(p->conf.lliface))
-+			fatalx("new_peer lliface strlcpy");
- 		p->conf.groupid = curgroup->conf.id;
- 		p->conf.local_as = curgroup->conf.local_as;
- 		p->conf.local_short_as = curgroup->conf.local_short_as;
-@@ -2674,39 +3173,52 @@ add_mrtconfig(enum mrt_type type, char *
- }
- 
- int
--add_rib(char *name, u_int16_t flags)
-+add_rib(char *name, u_int rtableid, u_int16_t flags)
- {
- 	struct rde_rib	*rr;
-+	u_int		 rdom;
- 
--	if (find_rib(name)) {
--		yyerror("rib \"%s\" allready exists.", name);
--		return (-1);
--	}
--
--	if ((rr = calloc(1, sizeof(*rr))) == NULL) {
--		log_warn("add_rib");
--		return (-1);
-+	if ((rr = find_rib(name)) == NULL) {
-+		if ((rr = calloc(1, sizeof(*rr))) == NULL) {
-+			log_warn("add_rib");
-+			return (-1);
-+		}
- 	}
- 	if (strlcpy(rr->name, name, sizeof(rr->name)) >= sizeof(rr->name)) {
- 		yyerror("rib name \"%s\" too long: max %u",
- 		   name, sizeof(rr->name) - 1);
-+		free(rr);
- 		return (-1);
- 	}
- 	rr->flags |= flags;
-+	if ((rr->flags & F_RIB_HASNOFIB) == 0) {
-+		if (ktable_exists(rtableid, &rdom) != 1) {
-+			yyerror("rtable id %lld does not exist", rtableid);
-+			free(rr);
-+			return (-1);
-+		}
-+		if (rdom != 0) {
-+			yyerror("rtable %lld does not belong to rdomain 0",
-+			    rtableid);
-+			free(rr);
-+			return (-1);
-+		}
-+		rr->rtableid = rtableid;
-+	}
- 	SIMPLEQ_INSERT_TAIL(&ribnames, rr, entry);
- 	return (0);
- }
- 
--int
-+struct rde_rib *
- find_rib(char *name)
- {
- 	struct rde_rib	*rr;
- 
- 	SIMPLEQ_FOREACH(rr, &ribnames, entry) {
- 		if (!strcmp(rr->name, name))
--			return (1);
-+			return (rr);
- 	}
--	return (0);
-+	return (NULL);
- }
- 
- int
-@@ -2715,7 +3227,7 @@ get_id(struct peer *newpeer)
- 	struct peer	*p;
- 
- 	for (p = peer_l_old; p != NULL; p = p->next)
--		if (newpeer->conf.remote_addr.af) {
-+		if (newpeer->conf.remote_addr.aid) {
- 			if (!memcmp(&p->conf.remote_addr,
- 			    &newpeer->conf.remote_addr,
- 			    sizeof(p->conf.remote_addr))) {
-@@ -2856,9 +3368,11 @@ str2key(char *s, char *dest, size_t max_
- int
- neighbor_consistent(struct peer *p)
- {
-+	u_int8_t	i;
-+
- 	/* local-address and peer's address: same address family */
--	if (p->conf.local_addr.af &&
--	    p->conf.local_addr.af != p->conf.remote_addr.af) {
-+	if (p->conf.local_addr.aid &&
-+	    p->conf.local_addr.aid != p->conf.remote_addr.aid) {
- 		yyerror("local-address and neighbor address "
- 		    "must be of the same address family");
- 		return (-1);
-@@ -2869,7 +3383,7 @@ neighbor_consistent(struct peer *p)
- 	    p->conf.auth.method == AUTH_IPSEC_IKE_AH ||
- 	    p->conf.auth.method == AUTH_IPSEC_MANUAL_ESP ||
- 	    p->conf.auth.method == AUTH_IPSEC_MANUAL_AH) &&
--	    !p->conf.local_addr.af) {
-+	    !p->conf.local_addr.aid) {
- 		yyerror("neighbors with any form of IPsec configured "
- 		    "need local-address to be specified");
- 		return (-1);
-@@ -2889,18 +3403,14 @@ neighbor_consistent(struct peer *p)
- 		return (-1);
- 	}
- 
--	/* for testing: enable 4-byte AS number capability if necessary */
--	if (conf->as > USHRT_MAX || p->conf.remote_as > USHRT_MAX)
--		p->conf.capabilities.as4byte = 1;
--
- 	/* set default values if they where undefined */
- 	p->conf.ebgp = (p->conf.remote_as != conf->as);
- 	if (p->conf.announce_type == ANNOUNCE_UNDEF)
--		p->conf.announce_type = p->conf.ebgp == 0 ?
--		    ANNOUNCE_ALL : ANNOUNCE_SELF;
-+		p->conf.announce_type = p->conf.ebgp ?
-+		    ANNOUNCE_SELF : ANNOUNCE_ALL;
- 	if (p->conf.enforce_as == ENFORCE_AS_UNDEF)
--		p->conf.enforce_as = p->conf.ebgp == 0 ?
--		    ENFORCE_AS_OFF : ENFORCE_AS_ON;
-+		p->conf.enforce_as = p->conf.ebgp ?
-+		    ENFORCE_AS_ON : ENFORCE_AS_OFF;
- 
- 	/* EBGP neighbors are not allowed in route reflector clusters */
- 	if (p->conf.reflector_client && p->conf.ebgp) {
-@@ -2909,6 +3419,11 @@ neighbor_consistent(struct peer *p)
- 		return (-1);
- 	}
- 
-+	/* the default MP capability is NONE */
-+	for (i = 0; i < AID_MAX; i++)
-+		if (p->conf.capabilities.mp[i] == -1)
-+			p->conf.capabilities.mp[i] = 0;
-+
- 	return (0);
- }
- 
-@@ -2927,6 +3442,11 @@ merge_filterset(struct filter_set_head *
- 				yyerror("community is already set");
- 			else if (s->type == ACTION_DEL_COMMUNITY)
- 				yyerror("community will already be deleted");
-+			else if (s->type == ACTION_SET_EXT_COMMUNITY)
-+				yyerror("ext-community is already set");
-+			else if (s->type == ACTION_DEL_EXT_COMMUNITY)
-+				yyerror(
-+				    "ext-community will already be deleted");
- 			else
- 				yyerror("redefining set parameter %s",
- 				    filterset_name(s->type));
-@@ -2953,9 +3473,18 @@ merge_filterset(struct filter_set_head *
- 					return (0);
- 				}
- 				break;
-+			case ACTION_SET_EXT_COMMUNITY:
-+			case ACTION_DEL_EXT_COMMUNITY:
-+				if (memcmp(&s->action.ext_community,
-+				    &t->action.ext_community,
-+				    sizeof(s->action.ext_community)) < 0) {
-+					TAILQ_INSERT_BEFORE(t, s, entry);
-+					return (0);
-+				}
-+				break;
- 			case ACTION_SET_NEXTHOP:
--				if (s->action.nexthop.af <
--				    t->action.nexthop.af) {
-+				if (s->action.nexthop.aid <
-+				    t->action.nexthop.aid) {
- 					TAILQ_INSERT_BEFORE(t, s, entry);
- 					return (0);
- 				}
-@@ -2985,22 +3514,6 @@ copy_filterset(struct filter_set_head *s
- 	}
- }
- 
--void
--move_filterset(struct filter_set_head *source, struct filter_set_head *dest)
--{
--	struct filter_set	*s;
--
--	TAILQ_INIT(dest);
--
--	if (source == NULL)
--		return;
--
--	while ((s = TAILQ_FIRST(source)) != NULL) {
--		TAILQ_REMOVE(source, s, entry);
--		TAILQ_INSERT_TAIL(dest, s, entry);
--	}
--}
--
- struct filter_rule *
- get_rule(enum action_types type)
- {
diff --git a/net/openbgpd/files/patch-bgpd_pfkey.c b/net/openbgpd/files/patch-bgpd_pfkey.c
deleted file mode 100644
index 224298fadf0d..000000000000
--- a/net/openbgpd/files/patch-bgpd_pfkey.c
+++ /dev/null
@@ -1,471 +0,0 @@
-diff -ur bgpd.orig/pfkey.c bgpd/pfkey.c
---- bgpd.orig/pfkey.c	2013-03-15 12:07:16.000000000 +0000
-+++ bgpd/pfkey.c	2013-03-15 12:07:47.000000000 +0000
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: pfkey.c,v 1.37 2009/04/21 15:25:52 henning Exp $ */
-+/*	$OpenBSD: pfkey.c,v 1.40 2009/12/14 17:38:18 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -21,7 +21,7 @@
- #include <sys/socket.h>
- #include <sys/uio.h>
- #include <net/pfkeyv2.h>
--#include <netinet/ip_ipsp.h>
-+//#include <netinet/ip_ipsp.h>
- #include <ctype.h>
- #include <errno.h>
- #include <limits.h>
-@@ -65,15 +65,15 @@
- {
- 	struct sadb_msg		smsg;
- 	struct sadb_sa		sa;
--	struct sadb_address	sa_src, sa_dst, sa_peer, sa_smask, sa_dmask;
-+	struct sadb_address	sa_src, sa_dst;
- 	struct sadb_key		sa_akey, sa_ekey;
- 	struct sadb_spirange	sa_spirange;
--	struct sadb_protocol	sa_flowtype, sa_protocol;
- 	struct iovec		iov[IOV_CNT];
- 	ssize_t			n;
- 	int			len = 0;
- 	int			iov_cnt;
--	struct sockaddr_storage	ssrc, sdst, speer, smask, dmask;
-+	struct sockaddr_storage	ssrc, sdst, smask, dmask;
-+	struct sockaddr		*saptr;
- 
- 	if (!pid)
- 		pid = getpid();
-@@ -81,22 +81,17 @@
- 	/* we need clean sockaddr... no ports set */
- 	bzero(&ssrc, sizeof(ssrc));
- 	bzero(&smask, sizeof(smask));
--	switch (src->af) {
--	case AF_INET:
--		((struct sockaddr_in *)&ssrc)->sin_addr = src->v4;
--		ssrc.ss_len = sizeof(struct sockaddr_in);
--		ssrc.ss_family = AF_INET;
-+	if ((saptr = addr2sa(src, 0)))
-+		memcpy(&ssrc, saptr, sizeof(ssrc));
-+	switch (src->aid) {
-+	case AID_INET:
- 		memset(&((struct sockaddr_in *)&smask)->sin_addr, 0xff, 32/8);
- 		break;
--	case AF_INET6:
--		memcpy(&((struct sockaddr_in6 *)&ssrc)->sin6_addr,
--		    &src->v6, sizeof(struct in6_addr));
--		ssrc.ss_len = sizeof(struct sockaddr_in6);
--		ssrc.ss_family = AF_INET6;
-+	case AID_INET6:
- 		memset(&((struct sockaddr_in6 *)&smask)->sin6_addr, 0xff,
- 		    128/8);
- 		break;
--	case 0:
-+	case AID_UNSPEC:
- 		ssrc.ss_len = sizeof(struct sockaddr);
- 		break;
- 	default:
-@@ -107,22 +102,17 @@
- 
- 	bzero(&sdst, sizeof(sdst));
- 	bzero(&dmask, sizeof(dmask));
--	switch (dst->af) {
--	case AF_INET:
--		((struct sockaddr_in *)&sdst)->sin_addr = dst->v4;
--		sdst.ss_len = sizeof(struct sockaddr_in);
--		sdst.ss_family = AF_INET;
-+	if ((saptr = addr2sa(dst, 0)))
-+		memcpy(&sdst, saptr, sizeof(sdst));
-+	switch (dst->aid) {
-+	case AID_INET:
- 		memset(&((struct sockaddr_in *)&dmask)->sin_addr, 0xff, 32/8);
- 		break;
--	case AF_INET6:
--		memcpy(&((struct sockaddr_in6 *)&sdst)->sin6_addr,
--		    &dst->v6, sizeof(struct in6_addr));
--		sdst.ss_len = sizeof(struct sockaddr_in6);
--		sdst.ss_family = AF_INET6;
-+	case AID_INET6:
- 		memset(&((struct sockaddr_in6 *)&dmask)->sin6_addr, 0xff,
- 		    128/8);
- 		break;
--	case 0:
-+	case AID_UNSPEC:
- 		sdst.ss_len = sizeof(struct sockaddr);
- 		break;
- 	default:
-@@ -135,7 +125,7 @@
- 	smsg.sadb_msg_version = PF_KEY_V2;
- 	smsg.sadb_msg_seq = ++sadb_msg_seq;
- 	smsg.sadb_msg_pid = pid;
--	smsg.sadb_msg_len = sizeof(smsg) / 8;
-+	smsg.sadb_msg_len = PFKEY_UNIT64(sizeof(smsg));
- 	smsg.sadb_msg_type = mtype;
- 	smsg.sadb_msg_satype = satype;
- 
-@@ -143,7 +133,7 @@
- 	case SADB_GETSPI:
- 		bzero(&sa_spirange, sizeof(sa_spirange));
- 		sa_spirange.sadb_spirange_exttype = SADB_EXT_SPIRANGE;
--		sa_spirange.sadb_spirange_len = sizeof(sa_spirange) / 8;
-+		sa_spirange.sadb_spirange_len = PFKEY_UNIT64(sizeof(sa_spirange));
- 		sa_spirange.sadb_spirange_min = 0x100;
- 		sa_spirange.sadb_spirange_max = 0xffffffff;
- 		sa_spirange.sadb_spirange_reserved = 0;
-@@ -153,11 +143,12 @@
- 	case SADB_DELETE:
- 		bzero(&sa, sizeof(sa));
- 		sa.sadb_sa_exttype = SADB_EXT_SA;
--		sa.sadb_sa_len = sizeof(sa) / 8;
-+		sa.sadb_sa_len = PFKEY_UNIT64(sizeof(sa));
- 		sa.sadb_sa_replay = 0;
- 		sa.sadb_sa_spi = spi;
- 		sa.sadb_sa_state = SADB_SASTATE_MATURE;
- 		break;
-+#if 0
- 	case SADB_X_ADDFLOW:
- 	case SADB_X_DELFLOW:
- 		bzero(&sa_flowtype, sizeof(sa_flowtype));
-@@ -172,35 +163,37 @@
- 		sa_protocol.sadb_protocol_direction = 0;
- 		sa_protocol.sadb_protocol_proto = 6;
- 		break;
-+#endif
- 	}
- 
- 	bzero(&sa_src, sizeof(sa_src));
- 	sa_src.sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
--	sa_src.sadb_address_len = (sizeof(sa_src) + ROUNDUP(ssrc.ss_len)) / 8;
-+	sa_src.sadb_address_len = PFKEY_UNIT64(sizeof(sa_src) + ROUNDUP(ssrc.ss_len));
- 
- 	bzero(&sa_dst, sizeof(sa_dst));
- 	sa_dst.sadb_address_exttype = SADB_EXT_ADDRESS_DST;
--	sa_dst.sadb_address_len = (sizeof(sa_dst) + ROUNDUP(sdst.ss_len)) / 8;
-+	sa_dst.sadb_address_len = PFKEY_UNIT64(sizeof(sa_dst) + ROUNDUP(sdst.ss_len));
- 
- 	sa.sadb_sa_auth = aalg;
--	sa.sadb_sa_encrypt = SADB_X_EALG_AES; /* XXX */
-+	sa.sadb_sa_encrypt = ealg; /* XXX */
- 
- 	switch (mtype) {
- 	case SADB_ADD:
- 	case SADB_UPDATE:
- 		bzero(&sa_akey, sizeof(sa_akey));
- 		sa_akey.sadb_key_exttype = SADB_EXT_KEY_AUTH;
--		sa_akey.sadb_key_len = (sizeof(sa_akey) +
--		    ((alen + 7) / 8) * 8) / 8;
-+		sa_akey.sadb_key_len = PFKEY_UNIT64(sizeof(sa_akey) +
-+		    (PFKEY_ALIGN8(alen)));
- 		sa_akey.sadb_key_bits = 8 * alen;
- 
- 		bzero(&sa_ekey, sizeof(sa_ekey));
- 		sa_ekey.sadb_key_exttype = SADB_EXT_KEY_ENCRYPT;
--		sa_ekey.sadb_key_len = (sizeof(sa_ekey) +
--		    ((elen + 7) / 8) * 8) / 8;
-+		sa_ekey.sadb_key_len = PFKEY_UNIT64(sizeof(sa_ekey) +
-+		    (PFKEY_ALIGN8(elen)));
- 		sa_ekey.sadb_key_bits = 8 * elen;
- 
- 		break;
-+#if 0
- 	case SADB_X_ADDFLOW:
- 	case SADB_X_DELFLOW:
- 		/* sa_peer always points to the remote machine */
-@@ -220,8 +213,8 @@
- 		sa_dst.sadb_address_exttype = SADB_X_EXT_DST_FLOW;
- 
- 		bzero(&smask, sizeof(smask));
--		switch (src->af) {
--		case AF_INET:
-+		switch (src->aid) {
-+		case AID_INET:
- 			smask.ss_len = sizeof(struct sockaddr_in);
- 			smask.ss_family = AF_INET;
- 			memset(&((struct sockaddr_in *)&smask)->sin_addr,
-@@ -233,7 +226,7 @@
- 				    htons(0xffff);
- 			}
- 			break;
--		case AF_INET6:
-+		case AID_INET6:
- 			smask.ss_len = sizeof(struct sockaddr_in6);
- 			smask.ss_family = AF_INET6;
- 			memset(&((struct sockaddr_in6 *)&smask)->sin6_addr,
-@@ -247,8 +240,8 @@
- 			break;
- 		}
- 		bzero(&dmask, sizeof(dmask));
--		switch (dst->af) {
--		case AF_INET:
-+		switch (dst->aid) {
-+		case AID_INET:
- 			dmask.ss_len = sizeof(struct sockaddr_in);
- 			dmask.ss_family = AF_INET;
- 			memset(&((struct sockaddr_in *)&dmask)->sin_addr,
-@@ -260,7 +253,7 @@
- 				    htons(0xffff);
- 			}
- 			break;
--		case AF_INET6:
-+		case AID_INET6:
- 			dmask.ss_len = sizeof(struct sockaddr_in6);
- 			dmask.ss_family = AF_INET6;
- 			memset(&((struct sockaddr_in6 *)&dmask)->sin6_addr,
-@@ -284,6 +277,7 @@
- 		sa_dmask.sadb_address_len =
- 		    (sizeof(sa_dmask) + ROUNDUP(dmask.ss_len)) / 8;
- 		break;
-+#endif
- 	}
- 
- 	iov_cnt = 0;
-@@ -310,6 +304,7 @@
- 		smsg.sadb_msg_len += sa_spirange.sadb_spirange_len;
- 		iov_cnt++;
- 		break;
-+#if 0
- 	case SADB_X_ADDFLOW:
- 		/* sa_peer always points to the remote machine */
- 		iov[iov_cnt].iov_base = &sa_peer;
-@@ -351,6 +346,7 @@
- 		smsg.sadb_msg_len += sa_dmask.sadb_address_len;
- 		iov_cnt++;
- 		break;
-+#endif
- 	}
- 
- 	/* dest addr */
-@@ -380,7 +376,7 @@
- 			iov[iov_cnt].iov_len = sizeof(sa_akey);
- 			iov_cnt++;
- 			iov[iov_cnt].iov_base = akey;
--			iov[iov_cnt].iov_len = ((alen + 7) / 8) * 8;
-+			iov[iov_cnt].iov_len = PFKEY_ALIGN8(alen);
- 			smsg.sadb_msg_len += sa_akey.sadb_key_len;
- 			iov_cnt++;
- 		}
-@@ -390,14 +386,14 @@
- 			iov[iov_cnt].iov_len = sizeof(sa_ekey);
- 			iov_cnt++;
- 			iov[iov_cnt].iov_base = ekey;
--			iov[iov_cnt].iov_len = ((elen + 7) / 8) * 8;
-+			iov[iov_cnt].iov_len = PFKEY_ALIGN8(elen);
- 			smsg.sadb_msg_len += sa_ekey.sadb_key_len;
- 			iov_cnt++;
- 		}
- 		break;
- 	}
- 
--	len = smsg.sadb_msg_len * 8;
-+	len = PFKEY_UNUNIT64(smsg.sadb_msg_len);
- 	do {
- 		n = writev(sd, iov, iov_cnt);
- 	} while (n == -1 && (errno == EAGAIN || errno == EINTR));
-@@ -411,6 +407,33 @@
- }
- 
- int
-+pfkey_read(int sd, struct sadb_msg *h)
-+{
-+	struct sadb_msg hdr;
-+
-+	if (recv(sd, &hdr, sizeof(hdr), MSG_PEEK) != sizeof(hdr)) {
-+		log_warn("pfkey peek");
-+		return (-1);
-+	}
-+
-+	/* XXX: Only one message can be outstanding. */
-+	if (hdr.sadb_msg_seq == sadb_msg_seq &&
-+	    hdr.sadb_msg_pid == pid) {
-+		if (h)
-+			bcopy(&hdr, h, sizeof(hdr));
-+		return (0);
-+	}
-+
-+	/* not ours, discard */
-+	if (read(sd, &hdr, sizeof(hdr)) == -1) {
-+		log_warn("pfkey read");
-+		return (-1);
-+	}
-+
-+	return (1);
-+}
-+
-+int
- pfkey_reply(int sd, u_int32_t *spip)
- {
- 	struct sadb_msg hdr, *msg;
-@@ -418,27 +441,17 @@
- 	struct sadb_sa *sa;
- 	u_int8_t *data;
- 	ssize_t len;
-+	int rv;
- 
--	for (;;) {
--		if (recv(sd, &hdr, sizeof(hdr), MSG_PEEK) != sizeof(hdr)) {
--			log_warn("pfkey peek");
--			return (-1);
--		}
--
--		if (hdr.sadb_msg_seq == sadb_msg_seq &&
--		    hdr.sadb_msg_pid == pid)
--			break;
--
--		/* not ours, discard */
--		if (read(sd, &hdr, sizeof(hdr)) == -1) {
--			log_warn("pfkey read");
-+	do {
-+		rv = pfkey_read(sd, &hdr);
-+		if (rv == -1)
- 			return (-1);
--		}
--	}
-+	} while (rv);
- 
- 	if (hdr.sadb_msg_errno != 0) {
- 		errno = hdr.sadb_msg_errno;
--		if (errno == ESRCH)
-+		if (errno == ESRCH || errno == EEXIST)
- 			return (0);
- 		else {
- 			log_warn("pfkey");
-@@ -486,13 +499,8 @@
- pfkey_sa_add(struct bgpd_addr *src, struct bgpd_addr *dst, u_int8_t keylen,
-     char *key, u_int32_t *spi)
- {
--	if (pfkey_send(fd, SADB_X_SATYPE_TCPSIGNATURE, SADB_GETSPI, 0,
--	    src, dst, 0, 0, 0, NULL, 0, 0, NULL, 0, 0) < 0)
--		return (-1);
--	if (pfkey_reply(fd, spi) < 0)
--		return (-1);
--	if (pfkey_send(fd, SADB_X_SATYPE_TCPSIGNATURE, SADB_UPDATE, 0,
--		src, dst, *spi, 0, keylen, key, 0, 0, NULL, 0, 0) < 0)
-+	if (pfkey_send(fd, SADB_X_SATYPE_TCPSIGNATURE, SADB_ADD, 0,
-+		src, dst, *spi, SADB_X_AALG_TCP_MD5, keylen, key, SADB_EALG_NONE, 0, NULL, 0, 0) < 0)
- 		return (-1);
- 	if (pfkey_reply(fd, NULL) < 0)
- 		return (-1);
-@@ -503,7 +511,7 @@
- pfkey_sa_remove(struct bgpd_addr *src, struct bgpd_addr *dst, u_int32_t *spi)
- {
- 	if (pfkey_send(fd, SADB_X_SATYPE_TCPSIGNATURE, SADB_DELETE, 0,
--	    src, dst, *spi, 0, 0, NULL, 0, 0, NULL, 0, 0) < 0)
-+	    src, dst, *spi, SADB_X_AALG_TCP_MD5, 0, NULL, 0, 0, NULL, 0, 0) < 0)
- 		return (-1);
- 	if (pfkey_reply(fd, NULL) < 0)
- 		return (-1);
-@@ -511,37 +519,37 @@
- 	return (0);
- }
- 
-+#define TCP_SIG_SPI     0x1000
- int
- pfkey_md5sig_establish(struct peer *p)
- {
- 	sleep(1);
- 
--	if (!p->auth.spi_out)
--		if (pfkey_sa_add(&p->auth.local_addr, &p->conf.remote_addr,
--		    p->conf.auth.md5key_len, p->conf.auth.md5key,
--		    &p->auth.spi_out) == -1)
--			return (-1);
--	if (!p->auth.spi_in)
--		if (pfkey_sa_add(&p->conf.remote_addr, &p->auth.local_addr,
--		    p->conf.auth.md5key_len, p->conf.auth.md5key,
--		    &p->auth.spi_in) == -1)
--			return (-1);
-+	p->auth.spi_out = htonl(TCP_SIG_SPI);
-+	if (pfkey_sa_add(&p->auth.local_addr, &p->conf.remote_addr,
-+	    p->conf.auth.md5key_len, p->conf.auth.md5key,
-+	    &p->auth.spi_out) == -1)
-+		return (-1);
-+	p->auth.spi_in = htonl(TCP_SIG_SPI);
-+	if (pfkey_sa_add(&p->conf.remote_addr, &p->auth.local_addr,
-+	    p->conf.auth.md5key_len, p->conf.auth.md5key,
-+	    &p->auth.spi_out) == -1)
-+		return (-1);
- 
- 	p->auth.established = 1;
- 	return (0);
- }
-+#undef TCP_SIG_SPI
- 
- int
- pfkey_md5sig_remove(struct peer *p)
- {
--	if (p->auth.spi_out)
--		if (pfkey_sa_remove(&p->auth.local_addr, &p->conf.remote_addr,
--		    &p->auth.spi_out) == -1)
--			return (-1);
--	if (p->auth.spi_in)
--		if (pfkey_sa_remove(&p->conf.remote_addr, &p->auth.local_addr,
--		    &p->auth.spi_in) == -1)
--			return (-1);
-+	if (pfkey_sa_remove(&p->auth.local_addr, &p->conf.remote_addr,
-+	    &p->auth.spi_out) == -1)
-+		return (-1);
-+	if (pfkey_sa_remove(&p->conf.remote_addr, &p->auth.local_addr,
-+	    &p->auth.spi_in) == -1)
-+		return (-1);
- 
- 	p->auth.established = 0;
- 	return (0);
-@@ -550,6 +558,7 @@
- int
- pfkey_ipsec_establish(struct peer *p)
- {
-+#if 0
- 	uint8_t satype = SADB_SATYPE_ESP;
- 
- 	switch (p->auth.method) {
-@@ -621,6 +630,9 @@
- 
- 	p->auth.established = 1;
- 	return (0);
-+#else
-+	return (-1);
-+#endif
- }
- 
- int
-@@ -660,6 +672,7 @@
- 		break;
- 	}
- 
-+#if 0
- 	if (pfkey_flow(fd, satype, SADB_X_DELFLOW, IPSP_DIRECTION_OUT,
- 	    &p->auth.local_addr, &p->conf.remote_addr, 0, BGP_PORT) < 0)
- 		return (-1);
-@@ -681,6 +694,7 @@
- 	if (pfkey_flow(fd, satype, SADB_X_DELFLOW, IPSP_DIRECTION_IN,
- 	    &p->conf.remote_addr, &p->auth.local_addr, BGP_PORT, 0) < 0)
- 		return (-1);
-+#endif
- 	if (pfkey_reply(fd, NULL) < 0)
- 		return (-1);
- 
-@@ -715,9 +729,7 @@
- int
- pfkey_remove(struct peer *p)
- {
--	if (!p->auth.established)
--		return (0);
--	else if (p->auth.method == AUTH_MD5SIG)
-+	if (p->auth.method == AUTH_MD5SIG)
- 		return (pfkey_md5sig_remove(p));
- 	else
- 		return (pfkey_ipsec_remove(p));
-@@ -730,11 +742,9 @@
- 		if (errno == EPROTONOSUPPORT) {
- 			log_warnx("PF_KEY not available, disabling ipsec");
- 			sysdep->no_pfkey = 1;
--			return (0);
--		} else {
--			log_warn("PF_KEY socket");
- 			return (-1);
--		}
-+		} else
-+			fatal("pfkey setup failed");
- 	}
--	return (0);
-+	return (fd);
- }
diff --git a/net/openbgpd/files/patch-bgpd_pftable.c b/net/openbgpd/files/patch-bgpd_pftable.c
deleted file mode 100644
index ee6a1ea2750c..000000000000
--- a/net/openbgpd/files/patch-bgpd_pftable.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: bgpd/pftable.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/pftable.c,v
-retrieving revision 1.1.1.5
-retrieving revision 1.1.1.7
-diff -u -p -r1.1.1.5 -r1.1.1.7
---- bgpd/pftable.c	14 Feb 2010 20:19:57 -0000	1.1.1.5
-+++ bgpd/pftable.c	13 Oct 2012 18:22:44 -0000	1.1.1.7
-@@ -214,7 +214,7 @@ pftable_add_work(const char *table, stru
- 
- 	bzero(pfa, sizeof(*pfa));
- 	memcpy(&pfa->pfra_u, &addr->ba, (len + 7U) / 8);
--	pfa->pfra_af = addr->af;
-+	pfa->pfra_af = aid2af(addr->aid);
- 	pfa->pfra_net = len;
- 
- 	pft->naddrs++;
diff --git a/net/openbgpd/files/patch-bgpd_printconf.c b/net/openbgpd/files/patch-bgpd_printconf.c
deleted file mode 100644
index 9b00e1efa386..000000000000
--- a/net/openbgpd/files/patch-bgpd_printconf.c
+++ /dev/null
@@ -1,439 +0,0 @@
-Index: bgpd/printconf.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/printconf.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.11
-diff -u -p -r1.1.1.7 -r1.11
---- bgpd/printconf.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/printconf.c	16 May 2014 00:36:26 -0000	1.11
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: printconf.c,v 1.70 2009/06/06 01:10:29 claudio Exp $	*/
-+/*	$OpenBSD: printconf.c,v 1.88 2012/09/23 09:39:18 claudio Exp $	*/
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -16,9 +16,13 @@
-  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(__FreeBSD__)	/* limits.h */
-+#include <limits.h>
-+#endif
- 
- #include "bgpd.h"
- #include "mrt.h"
-@@ -27,14 +31,19 @@
- 
- void		 print_op(enum comp_ops);
- void		 print_community(int, int);
-+void		 print_extcommunity(struct filter_extcommunity *);
-+void		 print_origin(u_int8_t);
- void		 print_set(struct filter_set_head *);
- void		 print_mainconf(struct bgpd_config *);
-+void		 print_rdomain_targets(struct filter_set_head *, const char *);
-+void		 print_rdomain(struct rdomain *);
-+const char	*print_af(u_int8_t);
- void		 print_network(struct network_config *);
- void		 print_peer(struct peer_config *, struct bgpd_config *,
- 		    const char *);
- const char	*print_auth_alg(u_int8_t);
- const char	*print_enc_alg(u_int8_t);
--const char	*print_safi(u_int8_t);
-+void		 print_announce(struct peer_config *, const char *);
- void		 print_rule(struct peer *, struct filter_rule *);
- const char *	 mrt_type(enum mrt_type);
- void		 print_mrt(u_int32_t, u_int32_t, const char *, const char *);
-@@ -94,6 +103,45 @@ print_community(int as, int type)
- }
- 
- void
-+print_extcommunity(struct filter_extcommunity *c)
-+{
-+	switch (c->type & EXT_COMMUNITY_VALUE) {
-+	case EXT_COMMUNITY_TWO_AS:
-+		printf("%s %i:%i ", log_ext_subtype(c->subtype),
-+		    c->data.ext_as.as, c->data.ext_as.val);
-+		break;
-+	case EXT_COMMUNITY_IPV4:
-+		printf("%s %s:%i ", log_ext_subtype(c->subtype),
-+		    inet_ntoa(c->data.ext_ip.addr), c->data.ext_ip.val);
-+		break;
-+	case EXT_COMMUNITY_FOUR_AS:
-+		printf("%s %s:%i ", log_ext_subtype(c->subtype),
-+		    log_as(c->data.ext_as4.as4), c->data.ext_as.val);
-+		break;
-+	case EXT_COMMUNITY_OPAQUE:
-+		printf("%s 0x%llx ", log_ext_subtype(c->subtype),
-+		    (long long unsigned int)c->data.ext_opaq);
-+		break;
-+	default:
-+		printf("0x%x 0x%llx ", c->type, (long long unsigned int)c->data.ext_opaq);
-+		break;
-+	}
-+}
-+
-+void
-+print_origin(u_int8_t o)
-+{
-+	if (o == ORIGIN_IGP)
-+		printf("igp ");
-+	else if (o == ORIGIN_EGP)
-+		printf("egp ");
-+	else if (o == ORIGIN_INCOMPLETE)
-+		printf("incomplete ");
-+	else
-+		printf("%u ", o);
-+}
-+
-+void
- print_set(struct filter_set_head *set)
- {
- 	struct filter_set	*s;
-@@ -161,11 +209,23 @@ print_set(struct filter_set_head *set)
- 		case ACTION_RTLABEL:
- 			printf("rtlabel %s ", s->action.rtlabel);
- 			break;
-+		case ACTION_SET_ORIGIN:
-+			printf("origin ");
-+			print_origin(s->action.origin);
-+			break;
- 		case ACTION_RTLABEL_ID:
- 		case ACTION_PFTABLE_ID:
- 			/* not possible */
- 			printf("king bula saiz: config broken");
- 			break;
-+		case ACTION_SET_EXT_COMMUNITY:
-+			printf("ext-community ");
-+			print_extcommunity(&s->action.ext_community);
-+			break;
-+		case ACTION_DEL_EXT_COMMUNITY:
-+			printf("ext-community delete ");
-+			print_extcommunity(&s->action.ext_community);
-+			break;
- 		}
- 	}
- 	printf("}");
-@@ -182,6 +242,10 @@ print_mainconf(struct bgpd_config *conf)
- 		printf(" %u", conf->short_as);
- 	ina.s_addr = conf->bgpid;
- 	printf("\nrouter-id %s\n", inet_ntoa(ina));
-+
-+	printf("socket \"%s\"\n", conf->csock);
-+	if (conf->rcsock)
-+		printf("socket \"%s\" restricted\n", conf->rcsock);
- 	if (conf->holdtime)
- 		printf("holdtime %u\n", conf->holdtime);
- 	if (conf->min_holdtime)
-@@ -189,11 +253,6 @@ print_mainconf(struct bgpd_config *conf)
- 	if (conf->connectretry)
- 		printf("connect-retry %u\n", conf->connectretry);
- 
--	if (conf->flags & BGPD_FLAG_NO_FIB_UPDATE)
--		printf("fib-update no\n");
--	else
--		printf("fib-update yes\n");
--
- 	if (conf->flags & BGPD_FLAG_NO_EVALUATE)
- 		printf("route-collector yes\n");
- 
-@@ -214,43 +273,67 @@ print_mainconf(struct bgpd_config *conf)
- 		printf("nexthop qualify via bgp\n");
- 	if (conf->flags & BGPD_FLAG_NEXTHOP_DEFAULT)
- 		printf("nexthop qualify via default\n");
-+}
- 
--	if (conf->flags & BGPD_FLAG_REDIST_CONNECTED) {
--		printf("network inet connected");
--		if (!TAILQ_EMPTY(&conf->connectset))
--			printf(" ");
--		print_set(&conf->connectset);
--		printf("\n");
--	}
--	if (conf->flags & BGPD_FLAG_REDIST_STATIC) {
--		printf("network inet static");
--		if (!TAILQ_EMPTY(&conf->staticset))
--			printf(" ");
--		print_set(&conf->staticset);
--		printf("\n");
--	}
--	if (conf->flags & BGPD_FLAG_REDIST6_CONNECTED) {
--		printf("network inet6 connected");
--		if (!TAILQ_EMPTY(&conf->connectset6))
--			printf(" ");
--		print_set(&conf->connectset6);
--		printf("\n");
--	}
--	if (conf->flags & BGPD_FLAG_REDIST_STATIC) {
--		printf("network inet6 static");
--		if (!TAILQ_EMPTY(&conf->staticset6))
--			printf(" ");
--		print_set(&conf->staticset6);
-+void
-+print_rdomain_targets(struct filter_set_head *set, const char *tgt)
-+{
-+	struct filter_set	*s;
-+	TAILQ_FOREACH(s, set, entry) {
-+		printf("\t%s ", tgt);
-+		print_extcommunity(&s->action.ext_community);
- 		printf("\n");
- 	}
--	if (conf->rtableid)
--		printf("rtable %u\n", conf->rtableid);
-+}
-+
-+void
-+print_rdomain(struct rdomain *r)
-+{
-+	printf("rdomain %u {\n", r->rtableid);
-+	printf("\tdescr \"%s\"\n", r->descr);
-+	if (r->flags & F_RIB_NOFIBSYNC)
-+		printf("\tfib-update no\n");
-+	else
-+		printf("\tfib-update yes\n");
-+	printf("\tdepend on %s\n", r->ifmpe);
-+
-+	printf("\n\t%s\n", log_rd(r->rd));
-+
-+	print_rdomain_targets(&r->export, "export-target");
-+	print_rdomain_targets(&r->import, "import-target");
-+
-+	printf("}\n");
-+}
-+
-+const char *
-+print_af(u_int8_t aid)
-+{
-+	/*
-+	 * Hack around the fact that aid2str() will return "IPv4 unicast"
-+	 * for AID_INET. AID_INET and AID_INET6 need special handling and
-+	 * the other AID should never end up here (at least for now).
-+	 */
-+	if (aid == AID_INET)
-+		return ("inet");
-+	if (aid == AID_INET6)
-+		return ("inet6");
-+	return (aid2str(aid));
- }
- 
- void
- print_network(struct network_config *n)
- {
--	printf("network %s/%u", log_addr(&n->prefix), n->prefixlen);
-+	switch (n->type) {
-+	case NETWORK_STATIC:
-+		printf("network %s static", print_af(n->prefix.aid));
-+		break;
-+	case NETWORK_CONNECTED:
-+		printf("network %s connected", print_af(n->prefix.aid));
-+		break;
-+	default:
-+		printf("network %s/%u", log_addr(&n->prefix), n->prefixlen);
-+		break;
-+	}
- 	if (!TAILQ_EMPTY(&n->attrset))
- 		printf(" ");
- 	print_set(&n->attrset);
-@@ -263,8 +346,8 @@ print_peer(struct peer_config *p, struct
- 	char		*method;
- 	struct in_addr	 ina;
- 
--	if ((p->remote_addr.af == AF_INET && p->remote_masklen != 32) ||
--	    (p->remote_addr.af == AF_INET6 && p->remote_masklen != 128))
-+	if ((p->remote_addr.aid == AID_INET && p->remote_masklen != 32) ||
-+	    (p->remote_addr.aid == AID_INET6 && p->remote_masklen != 128))
- 		printf("%sneighbor %s/%u {\n", c, log_addr(&p->remote_addr),
- 		    p->remote_masklen);
- 	else
-@@ -281,7 +364,7 @@ print_peer(struct peer_config *p, struct
- 		printf("%s\tmultihop %u\n", c, p->distance);
- 	if (p->passive)
- 		printf("%s\tpassive\n", c);
--	if (p->local_addr.af)
-+	if (p->local_addr.aid)
- 		printf("%s\tlocal-address %s\n", c, log_addr(&p->local_addr));
- 	if (p->max_prefix) {
- 		printf("%s\tmax-prefix %u", c, p->max_prefix);
-@@ -295,6 +378,12 @@ print_peer(struct peer_config *p, struct
- 		printf("%s\tholdtime min %u\n", c, p->min_holdtime);
- 	if (p->announce_capa == 0)
- 		printf("%s\tannounce capabilities no\n", c);
-+	if (p->capabilities.refresh == 0)
-+		printf("%s\tannounce refresh no\n", c);
-+	if (p->capabilities.grestart.restart == 0)
-+		printf("%s\tannounce restart no\n", c);
-+	if (p->capabilities.as4byte == 0)
-+		printf("%s\tannounce as4byte no\n", c);
- 	if (p->announce_type == ANNOUNCE_SELF)
- 		printf("%s\tannounce self\n", c);
- 	else if (p->announce_type == ANNOUNCE_NONE)
-@@ -324,6 +413,10 @@ print_peer(struct peer_config *p, struct
- 		printf("%s\tdepend on \"%s\"\n", c, p->if_depend);
- 	if (p->flags & PEERFLAG_TRANS_AS)
- 		printf("%s\ttransparent-as yes\n", c);
-+#if defined(IPV6_LINKLOCAL_PEER)
-+	if (p->lliface[0])
-+		printf("%s\tinterface %s\n", c, p->lliface);
-+#endif
- 
- 	if (p->auth.method == AUTH_MD5SIG)
- 		printf("%s\ttcp md5sig\n", c);
-@@ -354,8 +447,7 @@ print_peer(struct peer_config *p, struct
- 	if (p->ttlsec)
- 		printf("%s\tttl-security yes\n", c);
- 
--	printf("%s\tannounce IPv4 %s\n", c, print_safi(p->capabilities.mp_v4));
--	printf("%s\tannounce IPv6 %s\n", c, print_safi(p->capabilities.mp_v6));
-+	print_announce(p, c);
- 
- 	if (p->softreconfig_in == 1)
- 		printf("%s\tsoftreconfig in yes\n", c);
-@@ -399,17 +491,14 @@ print_enc_alg(u_int8_t alg)
- 	}
- }
- 
--const char *
--print_safi(u_int8_t safi)
-+void
-+print_announce(struct peer_config *p, const char *c)
- {
--	switch (safi) {
--	case SAFI_NONE:
--		return ("none");
--	case SAFI_UNICAST:
--		return ("unicast");
--	default:
--		return ("?");
--	}
-+	u_int8_t	aid;
-+
-+	for (aid = 0; aid < AID_MAX; aid++)
-+		if (p->capabilities.mp[aid])
-+			printf("%s\tannounce %s\n", c, aid2str(aid));
- }
- 
- void
-@@ -455,14 +544,14 @@ print_rule(struct peer *peer_l, struct f
- 	} else
- 		printf("any ");
- 
--	if (r->match.prefix.addr.af)
-+	if (r->match.prefix.addr.aid)
- 		printf("prefix %s/%u ", log_addr(&r->match.prefix.addr),
- 		    r->match.prefix.len);
- 
--	if (r->match.prefix.addr.af == 0 && r->match.prefixlen.af) {
--		if (r->match.prefixlen.af == AF_INET)
-+	if (r->match.prefix.addr.aid == 0 && r->match.prefixlen.aid) {
-+		if (r->match.prefixlen.aid == AID_INET)
- 			printf("inet ");
--		if (r->match.prefixlen.af == AF_INET6)
-+		if (r->match.prefixlen.aid == AID_INET6)
- 			printf("inet6 ");
- 	}
- 
-@@ -479,6 +568,13 @@ print_rule(struct peer *peer_l, struct f
- 		}
- 	}
- 
-+	if (r->match.nexthop.flags) {
-+		if (r->match.nexthop.flags == FILTER_NEXTHOP_NEIGHBOR)
-+			printf("nexthop neighbor ");
-+		else
-+			printf("nexthop %s ", log_addr(&r->match.nexthop.addr));
-+	}
-+
- 	if (r->match.as.type) {
- 		if (r->match.as.type == AS_ALL)
- 			printf("AS %s ", log_as(r->match.as.as));
-@@ -492,11 +588,20 @@ print_rule(struct peer *peer_l, struct f
- 			printf("unfluffy-as %s ", log_as(r->match.as.as));
- 	}
- 
-+	if (r->match.aslen.type) {
-+		printf("%s %u ", r->match.aslen.type == ASLEN_MAX ?
-+		    "max-as-len" : "max-as-seq", r->match.aslen.aslen);
-+	}
-+
- 	if (r->match.community.as != COMMUNITY_UNSET) {
- 		printf("community ");
- 		print_community(r->match.community.as,
- 		    r->match.community.type);
- 	}
-+	if (r->match.ext_community.flags & EXT_COMMUNITY_FLAG_VALID) {
-+		printf("ext-community ");
-+		print_extcommunity(&r->match.ext_community);
-+	}
- 
- 	print_set(&r->set);
- 
-@@ -513,6 +618,8 @@ mrt_type(enum mrt_type t)
- 		return "table";
- 	case MRT_TABLE_DUMP_MP:
- 		return "table-mp";
-+	case MRT_TABLE_DUMP_V2:
-+		return "table-v2";
- 	case MRT_ALL_IN:
- 		return "all in";
- 	case MRT_ALL_OUT:
-@@ -541,12 +648,12 @@ print_mrt(u_int32_t pid, u_int32_t gid, 
- 			printf("%s%sdump ", prep, prep2);
- 			if (m->rib[0])
- 				printf("rib %s ", m->rib);
-+			printf("%s \"%s\"", mrt_type(m->type),
-+			    MRT2MC(m)->name);
- 			if (MRT2MC(m)->ReopenTimerInterval == 0)
--				printf("%s %s\n", mrt_type(m->type),
--				    MRT2MC(m)->name);
-+				printf("\n");
- 			else
--				printf("%s %s %d\n", mrt_type(m->type),
--				    MRT2MC(m)->name,
-+				printf(" %ld\n",
- 				    MRT2MC(m)->ReopenTimerInterval);
- 		}
- }
-@@ -612,26 +719,34 @@ peer_compare(const void *aa, const void 
- void
- print_config(struct bgpd_config *conf, struct rib_names *rib_l,
-     struct network_head *net_l, struct peer *peer_l,
--    struct filter_head *rules_l, struct mrt_head *mrt_l)
-+    struct filter_head *rules_l, struct mrt_head *mrt_l,
-+    struct rdomain_head *rdom_l)
- {
- 	struct filter_rule	*r;
- 	struct network		*n;
- 	struct rde_rib		*rr;
-+	struct rdomain		*rd;
- 
- 	xmrt_l = mrt_l;
--	printf("\n");
- 	print_mainconf(conf);
- 	printf("\n");
-+	TAILQ_FOREACH(n, net_l, entry)
-+		print_network(&n->net);
-+	printf("\n");
-+	SIMPLEQ_FOREACH(rd, rdom_l, entry)
-+		print_rdomain(rd);
-+	printf("\n");
- 	SIMPLEQ_FOREACH(rr, rib_l, entry) {
- 		if (rr->flags & F_RIB_NOEVALUATE)
- 			printf("rde rib %s no evaluate\n", rr->name);
--		else
-+		else if (rr->flags & F_RIB_NOFIB)
- 			printf("rde rib %s\n", rr->name);
-+		else
-+			printf("rde rib %s rtable %u fib-update %s\n", rr->name,
-+			    rr->rtableid, rr->flags & F_RIB_NOFIBSYNC ?
-+			    "no" : "yes");
- 	}
- 	printf("\n");
--	TAILQ_FOREACH(n, net_l, entry)
--		print_network(&n->net);
--	printf("\n");
- 	print_mrt(0, 0, "", "");
- 	printf("\n");
- 	print_groups(conf, peer_l);
diff --git a/net/openbgpd/files/patch-bgpd_rde.c b/net/openbgpd/files/patch-bgpd_rde.c
deleted file mode 100644
index 76761d859f1d..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde.c
+++ /dev/null
@@ -1,2614 +0,0 @@
-Index: bgpd/rde.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde.c,v
-retrieving revision 1.1.1.8
-retrieving revision 1.12
-diff -u -p -r1.1.1.8 -r1.12
---- bgpd/rde.c	14 Feb 2010 20:19:57 -0000	1.1.1.8
-+++ bgpd/rde.c	16 May 2014 00:36:26 -0000	1.12
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: rde.c,v 1.264 2009/06/29 12:22:16 claudio Exp $ */
-+/*	$OpenBSD: rde.c,v 1.320 2012/09/18 09:45:51 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -18,10 +18,11 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- 
- #include <errno.h>
- #include <ifaddrs.h>
--#include <limits.h>
- #include <pwd.h>
- #include <poll.h>
- #include <signal.h>
-@@ -50,13 +51,18 @@ void		 rde_update_withdraw(struct rde_pe
- 		     u_int8_t);
- int		 rde_attr_parse(u_char *, u_int16_t, struct rde_peer *,
- 		     struct rde_aspath *, struct mpattr *);
-+int		 rde_attr_add(struct rde_aspath *, u_char *, u_int16_t);
- u_int8_t	 rde_attr_missing(struct rde_aspath *, int, u_int16_t);
--int		 rde_get_mp_nexthop(u_char *, u_int16_t, u_int16_t,
--		     struct rde_aspath *);
-+int		 rde_get_mp_nexthop(u_char *, u_int16_t, u_int8_t,
-+		     struct rde_aspath *, struct rde_peer *);
-+int		 rde_update_extract_prefix(u_char *, u_int16_t, void *,
-+		     u_int8_t, u_int8_t);
- int		 rde_update_get_prefix(u_char *, u_int16_t, struct bgpd_addr *,
- 		     u_int8_t *);
- int		 rde_update_get_prefix6(u_char *, u_int16_t, struct bgpd_addr *,
- 		     u_int8_t *);
-+int		 rde_update_get_vpn4(u_char *, u_int16_t, struct bgpd_addr *,
-+		     u_int8_t *);
- void		 rde_update_err(struct rde_peer *, u_int8_t , u_int8_t,
- 		     void *, u_int16_t);
- void		 rde_update_log(const char *, u_int16_t,
-@@ -78,11 +84,15 @@ void		 rde_dump_ctx_new(struct ctl_show_
- void		 rde_dump_mrt_new(struct mrt *, pid_t, int);
- void		 rde_dump_done(void *);
- 
-+int		 rde_rdomain_import(struct rde_aspath *, struct rdomain *);
- void		 rde_up_dump_upcall(struct rib_entry *, void *);
- void		 rde_softreconfig_out(struct rib_entry *, void *);
- void		 rde_softreconfig_in(struct rib_entry *, void *);
-+void		 rde_softreconfig_load(struct rib_entry *, void *);
-+void		 rde_softreconfig_load_peer(struct rib_entry *, void *);
-+void		 rde_softreconfig_unload_peer(struct rib_entry *, void *);
- void		 rde_update_queue_runner(void);
--void		 rde_update6_queue_runner(void);
-+void		 rde_update6_queue_runner(u_int8_t);
- 
- void		 peer_init(u_int32_t);
- void		 peer_shutdown(void);
-@@ -91,10 +101,12 @@ struct rde_peer	*peer_add(u_int32_t, str
- struct rde_peer	*peer_get(u_int32_t);
- void		 peer_up(u_int32_t, struct session_up *);
- void		 peer_down(u_int32_t);
--void		 peer_dump(u_int32_t, u_int16_t, u_int8_t);
--void		 peer_send_eor(struct rde_peer *, u_int16_t, u_int16_t);
-+void		 peer_flush(struct rde_peer *, u_int8_t);
-+void		 peer_stale(u_int32_t, u_int8_t);
-+void		 peer_recv_eor(struct rde_peer *, u_int8_t);
-+void		 peer_dump(u_int32_t, u_int8_t);
-+void		 peer_send_eor(struct rde_peer *, u_int8_t);
- 
--void		 network_init(struct network_head *);
- void		 network_add(struct network_config *, int);
- void		 network_delete(struct network_config *, int);
- void		 network_dump_upcall(struct rib_entry *, void *);
-@@ -108,6 +120,7 @@ time_t			 reloadtime;
- struct rde_peer_head	 peerlist;
- struct rde_peer		*peerself;
- struct filter_head	*rules_l, *newrules;
-+struct rdomain_head	*rdomains_l, *newdomains;
- struct imsgbuf		*ibuf_se;
- struct imsgbuf		*ibuf_se_ctl;
- struct imsgbuf		*ibuf_main;
-@@ -120,11 +133,12 @@ struct rde_dump_ctx {
- };
- 
- struct rde_mrt_ctx {
--	struct mrt		 mrt;
--	struct rib_context	 ribctx;
-+	struct mrt		mrt;
-+	struct rib_context	ribctx;
-+	LIST_ENTRY(rde_mrt_ctx)	entry;
- };
- 
--struct mrt_head rde_mrts = LIST_HEAD_INITIALIZER(rde_mrts);
-+LIST_HEAD(, rde_mrt_ctx) rde_mrts = LIST_HEAD_INITIALIZER(rde_mrts);
- u_int rde_mrt_cnt;
- 
- void
-@@ -144,24 +158,17 @@ u_int32_t	attrhashsize = 512;
- u_int32_t	nexthophashsize = 64;
- 
- pid_t
--rde_main(struct bgpd_config *config, struct peer *peer_l,
--    struct network_head *net_l, struct filter_head *rules,
--    struct mrt_head *mrt_l, struct rib_names *rib_n, int pipe_m2r[2],
--    int pipe_s2r[2], int pipe_m2s[2], int pipe_s2rctl[2], int debug)
-+rde_main(int pipe_m2r[2], int pipe_s2r[2], int pipe_m2s[2], int pipe_s2rctl[2],
-+    int debug)
- {
- 	pid_t			 pid;
- 	struct passwd		*pw;
--	struct peer		*p;
--	struct listen_addr	*la;
- 	struct pollfd		*pfd = NULL;
--	struct filter_rule	*f;
--	struct filter_set	*set;
--	struct nexthop		*nh;
--	struct rde_rib		*rr;
--	struct mrt		*mrt, *xmrt;
-+	struct rde_mrt_ctx	*mctx, *xmctx;
- 	void			*newp;
- 	u_int			 pfd_elms = 0, i, j;
- 	int			 timeout;
-+	u_int8_t		 aid;
- 
- 	switch (pid = fork()) {
- 	case -1:
-@@ -172,8 +179,6 @@ rde_main(struct bgpd_config *config, str
- 		return (pid);
- 	}
- 
--	conf = config;
--
- 	if ((pw = getpwnam(BGPD_USER)) == NULL)
- 		fatal("getpwnam");
- 
-@@ -194,6 +199,8 @@ rde_main(struct bgpd_config *config, str
- 	signal(SIGINT, rde_sighdlr);
- 	signal(SIGPIPE, SIG_IGN);
- 	signal(SIGHUP, SIG_IGN);
-+	signal(SIGALRM, SIG_IGN);
-+	signal(SIGUSR1, SIG_IGN);
- 
- 	close(pipe_s2r[0]);
- 	close(pipe_s2rctl[0]);
-@@ -210,50 +217,25 @@ rde_main(struct bgpd_config *config, str
- 	imsg_init(ibuf_se_ctl, pipe_s2rctl[1]);
- 	imsg_init(ibuf_main, pipe_m2r[1]);
- 
--	/* peer list, mrt list and listener list are not used in the RDE */
--	while ((p = peer_l) != NULL) {
--		peer_l = p->next;
--		free(p);
--	}
--
--	while ((mrt = LIST_FIRST(mrt_l)) != NULL) {
--		LIST_REMOVE(mrt, entry);
--		free(mrt);
--	}
--
--	while ((la = TAILQ_FIRST(config->listen_addrs)) != NULL) {
--		TAILQ_REMOVE(config->listen_addrs, la, entry);
--		close(la->fd);
--		free(la);
--	}
--	free(config->listen_addrs);
--
- 	pt_init();
--	while ((rr = SIMPLEQ_FIRST(&ribnames))) {
--		SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
--		rib_new(-1, rr->name, rr->flags);
--		free(rr);
--	}
- 	path_init(pathhashsize);
- 	aspath_init(pathhashsize);
- 	attr_init(attrhashsize);
- 	nexthop_init(nexthophashsize);
- 	peer_init(peerhashsize);
--	rules_l = rules;
--	network_init(net_l);
- 
-+	rules_l = calloc(1, sizeof(struct filter_head));
-+	if (rules_l == NULL)
-+		fatal(NULL);
-+	TAILQ_INIT(rules_l);
-+	rdomains_l = calloc(1, sizeof(struct rdomain_head));
-+	if (rdomains_l == NULL)
-+		fatal(NULL);
-+	SIMPLEQ_INIT(rdomains_l);
-+	if ((conf = calloc(1, sizeof(struct bgpd_config))) == NULL)
-+		fatal(NULL);
- 	log_info("route decision engine ready");
- 
--	TAILQ_FOREACH(f, rules, entry) {
--		f->peer.ribid = rib_find(f->rib);
--		TAILQ_FOREACH(set, &f->set, entry) {
--			if (set->type == ACTION_SET_NEXTHOP) {
--				nh = nexthop_get(&set->action.nexthop);
--				nh->refcnt++;
--			}
--		}
--	}
--
- 	while (rde_quit == 0) {
- 		if (pfd_elms < PFD_PIPE_COUNT + rde_mrt_cnt) {
- 			if ((newp = realloc(pfd, sizeof(struct pollfd) *
-@@ -287,11 +269,18 @@ rde_main(struct bgpd_config *config, str
- 			timeout = 0;
- 
- 		i = PFD_PIPE_COUNT;
--		LIST_FOREACH(mrt, &rde_mrts, entry) {
--			if (mrt->wbuf.queued) {
--				pfd[i].fd = mrt->wbuf.fd;
-+		for (mctx = LIST_FIRST(&rde_mrts); mctx != 0; mctx = xmctx) {
-+			xmctx = LIST_NEXT(mctx, entry);
-+			if (mctx->mrt.wbuf.queued) {
-+				pfd[i].fd = mctx->mrt.wbuf.fd;
- 				pfd[i].events = POLLOUT;
- 				i++;
-+			} else if (mctx->mrt.state == MRT_STATE_REMOVE) {
-+				close(mctx->mrt.wbuf.fd);
-+				LIST_REMOVE(&mctx->ribctx, entry);
-+				LIST_REMOVE(mctx, entry);
-+				free(mctx);
-+				rde_mrt_cnt--;
- 			}
- 		}
- 
-@@ -325,24 +314,17 @@ rde_main(struct bgpd_config *config, str
- 		if (pfd[PFD_PIPE_SESSION_CTL].revents & POLLIN)
- 			rde_dispatch_imsg_session(ibuf_se_ctl);
- 
--		for (j = PFD_PIPE_COUNT, mrt = LIST_FIRST(&rde_mrts);
--		    j < i && mrt != 0; j++) {
--			xmrt = LIST_NEXT(mrt, entry);
--			if (pfd[j].fd == mrt->wbuf.fd &&
-+		for (j = PFD_PIPE_COUNT, mctx = LIST_FIRST(&rde_mrts);
-+		    j < i && mctx != 0; j++) {
-+			if (pfd[j].fd == mctx->mrt.wbuf.fd &&
- 			    pfd[j].revents & POLLOUT)
--				mrt_write(mrt);
--			if (mrt->wbuf.queued == 0 && 
--			    mrt->state == MRT_STATE_REMOVE) {
--				close(mrt->wbuf.fd);
--				LIST_REMOVE(mrt, entry);
--				free(mrt);
--				rde_mrt_cnt--;
--			}
--			mrt = xmrt;
-+				mrt_write(&mctx->mrt);
-+			mctx = LIST_NEXT(mctx, entry);
- 		}
- 
- 		rde_update_queue_runner();
--		rde_update6_queue_runner();
-+		for (aid = AID_INET6; aid < AID_MAX; aid++)
-+			rde_update6_queue_runner(aid);
- 		if (ibuf_se_ctl->w.queued <= 0)
- 			rib_dump_runner();
- 	}
-@@ -351,11 +333,12 @@ rde_main(struct bgpd_config *config, str
- 	if (debug)
- 		rde_shutdown();
- 
--	while ((mrt = LIST_FIRST(&rde_mrts)) != NULL) {
--		msgbuf_clear(&mrt->wbuf);
--		close(mrt->wbuf.fd);
--		LIST_REMOVE(mrt, entry);
--		free(mrt);
-+	while ((mctx = LIST_FIRST(&rde_mrts)) != NULL) {
-+		msgbuf_clear(&mctx->mrt.wbuf);
-+		close(mctx->mrt.wbuf.fd);
-+		LIST_REMOVE(&mctx->ribctx, entry);
-+		LIST_REMOVE(mctx, entry);
-+		free(mctx);
- 	}
- 
- 	msgbuf_clear(&ibuf_se->w);
-@@ -378,13 +361,18 @@ rde_dispatch_imsg_session(struct imsgbuf
- 	struct imsg		 imsg;
- 	struct peer		 p;
- 	struct peer_config	 pconf;
--	struct rrefresh		 r;
--	struct rde_peer		*peer;
- 	struct session_up	 sup;
-+	struct ctl_show_rib	 csr;
- 	struct ctl_show_rib_request	req;
-+	struct rde_peer		*peer;
-+	struct rde_aspath	*asp;
- 	struct filter_set	*s;
- 	struct nexthop		*nh;
--	int			 n;
-+	u_int8_t		*asdata;
-+	ssize_t			 n;
-+	int			 verbose;
-+	u_int16_t		 len;
-+	u_int8_t		 aid;
- 
- 	if ((n = imsg_read(ibuf)) == -1)
- 		fatal("rde_dispatch_imsg_session: imsg_read error");
-@@ -422,13 +410,56 @@ rde_dispatch_imsg_session(struct imsgbuf
- 		case IMSG_SESSION_DOWN:
- 			peer_down(imsg.hdr.peerid);
- 			break;
-+		case IMSG_SESSION_STALE:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE != sizeof(aid)) {
-+				log_warnx("rde_dispatch: wrong imsg len");
-+				break;
-+			}
-+			memcpy(&aid, imsg.data, sizeof(aid));
-+			if (aid >= AID_MAX)
-+				fatalx("IMSG_SESSION_STALE: bad AID");
-+			peer_stale(imsg.hdr.peerid, aid);
-+			break;
-+		case IMSG_SESSION_FLUSH:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE != sizeof(aid)) {
-+				log_warnx("rde_dispatch: wrong imsg len");
-+				break;
-+			}
-+			memcpy(&aid, imsg.data, sizeof(aid));
-+			if (aid >= AID_MAX)
-+				fatalx("IMSG_SESSION_FLUSH: bad AID");
-+			if ((peer = peer_get(imsg.hdr.peerid)) == NULL) {
-+				log_warnx("rde_dispatch: unknown peer id %d",
-+				    imsg.hdr.peerid);
-+				break;
-+			}
-+			peer_flush(peer, aid);
-+			break;
-+		case IMSG_SESSION_RESTARTED:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE != sizeof(aid)) {
-+				log_warnx("rde_dispatch: wrong imsg len");
-+				break;
-+			}
-+			memcpy(&aid, imsg.data, sizeof(aid));
-+			if (aid >= AID_MAX)
-+				fatalx("IMSG_SESSION_RESTARTED: bad AID");
-+			if ((peer = peer_get(imsg.hdr.peerid)) == NULL) {
-+				log_warnx("rde_dispatch: unknown peer id %d",
-+				    imsg.hdr.peerid);
-+				break;
-+			}
-+			if (peer->staletime[aid])
-+				peer_flush(peer, aid);
-+			break;
- 		case IMSG_REFRESH:
--			if (imsg.hdr.len - IMSG_HEADER_SIZE != sizeof(r)) {
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE != sizeof(aid)) {
- 				log_warnx("rde_dispatch: wrong imsg len");
- 				break;
- 			}
--			memcpy(&r, imsg.data, sizeof(r));
--			peer_dump(imsg.hdr.peerid, r.afi, r.safi);
-+			memcpy(&aid, imsg.data, sizeof(aid));
-+			if (aid >= AID_MAX)
-+				fatalx("IMSG_REFRESH: bad AID");
-+			peer_dump(imsg.hdr.peerid, aid);
- 			break;
- 		case IMSG_NETWORK_ADD:
- 			if (imsg.hdr.len - IMSG_HEADER_SIZE !=
-@@ -440,23 +471,68 @@ rde_dispatch_imsg_session(struct imsgbuf
- 			TAILQ_INIT(&netconf_s.attrset);
- 			session_set = &netconf_s.attrset;
- 			break;
-+		case IMSG_NETWORK_ASPATH:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE <
-+			    sizeof(struct ctl_show_rib)) {
-+				log_warnx("rde_dispatch: wrong imsg len");
-+				bzero(&netconf_s, sizeof(netconf_s));
-+				break;
-+			}
-+			asdata = imsg.data;
-+			asdata += sizeof(struct ctl_show_rib);
-+			memcpy(&csr, imsg.data, sizeof(csr));
-+			if (csr.aspath_len + sizeof(csr) > imsg.hdr.len -
-+			    IMSG_HEADER_SIZE) {
-+				log_warnx("rde_dispatch: wrong aspath len");
-+				bzero(&netconf_s, sizeof(netconf_s));
-+				break;
-+			}
-+			asp = path_get();
-+			asp->lpref = csr.local_pref;
-+			asp->med = csr.med;
-+			asp->weight = csr.weight;
-+			asp->flags = csr.flags;
-+			asp->origin = csr.origin;
-+			asp->flags |= F_PREFIX_ANNOUNCED | F_ANN_DYNAMIC;
-+			asp->aspath = aspath_get(asdata, csr.aspath_len);
-+			netconf_s.asp = asp;
-+			break;
-+		case IMSG_NETWORK_ATTR:
-+			if (imsg.hdr.len <= IMSG_HEADER_SIZE) {
-+				log_warnx("rde_dispatch: wrong imsg len");
-+				break;
-+			}
-+			/* parse path attributes */
-+			len = imsg.hdr.len - IMSG_HEADER_SIZE;
-+			asp = netconf_s.asp;
-+			if (rde_attr_add(asp, imsg.data, len) == -1) {
-+				log_warnx("rde_dispatch: bad network "
-+				    "attribute");
-+				path_put(asp);
-+				bzero(&netconf_s, sizeof(netconf_s));
-+				break;
-+			}
-+			break;
- 		case IMSG_NETWORK_DONE:
- 			if (imsg.hdr.len != IMSG_HEADER_SIZE) {
- 				log_warnx("rde_dispatch: wrong imsg len");
- 				break;
- 			}
- 			session_set = NULL;
--			switch (netconf_s.prefix.af) {
--			case AF_INET:
-+			switch (netconf_s.prefix.aid) {
-+			case AID_INET:
- 				if (netconf_s.prefixlen > 32)
- 					goto badnet;
- 				network_add(&netconf_s, 0);
- 				break;
--			case AF_INET6:
-+			case AID_INET6:
- 				if (netconf_s.prefixlen > 128)
- 					goto badnet;
- 				network_add(&netconf_s, 0);
- 				break;
-+			case 0:
-+				/* something failed beforehands */
-+				break;
- 			default:
- badnet:
- 				log_warnx("rde_dispatch: bad network");
-@@ -528,10 +604,14 @@ badnet:
- 				    peer->prefix_rcvd_update;
- 				p.stats.prefix_rcvd_withdraw =
- 				    peer->prefix_rcvd_withdraw;
-+				p.stats.prefix_rcvd_eor =
-+				    peer->prefix_rcvd_eor;
- 				p.stats.prefix_sent_update =
- 				    peer->prefix_sent_update;
- 				p.stats.prefix_sent_withdraw =
- 				    peer->prefix_sent_withdraw;
-+				p.stats.prefix_sent_eor =
-+				    peer->prefix_sent_eor;
- 			}
- 			imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_NEIGHBOR, 0,
- 			    imsg.hdr.pid, -1, &p, sizeof(struct peer));
-@@ -544,6 +624,11 @@ badnet:
- 			imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_RIB_MEM, 0,
- 			    imsg.hdr.pid, -1, &rdemem, sizeof(rdemem));
- 			break;
-+		case IMSG_CTL_LOG_VERBOSE:
-+			/* already checked by SE */
-+			memcpy(&verbose, imsg.data, sizeof(verbose));
-+			log_verbose(verbose);
-+			break;
- 		default:
- 			break;
- 		}
-@@ -554,14 +639,17 @@ badnet:
- void
- rde_dispatch_imsg_parent(struct imsgbuf *ibuf)
- {
-+	static struct rdomain	*rd;
- 	struct imsg		 imsg;
- 	struct mrt		 xmrt;
- 	struct rde_rib		 rn;
- 	struct rde_peer		*peer;
-+	struct peer_config	*pconf;
- 	struct filter_rule	*r;
- 	struct filter_set	*s;
- 	struct nexthop		*nh;
--	int			 n, fd, reconf_in = 0, reconf_out = 0;
-+	int			 n, fd, reconf_in = 0, reconf_out = 0,
-+				 reconf_rib = 0;
- 	u_int16_t		 rid;
- 
- 	if ((n = imsg_read(ibuf)) == -1)
-@@ -576,20 +664,12 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 			break;
- 
- 		switch (imsg.hdr.type) {
--		case IMSG_RECONF_CONF:
--			reloadtime = time(NULL);
--			newrules = calloc(1, sizeof(struct filter_head));
--			if (newrules == NULL)
--				fatal(NULL);
--			TAILQ_INIT(newrules);
--			if ((nconf = malloc(sizeof(struct bgpd_config))) ==
--			    NULL)
--				fatal(NULL);
--			memcpy(nconf, imsg.data, sizeof(struct bgpd_config));
--			for (rid = 0; rid < rib_size; rid++)
--				ribs[rid].state = RIB_DELETE;
--			break;
- 		case IMSG_NETWORK_ADD:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE !=
-+			    sizeof(struct network_config)) {
-+				log_warnx("rde_dispatch: wrong imsg len");
-+				break;
-+			}
- 			memcpy(&netconf_p, imsg.data, sizeof(netconf_p));
- 			TAILQ_INIT(&netconf_p.attrset);
- 			parent_set = &netconf_p.attrset;
-@@ -608,6 +688,26 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 			TAILQ_INIT(&netconf_p.attrset);
- 			network_delete(&netconf_p, 1);
- 			break;
-+		case IMSG_RECONF_CONF:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE !=
-+			    sizeof(struct bgpd_config))
-+				fatalx("IMSG_RECONF_CONF bad len");
-+			reloadtime = time(NULL);
-+			newrules = calloc(1, sizeof(struct filter_head));
-+			if (newrules == NULL)
-+				fatal(NULL);
-+			TAILQ_INIT(newrules);
-+			newdomains = calloc(1, sizeof(struct rdomain_head));
-+			if (newdomains == NULL)
-+				fatal(NULL);
-+			SIMPLEQ_INIT(newdomains);
-+			if ((nconf = malloc(sizeof(struct bgpd_config))) ==
-+			    NULL)
-+				fatal(NULL);
-+			memcpy(nconf, imsg.data, sizeof(struct bgpd_config));
-+			for (rid = 0; rid < rib_size; rid++)
-+				ribs[rid].state = RECONF_DELETE;
-+			break;
- 		case IMSG_RECONF_RIB:
- 			if (imsg.hdr.len - IMSG_HEADER_SIZE !=
- 			    sizeof(struct rde_rib))
-@@ -615,9 +715,26 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 			memcpy(&rn, imsg.data, sizeof(rn));
- 			rid = rib_find(rn.name);
- 			if (rid == RIB_FAILED)
--				rib_new(-1, rn.name, rn.flags);
--			else
--				ribs[rid].state = RIB_ACTIVE;
-+				rib_new(rn.name, rn.rtableid, rn.flags);
-+			else if (ribs[rid].rtableid != rn.rtableid ||
-+			    (ribs[rid].flags & F_RIB_HASNOFIB) !=
-+			    (rn.flags & F_RIB_HASNOFIB)) {
-+				/* Big hammer in the F_RIB_NOFIB case but
-+				 * not often enough used to optimise it more. */
-+				rib_free(&ribs[rid]);
-+				rib_new(rn.name, rn.rtableid, rn.flags);
-+			} else
-+				ribs[rid].state = RECONF_KEEP;
-+			break;
-+		case IMSG_RECONF_PEER:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE !=
-+			    sizeof(struct peer_config))
-+				fatalx("IMSG_RECONF_PEER bad len");
-+			if ((peer = peer_get(imsg.hdr.peerid)) == NULL)
-+				break;
-+			pconf = imsg.data;
-+			strlcpy(peer->conf.rib, pconf->rib,
-+			    sizeof(peer->conf.rib));
- 			break;
- 		case IMSG_RECONF_FILTER:
- 			if (imsg.hdr.len - IMSG_HEADER_SIZE !=
-@@ -631,12 +748,42 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 			parent_set = &r->set;
- 			TAILQ_INSERT_TAIL(newrules, r, entry);
- 			break;
-+		case IMSG_RECONF_RDOMAIN:
-+			if (imsg.hdr.len - IMSG_HEADER_SIZE !=
-+			    sizeof(struct rdomain))
-+				fatalx("IMSG_RECONF_RDOMAIN bad len");
-+			if ((rd = malloc(sizeof(struct rdomain))) == NULL)
-+				fatal(NULL);
-+			memcpy(rd, imsg.data, sizeof(struct rdomain));
-+			TAILQ_INIT(&rd->import);
-+			TAILQ_INIT(&rd->export);
-+			SIMPLEQ_INSERT_TAIL(newdomains, rd, entry);
-+			break;
-+		case IMSG_RECONF_RDOMAIN_EXPORT:
-+			if (rd == NULL) {
-+				log_warnx("rde_dispatch_imsg_parent: "
-+				    "IMSG_RECONF_RDOMAIN_EXPORT unexpected");
-+				break;
-+			}
-+			parent_set = &rd->export;
-+			break;
-+		case IMSG_RECONF_RDOMAIN_IMPORT:
-+			if (rd == NULL) {
-+				log_warnx("rde_dispatch_imsg_parent: "
-+				    "IMSG_RECONF_RDOMAIN_IMPORT unexpected");
-+				break;
-+			}
-+			parent_set = &rd->import;
-+			break;
-+		case IMSG_RECONF_RDOMAIN_DONE:
-+			parent_set = NULL;
-+			break;
- 		case IMSG_RECONF_DONE:
- 			if (nconf == NULL)
- 				fatalx("got IMSG_RECONF_DONE but no config");
- 			if ((nconf->flags & BGPD_FLAG_NO_EVALUATE)
- 			    != (conf->flags & BGPD_FLAG_NO_EVALUATE)) {
--				log_warnx( "change to/from route-collector "
-+				log_warnx("change to/from route-collector "
- 				    "mode ignored");
- 				if (conf->flags & BGPD_FLAG_NO_EVALUATE)
- 					nconf->flags |= BGPD_FLAG_NO_EVALUATE;
-@@ -644,10 +791,27 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 					nconf->flags &= ~BGPD_FLAG_NO_EVALUATE;
- 			}
- 			memcpy(conf, nconf, sizeof(struct bgpd_config));
-+			conf->listen_addrs = NULL;
-+			conf->csock = NULL;
-+			conf->rcsock = NULL;
- 			free(nconf);
- 			nconf = NULL;
- 			parent_set = NULL;
--			prefix_network_clean(peerself, reloadtime, 0);
-+			/* sync peerself with conf */
-+			peerself->remote_bgpid = ntohl(conf->bgpid);
-+			peerself->conf.local_as = conf->as;
-+			peerself->conf.remote_as = conf->as;
-+			peerself->short_as = conf->short_as;
-+
-+			/* apply new set of rdomain, sync will be done later */
-+			while ((rd = SIMPLEQ_FIRST(rdomains_l)) != NULL) {
-+				SIMPLEQ_REMOVE_HEAD(rdomains_l, entry);
-+				filterset_free(&rd->import);
-+				filterset_free(&rd->export);
-+				free(rd);
-+			}
-+			free(rdomains_l);
-+			rdomains_l = newdomains;
- 
- 			/* check if filter changed */
- 			LIST_FOREACH(peer, &peerlist, peer_l) {
-@@ -655,30 +819,59 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 					continue;
- 				peer->reconf_out = 0;
- 				peer->reconf_in = 0;
--				if (peer->conf.softreconfig_out &&
--				    !rde_filter_equal(rules_l, newrules, peer,
--				    DIR_OUT)) {
--					peer->reconf_out = 1;
--					reconf_out = 1;
--				}
-+				peer->reconf_rib = 0;
- 				if (peer->conf.softreconfig_in &&
- 				    !rde_filter_equal(rules_l, newrules, peer,
- 				    DIR_IN)) {
- 					peer->reconf_in = 1;
- 					reconf_in = 1;
- 				}
-+				if (peer->ribid != rib_find(peer->conf.rib)) {
-+					rib_dump(&ribs[peer->ribid],
-+					    rde_softreconfig_unload_peer, peer,
-+					    AID_UNSPEC);
-+					peer->ribid = rib_find(peer->conf.rib);
-+					peer->reconf_rib = 1;
-+					reconf_rib = 1;
-+					continue;
-+				}
-+				if (peer->conf.softreconfig_out &&
-+				    !rde_filter_equal(rules_l, newrules, peer,
-+				    DIR_OUT)) {
-+					peer->reconf_out = 1;
-+					reconf_out = 1;
-+				}
- 			}
--			/* XXX this needs rework anyway */
--			/* sync local-RIB first */
-+			/* bring ribs in sync before softreconfig dance */
-+			for (rid = 0; rid < rib_size; rid++) {
-+				if (ribs[rid].state == RECONF_DELETE)
-+					rib_free(&ribs[rid]);
-+				else if (ribs[rid].state == RECONF_REINIT)
-+					rib_dump(&ribs[0],
-+					    rde_softreconfig_load, &ribs[rid],
-+					    AID_UNSPEC);
-+			}
-+			/* sync local-RIBs first */
- 			if (reconf_in)
- 				rib_dump(&ribs[0], rde_softreconfig_in, NULL,
--				    AF_UNSPEC);
-+				    AID_UNSPEC);
- 			/* then sync peers */
- 			if (reconf_out) {
- 				int i;
--				for (i = 1; i < rib_size; i++)
-+				for (i = 1; i < rib_size; i++) {
-+					if (ribs[i].state == RECONF_REINIT)
-+						/* already synced by _load */
-+						continue;
- 					rib_dump(&ribs[i], rde_softreconfig_out,
--					    NULL, AF_UNSPEC);
-+					    NULL, AID_UNSPEC);
-+				}
-+			}
-+			if (reconf_rib) {
-+				LIST_FOREACH(peer, &peerlist, peer_l) {
-+					rib_dump(&ribs[peer->ribid],
-+						rde_softreconfig_load_peer,
-+						peer, AID_UNSPEC);
-+				}
- 			}
- 
- 			while ((r = TAILQ_FIRST(rules_l)) != NULL) {
-@@ -688,16 +881,18 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 			}
- 			free(rules_l);
- 			rules_l = newrules;
--			for (rid = 0; rid < rib_size; rid++) {
--				if (ribs[rid].state == RIB_DELETE)
--					rib_free(&ribs[rid]);
--			}
-+
- 			log_info("RDE reconfigured");
-+			imsg_compose(ibuf_main, IMSG_RECONF_DONE, 0, 0,
-+			    -1, NULL, 0);
- 			break;
- 		case IMSG_NEXTHOP_UPDATE:
- 			nexthop_update(imsg.data);
- 			break;
- 		case IMSG_FILTER_SET:
-+			if (imsg.hdr.len > IMSG_HEADER_SIZE +
-+			    sizeof(struct filter_set))
-+				fatalx("IMSG_RECONF_CONF bad len");
- 			if (parent_set == NULL) {
- 				log_warnx("rde_dispatch_imsg_parent: "
- 				    "IMSG_FILTER_SET unexpected");
-@@ -725,7 +920,8 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- 				log_warnx("expected to receive fd for mrt dump "
- 				    "but didn't receive any");
- 			else if (xmrt.type == MRT_TABLE_DUMP ||
--			    xmrt.type == MRT_TABLE_DUMP_MP) {
-+			    xmrt.type == MRT_TABLE_DUMP_MP ||
-+			    xmrt.type == MRT_TABLE_DUMP_V2) {
- 				rde_dump_mrt_new(&xmrt, imsg.hdr.pid, fd);
- 			} else
- 				close(fd);
-@@ -744,6 +940,8 @@ rde_dispatch_imsg_parent(struct imsgbuf 
- int
- rde_update_dispatch(struct imsg *imsg)
- {
-+	struct bgpd_addr	 prefix;
-+	struct mpattr		 mpa;
- 	struct rde_peer		*peer;
- 	struct rde_aspath	*asp = NULL;
- 	u_char			*p, *mpp = NULL;
-@@ -752,9 +950,8 @@ rde_update_dispatch(struct imsg *imsg)
- 	u_int16_t		 withdrawn_len;
- 	u_int16_t		 attrpath_len;
- 	u_int16_t		 nlri_len;
--	u_int8_t		 prefixlen, safi, subtype;
--	struct bgpd_addr	 prefix;
--	struct mpattr		 mpa;
-+	u_int8_t		 aid, prefixlen, safi, subtype;
-+	u_int32_t		 fas;
- 
- 	peer = peer_get(imsg->hdr.peerid);
- 	if (peer == NULL)	/* unknown peer, cannot happen */
-@@ -810,26 +1007,21 @@ rde_update_dispatch(struct imsg *imsg)
- 			goto done;
- 		}
- 
--		/*
--		 * if either ATTR_AS4_AGGREGATOR or ATTR_AS4_PATH is present
--		 * try to fixup the attributes.
--		 * XXX do not fixup if F_ATTR_LOOP is set.
--		 */
--		if (asp->flags & F_ATTR_AS4BYTE_NEW &&
--		    !(asp->flags & F_ATTR_LOOP))
--			rde_as4byte_fixup(peer, asp);
-+		rde_as4byte_fixup(peer, asp);
- 
- 		/* enforce remote AS if requested */
- 		if (asp->flags & F_ATTR_ASPATH &&
--		    peer->conf.enforce_as == ENFORCE_AS_ON)
--			if (peer->conf.remote_as !=
--			    aspath_neighbor(asp->aspath)) {
--				log_peer_warnx(&peer->conf, "bad path, "
--				    "enforce remote-as enabled");
--				rde_update_err(peer, ERR_UPDATE, ERR_UPD_ASPATH,
-+		    peer->conf.enforce_as == ENFORCE_AS_ON) {
-+			fas = aspath_neighbor(asp->aspath);
-+			if (peer->conf.remote_as != fas) {
-+			    log_peer_warnx(&peer->conf, "bad path, "
-+				"starting with %s, "
-+				"enforce neighbor-as enabled", log_as(fas));
-+			    rde_update_err(peer, ERR_UPDATE, ERR_UPD_ASPATH,
- 				    NULL, 0);
--				goto done;
-+			    goto done;
- 			}
-+		}
- 
- 		rde_reflector(peer, asp);
- 	}
-@@ -860,9 +1052,9 @@ rde_update_dispatch(struct imsg *imsg)
- 		p += pos;
- 		len -= pos;
- 
--		if (peer->capa_received.mp_v4 == SAFI_NONE &&
--		    peer->capa_received.mp_v6 != SAFI_NONE) {
--			log_peer_warnx(&peer->conf, "bad AFI, IPv4 disabled");
-+		if (peer->capa.mp[AID_INET] == 0) {
-+			log_peer_warnx(&peer->conf,
-+			    "bad withdraw, %s disabled", aid2str(AID_INET));
- 			rde_update_err(peer, ERR_UPDATE, ERR_UPD_OPTATTR,
- 			    NULL, 0);
- 			goto done;
-@@ -879,6 +1071,10 @@ rde_update_dispatch(struct imsg *imsg)
- 			    ERR_UPD_ATTRLIST, NULL, 0);
- 			return (-1);
- 		}
-+		if (withdrawn_len == 0) {
-+			/* EoR marker */
-+			peer_recv_eor(peer, AID_INET);
-+		}
- 		return (0);
- 	}
- 
-@@ -892,15 +1088,30 @@ rde_update_dispatch(struct imsg *imsg)
- 		afi = ntohs(afi);
- 		safi = *mpp++;
- 		mplen--;
--		switch (afi) {
--		case AFI_IPv6:
--			if (peer->capa_received.mp_v6 == SAFI_NONE) {
--				log_peer_warnx(&peer->conf, "bad AFI, "
--				    "IPv6 disabled");
--				rde_update_err(peer, ERR_UPDATE,
--				    ERR_UPD_OPTATTR, NULL, 0);
--				goto done;
--			}
-+
-+		if (afi2aid(afi, safi, &aid) == -1) {
-+			log_peer_warnx(&peer->conf,
-+			    "bad AFI/SAFI pair in withdraw");
-+			rde_update_err(peer, ERR_UPDATE, ERR_UPD_OPTATTR,
-+			    NULL, 0);
-+			goto done;
-+		}
-+
-+		if (peer->capa.mp[aid] == 0) {
-+			log_peer_warnx(&peer->conf,
-+			    "bad withdraw, %s disabled", aid2str(aid));
-+			rde_update_err(peer, ERR_UPDATE, ERR_UPD_OPTATTR,
-+			    NULL, 0);
-+			goto done;
-+		}
-+
-+		if ((asp->flags & ~F_ATTR_MP_UNREACH) == 0 && mplen == 0) {
-+			/* EoR marker */
-+			peer_recv_eor(peer, aid);
-+		}
-+
-+		switch (aid) {
-+		case AID_INET6:
- 			while (mplen > 0) {
- 				if ((pos = rde_update_get_prefix6(mpp, mplen,
- 				    &prefix, &prefixlen)) == -1) {
-@@ -926,6 +1137,32 @@ rde_update_dispatch(struct imsg *imsg)
- 				rde_update_withdraw(peer, &prefix, prefixlen);
- 			}
- 			break;
-+		case AID_VPN_IPv4:
-+			while (mplen > 0) {
-+				if ((pos = rde_update_get_vpn4(mpp, mplen,
-+				    &prefix, &prefixlen)) == -1) {
-+					log_peer_warnx(&peer->conf,
-+					    "bad VPNv4 withdraw prefix");
-+					rde_update_err(peer, ERR_UPDATE,
-+					    ERR_UPD_OPTATTR,
-+					    mpa.unreach, mpa.unreach_len);
-+					goto done;
-+				}
-+				if (prefixlen > 32) {
-+					log_peer_warnx(&peer->conf,
-+					    "bad VPNv4 withdraw prefix");
-+					rde_update_err(peer, ERR_UPDATE,
-+					    ERR_UPD_OPTATTR,
-+					    mpa.unreach, mpa.unreach_len);
-+					goto done;
-+				}
-+
-+				mpp += pos;
-+				mplen -= pos;
-+
-+				rde_update_withdraw(peer, &prefix, prefixlen);
-+			}
-+			break;
- 		default:
- 			/* silently ignore unsupported multiprotocol AF */
- 			break;
-@@ -963,9 +1200,9 @@ rde_update_dispatch(struct imsg *imsg)
- 		p += pos;
- 		nlri_len -= pos;
- 
--		if (peer->capa_received.mp_v4 == SAFI_NONE &&
--		    peer->capa_received.mp_v6 != SAFI_NONE) {
--			log_peer_warnx(&peer->conf, "bad AFI, IPv4 disabled");
-+		if (peer->capa.mp[AID_INET] == 0) {
-+			log_peer_warnx(&peer->conf,
-+			    "bad update, %s disabled", aid2str(AID_INET));
- 			rde_update_err(peer, ERR_UPDATE, ERR_UPD_OPTATTR,
- 			    NULL, 0);
- 			goto done;
-@@ -995,6 +1232,22 @@ rde_update_dispatch(struct imsg *imsg)
- 		safi = *mpp++;
- 		mplen--;
- 
-+		if (afi2aid(afi, safi, &aid) == -1) {
-+			log_peer_warnx(&peer->conf,
-+			    "bad AFI/SAFI pair in update");
-+			rde_update_err(peer, ERR_UPDATE, ERR_UPD_OPTATTR,
-+			    NULL, 0);
-+			goto done;
-+		}
-+
-+		if (peer->capa.mp[aid] == 0) {
-+			log_peer_warnx(&peer->conf,
-+			    "bad update, %s disabled", aid2str(aid));
-+			rde_update_err(peer, ERR_UPDATE, ERR_UPD_OPTATTR,
-+			    NULL, 0);
-+			goto done;
-+		}
-+
- 		/*
- 		 * this works because asp is not linked.
- 		 * But first unlock the previously locked nexthop.
-@@ -1004,8 +1257,8 @@ rde_update_dispatch(struct imsg *imsg)
- 			(void)nexthop_delete(asp->nexthop);
- 			asp->nexthop = NULL;
- 		}
--		if ((pos = rde_get_mp_nexthop(mpp, mplen, afi, asp)) == -1) {
--			log_peer_warnx(&peer->conf, "bad IPv6 nlri prefix");
-+		if ((pos = rde_get_mp_nexthop(mpp, mplen, aid, asp, peer)) == -1) {
-+			log_peer_warnx(&peer->conf, "bad nlri prefix");
- 			rde_update_err(peer, ERR_UPDATE, ERR_UPD_OPTATTR,
- 			    mpa.reach, mpa.reach_len);
- 			goto done;
-@@ -1013,16 +1266,8 @@ rde_update_dispatch(struct imsg *imsg)
- 		mpp += pos;
- 		mplen -= pos;
- 
--		switch (afi) {
--		case AFI_IPv6:
--			if (peer->capa_received.mp_v6 == SAFI_NONE) {
--				log_peer_warnx(&peer->conf, "bad AFI, "
--				    "IPv6 disabled");
--				rde_update_err(peer, ERR_UPDATE,
--				    ERR_UPD_OPTATTR, NULL, 0);
--				goto done;
--			}
--
-+		switch (aid) {
-+		case AID_INET6:
- 			while (mplen > 0) {
- 				if ((pos = rde_update_get_prefix6(mpp, mplen,
- 				    &prefix, &prefixlen)) == -1) {
-@@ -1058,6 +1303,42 @@ rde_update_dispatch(struct imsg *imsg)
- 
- 			}
- 			break;
-+		case AID_VPN_IPv4:
-+			while (mplen > 0) {
-+				if ((pos = rde_update_get_vpn4(mpp, mplen,
-+				    &prefix, &prefixlen)) == -1) {
-+					log_peer_warnx(&peer->conf,
-+					    "bad VPNv4 nlri prefix");
-+					rde_update_err(peer, ERR_UPDATE,
-+					    ERR_UPD_OPTATTR,
-+					    mpa.reach, mpa.reach_len);
-+					goto done;
-+				}
-+				if (prefixlen > 32) {
-+					rde_update_err(peer, ERR_UPDATE,
-+					    ERR_UPD_OPTATTR,
-+					    mpa.reach, mpa.reach_len);
-+					goto done;
-+				}
-+
-+				mpp += pos;
-+				mplen -= pos;
-+
-+				rde_update_update(peer, asp, &prefix,
-+				    prefixlen);
-+
-+				/* max prefix checker */
-+				if (peer->conf.max_prefix &&
-+				    peer->prefix_cnt >= peer->conf.max_prefix) {
-+					log_peer_warnx(&peer->conf,
-+					    "prefix limit reached");
-+					rde_update_err(peer, ERR_CEASE,
-+					    ERR_CEASE_MAX_PREFIX, NULL, 0);
-+					goto done;
-+				}
-+
-+			}
-+			break;
- 		default:
- 			/* silently ignore unsupported multiprotocol AF */
- 			break;
-@@ -1085,7 +1366,8 @@ rde_update_update(struct rde_peer *peer,
-     struct bgpd_addr *prefix, u_int8_t prefixlen)
- {
- 	struct rde_aspath	*fasp;
--	int			 r = 0;
-+	enum filter_actions	 action;
-+	int			 r = 0, f = 0;
- 	u_int16_t		 i;
- 
- 	peer->prefix_rcvd_update++;
-@@ -1095,18 +1377,24 @@ rde_update_update(struct rde_peer *peer,
- 
- 	for (i = 1; i < rib_size; i++) {
- 		/* input filter */
--		if (rde_filter(i, &fasp, rules_l, peer, asp, prefix, prefixlen,
--		    peer, DIR_IN) == ACTION_DENY)
--			goto done;
-+		action = rde_filter(i, &fasp, rules_l, peer, asp, prefix,
-+		    prefixlen, peer, DIR_IN);
- 
- 		if (fasp == NULL)
- 			fasp = asp;
- 
--		rde_update_log("update", i, peer, &fasp->nexthop->exit_nexthop,
--		    prefix, prefixlen);
--		r += path_update(&ribs[i], peer, fasp, prefix, prefixlen);
-+		if (action == ACTION_ALLOW) {
-+			rde_update_log("update", i, peer,
-+			    &fasp->nexthop->exit_nexthop, prefix, prefixlen);
-+			r += path_update(&ribs[i], peer, fasp, prefix,
-+			    prefixlen);
-+		} else if (prefix_remove(&ribs[i], peer, prefix, prefixlen,
-+		    0)) {
-+			rde_update_log("filtered withdraw", i, peer,
-+			    NULL, prefix, prefixlen);
-+			f++;
-+		}
- 
--done:
- 		/* free modified aspath */
- 		if (fasp != asp)
- 			path_put(fasp);
-@@ -1114,6 +1402,8 @@ done:
- 
- 	if (r)
- 		peer->prefix_cnt++;
-+	else if (f)
-+		peer->prefix_cnt--;
- }
- 
- void
-@@ -1152,7 +1442,7 @@ rde_update_withdraw(struct rde_peer *pee
- 	} while (0)
- 
- #define CHECK_FLAGS(s, t, m)	\
--	(((s) & ~(ATTR_EXTLEN | (m))) == (t))
-+	(((s) & ~(ATTR_DEFMASK | (m))) == (t))
- 
- int
- rde_attr_parse(u_char *p, u_int16_t len, struct rde_peer *peer,
-@@ -1161,6 +1451,7 @@ rde_attr_parse(u_char *p, u_int16_t len,
- 	struct bgpd_addr nexthop;
- 	u_char		*op = p, *npath;
- 	u_int32_t	 tmp32;
-+	int		 err;
- 	u_int16_t	 attr_len, nlen;
- 	u_int16_t	 plen = 0;
- 	u_int8_t	 flags;
-@@ -1195,6 +1486,7 @@ bad_len:
- 	switch (type) {
- 	case ATTR_UNDEF:
- 		/* ignore and drop path attributes with a type code of 0 */
-+		plen += attr_len;
- 		break;
- 	case ATTR_ORIGIN:
- 		if (attr_len != 1)
-@@ -1220,7 +1512,17 @@ bad_flags:
- 	case ATTR_ASPATH:
- 		if (!CHECK_FLAGS(flags, ATTR_WELL_KNOWN, 0))
- 			goto bad_flags;
--		if (aspath_verify(p, attr_len, rde_as4byte(peer)) != 0) {
-+		err = aspath_verify(p, attr_len, rde_as4byte(peer));
-+		if (err == AS_ERR_SOFT) {
-+			/*
-+			 * soft errors like unexpected segment types are
-+			 * not considered fatal and the path is just
-+			 * marked invalid.
-+			 */
-+			a->flags |= F_ATTR_PARSE_ERR;
-+			log_peer_warnx(&peer->conf, "bad ASPATH, "
-+			    "path invalidated and prefix withdrawn");
-+		} else if (err != 0) {
- 			rde_update_err(peer, ERR_UPDATE, ERR_UPD_ASPATH,
- 			    NULL, 0);
- 			return (-1);
-@@ -1248,7 +1550,7 @@ bad_flags:
- 		a->flags |= F_ATTR_NEXTHOP;
- 
- 		bzero(&nexthop, sizeof(nexthop));
--		nexthop.af = AF_INET;
-+		nexthop.aid = AID_INET;
- 		UPD_READ(&nexthop.v4.s_addr, p, plen, 4);
- 		/*
- 		 * Check if the nexthop is a valid IP address. We consider
-@@ -1305,9 +1607,21 @@ bad_flags:
- 		goto optattr;
- 	case ATTR_AGGREGATOR:
- 		if ((!rde_as4byte(peer) && attr_len != 6) ||
--		    (rde_as4byte(peer) && attr_len != 8))
--			goto bad_len;
--		if (!CHECK_FLAGS(flags, ATTR_OPTIONAL|ATTR_TRANSITIVE, 0))
-+		    (rde_as4byte(peer) && attr_len != 8)) {
-+			/*
-+			 * ignore attribute in case of error as per
-+			 * draft-ietf-idr-optional-transitive-00.txt
-+			 * but only if partial bit is set
-+			 */
-+			if ((flags & ATTR_PARTIAL) == 0)
-+				goto bad_len;
-+			log_peer_warnx(&peer->conf, "bad AGGREGATOR, "
-+			    "partial attribute ignored");
-+			plen += attr_len;
-+			break;
-+		}
-+		if (!CHECK_FLAGS(flags, ATTR_OPTIONAL|ATTR_TRANSITIVE,
-+		    ATTR_PARTIAL))
- 			goto bad_flags;
- 		if (!rde_as4byte(peer)) {
- 			/* need to inflate aggregator AS to 4-byte */
-@@ -1323,8 +1637,35 @@ bad_flags:
- 		/* 4-byte ready server take the default route */
- 		goto optattr;
- 	case ATTR_COMMUNITIES:
--		if ((attr_len & 0x3) != 0)
--			goto bad_len;
-+		if (attr_len % 4 != 0) {
-+			/*
-+			 * mark update as bad and withdraw all routes as per
-+			 * draft-ietf-idr-optional-transitive-00.txt
-+			 * but only if partial bit is set
-+			 */
-+			if ((flags & ATTR_PARTIAL) == 0)
-+				goto bad_len;
-+			a->flags |= F_ATTR_PARSE_ERR;
-+			log_peer_warnx(&peer->conf, "bad COMMUNITIES, "
-+			    "path invalidated and prefix withdrawn");
-+		}
-+		if (!CHECK_FLAGS(flags, ATTR_OPTIONAL|ATTR_TRANSITIVE,
-+		    ATTR_PARTIAL))
-+			goto bad_flags;
-+		goto optattr;
-+	case ATTR_EXT_COMMUNITIES:
-+		if (attr_len % 8 != 0) {
-+			/*
-+			 * mark update as bad and withdraw all routes as per
-+			 * draft-ietf-idr-optional-transitive-00.txt
-+			 * but only if partial bit is set
-+			 */
-+			if ((flags & ATTR_PARTIAL) == 0)
-+				goto bad_len;
-+			a->flags |= F_ATTR_PARSE_ERR;
-+			log_peer_warnx(&peer->conf, "bad EXT_COMMUNITIES, "
-+			    "path invalidated and prefix withdrawn");
-+		}
- 		if (!CHECK_FLAGS(flags, ATTR_OPTIONAL|ATTR_TRANSITIVE,
- 		    ATTR_PARTIAL))
- 			goto bad_flags;
-@@ -1336,7 +1677,7 @@ bad_flags:
- 			goto bad_flags;
- 		goto optattr;
- 	case ATTR_CLUSTER_LIST:
--		if ((attr_len & 0x3) != 0)
-+		if (attr_len % 4 != 0)
- 			goto bad_len;
- 		if (!CHECK_FLAGS(flags, ATTR_OPTIONAL, 0))
- 			goto bad_flags;
-@@ -1370,8 +1711,15 @@ bad_flags:
- 		plen += attr_len;
- 		break;
- 	case ATTR_AS4_AGGREGATOR:
--		if (attr_len != 8)
--			goto bad_len;
-+		if (attr_len != 8) {
-+			/* see ATTR_AGGREGATOR ... */
-+			if ((flags & ATTR_PARTIAL) == 0)
-+				goto bad_len;
-+			log_peer_warnx(&peer->conf, "bad AS4_AGGREGATOR, "
-+			    "partial attribute ignored");
-+			plen += attr_len;
-+			break;
-+		}
- 		if (!CHECK_FLAGS(flags, ATTR_OPTIONAL|ATTR_TRANSITIVE,
- 		    ATTR_PARTIAL))
- 			goto bad_flags;
-@@ -1381,20 +1729,31 @@ bad_flags:
- 		if (!CHECK_FLAGS(flags, ATTR_OPTIONAL|ATTR_TRANSITIVE,
- 		    ATTR_PARTIAL))
- 			goto bad_flags;
--		if (aspath_verify(p, attr_len, 1) != 0) {
-+		if ((err = aspath_verify(p, attr_len, 1)) != 0) {
- 			/*
- 			 * XXX RFC does not specify how to handle errors.
- 			 * XXX Instead of dropping the session because of a
--			 * XXX bad path just mark the full update as not
--			 * XXX loop-free the update is no longer eligible and
--			 * XXX will not be considered for routing or
--			 * XXX redistribution. Something better is needed.
-+			 * XXX bad path just mark the full update as having
-+			 * XXX a parse error which makes the update no longer
-+			 * XXX eligible and will not be considered for routing
-+			 * XXX or redistribution.
-+			 * XXX We follow draft-ietf-idr-optional-transitive
-+			 * XXX by looking at the partial bit.
-+			 * XXX Consider soft errors similar to a partial attr.
- 			 */
--			a->flags |= F_ATTR_LOOP;
--			goto optattr;
--		}
--		a->flags |= F_ATTR_AS4BYTE_NEW;
--		goto optattr;
-+			if (flags & ATTR_PARTIAL || err == AS_ERR_SOFT) {
-+				a->flags |= F_ATTR_PARSE_ERR;
-+				log_peer_warnx(&peer->conf, "bad AS4_PATH, "
-+				    "path invalidated and prefix withdrawn");
-+				goto optattr;
-+			} else {
-+				rde_update_err(peer, ERR_UPDATE, ERR_UPD_ASPATH,
-+				    NULL, 0);
-+				return (-1);
-+			}
-+		}
-+		a->flags |= F_ATTR_AS4BYTE_NEW;
-+		goto optattr;
- 	default:
- 		if ((flags & ATTR_OPTIONAL) == 0) {
- 			rde_update_err(peer, ERR_UPDATE, ERR_UPD_UNKNWN_WK_ATTR,
-@@ -1415,6 +1774,42 @@ bad_list:
- 
- 	return (plen);
- }
-+
-+int
-+rde_attr_add(struct rde_aspath *a, u_char *p, u_int16_t len)
-+{
-+	u_int16_t	 attr_len;
-+	u_int16_t	 plen = 0;
-+	u_int8_t	 flags;
-+	u_int8_t	 type;
-+	u_int8_t	 tmp8;
-+
-+	if (a == NULL)		/* no aspath, nothing to do */
-+		return (0);
-+	if (len < 3)
-+		return (-1);
-+
-+	UPD_READ(&flags, p, plen, 1);
-+	UPD_READ(&type, p, plen, 1);
-+
-+	if (flags & ATTR_EXTLEN) {
-+		if (len - plen < 2)
-+			return (-1);
-+		UPD_READ(&attr_len, p, plen, 2);
-+		attr_len = ntohs(attr_len);
-+	} else {
-+		UPD_READ(&tmp8, p, plen, 1);
-+		attr_len = tmp8;
-+	}
-+
-+	if (len - plen < attr_len)
-+		return (-1);
-+
-+	if (attr_optadd(a, flags, type, p, attr_len) == -1)
-+		return (-1);
-+	return (0);
-+}
-+
- #undef UPD_READ
- #undef CHECK_FLAGS
- 
-@@ -1440,8 +1835,8 @@ rde_attr_missing(struct rde_aspath *a, i
- }
- 
- int
--rde_get_mp_nexthop(u_char *data, u_int16_t len, u_int16_t afi,
--    struct rde_aspath *asp)
-+rde_get_mp_nexthop(u_char *data, u_int16_t len, u_int8_t aid,
-+    struct rde_aspath *asp, struct rde_peer *peer)
- {
- 	struct bgpd_addr	nexthop;
- 	u_int8_t		totlen, nhlen;
-@@ -1457,8 +1852,9 @@ rde_get_mp_nexthop(u_char *data, u_int16
- 		return (-1);
- 
- 	bzero(&nexthop, sizeof(nexthop));
--	switch (afi) {
--	case AFI_IPv6:
-+	nexthop.aid = aid;
-+	switch (aid) {
-+	case AID_INET6:
- 		/*
- 		 * RFC2545 describes that there may be a link-local
- 		 * address carried in nexthop. Yikes!
-@@ -1471,72 +1867,144 @@ rde_get_mp_nexthop(u_char *data, u_int16
- 			log_warnx("bad multiprotocol nexthop, bad size");
- 			return (-1);
- 		}
--		nexthop.af = AF_INET6;
- 		memcpy(&nexthop.v6.s6_addr, data, 16);
--		asp->nexthop = nexthop_get(&nexthop);
-+#if defined(__KAME__) && defined(IPV6_LINKLOCAL_PEER)
-+		if (IN6_IS_ADDR_LINKLOCAL(&nexthop.v6) &&
-+		    peer->conf.lliface[0]) {
-+			int ifindex;
-+
-+			ifindex = if_nametoindex(peer->conf.lliface);
-+			if (ifindex != 0) {
-+				SET_IN6_LINKLOCAL_IFINDEX(nexthop.v6, ifindex);
-+				nexthop.scope_id = ifindex;
-+			} else
-+				log_warnx("bad interface: %s", peer->conf.lliface);
-+		}
-+#endif
-+		break;
-+	case AID_VPN_IPv4:
- 		/*
--		 * lock the nexthop because it is not yet linked else
--		 * withdraws may remove this nexthop which in turn would
--		 * cause a use after free error.
-+		 * Neither RFC4364 nor RFC3107 specify the format of the
-+		 * nexthop in an explicit way. The quality of RFC went down
-+		 * the toilet the larger the number got.
-+		 * RFC4364 is very confusing about VPN-IPv4 address and the
-+		 * VPN-IPv4 prefix that carries also a MPLS label.
-+		 * So the nexthop is a 12-byte address with a 64bit RD and
-+		 * an IPv4 address following. In the nexthop case the RD can
-+		 * be ignored.
-+		 * Since the nexthop has to be in the main IPv4 table just
-+		 * create an AID_INET nexthop. So we don't need to handle
-+		 * AID_VPN_IPv4 in nexthop and kroute.
- 		 */
--		asp->nexthop->refcnt++;
--
--		/* ignore reserved (old SNPA) field as per RFC 4760 */
--		totlen += nhlen + 1;
--		data += nhlen + 1;
--
--		return (totlen);
--	default:
--		log_warnx("bad multiprotocol nexthop, bad AF");
-+		if (nhlen != 12) {
-+			log_warnx("bad multiprotocol nexthop, bad size");
-+			return (-1);
-+		}
-+		data += sizeof(u_int64_t);
-+		nexthop.aid = AID_INET;
-+		memcpy(&nexthop.v4, data, sizeof(nexthop.v4));
- 		break;
-+	default:
-+		log_warnx("bad multiprotocol nexthop, bad AID");
-+		return (-1);
- 	}
- 
--	return (-1);
-+	asp->nexthop = nexthop_get(&nexthop);
-+	/*
-+	 * lock the nexthop because it is not yet linked else
-+	 * withdraws may remove this nexthop which in turn would
-+	 * cause a use after free error.
-+	 */
-+	asp->nexthop->refcnt++;
-+
-+	/* ignore reserved (old SNPA) field as per RFC4760 */
-+	totlen += nhlen + 1;
-+	data += nhlen + 1;
-+
-+	return (totlen);
-+}
-+
-+int
-+rde_update_extract_prefix(u_char *p, u_int16_t len, void *va,
-+    u_int8_t pfxlen, u_int8_t max)
-+{
-+	static u_char addrmask[] = {
-+	    0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
-+	u_char		*a = va;
-+	int		 i;
-+	u_int16_t	 plen = 0;
-+
-+	for (i = 0; pfxlen && i < max; i++) {
-+		if (len <= plen)
-+			return (-1);
-+		if (pfxlen < 8) {
-+			a[i] = *p++ & addrmask[pfxlen];
-+			plen++;
-+			break;
-+		} else {
-+			a[i] = *p++;
-+			plen++;
-+			pfxlen -= 8;
-+		}
-+	}
-+	return (plen);
- }
- 
- int
- rde_update_get_prefix(u_char *p, u_int16_t len, struct bgpd_addr *prefix,
-     u_int8_t *prefixlen)
- {
--	int		i;
--	u_int8_t	pfxlen;
--	u_int16_t	plen;
--	union {
--		struct in_addr	a32;
--		u_int8_t	a8[4];
--	}		addr;
-+	u_int8_t	 pfxlen;
-+	int		 plen;
- 
- 	if (len < 1)
- 		return (-1);
- 
--	memcpy(&pfxlen, p, 1);
--	p += 1;
--	plen = 1;
-+	pfxlen = *p++;
-+	len--;
- 
- 	bzero(prefix, sizeof(struct bgpd_addr));
--	addr.a32.s_addr = 0;
--	for (i = 0; i <= 3; i++) {
--		if (pfxlen > i * 8) {
--			if (len - plen < 1)
--				return (-1);
--			memcpy(&addr.a8[i], p++, 1);
--			plen++;
--		}
--	}
--	prefix->af = AF_INET;
--	prefix->v4.s_addr = addr.a32.s_addr;
-+	prefix->aid = AID_INET;
- 	*prefixlen = pfxlen;
- 
--	return (plen);
-+	if ((plen = rde_update_extract_prefix(p, len, &prefix->v4, pfxlen,
-+	    sizeof(prefix->v4))) == -1)
-+		return (-1);
-+
-+	return (plen + 1);	/* pfxlen needs to be added */
- }
- 
- int
- rde_update_get_prefix6(u_char *p, u_int16_t len, struct bgpd_addr *prefix,
-     u_int8_t *prefixlen)
- {
--	int		i;
-+	int		plen;
- 	u_int8_t	pfxlen;
--	u_int16_t	plen;
-+
-+	if (len < 1)
-+		return (-1);
-+
-+	pfxlen = *p++;
-+	len--;
-+
-+	bzero(prefix, sizeof(struct bgpd_addr));
-+	prefix->aid = AID_INET6;
-+	*prefixlen = pfxlen;
-+
-+	if ((plen = rde_update_extract_prefix(p, len, &prefix->v6, pfxlen,
-+	    sizeof(prefix->v6))) == -1)
-+		return (-1);
-+
-+	return (plen + 1);	/* pfxlen needs to be added */
-+}
-+
-+int
-+rde_update_get_vpn4(u_char *p, u_int16_t len, struct bgpd_addr *prefix,
-+    u_int8_t *prefixlen)
-+{
-+	int		 rv, done = 0;
-+	u_int8_t	 pfxlen;
-+	u_int16_t	 plen;
- 
- 	if (len < 1)
- 		return (-1);
-@@ -1546,25 +2014,50 @@ rde_update_get_prefix6(u_char *p, u_int1
- 	plen = 1;
- 
- 	bzero(prefix, sizeof(struct bgpd_addr));
--	for (i = 0; i <= 15; i++) {
--		if (pfxlen > i * 8) {
--			if (len - plen < 1)
--				return (-1);
--			memcpy(&prefix->v6.s6_addr[i], p++, 1);
--			plen++;
--		}
--	}
--	prefix->af = AF_INET6;
-+
-+	/* label stack */
-+	do {
-+		if (len - plen < 3 || pfxlen < 3 * 8)
-+			return (-1);
-+		if (prefix->vpn4.labellen + 3U >
-+		    sizeof(prefix->vpn4.labelstack))
-+			return (-1);
-+		prefix->vpn4.labelstack[prefix->vpn4.labellen++] = *p++;
-+		prefix->vpn4.labelstack[prefix->vpn4.labellen++] = *p++;
-+		prefix->vpn4.labelstack[prefix->vpn4.labellen] = *p++;
-+		if (prefix->vpn4.labelstack[prefix->vpn4.labellen] &
-+		    BGP_MPLS_BOS)
-+			done = 1;
-+		prefix->vpn4.labellen++;
-+		plen += 3;
-+		pfxlen -= 3 * 8;
-+	} while (!done);
-+
-+	/* RD */
-+	if (len - plen < (int)sizeof(u_int64_t) ||
-+	    pfxlen < sizeof(u_int64_t) * 8)
-+		return (-1);
-+	memcpy(&prefix->vpn4.rd, p, sizeof(u_int64_t));
-+	pfxlen -= sizeof(u_int64_t) * 8;
-+	p += sizeof(u_int64_t);
-+	plen += sizeof(u_int64_t);
-+
-+	/* prefix */
-+	prefix->aid = AID_VPN_IPv4;
- 	*prefixlen = pfxlen;
- 
--	return (plen);
-+	if ((rv = rde_update_extract_prefix(p, len, &prefix->vpn4.addr,
-+	    pfxlen, sizeof(prefix->vpn4.addr))) == -1)
-+		return (-1);
-+
-+	return (plen + rv);
- }
- 
- void
- rde_update_err(struct rde_peer *peer, u_int8_t error, u_int8_t suberr,
-     void *data, u_int16_t size)
- {
--	struct buf	*wbuf;
-+	struct ibuf	*wbuf;
- 
- 	if ((wbuf = imsg_create(ibuf_se, IMSG_UPDATE_ERR, peer->conf.id, 0,
- 	    size + sizeof(error) + sizeof(suberr))) == NULL)
-@@ -1616,16 +2109,30 @@ rde_as4byte_fixup(struct rde_peer *peer,
- 	struct attr	*nasp, *naggr, *oaggr;
- 	u_int32_t	 as;
- 
-+	/*
-+	 * if either ATTR_AS4_AGGREGATOR or ATTR_AS4_PATH is present
-+	 * try to fixup the attributes.
-+	 * Do not fixup if F_ATTR_PARSE_ERR is set.
-+	 */
-+	if (!(a->flags & F_ATTR_AS4BYTE_NEW) || a->flags & F_ATTR_PARSE_ERR)
-+		return;
-+
- 	/* first get the attributes */
- 	nasp = attr_optget(a, ATTR_AS4_PATH);
- 	naggr = attr_optget(a, ATTR_AS4_AGGREGATOR);
- 
- 	if (rde_as4byte(peer)) {
- 		/* NEW session using 4-byte ASNs */
--		if (nasp)
-+		if (nasp) {
-+			log_peer_warnx(&peer->conf, "uses 4-byte ASN "
-+			    "but sent AS4_PATH attribute.");
- 			attr_free(a, nasp);
--		if (naggr)
-+		}
-+		if (naggr) {
-+			log_peer_warnx(&peer->conf, "uses 4-byte ASN "
-+			    "but sent AS4_AGGREGATOR attribute.");
- 			attr_free(a, naggr);
-+		}
- 		return;
- 	}
- 	/* OLD session using 2-byte ASNs */
-@@ -1669,6 +2176,10 @@ rde_reflector(struct rde_peer *peer, str
- 	u_int16_t	 len;
- 	u_int32_t	 id;
- 
-+	/* do not consider updates with parse errors */
-+	if (asp->flags & F_ATTR_PARSE_ERR)
-+		return;
-+
- 	/* check for originator id if eq router_id drop */
- 	if ((a = attr_optget(asp, ATTR_ORIGINATOR_ID)) != NULL) {
- 		if (memcmp(&conf->bgpid, a->data, sizeof(conf->bgpid)) == 0) {
-@@ -1677,10 +2188,10 @@ rde_reflector(struct rde_peer *peer, str
- 			return;
- 		}
- 	} else if (conf->flags & BGPD_FLAG_REFLECTOR) {
--		if (peer->conf.ebgp == 0)
--			id = htonl(peer->remote_bgpid);
--		else
-+		if (peer->conf.ebgp)
- 			id = conf->bgpid;
-+		else
-+			id = htonl(peer->remote_bgpid);
- 		if (attr_optadd(asp, ATTR_OPTIONAL, ATTR_ORIGINATOR_ID,
- 		    &id, sizeof(u_int32_t)) == -1)
- 			fatalx("attr_optadd failed but impossible");
-@@ -1724,17 +2235,17 @@ void
- rde_dump_rib_as(struct prefix *p, struct rde_aspath *asp, pid_t pid, int flags)
- {
- 	struct ctl_show_rib	 rib;
--	struct buf		*wbuf;
-+	struct ibuf		*wbuf;
- 	struct attr		*a;
- 	void			*bp;
-+	time_t			 staletime;
- 	u_int8_t		 l;
- 
- 	bzero(&rib, sizeof(rib));
- 	rib.lastchange = p->lastchange;
- 	rib.local_pref = asp->lpref;
- 	rib.med = asp->med;
--	rib.prefix_cnt = asp->prefix_cnt;
--	rib.active_cnt = asp->active_cnt;
-+	rib.weight = asp->weight;
- 	strlcpy(rib.descr, asp->peer->conf.descr, sizeof(rib.descr));
- 	memcpy(&rib.remote_addr, &asp->peer->remote_addr,
- 	    sizeof(rib.remote_addr));
-@@ -1748,23 +2259,26 @@ rde_dump_rib_as(struct prefix *p, struct
- 		/* announced network may have a NULL nexthop */
- 		bzero(&rib.true_nexthop, sizeof(rib.true_nexthop));
- 		bzero(&rib.exit_nexthop, sizeof(rib.exit_nexthop));
--		rib.true_nexthop.af = p->prefix->af;
--		rib.exit_nexthop.af = p->prefix->af;
-+		rib.true_nexthop.aid = p->prefix->aid;
-+		rib.exit_nexthop.aid = p->prefix->aid;
- 	}
- 	pt_getaddr(p->prefix, &rib.prefix);
- 	rib.prefixlen = p->prefix->prefixlen;
- 	rib.origin = asp->origin;
- 	rib.flags = 0;
- 	if (p->rib->active == p)
--		rib.flags |= F_RIB_ACTIVE;
--	if (asp->peer->conf.ebgp == 0)
--		rib.flags |= F_RIB_INTERNAL;
-+		rib.flags |= F_PREF_ACTIVE;
-+	if (!asp->peer->conf.ebgp)
-+		rib.flags |= F_PREF_INTERNAL;
- 	if (asp->flags & F_PREFIX_ANNOUNCED)
--		rib.flags |= F_RIB_ANNOUNCE;
-+		rib.flags |= F_PREF_ANNOUNCE;
- 	if (asp->nexthop == NULL || asp->nexthop->state == NEXTHOP_REACH)
--		rib.flags |= F_RIB_ELIGIBLE;
-+		rib.flags |= F_PREF_ELIGIBLE;
- 	if (asp->flags & F_ATTR_LOOP)
--		rib.flags &= ~F_RIB_ELIGIBLE;
-+		rib.flags &= ~F_PREF_ELIGIBLE;
-+	staletime = asp->peer->staletime[p->prefix->aid];
-+	if (staletime && p->lastchange <= staletime)
-+		rib.flags |= F_PREF_STALE;
- 	rib.aspath_len = aspath_length(asp->aspath);
- 
- 	if ((wbuf = imsg_create(ibuf_se_ctl, IMSG_CTL_SHOW_RIB, 0, pid,
-@@ -1784,13 +2298,13 @@ rde_dump_rib_as(struct prefix *p, struct
- 			    IMSG_CTL_SHOW_RIB_ATTR, 0, pid,
- 			    attr_optlen(a))) == NULL)
- 				return;
--			if ((bp = buf_reserve(wbuf, attr_optlen(a))) == NULL) {
--				buf_free(wbuf);
-+			if ((bp = ibuf_reserve(wbuf, attr_optlen(a))) == NULL) {
-+				ibuf_free(wbuf);
- 				return;
- 			}
- 			if (attr_write(bp, attr_optlen(a), a->flags,
- 			    a->type, a->data, a->len) == -1) {
--				buf_free(wbuf);
-+				ibuf_free(wbuf);
- 				return;
- 			}
- 			imsg_close(ibuf_se_ctl, wbuf);
-@@ -1828,17 +2342,20 @@ rde_dump_filter(struct prefix *p, struct
- {
- 	struct rde_peer		*peer;
- 
--	if (req->flags & F_CTL_ADJ_IN || 
-+	if (req->flags & F_CTL_ADJ_IN ||
- 	    !(req->flags & (F_CTL_ADJ_IN|F_CTL_ADJ_OUT))) {
- 		if (req->peerid && req->peerid != p->aspath->peer->conf.id)
- 			return;
--		if (req->type == IMSG_CTL_SHOW_RIB_AS && 
--		    !aspath_match(p->aspath->aspath, req->as.type, req->as.as))
-+		if (req->type == IMSG_CTL_SHOW_RIB_AS &&
-+		    !aspath_match(p->aspath->aspath->data,
-+		    p->aspath->aspath->len, req->as.type, req->as.as))
- 			return;
- 		if (req->type == IMSG_CTL_SHOW_RIB_COMMUNITY &&
--		    !rde_filter_community(p->aspath, req->community.as,
-+		    !community_match(p->aspath, req->community.as,
- 		    req->community.type))
- 			return;
-+		if ((req->flags & F_CTL_ACTIVE) && p->rib->active != p)
-+			return;
- 		rde_dump_rib_as(p, p->aspath, req->pid, req->flags);
- 	} else if (req->flags & F_CTL_ADJ_OUT) {
- 		if (p->rib->active != p)
-@@ -1872,7 +2389,7 @@ rde_dump_prefix_upcall(struct rib_entry 
- 
- 	pt = re->prefix;
- 	pt_getaddr(pt, &addr);
--	if (addr.af != ctx->req.prefix.af)
-+	if (addr.aid != ctx->req.prefix.aid)
- 		return;
- 	if (ctx->req.prefixlen > pt->prefixlen)
- 		return;
-@@ -1889,6 +2406,7 @@ rde_dump_ctx_new(struct ctl_show_rib_req
- 	struct rib_entry	*re;
- 	u_int			 error;
- 	u_int16_t		 id;
-+	u_int8_t		 hostplen = 0;
- 
- 	if ((ctx = calloc(1, sizeof(*ctx))) == NULL) {
- 		log_warn("rde_dump_ctx_new");
-@@ -1902,6 +2420,7 @@ rde_dump_ctx_new(struct ctl_show_rib_req
- 		error = CTL_RES_NOSUCHPEER;
- 		imsg_compose(ibuf_se_ctl, IMSG_CTL_RESULT, 0, pid, -1, &error,
- 		    sizeof(error));
-+		free(ctx);
- 		return;
- 	}
- 
-@@ -1924,7 +2443,18 @@ rde_dump_ctx_new(struct ctl_show_rib_req
- 			ctx->ribctx.ctx_upcall = rde_dump_prefix_upcall;
- 			break;
- 		}
--		if (req->prefixlen == 32)
-+		switch (req->prefix.aid) {
-+		case AID_INET:
-+		case AID_VPN_IPv4:
-+			hostplen = 32;
-+			break;
-+		case AID_INET6:
-+			hostplen = 128;
-+			break;
-+		default:
-+			fatalx("rde_dump_ctx_new: unknown af");
-+		}
-+		if (req->prefixlen == hostplen)
- 			re = rib_lookup(&ribs[id], &req->prefix);
- 		else
- 			re = rib_get(&ribs[id], &req->prefix, req->prefixlen);
-@@ -1937,7 +2467,7 @@ rde_dump_ctx_new(struct ctl_show_rib_req
- 	}
- 	ctx->ribctx.ctx_done = rde_dump_done;
- 	ctx->ribctx.ctx_arg = ctx;
--	ctx->ribctx.ctx_af = ctx->req.af;
-+	ctx->ribctx.ctx_aid = ctx->req.aid;
- 	rib_dump_r(&ctx->ribctx);
- }
- 
-@@ -1971,13 +2501,17 @@ rde_dump_mrt_new(struct mrt *mrt, pid_t 
- 		free(ctx);
- 		return;
- 	}
-+
-+	if (ctx->mrt.type == MRT_TABLE_DUMP_V2)
-+		mrt_dump_v2_hdr(&ctx->mrt, conf, &peerlist);
-+
- 	ctx->ribctx.ctx_count = RDE_RUNNER_ROUNDS;
- 	ctx->ribctx.ctx_rib = &ribs[id];
- 	ctx->ribctx.ctx_upcall = mrt_dump_upcall;
--	ctx->ribctx.ctx_done = mrt_dump_done;
-+	ctx->ribctx.ctx_done = mrt_done;
- 	ctx->ribctx.ctx_arg = &ctx->mrt;
--	ctx->ribctx.ctx_af = AF_UNSPEC;
--	LIST_INSERT_HEAD(&rde_mrts, &ctx->mrt, entry);
-+	ctx->ribctx.ctx_aid = AID_UNSPEC;
-+	LIST_INSERT_HEAD(&rde_mrts, ctx, entry);
- 	rde_mrt_cnt++;
- 	rib_dump_r(&ctx->ribctx);
- }
-@@ -1985,13 +2519,25 @@ rde_dump_mrt_new(struct mrt *mrt, pid_t 
- /*
-  * kroute specific functions
-  */
-+int
-+rde_rdomain_import(struct rde_aspath *asp, struct rdomain *rd)
-+{
-+	struct filter_set	*s;
-+
-+	TAILQ_FOREACH(s, &rd->import, entry) {
-+		if (community_ext_match(asp, &s->action.ext_community, 0))
-+			return (1);
-+	}
-+	return (0);
-+}
-+
- void
--rde_send_kroute(struct prefix *new, struct prefix *old)
-+rde_send_kroute(struct prefix *new, struct prefix *old, u_int16_t ribid)
- {
--	struct kroute_label	 kl;
--	struct kroute6_label	 kl6;
-+	struct kroute_full	 kr;
- 	struct bgpd_addr	 addr;
- 	struct prefix		*p;
-+	struct rdomain		*rd;
- 	enum imsg_type		 type;
- 
- 	/*
-@@ -2011,43 +2557,43 @@ rde_send_kroute(struct prefix *new, stru
- 	}
- 
- 	pt_getaddr(p->prefix, &addr);
--	switch (addr.af) {
--	case AF_INET:
--		bzero(&kl, sizeof(kl));
--		kl.kr.prefix.s_addr = addr.v4.s_addr;
--		kl.kr.prefixlen = p->prefix->prefixlen;
--		if (p->aspath->flags & F_NEXTHOP_REJECT)
--			kl.kr.flags |= F_REJECT;
--		if (p->aspath->flags & F_NEXTHOP_BLACKHOLE)
--			kl.kr.flags |= F_BLACKHOLE;
--		if (type == IMSG_KROUTE_CHANGE)
--			kl.kr.nexthop.s_addr =
--			    p->aspath->nexthop->true_nexthop.v4.s_addr;
--		strlcpy(kl.label, rtlabel_id2name(p->aspath->rtlabelid),
--		    sizeof(kl.label));
--		if (imsg_compose(ibuf_main, type, 0, 0, -1, &kl,
--		    sizeof(kl)) == -1)
--			fatal("imsg_compose error");
-+	bzero(&kr, sizeof(kr));
-+	memcpy(&kr.prefix, &addr, sizeof(kr.prefix));
-+	kr.prefixlen = p->prefix->prefixlen;
-+	if (p->aspath->flags & F_NEXTHOP_REJECT)
-+		kr.flags |= F_REJECT;
-+	if (p->aspath->flags & F_NEXTHOP_BLACKHOLE)
-+		kr.flags |= F_BLACKHOLE;
-+	if (type == IMSG_KROUTE_CHANGE)
-+		memcpy(&kr.nexthop, &p->aspath->nexthop->true_nexthop,
-+		    sizeof(kr.nexthop));
-+	strlcpy(kr.label, rtlabel_id2name(p->aspath->rtlabelid),
-+	    sizeof(kr.label));
-+
-+	switch (addr.aid) {
-+	case AID_VPN_IPv4:
-+		if (ribid != 1)
-+			/* not Loc-RIB, no update for VPNs */
-+			break;
-+
-+		SIMPLEQ_FOREACH(rd, rdomains_l, entry) {
-+			if (!rde_rdomain_import(p->aspath, rd))
-+				continue;
-+			/* must send exit_nexthop so that correct MPLS tunnel
-+			 * is chosen
-+			 */
-+			if (type == IMSG_KROUTE_CHANGE)
-+				memcpy(&kr.nexthop,
-+				    &p->aspath->nexthop->exit_nexthop,
-+				    sizeof(kr.nexthop));
-+			if (imsg_compose(ibuf_main, type, rd->rtableid, 0, -1,
-+			    &kr, sizeof(kr)) == -1)
-+				fatal("imsg_compose error");
-+		}
- 		break;
--	case AF_INET6:
--		bzero(&kl6, sizeof(kl6));
--		memcpy(&kl6.kr.prefix, &addr.v6, sizeof(struct in6_addr));
--		kl6.kr.prefixlen = p->prefix->prefixlen;
--		if (p->aspath->flags & F_NEXTHOP_REJECT)
--			kl6.kr.flags |= F_REJECT;
--		if (p->aspath->flags & F_NEXTHOP_BLACKHOLE)
--			kl6.kr.flags |= F_BLACKHOLE;
--		if (type == IMSG_KROUTE_CHANGE) {
--			type = IMSG_KROUTE6_CHANGE;
--			memcpy(&kl6.kr.nexthop,
--			    &p->aspath->nexthop->true_nexthop.v6,
--			    sizeof(struct in6_addr));
--		} else
--			type = IMSG_KROUTE6_DELETE;
--		strlcpy(kl6.label, rtlabel_id2name(p->aspath->rtlabelid),
--		    sizeof(kl6.label));
--		if (imsg_compose(ibuf_main, type, 0, 0, -1, &kl6,
--		    sizeof(kl6)) == -1)
-+	default:
-+		if (imsg_compose(ibuf_main, type, ribs[ribid].rtableid, 0, -1,
-+		    &kr, sizeof(kr)) == -1)
- 			fatal("imsg_compose error");
- 		break;
- 	}
-@@ -2098,7 +2644,6 @@ rde_send_pftable_commit(void)
- void
- rde_send_nexthop(struct bgpd_addr *next, int valid)
- {
--	size_t			 size;
- 	int			 type;
- 
- 	if (valid)
-@@ -2106,8 +2651,6 @@ rde_send_nexthop(struct bgpd_addr *next,
- 	else
- 		type = IMSG_NEXTHOP_REMOVE;
- 
--	size = sizeof(struct bgpd_addr);
--
- 	if (imsg_compose(ibuf_main, type, 0, 0, -1, next,
- 	    sizeof(struct bgpd_addr)) == -1)
- 		fatal("imsg_compose error");
-@@ -2201,6 +2744,10 @@ rde_softreconfig_in(struct rib_entry *re
- 			continue;
- 
- 		for (i = 1; i < rib_size; i++) {
-+			/* only active ribs need a softreconfig rerun */
-+			if (ribs[i].state != RECONF_KEEP)
-+				continue;
-+
- 			/* check if prefix changed */
- 			oa = rde_filter(i, &oasp, rules_l, peer, asp, &addr,
- 			    pt->prefixlen, peer, DIR_IN);
-@@ -2228,7 +2775,7 @@ rde_softreconfig_in(struct rib_entry *re
- 				if (path_compare(nasp, oasp) == 0)
- 					goto done;
- 				/* send update */
--				path_update(&ribs[1], peer, nasp, &addr,
-+				path_update(&ribs[i], peer, nasp, &addr,
- 				    pt->prefixlen);
- 			}
- 
-@@ -2241,6 +2788,104 @@ done:
- 	}
- }
- 
-+void
-+rde_softreconfig_load(struct rib_entry *re, void *ptr)
-+{
-+	struct rib		*rib = ptr;
-+	struct prefix		*p, *np;
-+	struct pt_entry		*pt;
-+	struct rde_peer		*peer;
-+	struct rde_aspath	*asp, *nasp;
-+	enum filter_actions	 action;
-+	struct bgpd_addr	 addr;
-+
-+	pt = re->prefix;
-+	pt_getaddr(pt, &addr);
-+	for (p = LIST_FIRST(&re->prefix_h); p != NULL; p = np) {
-+		np = LIST_NEXT(p, rib_l);
-+
-+		/* store aspath as prefix may change till we're done */
-+		asp = p->aspath;
-+		peer = asp->peer;
-+
-+		action = rde_filter(rib->id, &nasp, newrules, peer, asp, &addr,
-+		    pt->prefixlen, peer, DIR_IN);
-+		nasp = nasp != NULL ? nasp : asp;
-+
-+		if (action == ACTION_ALLOW) {
-+			/* update Local-RIB */
-+			path_update(rib, peer, nasp, &addr, pt->prefixlen);
-+		}
-+
-+		if (nasp != asp)
-+			path_put(nasp);
-+	}
-+}
-+
-+void
-+rde_softreconfig_load_peer(struct rib_entry *re, void *ptr)
-+{
-+	struct rde_peer		*peer = ptr;
-+	struct prefix		*p = re->active;
-+	struct pt_entry		*pt;
-+	struct rde_aspath	*nasp;
-+	enum filter_actions	 na;
-+	struct bgpd_addr	 addr;
-+
-+	pt = re->prefix;
-+	pt_getaddr(pt, &addr);
-+
-+	/* check if prefix was announced */
-+	if (up_test_update(peer, p) != 1)
-+		return;
-+
-+	na = rde_filter(re->ribid, &nasp, newrules, peer, p->aspath,
-+	    &addr, pt->prefixlen, p->aspath->peer, DIR_OUT);
-+	nasp = nasp != NULL ? nasp : p->aspath;
-+
-+	if (na == ACTION_DENY)
-+		/* nothing todo */
-+		goto done;
-+
-+	/* send update */
-+	up_generate(peer, nasp, &addr, pt->prefixlen);
-+done:
-+	if (nasp != p->aspath)
-+		path_put(nasp);
-+}
-+
-+void
-+rde_softreconfig_unload_peer(struct rib_entry *re, void *ptr)
-+{
-+	struct rde_peer		*peer = ptr;
-+	struct prefix		*p = re->active;
-+	struct pt_entry		*pt;
-+	struct rde_aspath	*oasp;
-+	enum filter_actions	 oa;
-+	struct bgpd_addr	 addr;
-+
-+	pt = re->prefix;
-+	pt_getaddr(pt, &addr);
-+
-+	/* check if prefix was announced */
-+	if (up_test_update(peer, p) != 1)
-+		return;
-+
-+	oa = rde_filter(re->ribid, &oasp, rules_l, peer, p->aspath,
-+	    &addr, pt->prefixlen, p->aspath->peer, DIR_OUT);
-+	oasp = oasp != NULL ? oasp : p->aspath;
-+
-+	if (oa == ACTION_DENY)
-+		/* nothing todo */
-+		goto done;
-+
-+	/* send withdraw */
-+	up_generate(peer, NULL, &addr, pt->prefixlen);
-+done:
-+	if (oasp != p->aspath)
-+		path_put(oasp);
-+}
-+
- /*
-  * update specific functions
-  */
-@@ -2252,7 +2897,7 @@ rde_up_dump_upcall(struct rib_entry *re,
- 	struct rde_peer		*peer = ptr;
- 
- 	if (re->ribid != peer->ribid)
--		fatalx("King Bula: monsterous evil horror.");
-+		fatalx("King Bula: monstrous evil horror.");
- 	if (re->active == NULL)
- 		return;
- 	up_generate_updates(rules_l, peer, re->active, NULL);
-@@ -2265,7 +2910,7 @@ rde_generate_updates(u_int16_t ribid, st
- 
- 	/*
- 	 * If old is != NULL we know it was active and should be removed.
--	 * If new is != NULL we know it is reachable and then we should 
-+	 * If new is != NULL we know it is reachable and then we should
- 	 * generate an update.
- 	 */
- 	if (old == NULL && new == NULL)
-@@ -2286,7 +2931,7 @@ void
- rde_update_queue_runner(void)
- {
- 	struct rde_peer		*peer;
--	int			 r, sent, max = RDE_RUNNER_ROUNDS;
-+	int			 r, sent, max = RDE_RUNNER_ROUNDS, eor = 0;
- 	u_int16_t		 len, wd_len, wpos;
- 
- 	len = sizeof(queue_buf) - MSGSIZE_HEADER;
-@@ -2300,7 +2945,7 @@ rde_update_queue_runner(void)
- 			/* first withdraws */
- 			wpos = 2; /* reserve space for the length field */
- 			r = up_dump_prefix(queue_buf + wpos, len - wpos - 2,
--			    &peer->withdraws, peer);
-+			    &peer->withdraws[AID_INET], peer);
- 			wd_len = r;
- 			/* write withdraws length filed */
- 			wd_len = htons(wd_len);
-@@ -2310,31 +2955,49 @@ rde_update_queue_runner(void)
- 			/* now bgp path attributes */
- 			r = up_dump_attrnlri(queue_buf + wpos, len - wpos,
- 			    peer);
--			wpos += r;
--
--			if (wpos == 4)
--				/*
--				 * No packet to send. The 4 bytes are the
--				 * needed withdraw and path attribute length.
--				 */
--				continue;
-+			switch (r) {
-+			case -1:
-+				eor = 1;
-+				if (wd_len == 0) {
-+					/* no withdraws queued just send EoR */
-+					peer_send_eor(peer, AID_INET);
-+					continue;
-+				}
-+				break;
-+			case 2:
-+				if (wd_len == 0) {
-+					/*
-+					 * No packet to send. No withdraws and
-+					 * no path attributes. Skip.
-+					 */
-+					continue;
-+				}
-+				/* FALLTHROUGH */
-+			default:
-+				wpos += r;
-+				break;
-+			}
- 
- 			/* finally send message to SE */
- 			if (imsg_compose(ibuf_se, IMSG_UPDATE, peer->conf.id,
- 			    0, -1, queue_buf, wpos) == -1)
- 				fatal("imsg_compose error");
- 			sent++;
-+			if (eor) {
-+				eor = 0;
-+				peer_send_eor(peer, AID_INET);
-+			}
- 		}
- 		max -= sent;
- 	} while (sent != 0 && max > 0);
- }
- 
- void
--rde_update6_queue_runner(void)
-+rde_update6_queue_runner(u_int8_t aid)
- {
- 	struct rde_peer		*peer;
- 	u_char			*b;
--	int			 sent, max = RDE_RUNNER_ROUNDS / 2;
-+	int			 r, sent, max = RDE_RUNNER_ROUNDS / 2;
- 	u_int16_t		 len;
- 
- 	/* first withdraws ... */
-@@ -2346,7 +3009,7 @@ rde_update6_queue_runner(void)
- 			if (peer->state != PEER_UP)
- 				continue;
- 			len = sizeof(queue_buf) - MSGSIZE_HEADER;
--			b = up_dump_mp_unreach(queue_buf, &len, peer);
-+			b = up_dump_mp_unreach(queue_buf, &len, peer, aid);
- 
- 			if (b == NULL)
- 				continue;
-@@ -2369,10 +3032,18 @@ rde_update6_queue_runner(void)
- 			if (peer->state != PEER_UP)
- 				continue;
- 			len = sizeof(queue_buf) - MSGSIZE_HEADER;
--			b = up_dump_mp_reach(queue_buf, &len, peer);
--
--			if (b == NULL)
-+			r = up_dump_mp_reach(queue_buf, &len, peer, aid);
-+			switch (r) {
-+			case -2:
-+				continue;
-+			case -1:
-+				peer_send_eor(peer, aid);
- 				continue;
-+			default:
-+				b = queue_buf + r;
-+				break;
-+			}
-+
- 			/* finally send message to SE */
- 			if (imsg_compose(ibuf_se, IMSG_UPDATE, peer->conf.id,
- 			    0, -1, b, len) == -1)
-@@ -2411,7 +3082,7 @@ rde_decisionflags(void)
- int
- rde_as4byte(struct rde_peer *peer)
- {
--	return (peer->capa_announced.as4byte && peer->capa_received.as4byte);
-+	return (peer->capa.as4byte);
- }
- 
- /*
-@@ -2429,7 +3100,6 @@ void
- peer_init(u_int32_t hashsize)
- {
- 	struct peer_config pc;
--	struct in_addr   id;
- 	u_int32_t	 hs, i;
- 
- 	for (hs = 1; hs < hashsize; hs <<= 1)
-@@ -2445,17 +3115,13 @@ peer_init(u_int32_t hashsize)
- 	peertable.peer_hashmask = hs - 1;
- 
- 	bzero(&pc, sizeof(pc));
--	pc.remote_as = conf->as;
--	id.s_addr = conf->bgpid;
--	snprintf(pc.descr, sizeof(pc.descr), "LOCAL: ID %s", inet_ntoa(id));
-+	snprintf(pc.descr, sizeof(pc.descr), "LOCAL");
- 
- 	peerself = peer_add(0, &pc);
- 	if (peerself == NULL)
- 		fatalx("peer_init add self");
- 
- 	peerself->state = PEER_UP;
--	peerself->remote_bgpid = ntohl(conf->bgpid);
--	peerself->short_as = conf->short_as;
- }
- 
- void
-@@ -2534,14 +3200,10 @@ peer_localaddrs(struct rde_peer *peer, s
- 			if (ifa->ifa_addr->sa_family ==
- 			    match->ifa_addr->sa_family)
- 				ifa = match;
--			peer->local_v4_addr.af = AF_INET;
--			peer->local_v4_addr.v4.s_addr =
--			    ((struct sockaddr_in *)ifa->ifa_addr)->
--			    sin_addr.s_addr;
-+			sa2addr(ifa->ifa_addr, &peer->local_v4_addr);
- 			break;
- 		}
- 	}
--
- 	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
- 		if (ifa->ifa_addr->sa_family == AF_INET6 &&
- 		    strcmp(ifa->ifa_name, match->ifa_name) == 0) {
-@@ -2559,13 +3221,7 @@ peer_localaddrs(struct rde_peer *peer, s
- 			    &((struct sockaddr_in6 *)ifa->
- 			    ifa_addr)->sin6_addr))
- 				continue;
--			peer->local_v6_addr.af = AF_INET6;
--			memcpy(&peer->local_v6_addr.v6,
--			    &((struct sockaddr_in6 *)ifa->ifa_addr)->
--			    sin6_addr, sizeof(struct in6_addr));
--			peer->local_v6_addr.scope_id =
--			    ((struct sockaddr_in6 *)ifa->ifa_addr)->
--			    sin6_scope_id;
-+			sa2addr(ifa->ifa_addr, &peer->local_v6_addr);
- 			break;
- 		}
- 	}
-@@ -2577,23 +3233,22 @@ void
- peer_up(u_int32_t id, struct session_up *sup)
- {
- 	struct rde_peer	*peer;
-+	u_int8_t	 i;
- 
- 	peer = peer_get(id);
- 	if (peer == NULL) {
--		log_warnx("peer_up: peer id %d already exists", id);
-+		log_warnx("peer_up: unknown peer id %d", id);
- 		return;
- 	}
- 
--	if (peer->state != PEER_DOWN && peer->state != PEER_NONE)
-+	if (peer->state != PEER_DOWN && peer->state != PEER_NONE &&
-+	    peer->state != PEER_UP)
- 		fatalx("peer_up: bad state");
- 	peer->remote_bgpid = ntohl(sup->remote_bgpid);
- 	peer->short_as = sup->short_as;
- 	memcpy(&peer->remote_addr, &sup->remote_addr,
- 	    sizeof(peer->remote_addr));
--	memcpy(&peer->capa_announced, &sup->capa_announced,
--	    sizeof(peer->capa_announced));
--	memcpy(&peer->capa_received, &sup->capa_received,
--	    sizeof(peer->capa_received));
-+	memcpy(&peer->capa, &sup->capa, sizeof(peer->capa));
- 
- 	peer_localaddrs(peer, &sup->local_addr);
- 
-@@ -2607,7 +3262,10 @@ peer_up(u_int32_t id, struct session_up 
- 		 */
- 		return;
- 
--	peer_dump(id, AFI_ALL, SAFI_ALL);
-+	for (i = 0; i < AID_MAX; i++) {
-+		if (peer->capa.mp[i] == 1)
-+			peer_dump(id, i);
-+	}
- }
- 
- void
-@@ -2641,43 +3299,90 @@ peer_down(u_int32_t id)
- 	free(peer);
- }
- 
-+/*
-+ * Flush all routes older then staletime. If staletime is 0 all routes will
-+ * be flushed.
-+ */
-+void
-+peer_flush(struct rde_peer *peer, u_int8_t aid)
-+{
-+	struct rde_aspath	*asp, *nasp;
-+
-+	/* walk through per peer RIB list and remove all stale prefixes. */
-+	for (asp = LIST_FIRST(&peer->path_h); asp != NULL; asp = nasp) {
-+		nasp = LIST_NEXT(asp, peer_l);
-+		path_remove_stale(asp, aid);
-+	}
-+
-+	/* Deletions are performed in path_remove() */
-+	rde_send_pftable_commit();
-+
-+	/* flushed no need to keep staletime */
-+	peer->staletime[aid] = 0;
-+}
-+
- void
--peer_dump(u_int32_t id, u_int16_t afi, u_int8_t safi)
-+peer_stale(u_int32_t id, u_int8_t aid)
- {
- 	struct rde_peer		*peer;
-+	time_t			 now;
- 
- 	peer = peer_get(id);
- 	if (peer == NULL) {
--		log_warnx("peer_down: unknown peer id %d", id);
-+		log_warnx("peer_stale: unknown peer id %d", id);
- 		return;
- 	}
- 
--	if (afi == AFI_ALL || afi == AFI_IPv4)
--		if (safi == SAFI_ALL || safi == SAFI_UNICAST) {
--			if (peer->conf.announce_type == ANNOUNCE_DEFAULT_ROUTE)
--				up_generate_default(rules_l, peer, AF_INET);
--			else
--				rib_dump(&ribs[peer->ribid], rde_up_dump_upcall,
--				    peer, AF_INET);
--		}
--	if (afi == AFI_ALL || afi == AFI_IPv6)
--		if (safi == SAFI_ALL || safi == SAFI_UNICAST) {
--			if (peer->conf.announce_type == ANNOUNCE_DEFAULT_ROUTE)
--				up_generate_default(rules_l, peer, AF_INET6);
--			else
--				rib_dump(&ribs[peer->ribid], rde_up_dump_upcall,
--				    peer, AF_INET6);
--		}
-+	if (peer->staletime[aid])
-+		peer_flush(peer, aid);
-+	peer->staletime[aid] = now = time(NULL);
- 
--	if (peer->capa_received.restart && peer->capa_announced.restart)
--		peer_send_eor(peer, afi, safi);
-+	/* make sure new prefixes start on a higher timestamp */
-+	do {
-+		sleep(1);
-+	} while (now >= time(NULL));
- }
- 
--/* End-of-RIB marker, draft-ietf-idr-restart-13.txt */
- void
--peer_send_eor(struct rde_peer *peer, u_int16_t afi, u_int16_t safi)
-+peer_dump(u_int32_t id, u_int8_t aid)
- {
--	if (afi == AFI_IPv4 && safi == SAFI_UNICAST) {
-+	struct rde_peer		*peer;
-+
-+	peer = peer_get(id);
-+	if (peer == NULL) {
-+		log_warnx("peer_dump: unknown peer id %d", id);
-+		return;
-+	}
-+
-+	if (peer->conf.announce_type == ANNOUNCE_DEFAULT_ROUTE)
-+		up_generate_default(rules_l, peer, aid);
-+	else
-+		rib_dump(&ribs[peer->ribid], rde_up_dump_upcall, peer, aid);
-+	if (peer->capa.grestart.restart)
-+		up_generate_marker(peer, aid);
-+}
-+
-+/* End-of-RIB marker, RFC 4724 */
-+void
-+peer_recv_eor(struct rde_peer *peer, u_int8_t aid)
-+{
-+	peer->prefix_rcvd_eor++;
-+
-+	/* First notify SE to remove possible race with the timeout. */
-+	if (imsg_compose(ibuf_se, IMSG_SESSION_RESTARTED, peer->conf.id,
-+	    0, -1, &aid, sizeof(aid)) == -1)
-+		fatal("imsg_compose error");
-+}
-+
-+void
-+peer_send_eor(struct rde_peer *peer, u_int8_t aid)
-+{
-+	u_int16_t	afi;
-+	u_int8_t	safi;
-+
-+	peer->prefix_sent_eor++;
-+
-+	if (aid == AID_INET) {
- 		u_char null[4];
- 
- 		bzero(&null, 4);
-@@ -2688,6 +3393,9 @@ peer_send_eor(struct rde_peer *peer, u_i
- 		u_int16_t	i;
- 		u_char		buf[10];
- 
-+		if (aid2afi(aid, &afi, &safi) == -1)
-+			fatalx("peer_send_eor: bad AID");
-+
- 		i = 0;	/* v4 withdrawn len */
- 		bcopy(&i, &buf[0], sizeof(i));
- 		i = htons(6);	/* path attr len */
-@@ -2709,39 +3417,61 @@ peer_send_eor(struct rde_peer *peer, u_i
-  * network announcement stuff
-  */
- void
--network_init(struct network_head *net_l)
--{
--	struct network	*n;
--
--	reloadtime = time(NULL);
--
--	while ((n = TAILQ_FIRST(net_l)) != NULL) {
--		TAILQ_REMOVE(net_l, n, entry);
--		network_add(&n->net, 1);
--		free(n);
--	}
--}
--
--void
- network_add(struct network_config *nc, int flagstatic)
- {
-+	struct rdomain		*rd;
- 	struct rde_aspath	*asp;
-+	struct filter_set_head	*vpnset = NULL;
-+	in_addr_t		 prefix4;
- 	u_int16_t		 i;
- 
--	asp = path_get();
--	asp->aspath = aspath_get(NULL, 0);
--	asp->origin = ORIGIN_IGP;
--	asp->flags = F_ATTR_ORIGIN | F_ATTR_ASPATH |
--	    F_ATTR_LOCALPREF | F_PREFIX_ANNOUNCED;
--	/* the nexthop is unset unless a default set overrides it */
-+	if (nc->rtableid) {
-+		SIMPLEQ_FOREACH(rd, rdomains_l, entry) {
-+			if (rd->rtableid != nc->rtableid)
-+				continue;
-+			switch (nc->prefix.aid) {
-+			case AID_INET:
-+				prefix4 = nc->prefix.v4.s_addr;
-+				bzero(&nc->prefix, sizeof(nc->prefix));
-+				nc->prefix.aid = AID_VPN_IPv4;
-+				nc->prefix.vpn4.rd = rd->rd;
-+				nc->prefix.vpn4.addr.s_addr = prefix4;
-+				nc->prefix.vpn4.labellen = 3;
-+				nc->prefix.vpn4.labelstack[0] =
-+				    (rd->label >> 12) & 0xff;
-+				nc->prefix.vpn4.labelstack[1] =
-+				    (rd->label >> 4) & 0xff;
-+				nc->prefix.vpn4.labelstack[2] =
-+				    (rd->label << 4) & 0xf0;
-+				nc->prefix.vpn4.labelstack[2] |= BGP_MPLS_BOS;
-+				vpnset = &rd->export;
-+				break;
-+			default:
-+				log_warnx("unable to VPNize prefix");
-+				filterset_free(&nc->attrset);
-+				return;
-+			}
-+		}
-+	}
-+
-+	if (nc->type == NETWORK_MRTCLONE) {
-+		asp = nc->asp;
-+	} else {
-+		asp = path_get();
-+		asp->aspath = aspath_get(NULL, 0);
-+		asp->origin = ORIGIN_IGP;
-+		asp->flags = F_ATTR_ORIGIN | F_ATTR_ASPATH |
-+		    F_ATTR_LOCALPREF | F_PREFIX_ANNOUNCED;
-+		/* the nexthop is unset unless a default set overrides it */
-+	}
- 	if (!flagstatic)
- 		asp->flags |= F_ANN_DYNAMIC;
--
--	rde_apply_set(asp, &nc->attrset, nc->prefix.af, peerself, peerself);
-+	rde_apply_set(asp, &nc->attrset, nc->prefix.aid, peerself, peerself);
-+	if (vpnset)
-+		rde_apply_set(asp, vpnset, nc->prefix.aid, peerself, peerself);
- 	for (i = 1; i < rib_size; i++)
- 		path_update(&ribs[i], peerself, asp, &nc->prefix,
- 		    nc->prefixlen);
--
- 	path_put(asp);
- 	filterset_free(&nc->attrset);
- }
-@@ -2749,12 +3479,41 @@ network_add(struct network_config *nc, i
- void
- network_delete(struct network_config *nc, int flagstatic)
- {
--	u_int32_t	flags = F_PREFIX_ANNOUNCED;
--	u_int32_t	i;
-+	struct rdomain	*rd;
-+	in_addr_t	 prefix4;
-+	u_int32_t	 flags = F_PREFIX_ANNOUNCED;
-+	u_int32_t	 i;
- 
- 	if (!flagstatic)
- 		flags |= F_ANN_DYNAMIC;
- 
-+	if (nc->rtableid) {
-+		SIMPLEQ_FOREACH(rd, rdomains_l, entry) {
-+			if (rd->rtableid != nc->rtableid)
-+				continue;
-+			switch (nc->prefix.aid) {
-+			case AID_INET:
-+				prefix4 = nc->prefix.v4.s_addr;
-+				bzero(&nc->prefix, sizeof(nc->prefix));
-+				nc->prefix.aid = AID_VPN_IPv4;
-+				nc->prefix.vpn4.rd = rd->rd;
-+				nc->prefix.vpn4.addr.s_addr = prefix4;
-+				nc->prefix.vpn4.labellen = 3;
-+				nc->prefix.vpn4.labelstack[0] =
-+				    (rd->label >> 12) & 0xff;
-+				nc->prefix.vpn4.labelstack[1] =
-+				    (rd->label >> 4) & 0xff;
-+				nc->prefix.vpn4.labelstack[2] =
-+				    (rd->label << 4) & 0xf0;
-+				nc->prefix.vpn4.labelstack[2] |= BGP_MPLS_BOS;
-+				break;
-+			default:
-+				log_warnx("unable to VPNize prefix");
-+				return;
-+			}
-+		}
-+	}
-+
- 	for (i = rib_size - 1; i > 0; i--)
- 		prefix_remove(&ribs[i], peerself, &nc->prefix, nc->prefixlen,
- 		    flags);
-@@ -2764,38 +3523,31 @@ void
- network_dump_upcall(struct rib_entry *re, void *ptr)
- {
- 	struct prefix		*p;
--	struct kroute		 k;
--	struct kroute6		 k6;
-+	struct kroute_full	 k;
- 	struct bgpd_addr	 addr;
- 	struct rde_dump_ctx	*ctx = ptr;
- 
- 	LIST_FOREACH(p, &re->prefix_h, rib_l) {
- 		if (!(p->aspath->flags & F_PREFIX_ANNOUNCED))
- 			continue;
--		if (p->prefix->af == AF_INET) {
--			bzero(&k, sizeof(k));
--			pt_getaddr(p->prefix, &addr);
--			k.prefix.s_addr = addr.v4.s_addr;
--			k.prefixlen = p->prefix->prefixlen;
--			if (p->aspath->peer == peerself)
--				k.flags = F_KERNEL;
--			if (imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_NETWORK, 0,
--			    ctx->req.pid, -1, &k, sizeof(k)) == -1)
--				log_warnx("network_dump_upcall: "
--				    "imsg_compose error");
--		}
--		if (p->prefix->af == AF_INET6) {
--			bzero(&k6, sizeof(k6));
--			pt_getaddr(p->prefix, &addr);
--			memcpy(&k6.prefix, &addr.v6, sizeof(k6.prefix));
--			k6.prefixlen = p->prefix->prefixlen;
--			if (p->aspath->peer == peerself)
--				k6.flags = F_KERNEL;
--			if (imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_NETWORK6, 0,
--			    ctx->req.pid, -1, &k6, sizeof(k6)) == -1)
--				log_warnx("network_dump_upcall: "
--				    "imsg_compose error");
--		}
-+		pt_getaddr(p->prefix, &addr);
-+
-+		bzero(&k, sizeof(k));
-+		memcpy(&k.prefix, &addr, sizeof(k.prefix));
-+		if (p->aspath->nexthop == NULL ||
-+		    p->aspath->nexthop->state != NEXTHOP_REACH)
-+			k.nexthop.aid = k.prefix.aid;
-+		else
-+			memcpy(&k.nexthop, &p->aspath->nexthop->true_nexthop,
-+			    sizeof(k.nexthop));
-+		k.prefixlen = p->prefix->prefixlen;
-+		k.flags = F_KERNEL;
-+		if ((p->aspath->flags & F_ANN_DYNAMIC) == 0)
-+			k.flags = F_STATIC;
-+		if (imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_NETWORK, 0,
-+		    ctx->req.pid, -1, &k, sizeof(k)) == -1)
-+			log_warnx("network_dump_upcall: "
-+			    "imsg_compose error");
- 	}
- }
- 
-@@ -2841,10 +3593,10 @@ sa_cmp(struct bgpd_addr *a, struct socka
- 	struct sockaddr_in	*in_b;
- 	struct sockaddr_in6	*in6_b;
- 
--	if (a->af != b->sa_family)
-+	if (aid2af(a->aid) != b->sa_family)
- 		return (1);
- 
--	switch (a->af) {
-+	switch (b->sa_family) {
- 	case AF_INET:
- 		in_b = (struct sockaddr_in *)b;
- 		if (a->v4.s_addr != in_b->sin_addr.s_addr)
-@@ -2855,10 +3607,11 @@ sa_cmp(struct bgpd_addr *a, struct socka
- #ifdef __KAME__
- 		/* directly stolen from sbin/ifconfig/ifconfig.c */
- 		if (IN6_IS_ADDR_LINKLOCAL(&in6_b->sin6_addr)) {
--			in6_b->sin6_scope_id =
--			    ntohs(*(u_int16_t *)&in6_b->sin6_addr.s6_addr[2]);
--			in6_b->sin6_addr.s6_addr[2] =
--			    in6_b->sin6_addr.s6_addr[3] = 0;
-+			if (in6_b->sin6_scope_id == 0) {
-+				in6_b->sin6_scope_id =
-+				    IN6_LINKLOCAL_IFINDEX(in6_b->sin6_addr);
-+			}
-+			SET_IN6_LINKLOCAL_IFINDEX(in6_b->sin6_addr, 0);
- 		}
- #endif
- 		if (bcmp(&a->v6, &in6_b->sin6_addr,
diff --git a/net/openbgpd/files/patch-bgpd_rde.h b/net/openbgpd/files/patch-bgpd_rde.h
deleted file mode 100644
index ba7d2d095891..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde.h
+++ /dev/null
@@ -1,361 +0,0 @@
-Index: bgpd/rde.h
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde.h,v
-retrieving revision 1.1.1.8
-retrieving revision 1.1.1.13
-diff -u -p -r1.1.1.8 -r1.1.1.13
---- bgpd/rde.h	14 Feb 2010 20:19:57 -0000	1.1.1.8
-+++ bgpd/rde.h	8 Dec 2012 10:37:09 -0000	1.1.1.13
-@@ -1,8 +1,8 @@
--/*	$OpenBSD: rde.h,v 1.120 2009/06/06 01:10:29 claudio Exp $ */
-+/*	$OpenBSD: rde.h,v 1.144 2012/09/12 05:56:22 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
-- *                          Andre Oppermann <oppermann@pipeline.ch>
-+ *                          Andre Oppermann <oppermann@networx.ch>
-  *
-  * Permission to use, copy, modify, and distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the above
-@@ -56,16 +56,16 @@ struct rde_peer {
- 	struct bgpd_addr		 local_v6_addr;
- 	struct uptree_prefix		 up_prefix;
- 	struct uptree_attr		 up_attrs;
--	struct uplist_attr		 updates;
--	struct uplist_prefix		 withdraws;
--	struct uplist_attr		 updates6;
--	struct uplist_prefix		 withdraws6;
--	struct capabilities		 capa_announced;
--	struct capabilities		 capa_received;
-+	struct uplist_attr		 updates[AID_MAX];
-+	struct uplist_prefix		 withdraws[AID_MAX];
-+	struct capabilities		 capa;
-+	time_t				 staletime[AID_MAX];
- 	u_int64_t			 prefix_rcvd_update;
- 	u_int64_t			 prefix_rcvd_withdraw;
-+	u_int64_t			 prefix_rcvd_eor;
- 	u_int64_t			 prefix_sent_update;
- 	u_int64_t			 prefix_sent_withdraw;
-+	u_int64_t			 prefix_sent_eor;
- 	u_int32_t			 prefix_cnt; /* # of prefixes */
- 	u_int32_t			 remote_bgpid; /* host byte order! */
- 	u_int32_t			 up_pcnt;
-@@ -75,12 +75,16 @@ struct rde_peer {
- 	enum peer_state			 state;
- 	u_int16_t			 ribid;
- 	u_int16_t			 short_as;
-+	u_int16_t			 mrt_idx;
- 	u_int8_t			 reconf_in;	/* in filter changed */
- 	u_int8_t			 reconf_out;	/* out filter changed */
-+	u_int8_t			 reconf_rib;	/* rib changed */
- };
- 
- #define AS_SET			1
- #define AS_SEQUENCE		2
-+#define AS_CONFED_SEQUENCE	3
-+#define AS_CONFED_SET		4
- #define ASPATH_HEADER_SIZE	(sizeof(struct aspath) - sizeof(u_char))
- 
- LIST_HEAD(aspath_list, aspath);
-@@ -117,6 +121,9 @@ enum attrtypes {
- #define ATTR_PARTIAL		0x20
- #define ATTR_TRANSITIVE		0x40
- #define ATTR_OPTIONAL		0x80
-+#define ATTR_RESERVED		0x0f
-+/* by default mask the reserved bits and the ext len bit */
-+#define ATTR_DEFMASK		(ATTR_RESERVED | ATTR_EXTLEN)
- 
- /* default attribute flags for well known attributes */
- #define ATTR_WELL_KNOWN		ATTR_TRANSITIVE
-@@ -163,6 +170,8 @@ LIST_HEAD(prefix_head, prefix);
- #define	F_NEXTHOP_REJECT	0x02000
- #define	F_NEXTHOP_BLACKHOLE	0x04000
- #define	F_NEXTHOP_NOMODIFY	0x08000
-+#define	F_NEXTHOP_MASK		0x0f000
-+#define	F_ATTR_PARSE_ERR	0x10000
- #define	F_ATTR_LINKED		0x20000
- 
- 
-@@ -220,14 +229,14 @@ struct nexthop {
- /* generic entry without address specific part */
- struct pt_entry {
- 	RB_ENTRY(pt_entry)		 pt_e;
--	sa_family_t			 af;
-+	u_int8_t			 aid;
- 	u_int8_t			 prefixlen;
- 	u_int16_t			 refcnt;
- };
- 
- struct pt_entry4 {
- 	RB_ENTRY(pt_entry)		 pt_e;
--	sa_family_t			 af;
-+	u_int8_t			 aid;
- 	u_int8_t			 prefixlen;
- 	u_int16_t			 refcnt;
- 	struct in_addr			 prefix4;
-@@ -235,12 +244,25 @@ struct pt_entry4 {
- 
- struct pt_entry6 {
- 	RB_ENTRY(pt_entry)		 pt_e;
--	sa_family_t			 af;
-+	u_int8_t			 aid;
- 	u_int8_t			 prefixlen;
- 	u_int16_t			 refcnt;
- 	struct in6_addr			 prefix6;
- };
- 
-+struct pt_entry_vpn4 {
-+	RB_ENTRY(pt_entry)		 pt_e;
-+	u_int8_t			 aid;
-+	u_int8_t			 prefixlen;
-+	u_int16_t			 refcnt;
-+	struct in_addr			 prefix4;
-+	u_int64_t			 rd;
-+	u_int8_t			 labelstack[21];
-+	u_int8_t			 labellen;
-+	u_int8_t			 pad1;
-+	u_int8_t			 pad2;
-+};
-+
- struct rib_context {
- 	LIST_ENTRY(rib_context)		 entry;
- 	struct rib_entry		*ctx_re;
-@@ -250,7 +272,7 @@ struct rib_context {
- 	void		(*ctx_wait)(void *);
- 	void				*ctx_arg;
- 	unsigned int			 ctx_count;
--	sa_family_t			 ctx_af;
-+	u_int8_t			 ctx_aid;
- };
- 
- struct rib_entry {
-@@ -262,23 +284,15 @@ struct rib_entry {
- 	u_int16_t		 flags;
- };
- 
--enum rib_state {
--	RIB_NONE,
--	RIB_ACTIVE,
--	RIB_DELETE
--};
--
- struct rib {
- 	char			name[PEER_DESCR_LEN];
- 	struct rib_tree		rib;
--	enum rib_state		state;
-+	u_int			rtableid;
- 	u_int16_t		flags;
- 	u_int16_t		id;
-+	enum reconf_action 	state;
- };
- 
--#define F_RIB_ENTRYLOCK		0x0001
--#define F_RIB_NOEVALUATE	0x0002
--#define F_RIB_NOFIB		0x0004
- #define RIB_FAILED		0xffff
- 
- struct prefix {
-@@ -292,8 +306,14 @@ struct prefix {
- extern struct rde_memstats rdemem;
- 
- /* prototypes */
-+/* mrt.c */
-+int		 mrt_dump_v2_hdr(struct mrt *, struct bgpd_config *,
-+		    struct rde_peer_head *);
-+void		 mrt_dump_upcall(struct rib_entry *, void *);
-+void		 mrt_done(void *);
-+
- /* rde.c */
--void		 rde_send_kroute(struct prefix *, struct prefix *);
-+void		 rde_send_kroute(struct prefix *, struct prefix *, u_int16_t);
- void		 rde_send_nexthop(struct bgpd_addr *, int);
- void		 rde_send_pftable(u_int16_t, struct bgpd_addr *,
- 		     u_int8_t, int);
-@@ -309,7 +329,7 @@ int		 rde_as4byte(struct rde_peer *);
- /* rde_attr.c */
- int		 attr_write(void *, u_int16_t, u_int8_t, u_int8_t, void *,
- 		     u_int16_t);
--int		 attr_writebuf(struct buf *, u_int8_t, u_int8_t, void *,
-+int		 attr_writebuf(struct ibuf *, u_int8_t, u_int8_t, void *,
- 		     u_int16_t);
- void		 attr_init(u_int32_t);
- void		 attr_shutdown(void);
-@@ -327,6 +347,7 @@ int		 aspath_verify(void *, u_int16_t, i
- #define		 AS_ERR_LEN	-1
- #define		 AS_ERR_TYPE	-2
- #define		 AS_ERR_BAD	-3
-+#define		 AS_ERR_SOFT	-4
- void		 aspath_init(u_int32_t);
- void		 aspath_shutdown(void);
- struct aspath	*aspath_get(void *, u_int16_t);
-@@ -341,22 +362,66 @@ u_int32_t	 aspath_neighbor(struct aspath
- int		 aspath_loopfree(struct aspath *, u_int32_t);
- int		 aspath_compare(struct aspath *, struct aspath *);
- u_char		*aspath_prepend(struct aspath *, u_int32_t, int, u_int16_t *);
--int		 aspath_match(struct aspath *, enum as_spec, u_int32_t);
--int		 community_match(void *, u_int16_t, int, int);
-+int		 aspath_lenmatch(struct aspath *, enum aslen_spec, u_int);
-+int		 community_match(struct rde_aspath *, int, int);
- int		 community_set(struct rde_aspath *, int, int);
- void		 community_delete(struct rde_aspath *, int, int);
-+int		 community_ext_match(struct rde_aspath *,
-+		    struct filter_extcommunity *, u_int16_t);
-+int		 community_ext_set(struct rde_aspath *,
-+		    struct filter_extcommunity *, u_int16_t);
-+void		 community_ext_delete(struct rde_aspath *,
-+		    struct filter_extcommunity *, u_int16_t);
-+int		 community_ext_conv(struct filter_extcommunity *, u_int16_t,
-+		    u_int64_t *);
-+
-+/* rde_decide.c */
-+void		 prefix_evaluate(struct prefix *, struct rib_entry *);
-+
-+/* rde_filter.c */
-+enum filter_actions rde_filter(u_int16_t, struct rde_aspath **,
-+		     struct filter_head *, struct rde_peer *,
-+		     struct rde_aspath *, struct bgpd_addr *, u_int8_t,
-+		     struct rde_peer *, enum directions);
-+void		 rde_apply_set(struct rde_aspath *, struct filter_set_head *,
-+		     u_int8_t, struct rde_peer *, struct rde_peer *);
-+int		 rde_filter_equal(struct filter_head *, struct filter_head *,
-+		     struct rde_peer *, enum directions);
-+
-+/* rde_prefix.c */
-+#define pt_empty(pt)	((pt)->refcnt == 0)
-+#define pt_ref(pt)	do {				\
-+	++(pt)->refcnt;					\
-+	if ((pt)->refcnt == 0)				\
-+		fatalx("pt_ref: overflow");		\
-+} while(0)
-+#define pt_unref(pt)	do {				\
-+	if ((pt)->refcnt == 0)				\
-+		fatalx("pt_unref: underflow");		\
-+	--(pt)->refcnt;					\
-+} while(0)
-+
-+void	 pt_init(void);
-+void	 pt_shutdown(void);
-+void	 pt_getaddr(struct pt_entry *, struct bgpd_addr *);
-+struct pt_entry	*pt_fill(struct bgpd_addr *, int);
-+struct pt_entry	*pt_get(struct bgpd_addr *, int);
-+struct pt_entry *pt_add(struct bgpd_addr *, int);
-+void	 pt_remove(struct pt_entry *);
-+struct pt_entry	*pt_lookup(struct bgpd_addr *);
-+int	 pt_prefix_cmp(const struct pt_entry *, const struct pt_entry *);
- 
- /* rde_rib.c */
- extern u_int16_t	 rib_size;
- extern struct rib	*ribs;
- 
--u_int16_t	 rib_new(int, char *, u_int16_t);
-+u_int16_t	 rib_new(char *, u_int, u_int16_t);
- u_int16_t	 rib_find(char *);
- void		 rib_free(struct rib *);
- struct rib_entry *rib_get(struct rib *, struct bgpd_addr *, int);
- struct rib_entry *rib_lookup(struct rib *, struct bgpd_addr *);
- void		 rib_dump(struct rib *, void (*)(struct rib_entry *, void *),
--		     void *, sa_family_t);
-+		     void *, u_int8_t);
- void		 rib_dump_r(struct rib_context *);
- void		 rib_dump_runner(void);
- int		 rib_dump_pending(void);
-@@ -368,6 +433,7 @@ int		 path_update(struct rib *, struct r
- int		 path_compare(struct rde_aspath *, struct rde_aspath *);
- struct rde_aspath *path_lookup(struct rde_aspath *, struct rde_peer *);
- void		 path_remove(struct rde_aspath *);
-+void		 path_remove_stale(struct rde_aspath *, u_int8_t);
- void		 path_destroy(struct rde_aspath *);
- int		 path_empty(struct rde_aspath *);
- struct rde_aspath *path_copy(struct rde_aspath *);
-@@ -375,8 +441,6 @@ struct rde_aspath *path_get(void);
- void		 path_put(struct rde_aspath *);
- 
- #define	PREFIX_SIZE(x)	(((x) + 7) / 8 + 1)
--int		 prefix_compare(const struct bgpd_addr *,
--		    const struct bgpd_addr *, int);
- struct prefix	*prefix_get(struct rib *, struct rde_peer *,
- 		    struct bgpd_addr *, int, u_int32_t);
- int		 prefix_add(struct rib *, struct rde_aspath *,
-@@ -385,6 +449,7 @@ void		 prefix_move(struct rde_aspath *, 
- int		 prefix_remove(struct rib *, struct rde_peer *,
- 		    struct bgpd_addr *, int, u_int32_t);
- int		 prefix_write(u_char *, int, struct bgpd_addr *, u_int8_t);
-+int		 prefix_writebuf(struct ibuf *, struct bgpd_addr *, u_int8_t);
- struct prefix	*prefix_bypeer(struct rib_entry *, struct rde_peer *,
- 		     u_int32_t);
- void		 prefix_updateall(struct rde_aspath *, enum nexthop_state,
-@@ -395,7 +460,7 @@ void		 prefix_network_clean(struct rde_p
- void		 nexthop_init(u_int32_t);
- void		 nexthop_shutdown(void);
- void		 nexthop_modify(struct rde_aspath *, struct bgpd_addr *,
--		     enum action_types, sa_family_t);
-+		     enum action_types, u_int8_t);
- void		 nexthop_link(struct rde_aspath *);
- void		 nexthop_unlink(struct rde_aspath *);
- int		 nexthop_delete(struct nexthop *);
-@@ -403,9 +468,6 @@ void		 nexthop_update(struct kroute_next
- struct nexthop	*nexthop_get(struct bgpd_addr *);
- int		 nexthop_compare(struct nexthop *, struct nexthop *);
- 
--/* rde_decide.c */
--void		 prefix_evaluate(struct prefix *, struct rib_entry *);
--
- /* rde_update.c */
- void		 up_init(struct rde_peer *);
- void		 up_down(struct rde_peer *);
-@@ -415,49 +477,14 @@ int		 up_generate(struct rde_peer *, str
- void		 up_generate_updates(struct filter_head *, struct rde_peer *,
- 		     struct prefix *, struct prefix *);
- void		 up_generate_default(struct filter_head *, struct rde_peer *,
--		     sa_family_t);
-+		     u_int8_t);
-+int		 up_generate_marker(struct rde_peer *, u_int8_t);
- int		 up_dump_prefix(u_char *, int, struct uplist_prefix *,
- 		     struct rde_peer *);
- int		 up_dump_attrnlri(u_char *, int, struct rde_peer *);
--u_char		*up_dump_mp_unreach(u_char *, u_int16_t *, struct rde_peer *);
--u_char		*up_dump_mp_reach(u_char *, u_int16_t *, struct rde_peer *);
--
--/* rde_prefix.c */
--#define pt_empty(pt)	((pt)->refcnt == 0)
--#define pt_ref(pt)	do {				\
--	++(pt)->refcnt;					\
--	if ((pt)->refcnt == 0)				\
--		fatalx("pt_ref: overflow");		\
--} while(0)
--#define pt_unref(pt)	do {				\
--	if ((pt)->refcnt == 0)				\
--		fatalx("pt_unref: underflow");		\
--	--(pt)->refcnt;					\
--} while(0)
--
--void	 pt_init(void);
--void	 pt_shutdown(void);
--void	 pt_getaddr(struct pt_entry *, struct bgpd_addr *);
--struct pt_entry	*pt_fill(struct bgpd_addr *, int);
--struct pt_entry	*pt_get(struct bgpd_addr *, int);
--struct pt_entry *pt_add(struct bgpd_addr *, int);
--void	 pt_remove(struct pt_entry *);
--struct pt_entry	*pt_lookup(struct bgpd_addr *);
--int	 pt_prefix_cmp(const struct pt_entry *, const struct pt_entry *);
--
--
--/* rde_filter.c */
--enum filter_actions rde_filter(u_int16_t, struct rde_aspath **,
--		     struct filter_head *, struct rde_peer *,
--		     struct rde_aspath *, struct bgpd_addr *, u_int8_t,
--		     struct rde_peer *, enum directions);
--void		 rde_apply_set(struct rde_aspath *, struct filter_set_head *,
--		     sa_family_t, struct rde_peer *, struct rde_peer *);
--int		 rde_filter_community(struct rde_aspath *, int, int);
--int		 rde_filter_equal(struct filter_head *, struct filter_head *,
--		     struct rde_peer *, enum directions);
--
--/* util.c */
--u_int32_t	 aspath_extract(const void *, int);
-+u_char		*up_dump_mp_unreach(u_char *, u_int16_t *, struct rde_peer *,
-+		     u_int8_t);
-+int		 up_dump_mp_reach(u_char *, u_int16_t *, struct rde_peer *,
-+		     u_int8_t);
- 
- #endif /* __RDE_H__ */
diff --git a/net/openbgpd/files/patch-bgpd_rde_attr.c b/net/openbgpd/files/patch-bgpd_rde_attr.c
deleted file mode 100644
index 2c0192abe5da..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde_attr.c
+++ /dev/null
@@ -1,562 +0,0 @@
-Index: bgpd/rde_attr.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde_attr.c,v
-retrieving revision 1.1.1.6
-retrieving revision 1.7
-diff -u -p -r1.1.1.6 -r1.7
---- bgpd/rde_attr.c	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ bgpd/rde_attr.c	13 Oct 2012 18:36:00 -0000	1.7
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: rde_attr.c,v 1.79 2009/03/19 06:52:59 claudio Exp $ */
-+/*	$OpenBSD: rde_attr.c,v 1.90 2012/04/12 17:27:20 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -17,14 +17,22 @@
-  */
- 
- #include <sys/types.h>
-+#if defined(__FreeBSD__)	/* sys/hash.h */
-+#include "hash.h"
-+#else
- #include <sys/hash.h>
-+#endif /* defined(__FreeBSD__) */
- #include <sys/queue.h>
- 
- #include <netinet/in.h>
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#if defined(__FreeBSD__)	/* limits.h */
-+#include <limits.h>
-+#endif /* defined(__FreeBSD__) */
- 
- #include "bgpd.h"
- #include "rde.h"
-@@ -36,12 +44,12 @@ attr_write(void *p, u_int16_t p_len, u_i
- 	u_char		*b = p;
- 	u_int16_t	 tmp, tot_len = 2; /* attribute header (without len) */
- 
-+	flags &= ~ATTR_DEFMASK;
- 	if (data_len > 255) {
- 		tot_len += 2 + data_len;
- 		flags |= ATTR_EXTLEN;
- 	} else {
- 		tot_len += 1 + data_len;
--		flags &= ~ATTR_EXTLEN;
- 	}
- 
- 	if (tot_len > p_len)
-@@ -63,26 +71,26 @@ attr_write(void *p, u_int16_t p_len, u_i
- }
- 
- int
--attr_writebuf(struct buf *buf, u_int8_t flags, u_int8_t type, void *data,
-+attr_writebuf(struct ibuf *buf, u_int8_t flags, u_int8_t type, void *data,
-     u_int16_t data_len)
- {
- 	u_char	hdr[4];
- 
-+	flags &= ~ATTR_DEFMASK;
- 	if (data_len > 255) {
- 		flags |= ATTR_EXTLEN;
- 		hdr[2] = (data_len >> 8) & 0xff;
- 		hdr[3] = data_len & 0xff;
- 	} else {
--		flags &= ~ATTR_EXTLEN;
- 		hdr[2] = data_len & 0xff;
- 	}
- 
- 	hdr[0] = flags;
- 	hdr[1] = type;
- 
--	if (buf_add(buf, hdr, flags & ATTR_EXTLEN ? 4 : 3) == -1)
-+	if (ibuf_add(buf, hdr, flags & ATTR_EXTLEN ? 4 : 3) == -1)
- 		return (-1);
--	if (buf_add(buf, data, data_len) == -1)
-+	if (ibuf_add(buf, data, data_len) == -1)
- 		return (-1);
- 	return (0);
- }
-@@ -146,8 +154,11 @@ attr_optadd(struct rde_aspath *asp, u_in
- 	for (l = 0; l < asp->others_len; l++) {
- 		if (asp->others[l] == NULL)
- 			break;
--		if (type == asp->others[l]->type)
-+		if (type == asp->others[l]->type) {
-+			if (a->refcnt == 0)
-+				attr_put(a);
- 			return (-1);
-+		}
- 	}
- 
- 	/* add attribute to the table but first bump refcnt */
-@@ -318,6 +329,7 @@ attr_alloc(u_int8_t flags, u_int8_t type
- 		fatal("attr_optadd");
- 	rdemem.attr_cnt++;
- 
-+	flags &= ~ATTR_DEFMASK;	/* normalize mask */
- 	a->flags = flags;
- 	a->hash = hash32_buf(&flags, sizeof(flags), HASHINIT);
- 	a->type = type;
-@@ -347,6 +359,7 @@ attr_lookup(u_int8_t flags, u_int8_t typ
- 	struct attr		*a;
- 	u_int32_t		 hash;
- 
-+	flags &= ~ATTR_DEFMASK;	/* normalize mask */
- 	hash = hash32_buf(&flags, sizeof(flags), HASHINIT);
- 	hash = hash32_buf(&type, sizeof(type), hash);
- 	hash = hash32_buf(&len, sizeof(len), hash);
-@@ -405,6 +418,7 @@ aspath_verify(void *data, u_int16_t len,
- 	u_int8_t	*seg = data;
- 	u_int16_t	 seg_size, as_size = 2;
- 	u_int8_t	 seg_len, seg_type;
-+	int		 err = 0;
- 
- 	if (len & 1)
- 		/* odd length aspath are invalid */
-@@ -419,7 +433,15 @@ aspath_verify(void *data, u_int16_t len,
- 		seg_type = seg[0];
- 		seg_len = seg[1];
- 
--		if (seg_type != AS_SET && seg_type != AS_SEQUENCE)
-+		/*
-+		 * BGP confederations should not show up but consider them
-+		 * as a soft error which invalidates the path but keeps the
-+		 * bgp session running.
-+		 */
-+		if (seg_type == AS_CONFED_SEQUENCE || seg_type == AS_CONFED_SET)
-+			err = AS_ERR_SOFT;
-+		if (seg_type != AS_SET && seg_type != AS_SEQUENCE &&
-+		    seg_type != AS_CONFED_SEQUENCE && seg_type != AS_CONFED_SET)
- 			return (AS_ERR_TYPE);
- 
- 		seg_size = 2 + as_size * seg_len;
-@@ -431,7 +453,7 @@ aspath_verify(void *data, u_int16_t len,
- 			/* empty aspath segments are not allowed */
- 			return (AS_ERR_BAD);
- 	}
--	return (0);	/* aspath is valid but probably not loop free */
-+	return (err);	/* aspath is valid but probably not loop free */
- }
- 
- void
-@@ -762,15 +784,9 @@ aspath_countcopy(struct aspath *aspath, 
- u_int32_t
- aspath_neighbor(struct aspath *aspath)
- {
--	/*
--	 * Empty aspath is OK -- internal as route.
--	 * But what is the neighbor? For now let's return 0.
--	 * That should not break anything.
--	 */
--
-+	/* Empty aspath is OK -- internal AS route. */
- 	if (aspath->len == 0)
--		return (0);
--
-+		return (rde_local_as());
- 	return (aspath_extract(aspath->data, 0));
- }
- 
-@@ -910,76 +926,63 @@ aspath_prepend(struct aspath *asp, u_int
- 	return (p);
- }
- 
--/* we need to be able to search more than one as */
- int
--aspath_match(struct aspath *a, enum as_spec type, u_int32_t as)
-+aspath_lenmatch(struct aspath *a, enum aslen_spec type, u_int aslen)
- {
- 	u_int8_t	*seg;
--	int		 final;
-+	u_int32_t	 as, lastas = 0;
-+	u_int		 count = 0;
- 	u_int16_t	 len, seg_size;
- 	u_int8_t	 i, seg_type, seg_len;
- 
--	if (type == AS_EMPTY) {
--		if (a->len == 0)
-+	if (type == ASLEN_MAX) {
-+		if (aslen < aspath_count(a->data, a->len))
- 			return (1);
- 		else
- 			return (0);
- 	}
- 
--	final = 0;
-+	/* type == ASLEN_SEQ */
- 	seg = a->data;
- 	for (len = a->len; len > 0; len -= seg_size, seg += seg_size) {
- 		seg_type = seg[0];
- 		seg_len = seg[1];
- 		seg_size = 2 + sizeof(u_int32_t) * seg_len;
- 
--		final = (len == seg_size);
--
--		/* just check the first (leftmost) AS */
--		if (type == AS_PEER) {
--			if (as == aspath_extract(seg, 0))
--				return (1);
--			else
--				return (0);
--		}
--		/* just check the final (rightmost) AS */
--		if (type == AS_SOURCE) {
--			/* not yet in the final segment */
--			if (!final)
--				continue;
--
--			if (as == aspath_extract(seg, seg_len - 1))
--				return (1);
--			else
--				return (0);
--		}
--
--		/* AS_TRANSIT or AS_ALL */
- 		for (i = 0; i < seg_len; i++) {
--			if (as == aspath_extract(seg, i)) {
--				/*
--				 * the source (rightmost) AS is excluded from
--				 * AS_TRANSIT matches.
--				 */
--				if (final && i == seg_len - 1 &&
--				    type == AS_TRANSIT)
--					return (0);
--				return (1);
--			}
-+			/* what should we do with AS_SET? */
-+			as = aspath_extract(seg, i);
-+			if (as == lastas) {
-+				if (aslen < ++count)
-+					return (1);
-+			} else
-+				count = 1;
-+			lastas = as;
- 		}
- 	}
- 	return (0);
- }
- 
-+/*
-+ * Functions handling communities and extended communities.
-+ */
-+
-+int community_ext_matchone(struct filter_extcommunity *, u_int16_t, u_int64_t);
-+
- int
--community_match(void *data, u_int16_t len, int as, int type)
-+community_match(struct rde_aspath *asp, int as, int type)
- {
--	u_int8_t	*p = data;
--	u_int16_t	 eas, etype;
-+	struct attr	*a;
-+	u_int8_t	*p;
-+	u_int16_t	 eas, etype, len;
- 
--	len >>= 2; /* divide by four */
-+	a = attr_optget(asp, ATTR_COMMUNITIES);
-+	if (a == NULL)
-+		/* no communities, no match */
-+		return (0);
- 
--	for (; len > 0; len--) {
-+	p = a->data;
-+	for (len = a->len / 4; len > 0; len--) {
- 		eas = *p++;
- 		eas <<= 8;
- 		eas |= *p++;
-@@ -1000,7 +1003,6 @@ community_set(struct rde_aspath *asp, in
- 	u_int8_t	*p = NULL;
- 	unsigned int	 i, ncommunities = 0;
- 	u_int8_t	 f = ATTR_OPTIONAL|ATTR_TRANSITIVE;
--	u_int8_t	 t = ATTR_COMMUNITIES;
- 
- 	attr = attr_optget(asp, ATTR_COMMUNITIES);
- 	if (attr != NULL) {
-@@ -1017,7 +1019,7 @@ community_set(struct rde_aspath *asp, in
- 		p += 4;
- 	}
- 
--	if (ncommunities++ >= 0x3fff)
-+	if (ncommunities++ >= USHRT_MAX / 4)
- 		/* overflow */
- 		return (0);
- 
-@@ -1032,11 +1034,10 @@ community_set(struct rde_aspath *asp, in
- 	if (attr != NULL) {
- 		memcpy(p + 4, attr->data, attr->len);
- 		f = attr->flags;
--		t = attr->type;
- 		attr_free(asp, attr);
- 	}
- 
--	attr_optadd(asp, f, t, p, ncommunities << 2);
-+	attr_optadd(asp, f, ATTR_COMMUNITIES, p, ncommunities << 2);
- 
- 	free(p);
- 	return (1);
-@@ -1049,7 +1050,7 @@ community_delete(struct rde_aspath *asp,
- 	u_int8_t	*p, *n;
- 	u_int16_t	 l, len = 0;
- 	u_int16_t	 eas, etype;
--	u_int8_t	 f, t;
-+	u_int8_t	 f;
- 
- 	attr = attr_optget(asp, ATTR_COMMUNITIES);
- 	if (attr == NULL)
-@@ -1100,10 +1101,250 @@ community_delete(struct rde_aspath *asp,
- 	}
- 
- 	f = attr->flags;
--	t = attr->type;
- 
- 	attr_free(asp, attr);
--	attr_optadd(asp, f, t, n, len);
-+	attr_optadd(asp, f, ATTR_COMMUNITIES, n, len);
- 	free(n);
- }
- 
-+int
-+community_ext_match(struct rde_aspath *asp, struct filter_extcommunity *c,
-+    u_int16_t neighas)
-+{
-+	struct attr	*attr;
-+	u_int8_t	*p;
-+	u_int64_t	 ec;
-+	u_int16_t	 len;
-+
-+	attr = attr_optget(asp, ATTR_EXT_COMMUNITIES);
-+	if (attr == NULL)
-+		/* no communities, no match */
-+		return (0);
-+
-+	p = attr->data;
-+	for (len = attr->len / sizeof(ec); len > 0; len--) {
-+		memcpy(&ec, p, sizeof(ec));
-+		if (community_ext_matchone(c, neighas, ec))
-+			return (1);
-+		p += sizeof(ec);
-+	}
-+
-+	return (0);
-+}
-+
-+int
-+community_ext_set(struct rde_aspath *asp, struct filter_extcommunity *c,
-+    u_int16_t neighas)
-+{
-+	struct attr	*attr;
-+	u_int8_t	*p = NULL;
-+	u_int64_t	 community;
-+	unsigned int	 i, ncommunities = 0;
-+	u_int8_t	 f = ATTR_OPTIONAL|ATTR_TRANSITIVE;
-+
-+	if (community_ext_conv(c, neighas, &community))
-+		return (0);
-+
-+	attr = attr_optget(asp, ATTR_EXT_COMMUNITIES);
-+	if (attr != NULL) {
-+		p = attr->data;
-+		ncommunities = attr->len / sizeof(community);
-+	}
-+
-+	/* first check if the community is not already set */
-+	for (i = 0; i < ncommunities; i++) {
-+		if (memcmp(&community, p, sizeof(community)) == 0)
-+			/* already present, nothing todo */
-+			return (1);
-+		p += sizeof(community);
-+	}
-+
-+	if (ncommunities++ >= USHRT_MAX / sizeof(community))
-+		/* overflow */
-+		return (0);
-+
-+	if ((p = malloc(ncommunities * sizeof(community))) == NULL)
-+		fatal("community_ext_set");
-+
-+	memcpy(p, &community, sizeof(community));
-+	if (attr != NULL) {
-+		memcpy(p + sizeof(community), attr->data, attr->len);
-+		f = attr->flags;
-+		attr_free(asp, attr);
-+	}
-+
-+	attr_optadd(asp, f, ATTR_EXT_COMMUNITIES, p,
-+	    ncommunities * sizeof(community));
-+
-+	free(p);
-+	return (1);
-+}
-+
-+void
-+community_ext_delete(struct rde_aspath *asp, struct filter_extcommunity *c,
-+    u_int16_t neighas)
-+{
-+	struct attr	*attr;
-+	u_int8_t	*p, *n;
-+	u_int64_t	 community;
-+	u_int16_t	 l, len = 0;
-+	u_int8_t	 f;
-+
-+	if (community_ext_conv(c, neighas, &community))
-+		return;
-+
-+	attr = attr_optget(asp, ATTR_EXT_COMMUNITIES);
-+	if (attr == NULL)
-+		/* no attr nothing to do */
-+		return;
-+
-+	p = attr->data;
-+	for (l = 0; l < attr->len; l += sizeof(community)) {
-+		if (memcmp(&community, p + l, sizeof(community)) == 0)
-+			/* match */
-+			continue;
-+		len += sizeof(community);
-+	}
-+
-+	if (len == 0) {
-+		attr_free(asp, attr);
-+		return;
-+	}
-+
-+	if ((n = malloc(len)) == NULL)
-+		fatal("community_delete");
-+
-+	p = attr->data;
-+	for (l = 0; l < len && p < attr->data + attr->len;
-+	    p += sizeof(community)) {
-+		if (memcmp(&community, p, sizeof(community)) == 0)
-+			/* match */
-+			continue;
-+		memcpy(n + l, p, sizeof(community));
-+		l += sizeof(community);
-+	}
-+
-+	f = attr->flags;
-+
-+	attr_free(asp, attr);
-+	attr_optadd(asp, f, ATTR_EXT_COMMUNITIES, n, len);
-+	free(n);
-+}
-+
-+int
-+community_ext_conv(struct filter_extcommunity *c, u_int16_t neighas,
-+    u_int64_t *community)
-+{
-+	u_int64_t	com;
-+	u_int32_t	ip;
-+
-+	com = (u_int64_t)c->type << 56;
-+	switch (c->type & EXT_COMMUNITY_VALUE) {
-+	case EXT_COMMUNITY_TWO_AS:
-+		com |= (u_int64_t)c->subtype << 48;
-+		com |= (u_int64_t)c->data.ext_as.as << 32;
-+		com |= c->data.ext_as.val;
-+		break;
-+	case EXT_COMMUNITY_IPV4:
-+		com |= (u_int64_t)c->subtype << 48;
-+		ip = ntohl(c->data.ext_ip.addr.s_addr);
-+		com |= (u_int64_t)ip << 16;
-+		com |= c->data.ext_ip.val;
-+		break;
-+	case EXT_COMMUNITY_FOUR_AS:
-+		com |= (u_int64_t)c->subtype << 48;
-+		com |= (u_int64_t)c->data.ext_as4.as4 << 16;
-+		com |= c->data.ext_as4.val;
-+		break;
-+	case EXT_COMMUNITY_OPAQUE:
-+		com |= (u_int64_t)c->subtype << 48;
-+		com |= c->data.ext_opaq & EXT_COMMUNITY_OPAQUE_MAX;
-+		break;
-+	default:
-+		com |= c->data.ext_opaq & 0xffffffffffffffULL;
-+		break;
-+	}
-+
-+	*community = htobe64(com);
-+
-+	return (0);
-+}
-+
-+int
-+community_ext_matchone(struct filter_extcommunity *c, u_int16_t neighas,
-+    u_int64_t community)
-+{
-+	u_int64_t	com, mask;
-+	u_int32_t	ip;
-+
-+	community = betoh64(community);
-+
-+	com = (u_int64_t)c->type << 56;
-+	mask = 0xffULL << 56;
-+	if ((com & mask) != (community & mask))
-+		return (0);
-+
-+	switch (c->type & EXT_COMMUNITY_VALUE) {
-+	case EXT_COMMUNITY_TWO_AS:
-+	case EXT_COMMUNITY_IPV4:
-+	case EXT_COMMUNITY_FOUR_AS:
-+	case EXT_COMMUNITY_OPAQUE:
-+		com = (u_int64_t)c->subtype << 48;
-+		mask = 0xffULL << 48;
-+		if ((com & mask) != (community & mask))
-+			return (0);
-+		break;
-+	default:
-+		com = c->data.ext_opaq & 0xffffffffffffffULL;
-+		mask = 0xffffffffffffffULL;
-+		if ((com & mask) == (community & mask))
-+			return (1);
-+		return (0);
-+	}
-+
-+
-+	switch (c->type & EXT_COMMUNITY_VALUE) {
-+	case EXT_COMMUNITY_TWO_AS:
-+		com = (u_int64_t)c->data.ext_as.as << 32;
-+		mask = 0xffffULL << 32;
-+		if ((com & mask) != (community & mask))
-+			return (0);
-+
-+		com = c->data.ext_as.val;
-+		mask = 0xffffffffULL;
-+		if ((com & mask) == (community & mask))
-+			return (1);
-+		break;
-+	case EXT_COMMUNITY_IPV4:
-+		ip = ntohl(c->data.ext_ip.addr.s_addr);
-+		com = (u_int64_t)ip << 16;
-+		mask = 0xffffffff0000ULL;
-+		if ((com & mask) != (community & mask))
-+			return (0);
-+
-+		com = c->data.ext_ip.val;
-+		mask = 0xffff;
-+		if ((com & mask) == (community & mask))
-+			return (1);
-+		break;
-+	case EXT_COMMUNITY_FOUR_AS:
-+		com = (u_int64_t)c->data.ext_as4.as4 << 16;
-+		mask = 0xffffffffULL << 16;
-+		if ((com & mask) != (community & mask))
-+			return (0);
-+
-+		com = c->data.ext_as4.val;
-+		mask = 0xffff;
-+		if ((com & mask) == (community & mask))
-+			return (1);
-+		break;
-+	case EXT_COMMUNITY_OPAQUE:
-+		com = c->data.ext_opaq & EXT_COMMUNITY_OPAQUE_MAX;
-+		mask = EXT_COMMUNITY_OPAQUE_MAX;
-+		if ((com & mask) == (community & mask))
-+			return (1);
-+		break;
-+	}
-+
-+	return (0);
-+}
diff --git a/net/openbgpd/files/patch-bgpd_rde_decide.c b/net/openbgpd/files/patch-bgpd_rde_decide.c
deleted file mode 100644
index c9d27af5dbef..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde_decide.c
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: bgpd/rde_decide.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde_decide.c,v
-retrieving revision 1.1.1.6
-retrieving revision 1.4
-diff -u -p -r1.1.1.6 -r1.4
---- bgpd/rde_decide.c	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ bgpd/rde_decide.c	13 Oct 2012 18:36:00 -0000	1.4
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: rde_decide.c,v 1.58 2009/06/29 14:10:13 claudio Exp $ */
-+/*	$OpenBSD: rde_decide.c,v 1.61 2012/04/12 17:31:05 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -109,6 +109,9 @@ int
- prefix_cmp(struct prefix *p1, struct prefix *p2)
- {
- 	struct rde_aspath	*asp1, *asp2;
-+	struct attr		*a;
-+	u_int32_t		 p1id, p2id;
-+	int			 p1cnt, p2cnt;
- 
- 	if (p1 == NULL)
- 		return (-1);
-@@ -118,6 +121,12 @@ prefix_cmp(struct prefix *p1, struct pre
- 	asp1 = p1->aspath;
- 	asp2 = p2->aspath;
- 
-+	/* pathes with errors are not eligible */
-+	if (asp1->flags & F_ATTR_PARSE_ERR)
-+		return (-1);
-+	if (asp2->flags & F_ATTR_PARSE_ERR)
-+		return (1);
-+
- 	/* only loop free pathes are eligible */
- 	if (asp1->flags & F_ATTR_LOOP)
- 		return (-1);
-@@ -130,7 +139,7 @@ prefix_cmp(struct prefix *p1, struct pre
- 	if (asp1->nexthop != NULL && asp1->nexthop->state != NEXTHOP_REACH)
- 		return (-1);
- 
--	/* 2. preference of prefix, bigger is better */
-+	/* 2. local preference of prefix, bigger is better */
- 	if ((asp1->lpref - asp2->lpref) != 0)
- 		return (asp1->lpref - asp2->lpref);
- 
-@@ -154,10 +163,10 @@ prefix_cmp(struct prefix *p1, struct pre
- 	 * It is absolutely important that the ebgp value in peer_config.ebgp
- 	 * is bigger than all other ones (IBGP, confederations)
- 	 */
--	if ((asp1->peer->conf.ebgp - asp2->peer->conf.ebgp) != 0) {
--		if (asp1->peer->conf.ebgp == 1) /* p1 is EBGP other is lower */
-+	if (asp1->peer->conf.ebgp != asp2->peer->conf.ebgp) {
-+		if (asp1->peer->conf.ebgp) /* p1 is EBGP other is lower */
- 			return 1;
--		else if (asp2->peer->conf.ebgp == 1) /* p2 is EBGP */
-+		else if (asp2->peer->conf.ebgp) /* p2 is EBGP */
- 			return -1;
- 	}
- 
-@@ -181,13 +190,30 @@ prefix_cmp(struct prefix *p1, struct pre
- 		if ((p2->lastchange - p1->lastchange) != 0)
- 			return (p2->lastchange - p1->lastchange);
- 
--	/* 10. lowest BGP Id wins */
--	if ((p2->aspath->peer->remote_bgpid -
--	    p1->aspath->peer->remote_bgpid) != 0)
--		return (p2->aspath->peer->remote_bgpid -
--		    p1->aspath->peer->remote_bgpid);
-+	/* 10. lowest BGP Id wins, use ORIGINATOR_ID if present */
-+	if ((a = attr_optget(asp1, ATTR_ORIGINATOR_ID)) != NULL) {
-+		memcpy(&p1id, a->data, sizeof(p1id));
-+		p1id = ntohl(p1id);
-+	} else
-+		p1id = asp1->peer->remote_bgpid;
-+	if ((a = attr_optget(asp2, ATTR_ORIGINATOR_ID)) != NULL) {
-+		memcpy(&p2id, a->data, sizeof(p2id));
-+		p2id = ntohl(p2id);
-+	} else
-+		p2id = asp2->peer->remote_bgpid;
-+	if ((p2id - p1id) != 0)
-+		return (p2id - p1id);
-+
-+	/* 11. compare CLUSTER_LIST length, shorter is better */
-+	p1cnt = p2cnt = 0;
-+	if ((a = attr_optget(asp1, ATTR_CLUSTER_LIST)) != NULL)
-+		p1cnt = a->len / sizeof(u_int32_t);
-+	if ((a = attr_optget(asp2, ATTR_CLUSTER_LIST)) != NULL)
-+		p2cnt = a->len / sizeof(u_int32_t);
-+	if ((p2cnt - p1cnt) != 0)
-+		return (p2cnt - p1cnt);
- 
--	/* 11. lowest peer address wins (IPv4 is better than IPv6) */
-+	/* 12. lowest peer address wins (IPv4 is better than IPv6) */
- 	if (memcmp(&p1->aspath->peer->remote_addr,
- 	    &p2->aspath->peer->remote_addr,
- 	    sizeof(p1->aspath->peer->remote_addr)) != 0)
-@@ -195,7 +221,7 @@ prefix_cmp(struct prefix *p1, struct pre
- 		    &p2->aspath->peer->remote_addr,
- 		    sizeof(p1->aspath->peer->remote_addr)));
- 
--	/* 12. for announced prefixes prefer dynamic routes */
-+	/* 13. for announced prefixes prefer dynamic routes */
- 	if ((asp1->flags & F_ANN_DYNAMIC) != (asp2->flags & F_ANN_DYNAMIC)) {
- 		if (asp1->flags & F_ANN_DYNAMIC)
- 			return (1);
-@@ -204,7 +230,7 @@ prefix_cmp(struct prefix *p1, struct pre
- 	}
- 
- 	fatalx("Uh, oh a politician in the decision process");
--	/* NOTREACHED */
-+	return(0);	/* NOTREACHED */
- }
- 
- /*
-@@ -245,7 +271,7 @@ prefix_evaluate(struct prefix *p, struct
- 	}
- 
- 	xp = LIST_FIRST(&re->prefix_h);
--	if (xp == NULL || xp->aspath->flags & F_ATTR_LOOP ||
-+	if (xp == NULL || xp->aspath->flags & (F_ATTR_LOOP|F_ATTR_PARSE_ERR) ||
- 	    (xp->aspath->nexthop != NULL &&
- 	    xp->aspath->nexthop->state != NEXTHOP_REACH))
- 		/* xp is ineligible */
-@@ -263,7 +289,7 @@ prefix_evaluate(struct prefix *p, struct
- 		 */
- 		rde_generate_updates(re->ribid, xp, re->active);
- 		if ((re->flags & F_RIB_NOFIB) == 0)
--			rde_send_kroute(xp, re->active);
-+			rde_send_kroute(xp, re->active, re->ribid);
- 
- 		re->active = xp;
- 		if (xp != NULL)
diff --git a/net/openbgpd/files/patch-bgpd_rde_filter.c b/net/openbgpd/files/patch-bgpd_rde_filter.c
deleted file mode 100644
index c17d9fc5fdbf..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde_filter.c
+++ /dev/null
@@ -1,297 +0,0 @@
-Index: bgpd/rde_filter.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde_filter.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.9
-diff -u -p -r1.1.1.7 -r1.9
---- bgpd/rde_filter.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/rde_filter.c	8 Dec 2012 20:17:59 -0000	1.9
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: rde_filter.c,v 1.56 2009/06/06 01:10:29 claudio Exp $ */
-+/*	$OpenBSD: rde_filter.c,v 1.67 2011/09/20 21:19:06 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -26,7 +26,7 @@
- #include "rde.h"
- 
- int	rde_filter_match(struct filter_rule *, struct rde_aspath *,
--	    struct bgpd_addr *, u_int8_t, struct rde_peer *);
-+	    struct bgpd_addr *, u_int8_t, struct rde_peer *, struct rde_peer *);
- int	filterset_equal(struct filter_set_head *, struct filter_set_head *);
- 
- enum filter_actions
-@@ -40,6 +40,13 @@ rde_filter(u_int16_t ribid, struct rde_a
- 	if (new != NULL)
- 		*new = NULL;
- 
-+	if (asp->flags & F_ATTR_PARSE_ERR)
-+		/*
-+	 	 * don't try to filter bad updates just deny them
-+		 * so they act as implicit withdraws
-+		 */
-+		return (ACTION_DENY);
-+
- 	TAILQ_FOREACH(f, rules, entry) {
- 		if (dir != f->dir)
- 			continue;
-@@ -51,7 +58,7 @@ rde_filter(u_int16_t ribid, struct rde_a
- 		if (f->peer.peerid != 0 &&
- 		    f->peer.peerid != peer->conf.id)
- 			continue;
--		if (rde_filter_match(f, asp, prefix, prefixlen, peer)) {
-+		if (rde_filter_match(f, asp, prefix, prefixlen, peer, from)) {
- 			if (asp != NULL && new != NULL) {
- 				/* asp may get modified so create a copy */
- 				if (*new == NULL) {
-@@ -59,7 +66,7 @@ rde_filter(u_int16_t ribid, struct rde_a
- 					/* ... and use the copy from now on */
- 					asp = *new;
- 				}
--				rde_apply_set(asp, &f->set, prefix->af,
-+				rde_apply_set(asp, &f->set, prefix->aid,
- 				    from, peer);
- 			}
- 			if (f->action != ACTION_NONE)
-@@ -73,7 +80,7 @@ rde_filter(u_int16_t ribid, struct rde_a
- 
- void
- rde_apply_set(struct rde_aspath *asp, struct filter_set_head *sh,
--    sa_family_t af, struct rde_peer *from, struct rde_peer *peer)
-+    u_int8_t aid, struct rde_peer *from, struct rde_peer *peer)
- {
- 	struct filter_set	*set;
- 	u_char			*np;
-@@ -167,7 +174,7 @@ rde_apply_set(struct rde_aspath *asp, st
- 		case ACTION_SET_NEXTHOP_NOMODIFY:
- 		case ACTION_SET_NEXTHOP_SELF:
- 			nexthop_modify(asp, &set->action.nexthop, set->type,
--			    af);
-+			    aid);
- 			break;
- 		case ACTION_SET_COMMUNITY:
- 			switch (set->action.community.as) {
-@@ -243,19 +250,42 @@ rde_apply_set(struct rde_aspath *asp, st
- 			asp->rtlabelid = set->action.id;
- 			rtlabel_ref(asp->rtlabelid);
- 			break;
-+		case ACTION_SET_ORIGIN:
-+			asp->origin = set->action.origin;
-+			break;
-+		case ACTION_SET_EXT_COMMUNITY:
-+			community_ext_set(asp, &set->action.ext_community,
-+			    peer->conf.remote_as);
-+			break;
-+		case ACTION_DEL_EXT_COMMUNITY:
-+			community_ext_delete(asp, &set->action.ext_community,
-+			    peer->conf.remote_as);
-+			break;
- 		}
- 	}
- }
- 
- int
- rde_filter_match(struct filter_rule *f, struct rde_aspath *asp,
--    struct bgpd_addr *prefix, u_int8_t plen, struct rde_peer *peer)
-+    struct bgpd_addr *prefix, u_int8_t plen, struct rde_peer *peer,
-+    struct rde_peer *from)
- {
--	int	as, type;
-+	u_int32_t	pas;
-+	int		cas, type;
- 
--	if (asp != NULL && f->match.as.type != AS_NONE)
--		if (aspath_match(asp->aspath, f->match.as.type,
--		    f->match.as.as) == 0)
-+	if (asp != NULL && f->match.as.type != AS_NONE) {
-+		if (f->match.as.flags & AS_FLAG_NEIGHBORAS)
-+			pas = peer->conf.remote_as;
-+		else
-+			pas = f->match.as.as;
-+		if (aspath_match(asp->aspath->data, asp->aspath->len,
-+		    f->match.as.type, pas) == 0)
-+			return (0);
-+	}
-+
-+	if (asp != NULL && f->match.aslen.type != ASLEN_NONE)
-+		if (aspath_lenmatch(asp->aspath, f->match.aslen.type,
-+		    f->match.aslen.aslen) == 0)
- 			return (0);
- 
- 	if (asp != NULL && f->match.community.as != COMMUNITY_UNSET) {
-@@ -263,10 +293,10 @@ rde_filter_match(struct filter_rule *f, 
- 		case COMMUNITY_ERROR:
- 			fatalx("rde_apply_set bad community string");
- 		case COMMUNITY_NEIGHBOR_AS:
--			as = peer->conf.remote_as;
-+			cas = peer->conf.remote_as;
- 			break;
- 		default:
--			as = f->match.community.as;
-+			cas = f->match.community.as;
- 			break;
- 		}
- 
-@@ -281,12 +311,17 @@ rde_filter_match(struct filter_rule *f, 
- 			break;
- 		}
- 
--		if (rde_filter_community(asp, as, type) == 0)
-+		if (community_match(asp, cas, type) == 0)
- 			return (0);
- 	}
-+	if (asp != NULL &&
-+	    (f->match.ext_community.flags & EXT_COMMUNITY_FLAG_VALID))
-+		if (community_ext_match(asp, &f->match.ext_community,
-+		    peer->conf.remote_as) == 0)
-+			return (0);
- 
--	if (f->match.prefix.addr.af != 0) {
--		if (f->match.prefix.addr.af != prefix->af)
-+	if (f->match.prefix.addr.aid != 0) {
-+		if (f->match.prefix.addr.aid != prefix->aid)
- 			/* don't use IPv4 rules for IPv6 and vice versa */
- 			return (0);
- 
-@@ -322,7 +357,7 @@ rde_filter_match(struct filter_rule *f, 
- 	} else if (f->match.prefixlen.op != OP_NONE) {
- 		/* only prefixlen without a prefix */
- 
--		if (f->match.prefixlen.af != prefix->af)
-+		if (f->match.prefixlen.aid != prefix->aid)
- 			/* don't use IPv4 rules for IPv6 and vice versa */
- 			return (0);
- 
-@@ -350,25 +385,40 @@ rde_filter_match(struct filter_rule *f, 
- 		}
- 		/* NOTREACHED */
- 	}
-+	if (f->match.nexthop.flags != 0) {
-+		struct bgpd_addr *nexthop, *cmpaddr;
-+		if (asp->nexthop == NULL)
-+			/* no nexthop, skip */
-+			return (0);
-+		nexthop = &asp->nexthop->exit_nexthop;
-+		if (f->match.nexthop.flags == FILTER_NEXTHOP_ADDR)
-+			cmpaddr = &f->match.nexthop.addr;
-+		else
-+			cmpaddr = &from->remote_addr;
-+		if (cmpaddr->aid != nexthop->aid)
-+			/* don't use IPv4 rules for IPv6 and vice versa */
-+			return (0);
-+
-+		switch (cmpaddr->aid) {
-+		case AID_INET:
-+			if (cmpaddr->v4.s_addr != nexthop->v4.s_addr)
-+				return (0);
-+			break;
-+		case AID_INET6:
-+			if (memcmp(&cmpaddr->v6, &nexthop->v6,
-+			    sizeof(struct in6_addr)))
-+				return (0);
-+			break;
-+		default:
-+			fatalx("King Bula lost in address space");
-+		}
-+	}
- 
- 	/* matched somewhen or is anymatch rule  */
- 	return (1);
- }
- 
- int
--rde_filter_community(struct rde_aspath *asp, int as, int type)
--{
--	struct attr	*a;
--
--	a = attr_optget(asp, ATTR_COMMUNITIES);
--	if (a == NULL)
--		/* no communities, no match */
--		return (0);
--
--	return (community_match(a->data, a->len, as, type));
--}
--
--int
- rde_filter_equal(struct filter_head *a, struct filter_head *b,
-     struct rde_peer *peer, enum directions dir)
- {
-@@ -476,6 +526,12 @@ filterset_cmp(struct filter_set *a, stru
- 		return (a->action.community.type - b->action.community.type);
- 	}
- 
-+	if (a->type == ACTION_SET_EXT_COMMUNITY ||
-+	    a->type == ACTION_DEL_EXT_COMMUNITY) {	/* a->type == b->type */
-+		return (memcmp(&a->action.ext_community,
-+		    &b->action.ext_community, sizeof(a->action.ext_community)));
-+	}
-+
- 	if (a->type == ACTION_SET_NEXTHOP && b->type == ACTION_SET_NEXTHOP) {
- 		/*
- 		 * This is the only interesting case, all others are considered
-@@ -483,13 +539,29 @@ filterset_cmp(struct filter_set *a, stru
- 		 * reject it at the same time. Allow one IPv4 and one IPv6
- 		 * per filter set or only one of the other nexthop modifiers.
- 		 */
--		return (a->action.nexthop.af - b->action.nexthop.af);
-+		return (a->action.nexthop.aid - b->action.nexthop.aid);
- 	}
- 
- 	/* equal */
- 	return (0);
- }
- 
-+void
-+filterset_move(struct filter_set_head *source, struct filter_set_head *dest)
-+{
-+	struct filter_set	*s;
-+
-+	TAILQ_INIT(dest);
-+
-+	if (source == NULL)
-+		return;
-+
-+	while ((s = TAILQ_FIRST(source)) != NULL) {
-+		TAILQ_REMOVE(source, s, entry);
-+		TAILQ_INSERT_TAIL(dest, s, entry);
-+	}
-+}
-+
- int
- filterset_equal(struct filter_set_head *ah, struct filter_set_head *bh)
- {
-@@ -574,6 +646,19 @@ filterset_equal(struct filter_set_head *
- 			if (strcmp(as, bs) == 0)
- 				continue;
- 			break;
-+		case ACTION_SET_ORIGIN:
-+			if (a->type == b->type &&
-+			    a->action.origin == b->action.origin)
-+				continue;
-+			break;
-+		case ACTION_SET_EXT_COMMUNITY:
-+		case ACTION_DEL_EXT_COMMUNITY:
-+			if (a->type == b->type && memcmp(
-+			    &a->action.ext_community,
-+			    &b->action.ext_community,
-+			    sizeof(a->action.ext_community)) == 0)
-+				continue;
-+			break;
- 		}
- 		/* compare failed */
- 		return (0);
-@@ -616,7 +701,14 @@ filterset_name(enum action_types type)
- 	case ACTION_RTLABEL:
- 	case ACTION_RTLABEL_ID:
- 		return ("rtlabel");
-+	case ACTION_SET_ORIGIN:
-+		return ("origin");
-+	case ACTION_SET_EXT_COMMUNITY:
-+		return ("ext-community");
-+	case ACTION_DEL_EXT_COMMUNITY:
-+		return ("ext-community delete");
- 	}
- 
- 	fatalx("filterset_name: got lost");
-+	return (NULL); /* NOT REACHED */
- }
diff --git a/net/openbgpd/files/patch-bgpd_rde_prefix.c b/net/openbgpd/files/patch-bgpd_rde_prefix.c
deleted file mode 100644
index daea5cf62272..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde_prefix.c
+++ /dev/null
@@ -1,301 +0,0 @@
-Index: bgpd/rde_prefix.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde_prefix.c,v
-retrieving revision 1.1.1.6
-retrieving revision 1.6
-diff -u -p -r1.1.1.6 -r1.6
---- bgpd/rde_prefix.c	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ bgpd/rde_prefix.c	13 Oct 2012 18:36:00 -0000	1.6
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: rde_prefix.c,v 1.29 2009/05/30 18:27:17 claudio Exp $ */
-+/*	$OpenBSD: rde_prefix.c,v 1.31 2010/01/13 06:02:37 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -38,15 +38,16 @@
-  * pt_lookup: lookup a IP in the prefix table. Mainly for "show ip bgp".
-  * pt_empty:  returns true if there is no bgp prefix linked to the pt_entry.
-  * pt_init:   initialize prefix table.
-- * pt_alloc?: allocate a AF specific pt_entry. Internal function.
-+ * pt_alloc: allocate a AF specific pt_entry. Internal function.
-  * pt_free:   free a pt_entry. Internal function.
-  */
- 
- /* internal prototypes */
--static struct pt_entry4	*pt_alloc4(void);
--static struct pt_entry6	*pt_alloc6(void);
-+static struct pt_entry	*pt_alloc(struct pt_entry *);
- static void		 pt_free(struct pt_entry *);
- 
-+size_t	pt_sizes[AID_MAX] = AID_PTSIZE;
-+
- RB_HEAD(pt_tree, pt_entry);
- RB_PROTOTYPE(pt_tree, pt_entry, pt_e, pt_prefix_cmp);
- RB_GENERATE(pt_tree, pt_entry, pt_e, pt_prefix_cmp);
-@@ -70,17 +71,24 @@ void
- pt_getaddr(struct pt_entry *pte, struct bgpd_addr *addr)
- {
- 	bzero(addr, sizeof(struct bgpd_addr));
--	switch (pte->af) {
--	case AF_INET:
--		addr->af = pte->af;
-+	addr->aid = pte->aid;
-+	switch (addr->aid) {
-+	case AID_INET:
- 		addr->v4 = ((struct pt_entry4 *)pte)->prefix4;
- 		break;
--	case AF_INET6:
--		addr->af = pte->af;
-+	case AID_INET6:
- 		memcpy(&addr->v6, &((struct pt_entry6 *)pte)->prefix6,
- 		    sizeof(addr->v6));
- 		/* XXX scope_id ??? */
- 		break;
-+	case AID_VPN_IPv4:
-+		addr->vpn4.addr = ((struct pt_entry_vpn4 *)pte)->prefix4;
-+		addr->vpn4.rd = ((struct pt_entry_vpn4 *)pte)->rd;
-+		addr->vpn4.labellen = ((struct pt_entry_vpn4 *)pte)->labellen;
-+		memcpy(addr->vpn4.labelstack,
-+		    ((struct pt_entry_vpn4 *)pte)->labelstack,
-+		    addr->vpn4.labellen);
-+		break;
- 	default:
- 		fatalx("pt_getaddr: unknown af");
- 	}
-@@ -89,33 +97,49 @@ pt_getaddr(struct pt_entry *pte, struct 
- struct pt_entry *
- pt_fill(struct bgpd_addr *prefix, int prefixlen)
- {
--	static struct pt_entry4	pte4;
--	static struct pt_entry6	pte6;
--	in_addr_t		addr_hbo;
-+	static struct pt_entry4		pte4;
-+	static struct pt_entry6		pte6;
-+	static struct pt_entry_vpn4	pte_vpn4;
-+	in_addr_t			addr_hbo;
- 
--	switch (prefix->af) {
--	case AF_INET:
-+	switch (prefix->aid) {
-+	case AID_INET:
- 		bzero(&pte4, sizeof(pte4));
-+		pte4.aid = prefix->aid;
- 		if (prefixlen > 32)
--			fatalx("pt_get: bad IPv4 prefixlen");
--		pte4.af = AF_INET;
-+			fatalx("pt_fill: bad IPv4 prefixlen");
- 		addr_hbo = ntohl(prefix->v4.s_addr);
- 		pte4.prefix4.s_addr = htonl(addr_hbo &
- 		    prefixlen2mask(prefixlen));
- 		pte4.prefixlen = prefixlen;
- 		return ((struct pt_entry *)&pte4);
--	case AF_INET6:
-+	case AID_INET6:
- 		bzero(&pte6, sizeof(pte6));
-+		pte6.aid = prefix->aid;
- 		if (prefixlen > 128)
- 			fatalx("pt_get: bad IPv6 prefixlen");
--		pte6.af = AF_INET6;
- 		pte6.prefixlen = prefixlen;
- 		inet6applymask(&pte6.prefix6, &prefix->v6, prefixlen);
- 		return ((struct pt_entry *)&pte6);
-+	case AID_VPN_IPv4:
-+		bzero(&pte_vpn4, sizeof(pte_vpn4));
-+		pte_vpn4.aid = prefix->aid;
-+		if (prefixlen > 32)
-+			fatalx("pt_fill: bad IPv4 prefixlen");
-+		addr_hbo = ntohl(prefix->vpn4.addr.s_addr);
-+		pte_vpn4.prefix4.s_addr = htonl(addr_hbo &
-+		    prefixlen2mask(prefixlen));
-+		pte_vpn4.prefixlen = prefixlen;
-+		pte_vpn4.rd = prefix->vpn4.rd;
-+		pte_vpn4.labellen = prefix->vpn4.labellen;
-+		memcpy(pte_vpn4.labelstack, prefix->vpn4.labelstack,
-+		    prefix->vpn4.labellen);
-+		return ((struct pt_entry *)&pte_vpn4);
- 	default:
--		log_warnx("pt_get: unknown af");
--		return (NULL);
-+		fatalx("pt_fill: unknown af");
- 	}
-+	/* NOT REACHED */
-+	return (NULL);
- }
- 
- struct pt_entry *
-@@ -131,39 +155,12 @@ struct pt_entry *
- pt_add(struct bgpd_addr *prefix, int prefixlen)
- {
- 	struct pt_entry		*p = NULL;
--	struct pt_entry4	*p4;
--	struct pt_entry6	*p6;
--	in_addr_t		 addr_hbo;
--
--	switch (prefix->af) {
--	case AF_INET:
--		p4 = pt_alloc4();
--		if (prefixlen > 32)
--			fatalx("pt_add: bad IPv4 prefixlen");
--		p4->af = AF_INET;
--		p4->prefixlen = prefixlen;
--		addr_hbo = ntohl(prefix->v4.s_addr);
--		p4->prefix4.s_addr = htonl(addr_hbo &
--		    prefixlen2mask(prefixlen));
--		p = (struct pt_entry *)p4;
--		break;
--	case AF_INET6:
--		p6 = pt_alloc6();
--		if (prefixlen > 128)
--			fatalx("pt_add: bad IPv6 prefixlen");
--		p6->af = AF_INET6;
--		p6->prefixlen = prefixlen;
--		inet6applymask(&p6->prefix6, &prefix->v6, prefixlen);
--		p = (struct pt_entry *)p6;
--		break;
--	default:
--		fatalx("pt_add: unknown af");
--	}
- 
--	if (RB_INSERT(pt_tree, &pttable, p) != NULL) {
--		log_warnx("pt_add: insert failed");
--		return (NULL);
--	}
-+	p = pt_fill(prefix, prefixlen);
-+	p = pt_alloc(p);
-+
-+	if (RB_INSERT(pt_tree, &pttable, p) != NULL)
-+		fatalx("pt_add: insert failed");
- 
- 	return (p);
- }
-@@ -183,13 +180,14 @@ struct pt_entry *
- pt_lookup(struct bgpd_addr *addr)
- {
- 	struct pt_entry	*p;
--	int		 i;
-+	int		 i = 0;
- 
--	switch (addr->af) {
--	case AF_INET:
-+	switch (addr->aid) {
-+	case AID_INET:
-+	case AID_VPN_IPv4:
- 		i = 32;
- 		break;
--	case AF_INET6:
-+	case AID_INET6:
- 		i = 128;
- 		break;
- 	default:
-@@ -206,17 +204,18 @@ pt_lookup(struct bgpd_addr *addr)
- int
- pt_prefix_cmp(const struct pt_entry *a, const struct pt_entry *b)
- {
--	const struct pt_entry4	*a4, *b4;
--	const struct pt_entry6	*a6, *b6;
--	int			 i;
-+	const struct pt_entry4		*a4, *b4;
-+	const struct pt_entry6		*a6, *b6;
-+	const struct pt_entry_vpn4	*va4, *vb4;
-+	int				 i;
- 
--	if (a->af > b->af)
-+	if (a->aid > b->aid)
- 		return (1);
--	if (a->af < b->af)
-+	if (a->aid < b->aid)
- 		return (-1);
- 
--	switch (a->af) {
--	case AF_INET:
-+	switch (a->aid) {
-+	case AID_INET:
- 		a4 = (const struct pt_entry4 *)a;
- 		b4 = (const struct pt_entry4 *)b;
- 		if (ntohl(a4->prefix4.s_addr) > ntohl(b4->prefix4.s_addr))
-@@ -228,7 +227,7 @@ pt_prefix_cmp(const struct pt_entry *a, 
- 		if (a4->prefixlen < b4->prefixlen)
- 			return (-1);
- 		return (0);
--	case AF_INET6:
-+	case AID_INET6:
- 		a6 = (const struct pt_entry6 *)a;
- 		b6 = (const struct pt_entry6 *)b;
- 
-@@ -242,49 +241,49 @@ pt_prefix_cmp(const struct pt_entry *a, 
- 		if (a6->prefixlen > b6->prefixlen)
- 			return (1);
- 		return (0);
-+	case AID_VPN_IPv4:
-+		va4 = (const struct pt_entry_vpn4 *)a;
-+		vb4 = (const struct pt_entry_vpn4 *)b;
-+		if (ntohl(va4->prefix4.s_addr) > ntohl(vb4->prefix4.s_addr))
-+			return (1);
-+		if (ntohl(va4->prefix4.s_addr) < ntohl(vb4->prefix4.s_addr))
-+			return (-1);
-+		if (va4->prefixlen > vb4->prefixlen)
-+			return (1);
-+		if (va4->prefixlen < vb4->prefixlen)
-+			return (-1);
-+		if (betoh64(va4->rd) > betoh64(vb4->rd))
-+			return (1);
-+		if (betoh64(va4->rd) < betoh64(vb4->rd))
-+			return (-1);
-+		return (0);
- 	default:
- 		fatalx("pt_prefix_cmp: unknown af");
- 	}
- 	return (-1);
- }
- 
--/* returns a zeroed pt_entry function may not return on fail */
--static struct pt_entry4 *
--pt_alloc4(void)
-+/*
-+ * Returns a pt_entry cloned from the one passed in.
-+ * Function may not return on failure.
-+ */
-+static struct pt_entry *
-+pt_alloc(struct pt_entry *op)
- {
--	struct pt_entry4	*p;
-+	struct pt_entry		*p;
- 
--	p = calloc(1, sizeof(*p));
-+	p = malloc(pt_sizes[op->aid]);
- 	if (p == NULL)
- 		fatal("pt_alloc");
--	rdemem.pt4_cnt++;
--	return (p);
--}
-+	rdemem.pt_cnt[op->aid]++;
-+	memcpy(p, op, pt_sizes[op->aid]);
- 
--static struct pt_entry6 *
--pt_alloc6(void)
--{
--	struct pt_entry6	*p;
--
--	p = calloc(1, sizeof(*p));
--	if (p == NULL)
--		fatal("pt_alloc");
--	rdemem.pt6_cnt++;
- 	return (p);
- }
- 
- static void
- pt_free(struct pt_entry *pte)
- {
--	switch (pte->af) {
--	case AF_INET:
--		rdemem.pt4_cnt--;
--		break;
--	case AF_INET6:
--		rdemem.pt6_cnt--;
--		break;
--	default:
--		break;
--	}
-+	rdemem.pt_cnt[pte->aid]--;
- 	free(pte);
- }
diff --git a/net/openbgpd/files/patch-bgpd_rde_rib.c b/net/openbgpd/files/patch-bgpd_rde_rib.c
deleted file mode 100644
index 2fe781c69c4b..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde_rib.c
+++ /dev/null
@@ -1,513 +0,0 @@
-Index: bgpd/rde_rib.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde_rib.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.8
-diff -u -p -r1.1.1.7 -r1.8
---- bgpd/rde_rib.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/rde_rib.c	13 Oct 2012 18:36:00 -0000	1.8
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: rde_rib.c,v 1.116 2009/06/29 14:13:48 claudio Exp $ */
-+/*	$OpenBSD: rde_rib.c,v 1.133 2012/07/01 11:55:13 sthen Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -18,7 +18,11 @@
- 
- #include <sys/types.h>
- #include <sys/queue.h>
-+#if defined(__FreeBSD__)	/* sys/hash.h */
-+#include "hash.h"
-+#else
- #include <sys/hash.h>
-+#endif /* defined(__FreeBSD__) */
- 
- #include <stdlib.h>
- #include <string.h>
-@@ -50,16 +54,15 @@ RB_GENERATE(rib_tree, rib_entry, rib_e, 
- 
- /* RIB specific functions */
- u_int16_t
--rib_new(int id, char *name, u_int16_t flags)
-+rib_new(char *name, u_int rtableid, u_int16_t flags)
- {
- 	struct rib	*xribs;
- 	size_t		newsize;
-+	u_int16_t	id;
- 
--	if (id < 0) {
--		for (id = 0; id < rib_size; id++) {
--			if (*ribs[id].name == '\0')
--				break;
--		}
-+	for (id = 0; id < rib_size; id++) {
-+		if (*ribs[id].name == '\0')
-+			break;
- 	}
- 
- 	if (id == RIB_FAILED)
-@@ -78,9 +81,10 @@ rib_new(int id, char *name, u_int16_t fl
- 	bzero(&ribs[id], sizeof(struct rib));
- 	strlcpy(ribs[id].name, name, sizeof(ribs[id].name));
- 	RB_INIT(&ribs[id].rib);
--	ribs[id].state = RIB_ACTIVE;
-+	ribs[id].state = RECONF_REINIT;
- 	ribs[id].id = id;
- 	ribs[id].flags = flags;
-+	ribs[id].rtableid = rtableid;
- 
- 	return (id);
- }
-@@ -173,15 +177,16 @@ rib_lookup(struct rib *rib, struct bgpd_
- 	struct rib_entry *re;
- 	int		 i;
- 
--	switch (addr->af) {
--	case AF_INET:
-+	switch (addr->aid) {
-+	case AID_INET:
-+	case AID_VPN_IPv4:
- 		for (i = 32; i >= 0; i--) {
- 			re = rib_get(rib, addr, i);
- 			if (re != NULL)
- 				return (re);
- 		}
- 		break;
--	case AF_INET6:
-+	case AID_INET6:
- 		for (i = 128; i >= 0; i--) {
- 			re = rib_get(rib, addr, i);
- 			if (re != NULL)
-@@ -215,6 +220,7 @@ rib_add(struct rib *rib, struct bgpd_add
- 
-         if (RB_INSERT(rib_tree, &rib->rib, re) != NULL) {
- 		log_warnx("rib_add: insert failed");
-+		free(re);
- 		return (NULL);
- 	}
- 
-@@ -254,7 +260,7 @@ rib_empty(struct rib_entry *re)
- 
- void
- rib_dump(struct rib *rib, void (*upcall)(struct rib_entry *, void *),
--    void *arg, sa_family_t af)
-+    void *arg, u_int8_t aid)
- {
- 	struct rib_context	*ctx;
- 
-@@ -263,7 +269,7 @@ rib_dump(struct rib *rib, void (*upcall)
- 	ctx->ctx_rib = rib;
- 	ctx->ctx_upcall = upcall;
- 	ctx->ctx_arg = arg;
--	ctx->ctx_af = af;
-+	ctx->ctx_aid = aid;
- 	rib_dump_r(ctx);
- }
- 
-@@ -280,7 +286,8 @@ rib_dump_r(struct rib_context *ctx)
- 		re = rib_restart(ctx);
- 
- 	for (i = 0; re != NULL; re = RB_NEXT(rib_tree, unused, re)) {
--		if (ctx->ctx_af != AF_UNSPEC && ctx->ctx_af != re->prefix->af)
-+		if (ctx->ctx_aid != AID_UNSPEC &&
-+		    ctx->ctx_aid != re->prefix->aid)
- 			continue;
- 		if (ctx->ctx_count && i++ >= ctx->ctx_count &&
- 		    (re->flags & F_RIB_ENTRYLOCK) == 0) {
-@@ -308,7 +315,7 @@ rib_restart(struct rib_context *ctx)
- 	re->flags &= ~F_RIB_ENTRYLOCK;
- 
- 	/* find first non empty element */
--	while (rib_empty(re))
-+	while (re && rib_empty(re))
- 		re = RB_NEXT(rib_tree, unused, re);
- 
- 	/* free the previously locked rib element if empty */
-@@ -502,6 +509,36 @@ path_remove(struct rde_aspath *asp)
- 	}
- }
- 
-+/* remove all stale routes or if staletime is 0 remove all routes for
-+   a specified AID. */
-+void
-+path_remove_stale(struct rde_aspath *asp, u_int8_t aid)
-+{
-+	struct prefix	*p, *np;
-+	time_t		 staletime;
-+
-+	staletime = asp->peer->staletime[aid];
-+	for (p = LIST_FIRST(&asp->prefix_h); p != NULL; p = np) {
-+		np = LIST_NEXT(p, path_l);
-+		if (p->prefix->aid != aid)
-+			continue;
-+
-+		if (staletime && p->lastchange > staletime)
-+			continue;
-+
-+		if (asp->pftableid) {
-+			struct bgpd_addr addr;
-+
-+			pt_getaddr(p->prefix, &addr);
-+			/* Commit is done in peer_flush() */
-+			rde_send_pftable(p->aspath->pftableid, &addr,
-+			    p->prefix->prefixlen, 1);
-+		}
-+		prefix_destroy(p);
-+	}
-+}
-+
-+
- /* this function is only called by prefix_remove and path_remove */
- void
- path_destroy(struct rde_aspath *asp)
-@@ -624,48 +661,6 @@ static void		 prefix_link(struct prefix 
- 			     struct rde_aspath *);
- static void		 prefix_unlink(struct prefix *);
- 
--int
--prefix_compare(const struct bgpd_addr *a, const struct bgpd_addr *b,
--    int prefixlen)
--{
--	in_addr_t	mask, aa, ba;
--	int		i;
--	u_int8_t	m;
--
--	if (a->af != b->af)
--		return (a->af - b->af);
--
--	switch (a->af) {
--	case AF_INET:
--		if (prefixlen > 32)
--			fatalx("prefix_cmp: bad IPv4 prefixlen");
--		mask = htonl(prefixlen2mask(prefixlen));
--		aa = ntohl(a->v4.s_addr & mask);
--		ba = ntohl(b->v4.s_addr & mask);
--		if (aa != ba)
--			return (aa - ba);
--		return (0);
--	case AF_INET6:
--		if (prefixlen > 128)
--			fatalx("prefix_cmp: bad IPv6 prefixlen");
--		for (i = 0; i < prefixlen / 8; i++)
--			if (a->v6.s6_addr[i] != b->v6.s6_addr[i])
--				return (a->v6.s6_addr[i] - b->v6.s6_addr[i]);
--		i = prefixlen % 8;
--		if (i) {
--			m = 0xff00 >> i;
--			if ((a->v6.s6_addr[prefixlen / 8] & m) !=
--			    (b->v6.s6_addr[prefixlen / 8] & m))
--				return ((a->v6.s6_addr[prefixlen / 8] & m) -
--				    (b->v6.s6_addr[prefixlen / 8] & m));
--		}
--		return (0);
--	default:
--		fatalx("prefix_cmp: unknown af");
--	}
--	return (-1);
--}
--
- /*
-  * search for specified prefix of a peer. Returns NULL if not found.
-  */
-@@ -806,16 +801,58 @@ prefix_write(u_char *buf, int len, struc
- {
- 	int	totlen;
- 
--	if (prefix->af != AF_INET && prefix->af != AF_INET6)
-+	switch (prefix->aid) {
-+	case AID_INET:
-+	case AID_INET6:
-+		totlen = PREFIX_SIZE(plen);
-+
-+		if (totlen > len)
-+			return (-1);
-+		*buf++ = plen;
-+		memcpy(buf, &prefix->ba, totlen - 1);
-+		return (totlen);
-+	case AID_VPN_IPv4:
-+		totlen = PREFIX_SIZE(plen) + sizeof(prefix->vpn4.rd) +
-+		    prefix->vpn4.labellen;
-+		plen += (sizeof(prefix->vpn4.rd) + prefix->vpn4.labellen) * 8;
-+
-+		if (totlen > len)
-+			return (-1);
-+		*buf++ = plen;
-+		memcpy(buf, &prefix->vpn4.labelstack, prefix->vpn4.labellen);
-+		buf += prefix->vpn4.labellen;
-+		memcpy(buf, &prefix->vpn4.rd, sizeof(prefix->vpn4.rd));
-+		buf += sizeof(prefix->vpn4.rd);
-+		memcpy(buf, &prefix->vpn4.addr, PREFIX_SIZE(plen) - 1);
-+		return (totlen);
-+	default:
- 		return (-1);
-+	}
-+}
- 
--	totlen = PREFIX_SIZE(plen);
-+int
-+prefix_writebuf(struct ibuf *buf, struct bgpd_addr *prefix, u_int8_t plen)
-+{
-+	int	 totlen;
-+	void	*bptr;
- 
--	if (totlen > len)
-+	switch (prefix->aid) {
-+	case AID_INET:
-+	case AID_INET6:
-+		totlen = PREFIX_SIZE(plen);
-+		break;
-+	case AID_VPN_IPv4:
-+		totlen = PREFIX_SIZE(plen) + sizeof(prefix->vpn4.rd) +
-+		    prefix->vpn4.labellen;
-+	default:
- 		return (-1);
--	*buf++ = plen;
--	memcpy(buf, &prefix->ba, totlen - 1);
--	return (totlen);
-+	}
-+
-+	if ((bptr = ibuf_reserve(buf, totlen)) == NULL)
-+		return (-1);
-+	if (prefix_write(bptr, totlen, prefix, plen) == -1)
-+		return (-1);
-+	return (0);
- }
- 
- /*
-@@ -861,7 +898,7 @@ prefix_updateall(struct rde_aspath *asp,
- 			 */
- 			if ((p->rib->flags & F_RIB_NOFIB) == 0 &&
- 			    p == p->rib->active)
--				rde_send_kroute(p, NULL);
-+				rde_send_kroute(p, NULL, p->rib->ribid);
- 			continue;
- 		}
- 
-@@ -871,7 +908,7 @@ prefix_updateall(struct rde_aspath *asp,
- 		 * If the prefix is the active one remove it first,
- 		 * this has to be done because we can not detect when
- 		 * the active prefix changes its state. In this case
--		 * we know that this is a withdrawl and so the second
-+		 * we know that this is a withdrawal and so the second
- 		 * prefix_evaluate() will generate no update because
- 		 * the nexthop is unreachable or ineligible.
- 		 */
-@@ -885,16 +922,12 @@ prefix_updateall(struct rde_aspath *asp,
- void
- prefix_destroy(struct prefix *p)
- {
--	struct rib_entry	*re;
- 	struct rde_aspath	*asp;
- 
--	re = p->rib;
- 	asp = p->aspath;
- 	prefix_unlink(p);
- 	prefix_free(p);
- 
--	if (rib_empty(re))
--		rib_remove(re);
- 	if (path_empty(asp))
- 		path_destroy(asp);
- }
-@@ -907,21 +940,16 @@ prefix_network_clean(struct rde_peer *pe
- {
- 	struct rde_aspath	*asp, *xasp;
- 	struct prefix		*p, *xp;
--	struct pt_entry		*pte;
- 
- 	for (asp = LIST_FIRST(&peer->path_h); asp != NULL; asp = xasp) {
- 		xasp = LIST_NEXT(asp, peer_l);
--		if ((asp->flags & F_ANN_DYNAMIC) == flags)
-+		if ((asp->flags & F_ANN_DYNAMIC) != flags)
- 			continue;
- 		for (p = LIST_FIRST(&asp->prefix_h); p != NULL; p = xp) {
- 			xp = LIST_NEXT(p, path_l);
- 			if (reloadtime > p->lastchange) {
--				pte = p->prefix;
- 				prefix_unlink(p);
- 				prefix_free(p);
--
--				if (pt_empty(pte))
--					pt_remove(pte);
- 			}
- 		}
- 		if (path_empty(asp))
-@@ -954,11 +982,11 @@ prefix_link(struct prefix *pref, struct 
- static void
- prefix_unlink(struct prefix *pref)
- {
--	if (pref->rib) {
--		/* make route decision */
--		LIST_REMOVE(pref, rib_l);
--		prefix_evaluate(NULL, pref->rib);
--	}
-+	struct rib_entry	*re = pref->rib;
-+
-+	/* make route decision */
-+	LIST_REMOVE(pref, rib_l);
-+	prefix_evaluate(NULL, re);
- 
- 	LIST_REMOVE(pref, path_l);
- 	PREFIX_COUNT(pref->aspath, -1);
-@@ -966,6 +994,8 @@ prefix_unlink(struct prefix *pref)
- 	pt_unref(pref->prefix);
- 	if (pt_empty(pref->prefix))
- 		pt_remove(pref->prefix);
-+	if (rib_empty(re))
-+		rib_remove(re);
- 
- 	/* destroy all references to other objects */
- 	pref->aspath = NULL;
-@@ -973,8 +1003,8 @@ prefix_unlink(struct prefix *pref)
- 	pref->rib = NULL;
- 
- 	/*
--	 * It's the caller's duty to remove empty aspath respectively pt_entry
--	 * structures. Also freeing the unlinked prefix is the caller's duty.
-+	 * It's the caller's duty to remove empty aspath structures.
-+	 * Also freeing the unlinked prefix is the caller's duty.
- 	 */
- }
- 
-@@ -1070,10 +1100,6 @@ nexthop_update(struct kroute_nexthop *ms
- 		return;
- 	}
- 
--	if (nexthop_delete(nh))
--		/* nexthop no longer used */
--		return;
--
- 	oldstate = nh->state;
- 	if (msg->valid)
- 		nh->state = NEXTHOP_REACH;
-@@ -1088,21 +1114,13 @@ nexthop_update(struct kroute_nexthop *ms
- 		memcpy(&nh->true_nexthop, &msg->gateway,
- 		    sizeof(nh->true_nexthop));
- 
--	switch (msg->nexthop.af) {
--	case AF_INET:
--		nh->nexthop_netlen = msg->kr.kr4.prefixlen;
--		nh->nexthop_net.af = AF_INET;
--		nh->nexthop_net.v4.s_addr = msg->kr.kr4.prefix.s_addr;
--		break;
--	case AF_INET6:
--		nh->nexthop_netlen = msg->kr.kr6.prefixlen;
--		nh->nexthop_net.af = AF_INET6;
--		memcpy(&nh->nexthop_net.v6, &msg->kr.kr6.prefix,
--		    sizeof(struct in6_addr));
--		break;
--	default:
--		fatalx("nexthop_update: unknown af");
--	}
-+	memcpy(&nh->nexthop_net, &msg->net,
-+	    sizeof(nh->nexthop_net));
-+	nh->nexthop_netlen = msg->netlen;
-+
-+	if (nexthop_delete(nh))
-+		/* nexthop no longer used */
-+		return;
- 
- 	if (rde_noevaluate())
- 		/*
-@@ -1118,35 +1136,38 @@ nexthop_update(struct kroute_nexthop *ms
- 
- void
- nexthop_modify(struct rde_aspath *asp, struct bgpd_addr *nexthop,
--    enum action_types type, sa_family_t af)
-+    enum action_types type, u_int8_t aid)
- {
- 	struct nexthop	*nh;
- 
--	if (type == ACTION_SET_NEXTHOP_REJECT) {
--		asp->flags |= F_NEXTHOP_REJECT;
-+	if (type == ACTION_SET_NEXTHOP && aid != nexthop->aid)
- 		return;
--	}
--	if (type  == ACTION_SET_NEXTHOP_BLACKHOLE) {
-+
-+	asp->flags &= ~F_NEXTHOP_MASK;
-+	switch (type) {
-+	case ACTION_SET_NEXTHOP_REJECT:
-+		asp->flags |= F_NEXTHOP_REJECT;
-+		break;
-+	case ACTION_SET_NEXTHOP_BLACKHOLE:
- 		asp->flags |= F_NEXTHOP_BLACKHOLE;
--		return;
--	}
--	if (type == ACTION_SET_NEXTHOP_NOMODIFY) {
-+		break;
-+	case ACTION_SET_NEXTHOP_NOMODIFY:
- 		asp->flags |= F_NEXTHOP_NOMODIFY;
--		return;
--	}
--	if (type == ACTION_SET_NEXTHOP_SELF) {
-+		break;
-+	case ACTION_SET_NEXTHOP_SELF:
- 		asp->flags |= F_NEXTHOP_SELF;
--		return;
-+		break;
-+	case ACTION_SET_NEXTHOP:
-+		nh = nexthop_get(nexthop);
-+		if (asp->flags & F_ATTR_LINKED)
-+			nexthop_unlink(asp);
-+		asp->nexthop = nh;
-+		if (asp->flags & F_ATTR_LINKED)
-+			nexthop_link(asp);
-+		break;
-+	default:
-+		break;
- 	}
--	if (af != nexthop->af)
--		return;
--
--	nh = nexthop_get(nexthop);
--	if (asp->flags & F_ATTR_LINKED)
--		nexthop_unlink(asp);
--	asp->nexthop = nh;
--	if (asp->flags & F_ATTR_LINKED)
--		nexthop_link(asp);
- }
- 
- void
-@@ -1233,17 +1254,17 @@ nexthop_compare(struct nexthop *na, stru
- 	a = &na->exit_nexthop;
- 	b = &nb->exit_nexthop;
- 
--	if (a->af != b->af)
--		return (a->af - b->af);
-+	if (a->aid != b->aid)
-+		return (a->aid - b->aid);
- 
--	switch (a->af) {
--	case AF_INET:
-+	switch (a->aid) {
-+	case AID_INET:
- 		if (ntohl(a->v4.s_addr) > ntohl(b->v4.s_addr))
- 			return (1);
- 		if (ntohl(a->v4.s_addr) < ntohl(b->v4.s_addr))
- 			return (-1);
- 		return (0);
--	case AF_INET6:
-+	case AID_INET6:
- 		return (memcmp(&a->v6, &b->v6, sizeof(struct in6_addr)));
- 	default:
- 		fatalx("nexthop_cmp: unknown af");
-@@ -1269,14 +1290,14 @@ nexthop_hash(struct bgpd_addr *nexthop)
- {
- 	u_int32_t	 h = 0;
- 
--	switch (nexthop->af) {
--	case AF_INET:
-+	switch (nexthop->aid) {
-+	case AID_INET:
- 		h = (AF_INET ^ ntohl(nexthop->v4.s_addr) ^
- 		    ntohl(nexthop->v4.s_addr) >> 13) &
- 		    nexthoptable.nexthop_hashmask;
- 		break;
--	case AF_INET6:
--		h = hash32_buf(nexthop->v6.s6_addr, sizeof(struct in6_addr),
-+	case AID_INET6:
-+		h = hash32_buf(&nexthop->v6, sizeof(struct in6_addr),
- 		    HASHINIT) & nexthoptable.nexthop_hashmask;
- 		break;
- 	default:
diff --git a/net/openbgpd/files/patch-bgpd_rde_update.c b/net/openbgpd/files/patch-bgpd_rde_update.c
deleted file mode 100644
index ccd9601dcd3d..000000000000
--- a/net/openbgpd/files/patch-bgpd_rde_update.c
+++ /dev/null
@@ -1,644 +0,0 @@
-Index: bgpd/rde_update.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde_update.c,v
-retrieving revision 1.1.1.7
-retrieving revision 1.8
-diff -u -p -r1.1.1.7 -r1.8
---- bgpd/rde_update.c	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/rde_update.c	13 Oct 2012 18:36:00 -0000	1.8
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: rde_update.c,v 1.68 2009/06/06 01:10:29 claudio Exp $ */
-+/*	$OpenBSD: rde_update.c,v 1.77 2010/01/13 06:02:37 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
-@@ -17,19 +17,27 @@
-  */
- #include <sys/types.h>
- #include <sys/queue.h>
-+#if defined(__FreeBSD__)	/* sys/hash.h */
-+#include "hash.h"
-+#else
- #include <sys/hash.h>
-+#endif /* defined(__FreeBSD__) */
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(__FreeBSD__)	/* limits.h */
-+#include <limits.h>
-+#endif /* defined(__FreeBSD__) */
- 
- #include "bgpd.h"
- #include "rde.h"
- 
- in_addr_t	up_get_nexthop(struct rde_peer *, struct rde_aspath *);
- int		up_generate_mp_reach(struct rde_peer *, struct update_attr *,
--		    struct rde_aspath *, sa_family_t);
-+		    struct rde_aspath *, u_int8_t);
- int		up_generate_attr(struct rde_peer *, struct update_attr *,
--		    struct rde_aspath *, sa_family_t);
-+		    struct rde_aspath *, u_int8_t);
- 
- /* update stuff. */
- struct update_prefix {
-@@ -65,10 +73,12 @@ RB_GENERATE(uptree_attr, update_attr, en
- void
- up_init(struct rde_peer *peer)
- {
--	TAILQ_INIT(&peer->updates);
--	TAILQ_INIT(&peer->withdraws);
--	TAILQ_INIT(&peer->updates6);
--	TAILQ_INIT(&peer->withdraws6);
-+	u_int8_t	i;
-+
-+	for (i = 0; i < AID_MAX; i++) {
-+		TAILQ_INIT(&peer->updates[i]);
-+		TAILQ_INIT(&peer->withdraws[i]);
-+	}
- 	RB_INIT(&peer->up_prefix);
- 	RB_INIT(&peer->up_attrs);
- 	peer->up_pcnt = 0;
-@@ -103,8 +113,10 @@ up_clear(struct uplist_attr *updates, st
- void
- up_down(struct rde_peer *peer)
- {
--	up_clear(&peer->updates, &peer->withdraws);
--	up_clear(&peer->updates6, &peer->withdraws6);
-+	u_int8_t	i;
-+
-+	for (i = 0; i < AID_MAX; i++)
-+		up_clear(&peer->updates[i], &peer->withdraws[i]);
- 
- 	RB_INIT(&peer->up_prefix);
- 	RB_INIT(&peer->up_attrs);
-@@ -120,19 +132,19 @@ up_prefix_cmp(struct update_prefix *a, s
- {
- 	int	i;
- 
--	if (a->prefix.af < b->prefix.af)
-+	if (a->prefix.aid < b->prefix.aid)
- 		return (-1);
--	if (a->prefix.af > b->prefix.af)
-+	if (a->prefix.aid > b->prefix.aid)
- 		return (1);
- 
--	switch (a->prefix.af) {
--	case AF_INET:
-+	switch (a->prefix.aid) {
-+	case AID_INET:
- 		if (ntohl(a->prefix.v4.s_addr) < ntohl(b->prefix.v4.s_addr))
- 			return (-1);
- 		if (ntohl(a->prefix.v4.s_addr) > ntohl(b->prefix.v4.s_addr))
- 			return (1);
- 		break;
--	case AF_INET6:
-+	case AID_INET6:
- 		i = memcmp(&a->prefix.v6, &b->prefix.v6,
- 		    sizeof(struct in6_addr));
- 		if (i > 0)
-@@ -140,6 +152,25 @@ up_prefix_cmp(struct update_prefix *a, s
- 		if (i < 0)
- 			return (-1);
- 		break;
-+	case AID_VPN_IPv4:
-+		if (betoh64(a->prefix.vpn4.rd) < betoh64(b->prefix.vpn4.rd))
-+			return (-1);
-+		if (betoh64(a->prefix.vpn4.rd) > betoh64(b->prefix.vpn4.rd))
-+			return (1);
-+		if (ntohl(a->prefix.v4.s_addr) < ntohl(b->prefix.v4.s_addr))
-+			return (-1);
-+		if (ntohl(a->prefix.v4.s_addr) > ntohl(b->prefix.v4.s_addr))
-+			return (1);
-+		if (a->prefixlen < b->prefixlen)
-+			return (-1);
-+		if (a->prefixlen > b->prefixlen)
-+			return (1);
-+		if (a->prefix.vpn4.labellen < b->prefix.vpn4.labellen)
-+			return (-1);
-+		if (a->prefix.vpn4.labellen > b->prefix.vpn4.labellen)
-+			return (1);
-+		return (memcmp(a->prefix.vpn4.labelstack,
-+		    b->prefix.vpn4.labelstack, a->prefix.vpn4.labellen));
- 	default:
- 		fatalx("pt_prefix_cmp: unknown af");
- 	}
-@@ -174,18 +205,8 @@ up_add(struct rde_peer *peer, struct upd
- 	struct uplist_attr	*upl = NULL;
- 	struct uplist_prefix	*wdl = NULL;
- 
--	switch (p->prefix.af) {
--	case AF_INET:
--		upl = &peer->updates;
--		wdl = &peer->withdraws;
--		break;
--	case AF_INET6:
--		upl = &peer->updates6;
--		wdl = &peer->withdraws6;
--		break;
--	default:
--		fatalx("up_add: unknown AF");
--	}
-+	upl = &peer->updates[p->prefix.aid];
-+	wdl = &peer->withdraws[p->prefix.aid];
- 
- 	/* 1. search for attr */
- 	if (a != NULL && (na = RB_FIND(uptree_attr, &peer->up_attrs, a)) ==
-@@ -270,23 +291,16 @@ up_test_update(struct rde_peer *peer, st
- 		/* Do not send routes back to sender */
- 		return (0);
- 
-+	if (p->aspath->flags & F_ATTR_PARSE_ERR)
-+		fatalx("try to send out a botched path");
- 	if (p->aspath->flags & F_ATTR_LOOP)
- 		fatalx("try to send out a looped path");
- 
- 	pt_getaddr(p->prefix, &addr);
--	switch (addr.af) {
--	case AF_INET:
--		if (peer->capa_announced.mp_v4 == SAFI_NONE &&
--		    peer->capa_received.mp_v6 != SAFI_NONE)
--			return (-1);
--		break;
--	case AF_INET6:
--		if (peer->capa_announced.mp_v6 == SAFI_NONE)
--			return (-1);
--		break;
--	}
-+	if (peer->capa.mp[addr.aid] == 0)
-+		return (-1);
- 
--	if (p->aspath->peer->conf.ebgp == 0 && peer->conf.ebgp == 0) {
-+	if (!p->aspath->peer->conf.ebgp && !peer->conf.ebgp) {
- 		/*
- 		 * route reflector redistribution rules:
- 		 * 1. if announce is set                -> announce
-@@ -325,13 +339,13 @@ up_test_update(struct rde_peer *peer, st
- 	}
- 
- 	/* well known communities */
--	if (rde_filter_community(p->aspath,
-+	if (community_match(p->aspath,
- 	    COMMUNITY_WELLKNOWN, COMMUNITY_NO_ADVERTISE))
- 		return (0);
--	if (peer->conf.ebgp && rde_filter_community(p->aspath,
-+	if (peer->conf.ebgp && community_match(p->aspath,
- 	    COMMUNITY_WELLKNOWN, COMMUNITY_NO_EXPORT))
- 		return (0);
--	if (peer->conf.ebgp && rde_filter_community(p->aspath,
-+	if (peer->conf.ebgp && community_match(p->aspath,
- 	    COMMUNITY_WELLKNOWN, COMMUNITY_NO_EXPSUBCONFED))
- 		return (0);
- 
-@@ -362,7 +376,7 @@ up_generate(struct rde_peer *peer, struc
- 		if (ua == NULL)
- 			fatal("up_generate");
- 
--		if (up_generate_attr(peer, ua, asp, addr->af) == -1) {
-+		if (up_generate_attr(peer, ua, asp, addr->aid) == -1) {
- 			log_warnx("generation of bgp path attributes failed");
- 			free(ua);
- 			return (-1);
-@@ -444,18 +458,12 @@ up_generate_updates(struct filter_head *
- /* send a default route to the specified peer */
- void
- up_generate_default(struct filter_head *rules, struct rde_peer *peer,
--    sa_family_t af)
-+    u_int8_t aid)
- {
- 	struct rde_aspath	*asp, *fasp;
- 	struct bgpd_addr	 addr;
- 
--	if (peer->capa_received.mp_v4 == SAFI_NONE &&
--	    peer->capa_received.mp_v6 != SAFI_NONE &&
--	    af == AF_INET)
--		return;
--
--	if (peer->capa_received.mp_v6 == SAFI_NONE &&
--	    af == AF_INET6)
-+	if (peer->capa.mp[aid] == 0)
- 		return;
- 
- 	asp = path_get();
-@@ -471,7 +479,7 @@ up_generate_default(struct filter_head *
- 
- 	/* filter as usual */
- 	bzero(&addr, sizeof(addr));
--	addr.af = af;
-+	addr.aid = aid;
- 
- 	if (rde_filter(peer->ribid, &fasp, rules, peer, asp, &addr, 0, NULL,
- 	    DIR_OUT) == ACTION_DENY) {
-@@ -491,6 +499,43 @@ up_generate_default(struct filter_head *
- 	path_put(asp);
- }
- 
-+/* generate a EoR marker in the update list. This is a horrible hack. */
-+int
-+up_generate_marker(struct rde_peer *peer, u_int8_t aid)
-+{
-+	struct update_attr	*ua;
-+	struct update_attr	*na = NULL;
-+	struct uplist_attr	*upl = NULL;
-+
-+	ua = calloc(1, sizeof(struct update_attr));
-+	if (ua == NULL)
-+		fatal("up_generate_marker");
-+
-+	upl = &peer->updates[aid];
-+
-+	/* 1. search for attr */
-+	if ((na = RB_FIND(uptree_attr, &peer->up_attrs, ua)) == NULL) {
-+		/* 1.1 if not found -> add */
-+		TAILQ_INIT(&ua->prefix_h);
-+		if (RB_INSERT(uptree_attr, &peer->up_attrs, ua) != NULL) {
-+			log_warnx("uptree_attr insert failed");
-+			/* cleanup */
-+			free(ua);
-+			return (-1);
-+		}
-+		TAILQ_INSERT_TAIL(upl, ua, attr_l);
-+		peer->up_acnt++;
-+	} else {
-+		/* 1.2 if found -> use that, free ua */
-+		free(ua);
-+		ua = na;
-+		/* move to end of update queue */
-+		TAILQ_REMOVE(upl, ua, attr_l);
-+		TAILQ_INSERT_TAIL(upl, ua, attr_l);
-+	}
-+	return (0);
-+}
-+
- u_char	up_attr_buf[4096];
- 
- /* only for IPv4 */
-@@ -551,28 +596,41 @@ up_get_nexthop(struct rde_peer *peer, st
- 
- int
- up_generate_mp_reach(struct rde_peer *peer, struct update_attr *upa,
--    struct rde_aspath *a, sa_family_t af)
-+    struct rde_aspath *a, u_int8_t aid)
- {
- 	u_int16_t	tmp;
- 
--	switch (af) {
--	case AF_INET6:
-+	switch (aid) {
-+	case AID_INET6:
- 		upa->mpattr_len = 21; /* AFI + SAFI + NH LEN + NH + Reserved */
- 		upa->mpattr = malloc(upa->mpattr_len);
- 		if (upa->mpattr == NULL)
- 			fatal("up_generate_mp_reach");
--		tmp = htons(AFI_IPv6);
-+		if (aid2afi(aid, &tmp, &upa->mpattr[2]))
-+			fatalx("up_generate_mp_reachi: bad AID");
-+		tmp = htons(tmp);
- 		memcpy(upa->mpattr, &tmp, sizeof(tmp));
--		upa->mpattr[2] = SAFI_UNICAST;
- 		upa->mpattr[3] = sizeof(struct in6_addr);
- 		upa->mpattr[20] = 0; /* Reserved must be 0 */
- 
- 		/* nexthop dance see also up_get_nexthop() */
--		if (peer->conf.ebgp == 0) {
-+		if (a->flags & F_NEXTHOP_NOMODIFY) {
-+			/* no modify flag set */
-+			if (a->nexthop == NULL)
-+				memcpy(&upa->mpattr[4], &peer->local_v6_addr.v6,
-+				    sizeof(struct in6_addr));
-+			else
-+				memcpy(&upa->mpattr[4],
-+				    &a->nexthop->exit_nexthop.v6,
-+				    sizeof(struct in6_addr));
-+		} else if (a->flags & F_NEXTHOP_SELF)
-+			memcpy(&upa->mpattr[4], &peer->local_v6_addr.v6,
-+			    sizeof(struct in6_addr));
-+		else if (!peer->conf.ebgp) {
- 			/* ibgp */
- 			if (a->nexthop == NULL ||
--			    (a->nexthop->exit_nexthop.af == AF_INET6 &&
--			    memcmp(&a->nexthop->exit_nexthop.v6,
-+			    (a->nexthop->exit_nexthop.aid == AID_INET6 &&
-+			    !memcmp(&a->nexthop->exit_nexthop.v6,
- 			    &peer->remote_addr.v6, sizeof(struct in6_addr))))
- 				memcpy(&upa->mpattr[4], &peer->local_v6_addr.v6,
- 				    sizeof(struct in6_addr));
-@@ -603,6 +661,68 @@ up_generate_mp_reach(struct rde_peer *pe
- 			memcpy(&upa->mpattr[4], &peer->local_v6_addr.v6,
- 			    sizeof(struct in6_addr));
- 		return (0);
-+	case AID_VPN_IPv4:
-+		upa->mpattr_len = 17; /* AFI + SAFI + NH LEN + NH + Reserved */
-+		upa->mpattr = calloc(upa->mpattr_len, 1);
-+		if (upa->mpattr == NULL)
-+			fatal("up_generate_mp_reach");
-+		if (aid2afi(aid, &tmp, &upa->mpattr[2]))
-+			fatalx("up_generate_mp_reachi: bad AID");
-+		tmp = htons(tmp);
-+		memcpy(upa->mpattr, &tmp, sizeof(tmp));
-+		upa->mpattr[3] = sizeof(u_int64_t) + sizeof(struct in_addr);
-+
-+		/* nexthop dance see also up_get_nexthop() */
-+		if (a->flags & F_NEXTHOP_NOMODIFY) {
-+			/* no modify flag set */
-+			if (a->nexthop == NULL)
-+				memcpy(&upa->mpattr[12],
-+				    &peer->local_v4_addr.v4,
-+				    sizeof(struct in_addr));
-+			else
-+				/* nexthops are stored as IPv4 addrs */
-+				memcpy(&upa->mpattr[12],
-+				    &a->nexthop->exit_nexthop.v4,
-+				    sizeof(struct in_addr));
-+		} else if (a->flags & F_NEXTHOP_SELF)
-+			memcpy(&upa->mpattr[12], &peer->local_v4_addr.v4,
-+			    sizeof(struct in_addr));
-+		else if (!peer->conf.ebgp) {
-+			/* ibgp */
-+			if (a->nexthop == NULL ||
-+			    (a->nexthop->exit_nexthop.aid == AID_INET &&
-+			    !memcmp(&a->nexthop->exit_nexthop.v4,
-+			    &peer->remote_addr.v4, sizeof(struct in_addr))))
-+				memcpy(&upa->mpattr[12],
-+				    &peer->local_v4_addr.v4,
-+				    sizeof(struct in_addr));
-+			else
-+				memcpy(&upa->mpattr[12],
-+				    &a->nexthop->exit_nexthop.v4,
-+				    sizeof(struct in_addr));
-+		} else if (peer->conf.distance == 1) {
-+			/* ebgp directly connected */
-+			if (a->nexthop != NULL &&
-+			    a->nexthop->flags & NEXTHOP_CONNECTED)
-+				if (prefix_compare(&peer->remote_addr,
-+				    &a->nexthop->nexthop_net,
-+				    a->nexthop->nexthop_netlen) == 0) {
-+					/*
-+					 * nexthop and peer are in the same
-+					 * subnet
-+					 */
-+					memcpy(&upa->mpattr[12],
-+					    &a->nexthop->exit_nexthop.v4,
-+					    sizeof(struct in_addr));
-+					return (0);
-+				}
-+			memcpy(&upa->mpattr[12], &peer->local_v4_addr.v4,
-+			    sizeof(struct in_addr));
-+		} else
-+			/* ebgp multihop */
-+			memcpy(&upa->mpattr[12], &peer->local_v4_addr.v4,
-+			    sizeof(struct in_addr));
-+		return (0);
- 	default:
- 		break;
- 	}
-@@ -611,7 +731,7 @@ up_generate_mp_reach(struct rde_peer *pe
- 
- int
- up_generate_attr(struct rde_peer *peer, struct update_attr *upa,
--    struct rde_aspath *a, sa_family_t af)
-+    struct rde_aspath *a, u_int8_t aid)
- {
- 	struct attr	*oa, *newaggr = NULL;
- 	u_char		*pdata;
-@@ -643,8 +763,8 @@ up_generate_attr(struct rde_peer *peer, 
- 	wlen += r; len -= r;
- 	free(pdata);
- 
--	switch (af) {
--	case AF_INET:
-+	switch (aid) {
-+	case AID_INET:
- 		nexthop = up_get_nexthop(peer, a);
- 		if ((r = attr_write(up_attr_buf + wlen, len, ATTR_WELL_KNOWN,
- 		    ATTR_NEXTHOP, &nexthop, 4)) == -1)
-@@ -659,9 +779,11 @@ up_generate_attr(struct rde_peer *peer, 
- 	/*
- 	 * The old MED from other peers MUST not be announced to others
- 	 * unless the MED is originating from us or the peer is an IBGP one.
-+	 * Only exception are routers with "transparent-as yes" set.
- 	 */
--	if (a->flags & F_ATTR_MED && (peer->conf.ebgp == 0 ||
--	    a->flags & F_ATTR_MED_ANNOUNCE)) {
-+	if (a->flags & F_ATTR_MED && (!peer->conf.ebgp ||
-+	    a->flags & F_ATTR_MED_ANNOUNCE ||
-+	    peer->conf.flags & PEERFLAG_TRANS_AS)) {
- 		tmp32 = htonl(a->med);
- 		if ((r = attr_write(up_attr_buf + wlen, len, ATTR_OPTIONAL,
- 		    ATTR_MED, &tmp32, 4)) == -1)
-@@ -669,7 +791,7 @@ up_generate_attr(struct rde_peer *peer, 
- 		wlen += r; len -= r;
- 	}
- 
--	if (peer->conf.ebgp == 0) {
-+	if (!peer->conf.ebgp) {
- 		/* local preference, only valid for ibgp */
- 		tmp32 = htonl(a->lpref);
- 		if ((r = attr_write(up_attr_buf + wlen, len, ATTR_WELL_KNOWN,
-@@ -704,7 +826,7 @@ up_generate_attr(struct rde_peer *peer, 
- 				u_int16_t	tas;
- 
- 				if ((!(oa->flags & ATTR_TRANSITIVE)) &&
--				    peer->conf.ebgp != 0) {
-+				    peer->conf.ebgp) {
- 					r = 0;
- 					break;
- 				}
-@@ -730,7 +852,7 @@ up_generate_attr(struct rde_peer *peer, 
- 		case ATTR_ORIGINATOR_ID:
- 		case ATTR_CLUSTER_LIST:
- 			if ((!(oa->flags & ATTR_TRANSITIVE)) &&
--			    peer->conf.ebgp != 0) {
-+			    peer->conf.ebgp) {
- 				r = 0;
- 				break;
- 			}
-@@ -791,7 +913,7 @@ up_generate_attr(struct rde_peer *peer, 
- 
- 	/* write mp attribute to different buffer */
- 	if (ismp)
--		if (up_generate_mp_reach(peer, upa, a, AF_INET6) == -1)
-+		if (up_generate_mp_reach(peer, upa, a, aid) == -1)
- 			return (-1);
- 
- 	/* the bgp path attributes are now stored in the global buf */
-@@ -810,6 +932,7 @@ up_dump_prefix(u_char *buf, int len, str
- {
- 	struct update_prefix	*upp;
- 	int			 r, wpos = 0;
-+	u_int8_t		 i;
- 
- 	while ((upp = TAILQ_FIRST(prefix_head)) != NULL) {
- 		if ((r = prefix_write(buf + wpos, len - wpos,
-@@ -820,13 +943,14 @@ up_dump_prefix(u_char *buf, int len, str
- 			log_warnx("dequeuing update failed.");
- 		TAILQ_REMOVE(upp->prefix_h, upp, prefix_l);
- 		peer->up_pcnt--;
--		if (upp->prefix_h == &peer->withdraws ||
--		    upp->prefix_h == &peer->withdraws6) {
--			peer->up_wcnt--;
--			peer->prefix_sent_withdraw++;
--		} else {
--			peer->up_nlricnt--;
--			peer->prefix_sent_update++;
-+		for (i = 0; i < AID_MAX; i++) {
-+			if (upp->prefix_h == &peer->withdraws[i]) {
-+				peer->up_wcnt--;
-+				peer->prefix_sent_withdraw++;
-+			} else {
-+				peer->up_nlricnt--;
-+				peer->prefix_sent_update++;
-+			}
- 		}
- 		free(upp);
- 	}
-@@ -844,16 +968,21 @@ up_dump_attrnlri(u_char *buf, int len, s
- 	 * It is possible that a queued path attribute has no nlri prefix.
- 	 * Ignore and remove those path attributes.
- 	 */
--	while ((upa = TAILQ_FIRST(&peer->updates)) != NULL)
-+	while ((upa = TAILQ_FIRST(&peer->updates[AID_INET])) != NULL)
- 		if (TAILQ_EMPTY(&upa->prefix_h)) {
-+			attr_len = upa->attr_len;
- 			if (RB_REMOVE(uptree_attr, &peer->up_attrs,
- 			    upa) == NULL)
- 				log_warnx("dequeuing update failed.");
--			TAILQ_REMOVE(&peer->updates, upa, attr_l);
-+			TAILQ_REMOVE(&peer->updates[AID_INET], upa, attr_l);
- 			free(upa->attr);
- 			free(upa->mpattr);
- 			free(upa);
- 			peer->up_acnt--;
-+			/* XXX horrible hack,
-+			 * if attr_len is 0, it is a EoR marker */
-+			if (attr_len == 0)
-+				return (-1);
- 		} else
- 			break;
- 
-@@ -884,7 +1013,7 @@ up_dump_attrnlri(u_char *buf, int len, s
- 	if (TAILQ_EMPTY(&upa->prefix_h)) {
- 		if (RB_REMOVE(uptree_attr, &peer->up_attrs, upa) == NULL)
- 			log_warnx("dequeuing update failed.");
--		TAILQ_REMOVE(&peer->updates, upa, attr_l);
-+		TAILQ_REMOVE(&peer->updates[AID_INET], upa, attr_l);
- 		free(upa->attr);
- 		free(upa->mpattr);
- 		free(upa);
-@@ -895,12 +1024,13 @@ up_dump_attrnlri(u_char *buf, int len, s
- }
- 
- u_char *
--up_dump_mp_unreach(u_char *buf, u_int16_t *len, struct rde_peer *peer)
-+up_dump_mp_unreach(u_char *buf, u_int16_t *len, struct rde_peer *peer,
-+    u_int8_t aid)
- {
- 	int		wpos;
- 	u_int16_t	datalen, tmp;
- 	u_int16_t	attrlen = 2;	/* attribute header (without len) */
--	u_int8_t	flags = ATTR_OPTIONAL;
-+	u_int8_t	flags = ATTR_OPTIONAL, safi;
- 
- 	/*
- 	 * reserve space for withdraw len, attr len, the attribute header
-@@ -912,7 +1042,7 @@ up_dump_mp_unreach(u_char *buf, u_int16_
- 		return (NULL);
- 
- 	datalen = up_dump_prefix(buf + wpos, *len - wpos,
--	    &peer->withdraws6, peer);
-+	    &peer->withdraws[aid], peer);
- 	if (datalen == 0)
- 		return (NULL);
- 
-@@ -920,9 +1050,11 @@ up_dump_mp_unreach(u_char *buf, u_int16_
- 
- 	/* prepend header, need to do it reverse */
- 	/* safi & afi */
--	buf[--wpos] = SAFI_UNICAST;
-+	if (aid2afi(aid, &tmp, &safi))
-+		fatalx("up_dump_mp_unreach: bad AID");
-+	buf[--wpos] = safi;
- 	wpos -= sizeof(u_int16_t);
--	tmp = htons(AFI_IPv6);
-+	tmp = htons(tmp);
- 	memcpy(buf + wpos, &tmp, sizeof(u_int16_t));
- 
- 	/* attribute length */
-@@ -959,33 +1091,39 @@ up_dump_mp_unreach(u_char *buf, u_int16_
- 	return (buf + wpos);
- }
- 
--u_char *
--up_dump_mp_reach(u_char *buf, u_int16_t *len, struct rde_peer *peer)
-+int
-+up_dump_mp_reach(u_char *buf, u_int16_t *len, struct rde_peer *peer,
-+    u_int8_t aid)
- {
- 	struct update_attr	*upa;
- 	int			wpos;
--	u_int16_t		datalen, tmp;
-+	u_int16_t		attr_len, datalen, tmp;
- 	u_int8_t		flags = ATTR_OPTIONAL;
- 
- 	/*
- 	 * It is possible that a queued path attribute has no nlri prefix.
- 	 * Ignore and remove those path attributes.
- 	 */
--	while ((upa = TAILQ_FIRST(&peer->updates6)) != NULL)
-+	while ((upa = TAILQ_FIRST(&peer->updates[aid])) != NULL)
- 		if (TAILQ_EMPTY(&upa->prefix_h)) {
-+			attr_len = upa->attr_len;
- 			if (RB_REMOVE(uptree_attr, &peer->up_attrs,
- 			    upa) == NULL)
- 				log_warnx("dequeuing update failed.");
--			TAILQ_REMOVE(&peer->updates6, upa, attr_l);
-+			TAILQ_REMOVE(&peer->updates[aid], upa, attr_l);
- 			free(upa->attr);
- 			free(upa->mpattr);
- 			free(upa);
- 			peer->up_acnt--;
-+			/* XXX horrible hack,
-+			 * if attr_len is 0, it is a EoR marker */
-+			if (attr_len == 0)
-+				return (-1);
- 		} else
- 			break;
- 
- 	if (upa == NULL)
--		return (NULL);
-+		return (-2);
- 
- 	/*
- 	 * reserve space for attr len, the attributes, the
-@@ -993,12 +1131,12 @@ up_dump_mp_reach(u_char *buf, u_int16_t 
- 	 */
- 	wpos = 2 + 2 + upa->attr_len + 4 + upa->mpattr_len;
- 	if (*len < wpos)
--		return (NULL);
-+		return (-2);
- 
- 	datalen = up_dump_prefix(buf + wpos, *len - wpos,
- 	    &upa->prefix_h, peer);
- 	if (datalen == 0)
--		return (NULL);
-+		return (-2);
- 
- 	if (upa->mpattr_len == 0 || upa->mpattr == NULL)
- 		fatalx("mulitprotocol update without MP attrs");
-@@ -1038,7 +1176,7 @@ up_dump_mp_reach(u_char *buf, u_int16_t 
- 	if (TAILQ_EMPTY(&upa->prefix_h)) {
- 		if (RB_REMOVE(uptree_attr, &peer->up_attrs, upa) == NULL)
- 			log_warnx("dequeuing update failed.");
--		TAILQ_REMOVE(&peer->updates6, upa, attr_l);
-+		TAILQ_REMOVE(&peer->updates[aid], upa, attr_l);
- 		free(upa->attr);
- 		free(upa->mpattr);
- 		free(upa);
-@@ -1046,6 +1184,5 @@ up_dump_mp_reach(u_char *buf, u_int16_t 
- 	}
- 
- 	*len = datalen + 4;
--	return (buf + wpos);
-+	return (wpos);
- }
--
diff --git a/net/openbgpd/files/patch-bgpd_session.c b/net/openbgpd/files/patch-bgpd_session.c
deleted file mode 100644
index 66c05a92aec0..000000000000
--- a/net/openbgpd/files/patch-bgpd_session.c
+++ /dev/null
@@ -1,2075 +0,0 @@
-Index: bgpd/session.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/session.c,v
-retrieving revision 1.1.1.8
-retrieving revision 1.13
-diff -u -p -r1.1.1.8 -r1.13
---- bgpd/session.c	14 Feb 2010 20:19:57 -0000	1.1.1.8
-+++ bgpd/session.c	8 Dec 2012 20:17:59 -0000	1.13
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: session.c,v 1.293 2009/06/07 05:56:24 eric Exp $ */
-+/*	$OpenBSD: session.c,v 1.325 2012/09/18 09:45:50 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
-@@ -21,18 +21,21 @@
- 
- #include <sys/mman.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <sys/un.h>
-+#include <sys/queue.h>
- #include <net/if_types.h>
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
-+#include <netinet/tcp_var.h>
- #include <arpa/inet.h>
- 
- #include <err.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <limits.h>
- #include <poll.h>
- #include <pwd.h>
- #include <signal.h>
-@@ -50,7 +53,12 @@
- #define PFD_PIPE_ROUTE_CTL	2
- #define PFD_SOCK_CTL		3
- #define PFD_SOCK_RCTL		4
--#define PFD_LISTENERS_START	5
-+#define PFD_SOCK_PFKEY		5
-+#define PFD_LISTENERS_START	6
-+
-+#if defined(__FreeBSD__) /* FreeBSD has no LINK_STATE_IS_UP macro. */
-+#define LINK_STATE_IS_UP(_s)  ((_s) >= LINK_STATE_UP)
-+#endif /* defined(__FreeBSD__) */ 
- 
- void	session_sighdlr(int);
- int	setup_listeners(u_int *);
-@@ -65,9 +73,9 @@ void	session_accept(int);
- int	session_connect(struct peer *);
- void	session_tcp_established(struct peer *);
- void	session_capa_ann_none(struct peer *);
--int	session_capa_add(struct peer *, struct buf *, u_int8_t, u_int8_t,
--	    u_int8_t *);
--int	session_capa_add_mp(struct buf *, u_int16_t, u_int8_t);
-+int	session_capa_add(struct ibuf *, u_int8_t, u_int8_t);
-+int	session_capa_add_mp(struct ibuf *, u_int8_t);
-+int	session_capa_add_gr(struct peer *, struct ibuf *, u_int8_t);
- struct bgp_msg	*session_newmsg(enum msg_type, u_int16_t);
- int	session_sendmsg(struct bgp_msg *, struct peer *);
- void	session_open(struct peer *);
-@@ -75,30 +83,34 @@ void	session_keepalive(struct peer *);
- void	session_update(u_int32_t, void *, size_t);
- void	session_notification(struct peer *, u_int8_t, u_int8_t, void *,
- 	    ssize_t);
--void	session_rrefresh(struct peer *, u_int16_t, u_int8_t);
-+void	session_rrefresh(struct peer *, u_int8_t);
-+int	session_graceful_restart(struct peer *);
-+int	session_graceful_is_restarting(struct peer *);
-+int	session_graceful_stop(struct peer *);
- int	session_dispatch_msg(struct pollfd *, struct peer *);
-+int	session_process_msg(struct peer *);
- int	parse_header(struct peer *, u_char *, u_int16_t *, u_int8_t *);
- int	parse_open(struct peer *);
- int	parse_update(struct peer *);
- int	parse_refresh(struct peer *);
- int	parse_notification(struct peer *);
- int	parse_capabilities(struct peer *, u_char *, u_int16_t, u_int32_t *);
-+int	capa_neg_calc(struct peer *);
- void	session_dispatch_imsg(struct imsgbuf *, int, u_int *);
- void	session_up(struct peer *);
- void	session_down(struct peer *);
- void	session_demote(struct peer *, int);
- 
--int			 la_cmp(struct listen_addr *, struct listen_addr *);
--struct peer		*getpeerbyip(struct sockaddr *);
--int			 session_match_mask(struct peer *, struct sockaddr *);
--struct peer		*getpeerbyid(u_int32_t);
--static struct sockaddr	*addr2sa(struct bgpd_addr *, u_int16_t);
-+int		 la_cmp(struct listen_addr *, struct listen_addr *);
-+struct peer	*getpeerbyip(struct sockaddr *);
-+int		 session_match_mask(struct peer *, struct bgpd_addr *);
-+struct peer	*getpeerbyid(u_int32_t);
- 
--struct bgpd_config	*conf, *nconf = NULL;
-+struct bgpd_config	*conf, *nconf;
- struct bgpd_sysdep	 sysdep;
--struct peer		*npeers;
--volatile sig_atomic_t	 session_quit = 0;
--int			 pending_reconf = 0;
-+struct peer		*peers, *npeers;
-+volatile sig_atomic_t	 session_quit;
-+int			 pending_reconf;
- int			 csock = -1, rcsock = -1;
- u_int			 peer_cnt;
- struct imsgbuf		*ibuf_rde;
-@@ -106,6 +118,7 @@ struct imsgbuf		*ibuf_rde_ctl;
- struct imsgbuf		*ibuf_main;
- 
- struct mrt_head		 mrthead;
-+time_t			 pauseaccept;
- 
- void
- session_sighdlr(int sig)
-@@ -125,6 +138,22 @@ setup_listeners(u_int *la_cnt)
- 	int			 opt;
- 	struct listen_addr	*la;
- 	u_int			 cnt = 0;
-+#if defined(__FreeBSD__)
-+	int			 s;
-+
-+	/* Check if TCP_MD5SIG is supported. */
-+	s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-+	if (s < 0)
-+		fatal("socket open for TCP_MD5SIG check");
-+	opt = TF_SIGNATURE;
-+	if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, &opt, sizeof(opt)) == -1) {
-+		if (errno == ENOPROTOOPT || errno == EINVAL)
-+			sysdep.no_md5sig = 1;
-+		else
-+			fatal("setsockopt TCP_MD5SIG");
-+	}
-+	close(s);
-+#endif /* defined(__FreeBSD__) */
- 
- 	TAILQ_FOREACH(la, conf->listen_addrs, entry) {
- 		la->reconf = RECONF_NONE;
-@@ -140,6 +169,7 @@ setup_listeners(u_int *la_cnt)
- 		}
- 
- 		opt = 1;
-+#if !defined(__FreeBSD__)
- 		if (setsockopt(la->fd, IPPROTO_TCP, TCP_MD5SIG,
- 		    &opt, sizeof(opt)) == -1) {
- 			if (errno == ENOPROTOOPT) {	/* system w/o md5sig */
-@@ -148,6 +178,7 @@ setup_listeners(u_int *la_cnt)
- 			} else
- 				fatal("setsockopt TCP_MD5SIG");
- 		}
-+#endif /* !defined(__FreeBSD__) */
- 
- 		/* set ttl to 255 so that ttl-security works */
- 		if (la->sa.ss_family == AF_INET && setsockopt(la->fd,
-@@ -175,12 +206,10 @@ setup_listeners(u_int *la_cnt)
- }
- 
- pid_t
--session_main(struct bgpd_config *config, struct peer *cpeers,
--    struct network_head *net_l, struct filter_head *rules,
--    struct mrt_head *m_l, struct rib_names *rib_l, int pipe_m2s[2],
--    int pipe_s2r[2], int pipe_m2r[2], int pipe_s2rctl[2])
-+session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2],
-+    int pipe_s2rctl[2])
- {
--	int			 nfds, timeout;
-+	int			 nfds, timeout, pfkeysock;
- 	unsigned int		 i, j, idx_peers, idx_listeners, idx_mrts;
- 	pid_t			 pid;
- 	u_int			 pfd_elms = 0, peer_l_elms = 0, mrt_l_elms = 0;
-@@ -189,19 +218,13 @@ session_main(struct bgpd_config *config,
- 	u_int32_t		 ctl_queued;
- 	struct passwd		*pw;
- 	struct peer		*p, **peer_l = NULL, *last, *next;
--	struct network		*net;
--	struct mrt		*m, **mrt_l = NULL;
--	struct filter_rule	*r;
-+	struct mrt		*m, *xm, **mrt_l = NULL;
- 	struct pollfd		*pfd = NULL;
- 	struct ctl_conn		*ctl_conn;
- 	struct listen_addr	*la;
--	struct rde_rib		*rr;
- 	void			*newp;
- 	short			 events;
- 
--	conf = config;
--	peers = cpeers;
--
- 	switch (pid = fork()) {
- 	case -1:
- 		fatal("cannot fork");
-@@ -211,13 +234,6 @@ session_main(struct bgpd_config *config,
- 		return (pid);
- 	}
- 
--	/* control socket is outside chroot */
--	if ((csock = control_init(0, conf->csock)) == -1)
--		fatalx("control socket setup failed");
--	if (conf->rcsock != NULL &&
--	    (rcsock = control_init(1, conf->rcsock)) == -1)
--		fatalx("control socket setup failed");
--
- 	if ((pw = getpwnam(BGPD_USER)) == NULL)
- 		fatal(NULL);
- 
-@@ -228,29 +244,25 @@ session_main(struct bgpd_config *config,
- 
- 	setproctitle("session engine");
- 	bgpd_process = PROC_SE;
--
--	if (pfkey_init(&sysdep) == -1)
--		fatalx("pfkey setup failed");
-+	pfkeysock = pfkey_init(&sysdep);
- 
- 	if (setgroups(1, &pw->pw_gid) ||
- 	    setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||
- 	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
- 		fatal("can't drop privileges");
- 
--	listener_cnt = 0;
--	setup_listeners(&listener_cnt);
--
- 	signal(SIGTERM, session_sighdlr);
- 	signal(SIGINT, session_sighdlr);
- 	signal(SIGPIPE, SIG_IGN);
- 	signal(SIGHUP, SIG_IGN);
--	log_info("session engine ready");
-+	signal(SIGALRM, SIG_IGN);
-+	signal(SIGUSR1, SIG_IGN);
-+
- 	close(pipe_m2s[0]);
- 	close(pipe_s2r[1]);
- 	close(pipe_s2rctl[1]);
- 	close(pipe_m2r[0]);
- 	close(pipe_m2r[1]);
--	init_conf(conf);
- 	if ((ibuf_rde = malloc(sizeof(struct imsgbuf))) == NULL ||
- 	    (ibuf_rde_ctl = malloc(sizeof(struct imsgbuf))) == NULL ||
- 	    (ibuf_main = malloc(sizeof(struct imsgbuf))) == NULL)
-@@ -258,37 +270,21 @@ session_main(struct bgpd_config *config,
- 	imsg_init(ibuf_rde, pipe_s2r[0]);
- 	imsg_init(ibuf_rde_ctl, pipe_s2rctl[0]);
- 	imsg_init(ibuf_main, pipe_m2s[1]);
-+
- 	TAILQ_INIT(&ctl_conns);
--	control_listen(csock);
--	control_listen(rcsock);
- 	LIST_INIT(&mrthead);
-+	listener_cnt = 0;
- 	peer_cnt = 0;
- 	ctl_cnt = 0;
- 
--	/* filter rules are not used in the SE */
--	while ((r = TAILQ_FIRST(rules)) != NULL) {
--		TAILQ_REMOVE(rules, r, entry);
--		free(r);
--	}
--	free(rules);
--
--	/* network list is not used in the SE */
--	while ((net = TAILQ_FIRST(net_l)) != NULL) {
--		TAILQ_REMOVE(net_l, net, entry);
--		filterset_free(&net->net.attrset);
--		free(net);
--	}
-+	if ((conf = calloc(1, sizeof(struct bgpd_config))) == NULL)
-+		fatal(NULL);
-+	if ((conf->listen_addrs = calloc(1, sizeof(struct listen_addrs))) ==
-+	    NULL)
-+		fatal(NULL);
-+	TAILQ_INIT(conf->listen_addrs);
- 
--	/* main mrt list is not used in the SE */
--	while ((m = LIST_FIRST(m_l)) != NULL) {
--		LIST_REMOVE(m, entry);
--		free(m);
--	}
--	/* rib names not used in the SE */
--	while ((rr = SIMPLEQ_FIRST(&ribnames))) {
--		SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
--		free(rr);
--	}
-+	log_info("session engine ready");
- 
- 	while (session_quit == 0) {
- 		/* check for peers to be initialized or deleted */
-@@ -308,8 +304,9 @@ session_main(struct bgpd_config *config,
- 
- 				/* reinit due? */
- 				if (p->conf.reconf_action == RECONF_REINIT) {
--					bgp_fsm(p, EVNT_STOP);
--					timer_set(p, Timer_IdleHold, 0);
-+					session_stop(p, ERR_CEASE_ADMIN_RESET);
-+					if (!p->conf.down)
-+						timer_set(p, Timer_IdleHold, 0);
- 				}
- 
- 				/* deletion due? */
-@@ -317,7 +314,7 @@ session_main(struct bgpd_config *config,
- 					if (p->demoted)
- 						session_demote(p, -1);
- 					p->conf.demote_group[0] = 0;
--					bgp_fsm(p, EVNT_STOP);
-+					session_stop(p, ERR_CEASE_PEER_UNCONF);
- 					log_peer_warnx(&p->conf, "removed");
- 					if (last != NULL)
- 						last->next = next;
-@@ -346,9 +343,17 @@ session_main(struct bgpd_config *config,
- 		}
- 
- 		mrt_cnt = 0;
--		LIST_FOREACH(m, &mrthead, entry)
-+		for (m = LIST_FIRST(&mrthead); m != NULL; m = xm) {
-+			xm = LIST_NEXT(m, entry);
-+			if (m->state == MRT_STATE_REMOVE) {
-+				mrt_clean(m);
-+				LIST_REMOVE(m, entry);
-+				free(m);
-+				continue;
-+			}
- 			if (m->wbuf.queued)
- 				mrt_cnt++;
-+		}
- 
- 		if (mrt_cnt > mrt_l_elms) {
- 			if ((newp = realloc(mrt_l, sizeof(struct mrt *) *
-@@ -394,18 +399,31 @@ session_main(struct bgpd_config *config,
- 		if (ctl_queued < SESSION_CTL_QUEUE_MAX)
- 			/*
- 			 * Do not act as unlimited buffer. Don't read in more
--			 * messages if the ctl sockets are getting full. 
-+			 * messages if the ctl sockets are getting full.
- 			 */
- 			pfd[PFD_PIPE_ROUTE_CTL].events = POLLIN;
--		pfd[PFD_SOCK_CTL].fd = csock;
--		pfd[PFD_SOCK_CTL].events = POLLIN;
--		pfd[PFD_SOCK_RCTL].fd = rcsock;
--		pfd[PFD_SOCK_RCTL].events = POLLIN;
--
-+		if (pauseaccept == 0) {
-+			pfd[PFD_SOCK_CTL].fd = csock;
-+			pfd[PFD_SOCK_CTL].events = POLLIN;
-+			pfd[PFD_SOCK_RCTL].fd = rcsock;
-+			pfd[PFD_SOCK_RCTL].events = POLLIN;
-+		} else {
-+			pfd[PFD_SOCK_CTL].fd = -1;
-+			pfd[PFD_SOCK_RCTL].fd = -1;
-+		}
-+		pfd[PFD_SOCK_PFKEY].fd = pfkeysock;
-+#if !defined(__FreeBSD__)
-+		pfd[PFD_SOCK_PFKEY].events = POLLIN;
-+#else
-+		pfd[PFD_SOCK_PFKEY].events = 0;
-+#endif
- 		i = PFD_LISTENERS_START;
- 		TAILQ_FOREACH(la, conf->listen_addrs, entry) {
--			pfd[i].fd = la->fd;
--			pfd[i].events = POLLIN;
-+			if (pauseaccept == 0) {
-+				pfd[i].fd = la->fd;
-+				pfd[i].events = POLLIN;
-+			} else
-+				pfd[i].fd = -1;
- 			i++;
- 		}
- 		idx_listeners = i;
-@@ -450,6 +468,10 @@ session_main(struct bgpd_config *config,
- 					    p->state == STATE_ESTABLISHED)
- 						session_demote(p, -1);
- 					break;
-+				case Timer_RestartTimeout:
-+					timer_stop(p, Timer_RestartTimeout);
-+					session_graceful_stop(p);
-+					break;
- 				default:
- 					fatalx("King Bula lost in time");
- 				}
-@@ -462,6 +484,9 @@ session_main(struct bgpd_config *config,
- 			events = POLLIN;
- 			if (p->wbuf.queued > 0 || p->state == STATE_CONNECT)
- 				events |= POLLOUT;
-+			/* is there still work to do? */
-+			if (p->rbuf && p->rbuf->wpos)
-+				timeout = 0;
- 
- 			/* poll events */
- 			if (p->fd != -1 && events != 0) {
-@@ -492,12 +517,21 @@ session_main(struct bgpd_config *config,
- 			i++;
- 		}
- 
-+		if (pauseaccept && timeout > 1)
-+			timeout = 1;
- 		if (timeout < 0)
- 			timeout = 0;
- 		if ((nfds = poll(pfd, i, timeout * 1000)) == -1)
- 			if (errno != EINTR)
- 				fatal("poll error");
- 
-+		/*
-+		 * If we previously saw fd exhaustion, we stop accept()
-+		 * for 1 second to throttle the accept() loop.
-+		 */
-+		if (pauseaccept && getmonotime() > pauseaccept + 1)
-+			pauseaccept = 0;
-+
- 		if (nfds > 0 && pfd[PFD_PIPE_MAIN].revents & POLLOUT)
- 			if (msgbuf_write(&ibuf_main->w) < 0)
- 				fatal("pipe write error");
-@@ -534,6 +568,14 @@ session_main(struct bgpd_config *config,
- 			ctl_cnt += control_accept(rcsock, 1);
- 		}
- 
-+		if (nfds > 0 && pfd[PFD_SOCK_PFKEY].revents & POLLIN) {
-+			nfds--;
-+			if (pfkey_read(pfkeysock, NULL) == -1) {
-+				log_warnx("pfkey_read failed, exiting...");
-+				session_quit = 1;
-+			}
-+		}
-+
- 		for (j = PFD_LISTENERS_START; nfds > 0 && j < idx_listeners;
- 		    j++)
- 			if (pfd[j].revents & POLLIN) {
-@@ -545,6 +587,10 @@ session_main(struct bgpd_config *config,
- 			nfds -= session_dispatch_msg(&pfd[j],
- 			    peer_l[j - idx_listeners]);
- 
-+		for (p = peers; p != NULL; p = p->next)
-+			if (p->rbuf && p->rbuf->wpos)
-+				session_process_msg(p);
-+
- 		for (; nfds > 0 && j < idx_mrts; j++)
- 			if (pfd[j].revents & POLLOUT) {
- 				nfds--;
-@@ -557,7 +603,7 @@ session_main(struct bgpd_config *config,
- 
- 	while ((p = peers) != NULL) {
- 		peers = p->next;
--		bgp_fsm(p, EVNT_STOP);
-+		session_stop(p, ERR_CEASE_ADMIN_DOWN);
- 		pfkey_remove(p);
- 		free(p);
- 	}
-@@ -643,10 +689,9 @@ bgp_fsm(struct peer *peer, enum session_
- 			timer_stop(peer, Timer_IdleHold);
- 
- 			/* allocate read buffer */
--			peer->rbuf = calloc(1, sizeof(struct buf_read));
-+			peer->rbuf = calloc(1, sizeof(struct ibuf_read));
- 			if (peer->rbuf == NULL)
- 				fatal(NULL);
--			peer->rbuf->wpos = 0;
- 
- 			/* init write buffer */
- 			msgbuf_init(&peer->wbuf);
-@@ -746,7 +791,6 @@ bgp_fsm(struct peer *peer, enum session_
- 			/* ignore */
- 			break;
- 		case EVNT_STOP:
--			session_notification(peer, ERR_CEASE, 0, NULL, 0);
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		case EVNT_CON_CLOSED:
-@@ -780,7 +824,8 @@ bgp_fsm(struct peer *peer, enum session_
- 				change_state(peer, STATE_IDLE, event);
- 			break;
- 		default:
--			session_notification(peer, ERR_FSM, 0, NULL, 0);
-+			session_notification(peer,
-+			    ERR_FSM, ERR_FSM_UNEX_OPENSENT, NULL, 0);
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		}
-@@ -791,7 +836,6 @@ bgp_fsm(struct peer *peer, enum session_
- 			/* ignore */
- 			break;
- 		case EVNT_STOP:
--			session_notification(peer, ERR_CEASE, 0, NULL, 0);
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		case EVNT_CON_CLOSED:
-@@ -815,7 +859,8 @@ bgp_fsm(struct peer *peer, enum session_
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		default:
--			session_notification(peer, ERR_FSM, 0, NULL, 0);
-+			session_notification(peer,
-+			    ERR_FSM, ERR_FSM_UNEX_OPENCONFIRM, NULL, 0);
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		}
-@@ -826,7 +871,6 @@ bgp_fsm(struct peer *peer, enum session_
- 			/* ignore */
- 			break;
- 		case EVNT_STOP:
--			session_notification(peer, ERR_CEASE, 0, NULL, 0);
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		case EVNT_CON_CLOSED:
-@@ -856,7 +900,8 @@ bgp_fsm(struct peer *peer, enum session_
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		default:
--			session_notification(peer, ERR_FSM, 0, NULL, 0);
-+			session_notification(peer,
-+			    ERR_FSM, ERR_FSM_UNEX_ESTABLISHED, NULL, 0);
- 			change_state(peer, STATE_IDLE, event);
- 			break;
- 		}
-@@ -885,9 +930,10 @@ start_timer_keepalive(struct peer *peer)
- void
- session_close_connection(struct peer *peer)
- {
--	if (peer->fd != -1)
-+	if (peer->fd != -1) {
- 		close(peer->fd);
--
-+		pauseaccept = 0;
-+	}
- 	peer->fd = peer->wbuf.fd = -1;
- }
- 
-@@ -923,20 +969,31 @@ change_state(struct peer *peer, enum ses
- 		timer_stop(peer, Timer_ConnectRetry);
- 		timer_stop(peer, Timer_Keepalive);
- 		timer_stop(peer, Timer_Hold);
-+		timer_stop(peer, Timer_IdleHold);
- 		timer_stop(peer, Timer_IdleHoldReset);
- 		session_close_connection(peer);
- 		msgbuf_clear(&peer->wbuf);
- 		free(peer->rbuf);
- 		peer->rbuf = NULL;
- 		bzero(&peer->capa.peer, sizeof(peer->capa.peer));
--		if (peer->state == STATE_ESTABLISHED)
--			session_down(peer);
-+
- 		if (event != EVNT_STOP) {
- 			timer_set(peer, Timer_IdleHold, peer->IdleHoldTime);
- 			if (event != EVNT_NONE &&
- 			    peer->IdleHoldTime < MAX_IDLE_HOLD/2)
- 				peer->IdleHoldTime *= 2;
- 		}
-+		if (peer->state == STATE_ESTABLISHED) {
-+			if (peer->capa.neg.grestart.restart == 2 &&
-+			    (event == EVNT_CON_CLOSED ||
-+			    event == EVNT_CON_FATAL)) {
-+				/* don't punish graceful restart */
-+				timer_set(peer, Timer_IdleHold, 0);
-+				peer->IdleHoldTime /= 2;
-+				session_graceful_restart(peer);
-+			} else
-+				session_down(peer);
-+		}
- 		if (peer->state == STATE_NONE ||
- 		    peer->state == STATE_ESTABLISHED) {
- 			/* initialize capability negotiation structures */
-@@ -947,6 +1004,20 @@ change_state(struct peer *peer, enum ses
- 		}
- 		break;
- 	case STATE_CONNECT:
-+		if (peer->state == STATE_ESTABLISHED &&
-+		    peer->capa.neg.grestart.restart == 2) {
-+			/* do the graceful restart dance */
-+			session_graceful_restart(peer);
-+			peer->holdtime = INTERVAL_HOLD_INITIAL;
-+			timer_stop(peer, Timer_ConnectRetry);
-+			timer_stop(peer, Timer_Keepalive);
-+			timer_stop(peer, Timer_Hold);
-+			timer_stop(peer, Timer_IdleHold);
-+			timer_stop(peer, Timer_IdleHoldReset);
-+			session_close_connection(peer);
-+			msgbuf_clear(&peer->wbuf);
-+			bzero(&peer->capa.peer, sizeof(peer->capa.peer));
-+		}
- 		break;
- 	case STATE_ACTIVE:
- 		break;
-@@ -990,7 +1061,10 @@ session_accept(int listenfd)
- 	len = sizeof(cliaddr);
- 	if ((connfd = accept(listenfd,
- 	    (struct sockaddr *)&cliaddr, &len)) == -1) {
--		if (errno == EWOULDBLOCK || errno == EINTR)
-+		if (errno == ENFILE || errno == EMFILE) {
-+			pauseaccept = getmonotime();
-+			return;
-+		} else if (errno == EWOULDBLOCK || errno == EINTR)
- 			return;
- 		else
- 			log_warn("accept");
-@@ -1017,6 +1091,7 @@ session_accept(int listenfd)
- 			}
- 		}
- 
-+open:
- 		if (p->conf.auth.method != AUTH_NONE && sysdep.no_pfkey) {
- 			log_peer_warnx(&p->conf,
- 			    "ipsec or md5sig configured but not available");
-@@ -1049,6 +1124,13 @@ session_accept(int listenfd)
- 		}
- 		session_socket_blockmode(connfd, BM_NONBLOCK);
- 		bgp_fsm(p, EVNT_CON_OPEN);
-+		return;
-+	} else if (p != NULL && p->state == STATE_ESTABLISHED &&
-+	    p->capa.neg.grestart.restart == 2) {
-+		/* first do the graceful restart dance */
-+		change_state(p, STATE_CONNECT, EVNT_CON_CLOSED);
-+		/* then do part of the open dance */
-+		goto open;
- 	} else {
- 		log_conn_attempt(p, (struct sockaddr *)&cliaddr);
- 		close(connfd);
-@@ -1069,7 +1151,7 @@ session_connect(struct peer *peer)
- 	if (peer->fd != -1)
- 		return (-1);
- 
--	if ((peer->fd = socket(peer->conf.remote_addr.af, SOCK_STREAM,
-+	if ((peer->fd = socket(aid2af(peer->conf.remote_addr.aid), SOCK_STREAM,
- 	    IPPROTO_TCP)) == -1) {
- 		log_peer_warn(&peer->conf, "session_connect socket");
- 		bgp_fsm(peer, EVNT_CON_OPENFAIL);
-@@ -1100,8 +1182,7 @@ session_connect(struct peer *peer)
- 	peer->wbuf.fd = peer->fd;
- 
- 	/* if update source is set we need to bind() */
--	if (peer->conf.local_addr.af) {
--		sa = addr2sa(&peer->conf.local_addr, 0);
-+	if ((sa = addr2sa(&peer->conf.local_addr, 0)) != NULL) {
- 		if (bind(peer->fd, sa, sa->sa_len) == -1) {
- 			log_peer_warn(&peer->conf, "session_connect bind");
- 			bgp_fsm(peer, EVNT_CON_OPENFAIL);
-@@ -1139,42 +1220,50 @@ session_setup_socket(struct peer *p)
- 	int	nodelay = 1;
- 	int	bsize;
- 
--	if (p->conf.ebgp && p->conf.remote_addr.af == AF_INET) {
--		/* set TTL to foreign router's distance - 1=direct n=multihop
--		   with ttlsec, we always use 255 */
--		if (p->conf.ttlsec) {
--			ttl = 256 - p->conf.distance;
--			if (setsockopt(p->fd, IPPROTO_IP, IP_MINTTL, &ttl,
-+	switch (p->conf.remote_addr.aid) {
-+	case AID_INET:
-+		/* set precedence, see RFC 1771 appendix 5 */
-+		if (setsockopt(p->fd, IPPROTO_IP, IP_TOS, &pre, sizeof(pre)) ==
-+		    -1) {
-+			log_peer_warn(&p->conf,
-+			    "session_setup_socket setsockopt TOS");
-+			return (-1);
-+		}
-+
-+		if (p->conf.ebgp) {
-+			/* set TTL to foreign router's distance
-+			   1=direct n=multihop with ttlsec, we always use 255 */
-+			if (p->conf.ttlsec) {
-+				ttl = 256 - p->conf.distance;
-+				if (setsockopt(p->fd, IPPROTO_IP, IP_MINTTL,
-+				    &ttl, sizeof(ttl)) == -1) {
-+					log_peer_warn(&p->conf,
-+					    "session_setup_socket: "
-+					    "setsockopt MINTTL");
-+					return (-1);
-+				}
-+				ttl = 255;
-+			}
-+
-+			if (setsockopt(p->fd, IPPROTO_IP, IP_TTL, &ttl,
- 			    sizeof(ttl)) == -1) {
- 				log_peer_warn(&p->conf,
--				    "session_setup_socket setsockopt MINTTL");
-+				    "session_setup_socket setsockopt TTL");
- 				return (-1);
- 			}
--			ttl = 255;
--		}
--
--		if (setsockopt(p->fd, IPPROTO_IP, IP_TTL, &ttl,
--		    sizeof(ttl)) == -1) {
--			log_peer_warn(&p->conf,
--			    "session_setup_socket setsockopt TTL");
--			return (-1);
- 		}
--	}
--
--	if (p->conf.ebgp && p->conf.remote_addr.af == AF_INET6)
--		/* set hoplimit to foreign router's distance */
--		if (setsockopt(p->fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &ttl,
--		    sizeof(ttl)) == -1) {
--			log_peer_warn(&p->conf,
--			    "session_setup_socket setsockopt hoplimit");
--			return (-1);
-+		break;
-+	case AID_INET6:
-+		if (p->conf.ebgp) {
-+			/* set hoplimit to foreign router's distance */
-+			if (setsockopt(p->fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
-+			    &ttl, sizeof(ttl)) == -1) {
-+				log_peer_warn(&p->conf,
-+				    "session_setup_socket setsockopt hoplimit");
-+				return (-1);
-+			}
- 		}
--
--	/* if ttlsec is in use, set minttl */
--	if (p->conf.ttlsec) {
--		ttl = 256 - p->conf.distance;
--		setsockopt(p->fd, IPPROTO_IP, IP_MINTTL, &ttl, sizeof(ttl));
--
-+		break;
- 	}
- 
- 	/* set TCP_NODELAY */
-@@ -1185,24 +1274,18 @@ session_setup_socket(struct peer *p)
- 		return (-1);
- 	}
- 
--	/* set precedence, see RFC 1771 appendix 5 */
--	if (p->conf.remote_addr.af == AF_INET &&
--	    setsockopt(p->fd, IPPROTO_IP, IP_TOS, &pre, sizeof(pre)) == -1) {
--		log_peer_warn(&p->conf,
--		    "session_setup_socket setsockopt TOS");
--		return (-1);
--	}
--
- 	/* only increase bufsize (and thus window) if md5 or ipsec is in use */
- 	if (p->conf.auth.method != AUTH_NONE) {
- 		/* try to increase bufsize. no biggie if it fails */
- 		bsize = 65535;
--		while (setsockopt(p->fd, SOL_SOCKET, SO_RCVBUF, &bsize,
--		    sizeof(bsize)) == -1)
-+		while (bsize > 8192 &&
-+		    setsockopt(p->fd, SOL_SOCKET, SO_RCVBUF, &bsize,
-+		    sizeof(bsize)) == -1 && errno != EINVAL)
- 			bsize /= 2;
- 		bsize = 65535;
--		while (setsockopt(p->fd, SOL_SOCKET, SO_SNDBUF, &bsize,
--		    sizeof(bsize)) == -1)
-+		while (bsize > 8192 &&
-+		    setsockopt(p->fd, SOL_SOCKET, SO_SNDBUF, &bsize,
-+		    sizeof(bsize)) == -1 && errno != EINVAL)
- 			bsize /= 2;
- 	}
- 
-@@ -1244,40 +1327,56 @@ session_tcp_established(struct peer *pee
- void
- session_capa_ann_none(struct peer *peer)
- {
--	peer->capa.ann.mp_v4 = SAFI_NONE;
--	peer->capa.ann.mp_v4 = SAFI_NONE;
--	peer->capa.ann.refresh = 0;
--	peer->capa.ann.restart = 0;
--	peer->capa.ann.as4byte = 0;
-+	bzero(&peer->capa.ann, sizeof(peer->capa.ann));
- }
- 
- int
--session_capa_add(struct peer *p, struct buf *opb, u_int8_t capa_code,
--    u_int8_t capa_len, u_int8_t *optparamlen)
--{
--	u_int8_t	op_type, op_len, tot_len, errs = 0;
--
--	op_type = OPT_PARAM_CAPABILITIES;
--	op_len = sizeof(capa_code) + sizeof(capa_len) + capa_len;
--	tot_len = sizeof(op_type) + sizeof(op_len) + op_len;
--	errs += buf_add(opb, &op_type, sizeof(op_type));
--	errs += buf_add(opb, &op_len, sizeof(op_len));
--	errs += buf_add(opb, &capa_code, sizeof(capa_code));
--	errs += buf_add(opb, &capa_len, sizeof(capa_len));
--	*optparamlen += tot_len;
-+session_capa_add(struct ibuf *opb, u_int8_t capa_code, u_int8_t capa_len)
-+{
-+	int errs = 0;
-+
-+	errs += ibuf_add(opb, &capa_code, sizeof(capa_code));
-+	errs += ibuf_add(opb, &capa_len, sizeof(capa_len));
- 	return (errs);
- }
- 
- int
--session_capa_add_mp(struct buf *buf, u_int16_t afi, u_int8_t safi)
-+session_capa_add_mp(struct ibuf *buf, u_int8_t aid)
- {
--	u_int8_t		 pad = 0;
-+	u_int8_t		 safi, pad = 0;
-+	u_int16_t		 afi;
- 	int			 errs = 0;
- 
-+	if (aid2afi(aid, &afi, &safi) == -1)
-+		fatalx("session_capa_add_mp: bad afi/safi pair");
-+	afi = htons(afi);
-+	errs += ibuf_add(buf, &afi, sizeof(afi));
-+	errs += ibuf_add(buf, &pad, sizeof(pad));
-+	errs += ibuf_add(buf, &safi, sizeof(safi));
-+
-+	return (errs);
-+}
-+
-+int
-+session_capa_add_gr(struct peer *p, struct ibuf *b, u_int8_t aid)
-+{
-+	u_int		errs = 0;
-+	u_int16_t	afi;
-+	u_int8_t	flags, safi;
-+
-+	if (aid2afi(aid, &afi, &safi)) {
-+		log_warn("session_capa_add_gr: bad AID");
-+		return (1);
-+	}
-+	if (p->capa.neg.grestart.flags[aid] & CAPA_GR_RESTARTING)
-+		flags = CAPA_GR_F_FLAG;
-+	else
-+		flags = 0;
-+
- 	afi = htons(afi);
--	errs += buf_add(buf, &afi, sizeof(afi));
--	errs += buf_add(buf, &pad, sizeof(pad));
--	errs += buf_add(buf, &safi, sizeof(safi));
-+	errs += ibuf_add(b, &afi, sizeof(afi));
-+	errs += ibuf_add(b, &safi, sizeof(safi));
-+	errs += ibuf_add(b, &flags, sizeof(flags));
- 
- 	return (errs);
- }
-@@ -1287,23 +1386,22 @@ session_newmsg(enum msg_type msgtype, u_
- {
- 	struct bgp_msg		*msg;
- 	struct msg_header	 hdr;
--	struct buf		*buf;
-+	struct ibuf		*buf;
- 	int			 errs = 0;
- 
- 	memset(&hdr.marker, 0xff, sizeof(hdr.marker));
- 	hdr.len = htons(len);
- 	hdr.type = msgtype;
- 
--	if ((buf = buf_open(len)) == NULL)
-+	if ((buf = ibuf_open(len)) == NULL)
- 		return (NULL);
- 
--	errs += buf_add(buf, &hdr.marker, sizeof(hdr.marker));
--	errs += buf_add(buf, &hdr.len, sizeof(hdr.len));
--	errs += buf_add(buf, &hdr.type, sizeof(hdr.type));
--
--	if (errs > 0 ||
--	    (msg = calloc(1, sizeof(*msg))) == NULL) {
--		buf_free(buf);
-+	errs += ibuf_add(buf, &hdr.marker, sizeof(hdr.marker));
-+	errs += ibuf_add(buf, &hdr.len, sizeof(hdr.len));
-+	errs += ibuf_add(buf, &hdr.type, sizeof(hdr.type));
-+
-+	if (errs || (msg = calloc(1, sizeof(*msg))) == NULL) {
-+		ibuf_free(buf);
- 		return (NULL);
- 	}
- 
-@@ -1329,7 +1427,7 @@ session_sendmsg(struct bgp_msg *msg, str
- 			mrt_dump_bgp_msg(mrt, msg->buf->buf, msg->len, p);
- 	}
- 
--	buf_close(&p->wbuf, msg->buf);
-+	ibuf_close(&p->wbuf, msg->buf);
- 	free(msg);
- 	return (0);
- }
-@@ -1338,40 +1436,70 @@ void
- session_open(struct peer *p)
- {
- 	struct bgp_msg		*buf;
--	struct buf		*opb;
-+	struct ibuf		*opb;
- 	struct msg_open		 msg;
- 	u_int16_t		 len;
--	u_int8_t		 optparamlen = 0;
--	u_int			 errs = 0;
-+	u_int8_t		 i, op_type, optparamlen = 0;
-+	int			 errs = 0;
-+	int			 mpcapa = 0;
- 
- 
--	if ((opb = buf_dynamic(0, MAX_PKTSIZE - MSGSIZE_OPEN_MIN)) == NULL) {
-+	if ((opb = ibuf_dynamic(0, UCHAR_MAX - sizeof(op_type) -
-+	    sizeof(optparamlen))) == NULL) {
- 		bgp_fsm(p, EVNT_CON_FATAL);
- 		return;
- 	}
- 
- 	/* multiprotocol extensions, RFC 4760 */
--	if (p->capa.ann.mp_v4) {	/* 4 bytes data */
--		errs += session_capa_add(p, opb, CAPA_MP, 4, &optparamlen);
--		errs += session_capa_add_mp(opb, AFI_IPv4, p->capa.ann.mp_v4);
--	}
--	if (p->capa.ann.mp_v6) {	/* 4 bytes data */
--		errs += session_capa_add(p, opb, CAPA_MP, 4, &optparamlen);
--		errs += session_capa_add_mp(opb, AFI_IPv6, p->capa.ann.mp_v6);
--	}
-+	for (i = 0; i < AID_MAX; i++)
-+		if (p->capa.ann.mp[i]) {	/* 4 bytes data */
-+			errs += session_capa_add(opb, CAPA_MP, 4);
-+			errs += session_capa_add_mp(opb, i);
-+			mpcapa++;
-+		}
- 
- 	/* route refresh, RFC 2918 */
- 	if (p->capa.ann.refresh)	/* no data */
--		errs += session_capa_add(p, opb, CAPA_REFRESH, 0, &optparamlen);
-+		errs += session_capa_add(opb, CAPA_REFRESH, 0);
- 
--	/* End-of-RIB marker, RFC 4724 */
--	if (p->capa.ann.restart) {	/* 2 bytes data */
--		u_char		c[2];
--
--		bzero(&c, 2);
--		c[0] = 0x80; /* we're always restarting */
--		errs += session_capa_add(p, opb, CAPA_RESTART, 2, &optparamlen);
--		errs += buf_add(opb, &c, 2);
-+	/* graceful restart and End-of-RIB marker, RFC 4724 */
-+	if (p->capa.ann.grestart.restart) {
-+		int		rst = 0;
-+		u_int16_t	hdr;
-+		u_int8_t	grlen;
-+
-+		if (mpcapa) {
-+			grlen = 2 + 4 * mpcapa;
-+			for (i = 0; i < AID_MAX; i++) {
-+				if (p->capa.neg.grestart.flags[i] &
-+				    CAPA_GR_RESTARTING)
-+					rst++;
-+			}
-+		} else {	/* AID_INET */
-+			grlen = 2 + 4;
-+			if (p->capa.neg.grestart.flags[AID_INET] &
-+			    CAPA_GR_RESTARTING)
-+				rst++;
-+		}
-+
-+		hdr = conf->holdtime;		/* default timeout */
-+		/* if client does graceful restart don't set R flag */
-+		if (!rst)
-+			hdr |= CAPA_GR_R_FLAG;
-+		hdr = htons(hdr);
-+
-+		errs += session_capa_add(opb, CAPA_RESTART, grlen);
-+		errs += ibuf_add(opb, &hdr, sizeof(hdr));
-+
-+		if (mpcapa) {
-+			for (i = 0; i < AID_MAX; i++) {
-+				if (p->capa.ann.mp[i]) {
-+					errs += session_capa_add_gr(p, opb, i);
-+				}
-+			}
-+		} else {	/* AID_INET */
-+			errs += session_capa_add_gr(p, opb, AID_INET);
-+		}
- 	}
- 
- 	/* 4-bytes AS numbers, draft-ietf-idr-as4bytes-13 */
-@@ -1379,13 +1507,17 @@ session_open(struct peer *p)
- 		u_int32_t	nas;
- 
- 		nas = htonl(conf->as);
--		errs += session_capa_add(p, opb, CAPA_AS4BYTE, 4, &optparamlen);
--		errs += buf_add(opb, &nas, 4);
-+		errs += session_capa_add(opb, CAPA_AS4BYTE, sizeof(nas));
-+		errs += ibuf_add(opb, &nas, sizeof(nas));
- 	}
- 
-+	if (ibuf_size(opb))
-+		optparamlen = ibuf_size(opb) + sizeof(op_type) +
-+		    sizeof(optparamlen);
-+
- 	len = MSGSIZE_OPEN_MIN + optparamlen;
- 	if (errs || (buf = session_newmsg(OPEN, len)) == NULL) {
--		buf_free(opb);
-+		ibuf_free(opb);
- 		bgp_fsm(p, EVNT_CON_FATAL);
- 		return;
- 	}
-@@ -1399,19 +1531,24 @@ session_open(struct peer *p)
- 	msg.bgpid = conf->bgpid;	/* is already in network byte order */
- 	msg.optparamlen = optparamlen;
- 
--	errs += buf_add(buf->buf, &msg.version, sizeof(msg.version));
--	errs += buf_add(buf->buf, &msg.myas, sizeof(msg.myas));
--	errs += buf_add(buf->buf, &msg.holdtime, sizeof(msg.holdtime));
--	errs += buf_add(buf->buf, &msg.bgpid, sizeof(msg.bgpid));
--	errs += buf_add(buf->buf, &msg.optparamlen, sizeof(msg.optparamlen));
--
--	if (optparamlen)
--		errs += buf_add(buf->buf, opb->buf, optparamlen);
-+	errs += ibuf_add(buf->buf, &msg.version, sizeof(msg.version));
-+	errs += ibuf_add(buf->buf, &msg.myas, sizeof(msg.myas));
-+	errs += ibuf_add(buf->buf, &msg.holdtime, sizeof(msg.holdtime));
-+	errs += ibuf_add(buf->buf, &msg.bgpid, sizeof(msg.bgpid));
-+	errs += ibuf_add(buf->buf, &msg.optparamlen, sizeof(msg.optparamlen));
-+
-+	if (optparamlen) {
-+		op_type = OPT_PARAM_CAPABILITIES;
-+		optparamlen = ibuf_size(opb);
-+		errs += ibuf_add(buf->buf, &op_type, sizeof(op_type));
-+		errs += ibuf_add(buf->buf, &optparamlen, sizeof(optparamlen));
-+		errs += ibuf_add(buf->buf, opb->buf, ibuf_size(opb));
-+	}
- 
--	buf_free(opb);
-+	ibuf_free(opb);
- 
--	if (errs > 0) {
--		buf_free(buf->buf);
-+	if (errs) {
-+		ibuf_free(buf->buf);
- 		free(buf);
- 		bgp_fsm(p, EVNT_CON_FATAL);
- 		return;
-@@ -1459,8 +1596,8 @@ session_update(u_int32_t peerid, void *d
- 		return;
- 	}
- 
--	if (buf_add(buf->buf, data, datalen)) {
--		buf_free(buf->buf);
-+	if (ibuf_add(buf->buf, data, datalen)) {
-+		ibuf_free(buf->buf);
- 		free(buf);
- 		bgp_fsm(p, EVNT_CON_FATAL);
- 		return;
-@@ -1480,29 +1617,27 @@ session_notification(struct peer *p, u_i
-     void *data, ssize_t datalen)
- {
- 	struct bgp_msg		*buf;
--	u_int			 errs = 0;
--	u_int8_t		 null8 = 0;
-+	int			 errs = 0;
- 
- 	if (p->stats.last_sent_errcode)	/* some notification already sent */
- 		return;
- 
-+	log_notification(p, errcode, subcode, data, datalen, "sending");
-+
- 	if ((buf = session_newmsg(NOTIFICATION,
- 	    MSGSIZE_NOTIFICATION_MIN + datalen)) == NULL) {
- 		bgp_fsm(p, EVNT_CON_FATAL);
- 		return;
- 	}
- 
--	errs += buf_add(buf->buf, &errcode, sizeof(errcode));
--	if (errcode == ERR_CEASE)
--		errs += buf_add(buf->buf, &null8, sizeof(null8));
--	else
--		errs += buf_add(buf->buf, &subcode, sizeof(subcode));
-+	errs += ibuf_add(buf->buf, &errcode, sizeof(errcode));
-+	errs += ibuf_add(buf->buf, &subcode, sizeof(subcode));
- 
- 	if (datalen > 0)
--		errs += buf_add(buf->buf, data, datalen);
-+		errs += ibuf_add(buf->buf, data, datalen);
- 
--	if (errs > 0) {
--		buf_free(buf->buf);
-+	if (errs) {
-+		ibuf_free(buf->buf);
- 		free(buf);
- 		bgp_fsm(p, EVNT_CON_FATAL);
- 		return;
-@@ -1521,23 +1656,29 @@ session_notification(struct peer *p, u_i
- int
- session_neighbor_rrefresh(struct peer *p)
- {
-+	u_int8_t	i;
-+
- 	if (!p->capa.peer.refresh)
- 		return (-1);
- 
--	if (p->capa.peer.mp_v4 != SAFI_NONE)
--		session_rrefresh(p, AFI_IPv4, p->capa.peer.mp_v4);
--	if (p->capa.peer.mp_v6 != SAFI_NONE)
--		session_rrefresh(p, AFI_IPv6, p->capa.peer.mp_v6);
-+	for (i = 0; i < AID_MAX; i++) {
-+		if (p->capa.peer.mp[i] != 0)
-+			session_rrefresh(p, i);
-+	}
- 
- 	return (0);
- }
- 
- void
--session_rrefresh(struct peer *p, u_int16_t afi, u_int8_t safi)
-+session_rrefresh(struct peer *p, u_int8_t aid)
- {
- 	struct bgp_msg		*buf;
- 	int			 errs = 0;
--	u_int8_t		 null8 = 0;
-+	u_int16_t		 afi;
-+	u_int8_t		 safi, null8 = 0;
-+
-+	if (aid2afi(aid, &afi, &safi) == -1)
-+		fatalx("session_rrefresh: bad afi/safi pair");
- 
- 	if ((buf = session_newmsg(RREFRESH, MSGSIZE_RREFRESH)) == NULL) {
- 		bgp_fsm(p, EVNT_CON_FATAL);
-@@ -1545,12 +1686,12 @@ session_rrefresh(struct peer *p, u_int16
- 	}
- 
- 	afi = htons(afi);
--	errs += buf_add(buf->buf, &afi, sizeof(afi));
--	errs += buf_add(buf->buf, &null8, sizeof(null8));
--	errs += buf_add(buf->buf, &safi, sizeof(safi));
-+	errs += ibuf_add(buf->buf, &afi, sizeof(afi));
-+	errs += ibuf_add(buf->buf, &null8, sizeof(null8));
-+	errs += ibuf_add(buf->buf, &safi, sizeof(safi));
- 
--	if (errs > 0) {
--		buf_free(buf->buf);
-+	if (errs) {
-+		ibuf_free(buf->buf);
- 		free(buf);
- 		bgp_fsm(p, EVNT_CON_FATAL);
- 		return;
-@@ -1565,13 +1706,74 @@ session_rrefresh(struct peer *p, u_int16
- }
- 
- int
-+session_graceful_restart(struct peer *p)
-+{
-+	u_int8_t	i;
-+
-+	timer_set(p, Timer_RestartTimeout, p->capa.neg.grestart.timeout);
-+
-+	for (i = 0; i < AID_MAX; i++) {
-+		if (p->capa.neg.grestart.flags[i] & CAPA_GR_PRESENT) {
-+			if (imsg_compose(ibuf_rde, IMSG_SESSION_STALE,
-+			    p->conf.id, 0, -1, &i, sizeof(i)) == -1)
-+				return (-1);
-+			log_peer_warnx(&p->conf,
-+			    "graceful restart of %s, keeping routes",
-+			    aid2str(i));
-+			p->capa.neg.grestart.flags[i] |= CAPA_GR_RESTARTING;
-+		} else if (p->capa.neg.mp[i]) {
-+			if (imsg_compose(ibuf_rde, IMSG_SESSION_FLUSH,
-+			    p->conf.id, 0, -1, &i, sizeof(i)) == -1)
-+				return (-1);
-+			log_peer_warnx(&p->conf,
-+			    "graceful restart of %s, flushing routes",
-+			    aid2str(i));
-+		}
-+	}
-+	return (0);
-+}
-+
-+int
-+session_graceful_is_restarting(struct peer *p)
-+{
-+	u_int8_t	i;
-+
-+	for (i = 0; i < AID_MAX; i++)
-+		if (p->capa.neg.grestart.flags[i] & CAPA_GR_RESTARTING)
-+			return (1);
-+	return (0);
-+}
-+
-+int
-+session_graceful_stop(struct peer *p)
-+{
-+	u_int8_t	i;
-+
-+	for (i = 0; i < AID_MAX; i++) {
-+		/*
-+		 * Only flush if the peer is restarting and the peer indicated
-+		 * it hold the forwarding state. In all other cases the
-+		 * session was already flushed when the session came up.
-+		 */
-+		if (p->capa.neg.grestart.flags[i] & CAPA_GR_RESTARTING &&
-+		    p->capa.neg.grestart.flags[i] & CAPA_GR_FORWARD) {
-+			log_peer_warnx(&p->conf, "graceful restart of %s, "
-+			    "time-out, flushing", aid2str(i));
-+			if (imsg_compose(ibuf_rde, IMSG_SESSION_FLUSH,
-+			    p->conf.id, 0, -1, &i, sizeof(i)) == -1)
-+				return (-1);
-+		}
-+		p->capa.neg.grestart.flags[i] &= ~CAPA_GR_RESTARTING;
-+	}
-+	return (0);
-+}
-+
-+int
- session_dispatch_msg(struct pollfd *pfd, struct peer *p)
- {
--	ssize_t		n, rpos, av, left;
-+	ssize_t		n;
- 	socklen_t	len;
--	int		error, processed = 0;
--	u_int16_t	msglen;
--	u_int8_t	msgtype;
-+	int		error;
- 
- 	if (p->state == STATE_CONNECT) {
- 		if (pfd->revents & POLLOUT) {
-@@ -1641,71 +1843,83 @@ session_dispatch_msg(struct pollfd *pfd,
- 			return (1);
- 		}
- 
--		rpos = 0;
--		av = p->rbuf->wpos + n;
-+		p->rbuf->wpos += n;
- 		p->stats.last_read = time(NULL);
-+		return (1);
-+	}
-+	return (0);
-+}
- 
--		/*
--		 * session might drop to IDLE -> buffers deallocated
--		 * we MUST check rbuf != NULL before use
--		 */
--		for (;;) {
--			if (rpos + MSGSIZE_HEADER > av)
--				break;
--			if (p->rbuf == NULL)
--				break;
--			if (parse_header(p, p->rbuf->buf + rpos, &msglen,
--			    &msgtype) == -1)
--				return (0);
--			if (rpos + msglen > av)
--				break;
--			p->rbuf->rptr = p->rbuf->buf + rpos;
--
--			switch (msgtype) {
--			case OPEN:
--				bgp_fsm(p, EVNT_RCVD_OPEN);
--				p->stats.msg_rcvd_open++;
--				break;
--			case UPDATE:
--				bgp_fsm(p, EVNT_RCVD_UPDATE);
--				p->stats.msg_rcvd_update++;
--				break;
--			case NOTIFICATION:
--				bgp_fsm(p, EVNT_RCVD_NOTIFICATION);
--				p->stats.msg_rcvd_notification++;
--				break;
--			case KEEPALIVE:
--				bgp_fsm(p, EVNT_RCVD_KEEPALIVE);
--				p->stats.msg_rcvd_keepalive++;
--				break;
--			case RREFRESH:
--				parse_refresh(p);
--				p->stats.msg_rcvd_rrefresh++;
--				break;
--			default:	/* cannot happen */
--				session_notification(p, ERR_HEADER,
--				    ERR_HDR_TYPE, &msgtype, 1);
--				log_warnx("received message with "
--				    "unknown type %u", msgtype);
--				bgp_fsm(p, EVNT_CON_FATAL);
--			}
--			rpos += msglen;
--			if (++processed > MSG_PROCESS_LIMIT)
--				break;
--		}
--		if (p->rbuf == NULL)
--			return (1);
-+int
-+session_process_msg(struct peer *p)
-+{
-+	ssize_t		rpos, av, left;
-+	int		processed = 0;
-+	u_int16_t	msglen;
-+	u_int8_t	msgtype;
- 
--		if (rpos < av) {
--			left = av - rpos;
--			memcpy(&p->rbuf->buf, p->rbuf->buf + rpos, left);
--			p->rbuf->wpos = left;
--		} else
--			p->rbuf->wpos = 0;
-+	rpos = 0;
-+	av = p->rbuf->wpos;
- 
--		return (1);
-+	/*
-+	 * session might drop to IDLE -> buffers deallocated
-+	 * we MUST check rbuf != NULL before use
-+	 */
-+	for (;;) {
-+		if (rpos + MSGSIZE_HEADER > av)
-+			break;
-+		if (p->rbuf == NULL)
-+			break;
-+		if (parse_header(p, p->rbuf->buf + rpos, &msglen,
-+		    &msgtype) == -1)
-+			return (0);
-+		if (rpos + msglen > av)
-+			break;
-+		p->rbuf->rptr = p->rbuf->buf + rpos;
-+
-+		switch (msgtype) {
-+		case OPEN:
-+			bgp_fsm(p, EVNT_RCVD_OPEN);
-+			p->stats.msg_rcvd_open++;
-+			break;
-+		case UPDATE:
-+			bgp_fsm(p, EVNT_RCVD_UPDATE);
-+			p->stats.msg_rcvd_update++;
-+			break;
-+		case NOTIFICATION:
-+			bgp_fsm(p, EVNT_RCVD_NOTIFICATION);
-+			p->stats.msg_rcvd_notification++;
-+			break;
-+		case KEEPALIVE:
-+			bgp_fsm(p, EVNT_RCVD_KEEPALIVE);
-+			p->stats.msg_rcvd_keepalive++;
-+			break;
-+		case RREFRESH:
-+			parse_refresh(p);
-+			p->stats.msg_rcvd_rrefresh++;
-+			break;
-+		default:	/* cannot happen */
-+			session_notification(p, ERR_HEADER, ERR_HDR_TYPE,
-+			    &msgtype, 1);
-+			log_warnx("received message with unknown type %u",
-+			    msgtype);
-+			bgp_fsm(p, EVNT_CON_FATAL);
-+		}
-+		rpos += msglen;
-+		if (++processed > MSG_PROCESS_LIMIT)
-+			break;
- 	}
--	return (0);
-+	if (p->rbuf == NULL)
-+		return (1);
-+
-+	if (rpos < av) {
-+		left = av - rpos;
-+		memcpy(&p->rbuf->buf, p->rbuf->buf + rpos, left);
-+		p->rbuf->wpos = left;
-+	} else
-+		p->rbuf->wpos = 0;
-+
-+	return (1);
- }
- 
- int
-@@ -1853,12 +2067,6 @@ parse_open(struct peer *peer)
- 	p += sizeof(short_as);
- 	as = peer->short_as = ntohs(short_as);
- 
--	/* if remote-as is zero and it's a cloned neighbor, accept any */
--	if (peer->conf.cloned && !peer->conf.remote_as && as != AS_TRANS) {
--		peer->conf.remote_as = as;
--		peer->conf.ebgp = (peer->conf.remote_as != conf->as);
--	}
--
- 	memcpy(&oholdtime, p, sizeof(oholdtime));
- 	p += sizeof(oholdtime);
- 
-@@ -1966,6 +2174,15 @@ parse_open(struct peer *peer)
- 		}
- 	}
- 
-+	/* if remote-as is zero and it's a cloned neighbor, accept any */
-+	if (peer->conf.cloned && !peer->conf.remote_as && as != AS_TRANS) {
-+		peer->conf.remote_as = as;
-+		peer->conf.ebgp = (peer->conf.remote_as != conf->as);
-+		if (!peer->conf.ebgp)
-+			/* force enforce_as off for iBGP sessions */
-+			peer->conf.enforce_as = ENFORCE_AS_OFF;
-+	}
-+
- 	if (peer->conf.remote_as != as) {
- 		log_peer_warnx(&peer->conf, "peer sent wrong AS %s",
- 		    log_as(as));
-@@ -1974,6 +2191,14 @@ parse_open(struct peer *peer)
- 		return (-1);
- 	}
- 
-+	if (capa_neg_calc(peer) == -1) {
-+		log_peer_warnx(&peer->conf,
-+		    "capability negotiation calculation failed");
-+		session_notification(peer, ERR_OPEN, 0, NULL, 0);
-+		change_state(peer, STATE_IDLE, EVNT_RCVD_OPEN);
-+		return (-1);
-+	}
-+
- 	return (0);
- }
- 
-@@ -2008,24 +2233,35 @@ int
- parse_refresh(struct peer *peer)
- {
- 	u_char		*p;
--	struct rrefresh	 r;
-+	u_int16_t	 afi;
-+	u_int8_t	 aid, safi;
- 
- 	p = peer->rbuf->rptr;
- 	p += MSGSIZE_HEADER;	/* header is already checked */
- 
-+	/*
-+	 * We could check if we actually announced the capability but
-+	 * as long as the message is correctly encoded we don't care.
-+	 */
-+
- 	/* afi, 2 byte */
--	memcpy(&r.afi, p, sizeof(r.afi));
--	r.afi = ntohs(r.afi);
-+	memcpy(&afi, p, sizeof(afi));
-+	afi = ntohs(afi);
- 	p += 2;
- 	/* reserved, 1 byte */
- 	p += 1;
- 	/* safi, 1 byte */
--	memcpy(&r.safi, p, sizeof(r.safi));
-+	memcpy(&safi, p, sizeof(safi));
- 
- 	/* afi/safi unchecked -	unrecognized values will be ignored anyway */
-+	if (afi2aid(afi, safi, &aid) == -1) {
-+		log_peer_warnx(&peer->conf, "peer sent bad refresh, "
-+		    "invalid afi/safi pair");
-+		return (0);
-+	}
- 
--	if (imsg_compose(ibuf_rde, IMSG_REFRESH, peer->conf.id, 0, -1, &r,
--	    sizeof(r)) == -1)
-+	if (imsg_compose(ibuf_rde, IMSG_REFRESH, peer->conf.id, 0, -1, &aid,
-+	    sizeof(aid)) == -1)
- 		return (-1);
- 
- 	return (0);
-@@ -2035,11 +2271,12 @@ int
- parse_notification(struct peer *peer)
- {
- 	u_char		*p;
-+	u_int16_t	 datalen;
- 	u_int8_t	 errcode;
- 	u_int8_t	 subcode;
--	u_int16_t	 datalen;
- 	u_int8_t	 capa_code;
- 	u_int8_t	 capa_len;
-+	u_int8_t	 i;
- 
- 	/* just log */
- 	p = peer->rbuf->rptr;
-@@ -2059,7 +2296,7 @@ parse_notification(struct peer *peer)
- 	p += sizeof(subcode);
- 	datalen -= sizeof(subcode);
- 
--	log_notification(peer, errcode, subcode, p, datalen);
-+	log_notification(peer, errcode, subcode, p, datalen, "received");
- 	peer->errcnt++;
- 
- 	if (errcode == ERR_OPEN && subcode == ERR_OPEN_CAPA) {
-@@ -2094,8 +2331,8 @@ parse_notification(struct peer *peer)
- 			datalen -= capa_len;
- 			switch (capa_code) {
- 			case CAPA_MP:
--				peer->capa.ann.mp_v4 = SAFI_NONE;
--				peer->capa.ann.mp_v6 = SAFI_NONE;
-+				for (i = 0; i < AID_MAX; i++)
-+					peer->capa.ann.mp[i] = 0;
- 				log_peer_warnx(&peer->conf,
- 				    "disabling multiprotocol capability");
- 				break;
-@@ -2105,7 +2342,7 @@ parse_notification(struct peer *peer)
- 				    "disabling route refresh capability");
- 				break;
- 			case CAPA_RESTART:
--				peer->capa.ann.restart = 0;
-+				peer->capa.ann.grestart.restart = 0;
- 				log_peer_warnx(&peer->conf,
- 				    "disabling restart capability");
- 				break;
-@@ -2139,19 +2376,23 @@ parse_notification(struct peer *peer)
- int
- parse_capabilities(struct peer *peer, u_char *d, u_int16_t dlen, u_int32_t *as)
- {
-+	u_char		*capa_val;
-+	u_int32_t	 remote_as;
- 	u_int16_t	 len;
-+	u_int16_t	 afi;
-+	u_int16_t	 gr_header;
-+	u_int8_t	 safi;
-+	u_int8_t	 aid;
-+	u_int8_t	 gr_flags;
- 	u_int8_t	 capa_code;
- 	u_int8_t	 capa_len;
--	u_char		*capa_val;
--	u_int16_t	 mp_afi;
--	u_int8_t	 mp_safi;
--	u_int32_t	 remote_as;
-+	u_int8_t	 i;
- 
- 	len = dlen;
- 	while (len > 0) {
- 		if (len < 2) {
--			log_peer_warnx(&peer->conf, "parse_capabilities: "
--			    "expect len >= 2, len is %u", len);
-+			log_peer_warnx(&peer->conf, "Bad capabilities attr "
-+			    "length: %u, too short", len);
- 			return (-1);
- 		}
- 		memcpy(&capa_code, d, sizeof(capa_code));
-@@ -2163,7 +2404,7 @@ parse_capabilities(struct peer *peer, u_
- 		if (capa_len > 0) {
- 			if (len < capa_len) {
- 				log_peer_warnx(&peer->conf,
--				    "parse_capabilities: "
-+				    "Bad capabilities attr length: "
- 				    "len %u smaller than capa_len %u",
- 				    len, capa_len);
- 				return (-1);
-@@ -2178,47 +2419,82 @@ parse_capabilities(struct peer *peer, u_
- 		case CAPA_MP:			/* RFC 4760 */
- 			if (capa_len != 4) {
- 				log_peer_warnx(&peer->conf,
--				    "parse_capabilities: "
--				    "expect len 4, len is %u", capa_len);
--				return (-1);
--			}
--			memcpy(&mp_afi, capa_val, sizeof(mp_afi));
--			mp_afi = ntohs(mp_afi);
--			memcpy(&mp_safi, capa_val + 3, sizeof(mp_safi));
--			switch (mp_afi) {
--			case AFI_IPv4:
--				if (mp_safi < 1 || mp_safi > 3)
--					log_peer_warnx(&peer->conf,
--					    "parse_capabilities: AFI IPv4, "
--					    "mp_safi %u unknown", mp_safi);
--				else
--					peer->capa.peer.mp_v4 = mp_safi;
-+				    "Bad multi protocol capability length: "
-+				    "%u", capa_len);
- 				break;
--			case AFI_IPv6:
--				if (mp_safi < 1 || mp_safi > 3)
--					log_peer_warnx(&peer->conf,
--					    "parse_capabilities: AFI IPv6, "
--					    "mp_safi %u unknown", mp_safi);
--				else
--					peer->capa.peer.mp_v6 = mp_safi;
--				break;
--			default:			/* ignore */
-+			}
-+			memcpy(&afi, capa_val, sizeof(afi));
-+			afi = ntohs(afi);
-+			memcpy(&safi, capa_val + 3, sizeof(safi));
-+			if (afi2aid(afi, safi, &aid) == -1) {
-+				log_peer_warnx(&peer->conf,
-+				    "Received multi protocol capability: "
-+				    " unknown AFI %u, safi %u pair",
-+				    afi, safi);
- 				break;
- 			}
-+			peer->capa.peer.mp[aid] = 1;
- 			break;
- 		case CAPA_REFRESH:
- 			peer->capa.peer.refresh = 1;
- 			break;
- 		case CAPA_RESTART:
--			peer->capa.peer.restart = 1;
--			/* we don't care about the further restart capas yet */
-+			if (capa_len == 2) {
-+				/* peer only supports EoR marker */
-+				peer->capa.peer.grestart.restart = 1;
-+				peer->capa.peer.grestart.timeout = 0;
-+				break;
-+			} else if (capa_len % 4 != 2) {
-+				log_peer_warnx(&peer->conf,
-+				    "Bad graceful restart capability length: "
-+				    "%u", capa_len);
-+				peer->capa.peer.grestart.restart = 0;
-+				peer->capa.peer.grestart.timeout = 0;
-+				break;
-+			}
-+
-+			memcpy(&gr_header, capa_val, sizeof(gr_header));
-+			gr_header = ntohs(gr_header);
-+			peer->capa.peer.grestart.timeout =
-+			    gr_header & CAPA_GR_TIMEMASK;
-+			if (peer->capa.peer.grestart.timeout == 0) {
-+				log_peer_warnx(&peer->conf, "Received "
-+				    "graceful restart timeout is zero");
-+				peer->capa.peer.grestart.restart = 0;
-+				break;
-+			}
-+
-+			for (i = 2; i <= capa_len - 4; i += 4) {
-+				memcpy(&afi, capa_val + i, sizeof(afi));
-+				afi = ntohs(afi);
-+				memcpy(&safi, capa_val + i + 2, sizeof(safi));
-+				if (afi2aid(afi, safi, &aid) == -1) {
-+					log_peer_warnx(&peer->conf,
-+					    "Received graceful restart capa: "
-+					    " unknown AFI %u, safi %u pair",
-+					    afi, safi);
-+					continue;
-+				}
-+				memcpy(&gr_flags, capa_val + i + 3,
-+				    sizeof(gr_flags));
-+				peer->capa.peer.grestart.flags[aid] |=
-+				    CAPA_GR_PRESENT;
-+				if (gr_flags & CAPA_GR_F_FLAG)
-+					peer->capa.peer.grestart.flags[aid] |=
-+					    CAPA_GR_FORWARD;
-+				if (gr_header & CAPA_GR_R_FLAG)
-+					peer->capa.peer.grestart.flags[aid] |=
-+					    CAPA_GR_RESTART;
-+				peer->capa.peer.grestart.restart = 2;
-+			}
- 			break;
- 		case CAPA_AS4BYTE:
- 			if (capa_len != 4) {
- 				log_peer_warnx(&peer->conf,
--				    "parse_capabilities: "
--				    "expect len 4, len is %u", capa_len);
--				return (-1);
-+				    "Bad AS4BYTE capability length: "
-+				    "%u", capa_len);
-+				peer->capa.peer.as4byte = 0;
-+				break;
- 			}
- 			memcpy(&remote_as, capa_val, sizeof(remote_as));
- 			*as = ntohl(remote_as);
-@@ -2232,6 +2508,66 @@ parse_capabilities(struct peer *peer, u_
- 	return (0);
- }
- 
-+int
-+capa_neg_calc(struct peer *p)
-+{
-+	u_int8_t	i, hasmp = 0;
-+
-+	/* refresh: does not realy matter here, use peer setting */
-+	p->capa.neg.refresh = p->capa.peer.refresh;
-+
-+	/* as4byte: both side must announce capability */
-+	if (p->capa.ann.as4byte && p->capa.peer.as4byte)
-+		p->capa.neg.as4byte = 1;
-+	else
-+		p->capa.neg.as4byte = 0;
-+
-+	/* MP: both side must announce capability */
-+	for (i = 0; i < AID_MAX; i++) {
-+		if (p->capa.ann.mp[i] && p->capa.peer.mp[i]) {
-+			p->capa.neg.mp[i] = 1;
-+			hasmp = 1;
-+		} else
-+			p->capa.neg.mp[i] = 0;
-+	}
-+	/* if no MP capability present default to IPv4 unicast mode */
-+	if (!hasmp)
-+		p->capa.neg.mp[AID_INET] = 1;
-+
-+	/*
-+	 * graceful restart: only the peer capabilities are of interest here.
-+	 * It is necessary to compare the new values with the previous ones
-+	 * and act acordingly. AFI/SAFI that are not part in the MP capability
-+	 * are treated as not being present.
-+	 */
-+
-+	for (i = 0; i < AID_MAX; i++) {
-+		/* disable GR if the AFI/SAFI is not present */
-+		if (p->capa.peer.grestart.flags[i] & CAPA_GR_PRESENT &&
-+		    p->capa.neg.mp[i] == 0)
-+			p->capa.peer.grestart.flags[i] = 0;	/* disable */
-+		/* look at current GR state and decide what to do */
-+		if (p->capa.neg.grestart.flags[i] & CAPA_GR_RESTARTING) {
-+			if (!(p->capa.peer.grestart.flags[i] &
-+			    CAPA_GR_FORWARD)) {
-+				if (imsg_compose(ibuf_rde, IMSG_SESSION_FLUSH,
-+				    p->conf.id, 0, -1, &i, sizeof(i)) == -1)
-+					return (-1);
-+				log_peer_warnx(&p->conf, "graceful restart of "
-+				    "%s, not restarted, flushing", aid2str(i));
-+			}
-+			p->capa.neg.grestart.flags[i] =
-+			    p->capa.peer.grestart.flags[i] | CAPA_GR_RESTARTING;
-+		} else
-+			p->capa.neg.grestart.flags[i] =
-+			    p->capa.peer.grestart.flags[i];
-+	}
-+	p->capa.neg.grestart.timeout = p->capa.peer.grestart.timeout;
-+	p->capa.neg.grestart.restart = p->capa.peer.grestart.restart;
-+
-+	return (0);
-+}
-+
- void
- session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt)
- {
-@@ -2244,8 +2580,8 @@ session_dispatch_imsg(struct imsgbuf *ib
- 	struct kif		*kif;
- 	u_char			*data;
- 	enum reconf_action	 reconf;
--	int			 n, depend_ok;
--	u_int8_t		 errcode, subcode;
-+	int			 n, depend_ok, restricted;
-+	u_int8_t		 aid, errcode, subcode;
- 
- 	if ((n = imsg_read(ibuf)) == -1)
- 		fatal("session_dispatch_imsg: imsg_read error");
-@@ -2332,15 +2668,42 @@ session_dispatch_imsg(struct imsgbuf *ib
- 			}
- 
- 			break;
-+		case IMSG_RECONF_CTRL:
-+			if (idx != PFD_PIPE_MAIN)
-+				fatalx("reconf request not from parent");
-+			if (imsg.hdr.len != IMSG_HEADER_SIZE +
-+			    sizeof(restricted))
-+				fatalx("IFINFO imsg with wrong len");
-+			memcpy(&restricted, imsg.data, sizeof(restricted));
-+			if (imsg.fd == -1) {
-+				log_warnx("expected to receive fd for control "
-+				    "socket but didn't receive any");
-+				break;
-+			}
-+			if (restricted) {
-+				control_shutdown(rcsock);
-+				rcsock = imsg.fd;
-+				control_listen(rcsock);
-+			} else {
-+				control_shutdown(csock);
-+				csock = imsg.fd;
-+				control_listen(csock);
-+			}
-+			break;
- 		case IMSG_RECONF_DONE:
- 			if (idx != PFD_PIPE_MAIN)
- 				fatalx("reconf request not from parent");
- 			if (nconf == NULL)
- 				fatalx("got IMSG_RECONF_DONE but no config");
-+			conf->flags = nconf->flags;
-+			conf->log = nconf->log;
-+			conf->bgpid = nconf->bgpid;
-+			conf->clusterid = nconf->clusterid;
- 			conf->as = nconf->as;
-+			conf->short_as = nconf->short_as;
- 			conf->holdtime = nconf->holdtime;
--			conf->bgpid = nconf->bgpid;
- 			conf->min_holdtime = nconf->min_holdtime;
-+			conf->connectretry = nconf->connectretry;
- 
- 			/* add new peers */
- 			for (p = npeers; p != NULL; p = next) {
-@@ -2388,6 +2751,8 @@ session_dispatch_imsg(struct imsgbuf *ib
- 			nconf = NULL;
- 			pending_reconf = 0;
- 			log_info("SE reconfigured");
-+			imsg_compose(ibuf_main, IMSG_RECONF_DONE, 0, 0,
-+			    -1, NULL, 0);
- 			break;
- 		case IMSG_IFINFO:
- 			if (idx != PFD_PIPE_MAIN)
-@@ -2397,9 +2762,7 @@ session_dispatch_imsg(struct imsgbuf *ib
- 				fatalx("IFINFO imsg with wrong len");
- 			kif = imsg.data;
- 			depend_ok = (kif->flags & IFF_UP) &&
--			    (LINK_STATE_IS_UP(kif->link_state) ||
--			    (kif->link_state == LINK_STATE_UNKNOWN &&
--			    kif->media_type != IFT_CARP));
-+			    LINK_STATE_IS_UP(kif->link_state);
- 
- 			for (p = peers; p != NULL; p = p->next)
- 				if (!strcmp(p->conf.if_depend, kif->ifname)) {
-@@ -2408,7 +2771,8 @@ session_dispatch_imsg(struct imsgbuf *ib
- 						bgp_fsm(p, EVNT_START);
- 					} else if (!depend_ok && p->depend_ok) {
- 						p->depend_ok = depend_ok;
--						bgp_fsm(p, EVNT_STOP);
-+						session_stop(p,
-+						    ERR_CEASE_OTHER_CHANGE);
- 					}
- 				}
- 			break;
-@@ -2456,10 +2820,10 @@ session_dispatch_imsg(struct imsgbuf *ib
- 			}
- 			break;
- 		case IMSG_CTL_KROUTE:
--		case IMSG_CTL_KROUTE6:
- 		case IMSG_CTL_KROUTE_ADDR:
- 		case IMSG_CTL_SHOW_NEXTHOP:
- 		case IMSG_CTL_SHOW_INTERFACE:
-+		case IMSG_CTL_SHOW_FIB_TABLES:
- 			if (idx != PFD_PIPE_MAIN)
- 				fatalx("ctl kroute request not from parent");
- 			control_imsg_relay(&imsg);
-@@ -2469,7 +2833,6 @@ session_dispatch_imsg(struct imsgbuf *ib
- 		case IMSG_CTL_SHOW_RIB_ATTR:
- 		case IMSG_CTL_SHOW_RIB_MEM:
- 		case IMSG_CTL_SHOW_NETWORK:
--		case IMSG_CTL_SHOW_NETWORK6:
- 		case IMSG_CTL_SHOW_NEIGHBOR:
- 			if (idx != PFD_PIPE_ROUTE_CTL)
- 				fatalx("ctl rib request not from RDE");
-@@ -2531,6 +2894,40 @@ session_dispatch_imsg(struct imsgbuf *ib
- 				break;
- 			}
- 			break;
-+		case IMSG_SESSION_RESTARTED:
-+			if (idx != PFD_PIPE_ROUTE)
-+				fatalx("update request not from RDE");
-+			if (imsg.hdr.len < IMSG_HEADER_SIZE + sizeof(aid)) {
-+				log_warnx("RDE sent invalid restart msg");
-+				break;
-+			}
-+			if ((p = getpeerbyid(imsg.hdr.peerid)) == NULL) {
-+				log_warnx("no such peer: id=%u",
-+				    imsg.hdr.peerid);
-+				break;
-+			}
-+			memcpy(&aid, imsg.data, sizeof(aid));
-+			if (aid >= AID_MAX)
-+				fatalx("IMSG_SESSION_RESTARTED: bad AID");
-+			if (p->capa.neg.grestart.flags[aid] &
-+			    CAPA_GR_RESTARTING &&
-+			    p->capa.neg.grestart.flags[aid] &
-+			    CAPA_GR_FORWARD) {
-+				log_peer_warnx(&p->conf,
-+				    "graceful restart of %s finished",
-+				    aid2str(aid));
-+				p->capa.neg.grestart.flags[aid] &=
-+				    ~CAPA_GR_RESTARTING;
-+				timer_stop(p, Timer_RestartTimeout);
-+
-+				/* signal back to RDE to cleanup stale routes */
-+				if (imsg_compose(ibuf_rde,
-+				    IMSG_SESSION_RESTARTED, imsg.hdr.peerid, 0,
-+				    -1, &aid, sizeof(aid)) == -1)
-+					fatal("imsg_compose: "
-+					    "IMSG_SESSION_RESTARTED");
-+			}
-+			break;
- 		default:
- 			break;
- 		}
-@@ -2612,29 +3009,23 @@ getpeerbydesc(const char *descr)
- struct peer *
- getpeerbyip(struct sockaddr *ip)
- {
-+	struct bgpd_addr addr;
- 	struct peer	*p, *newpeer, *loose = NULL;
- 	u_int32_t	 id;
- 
-+	sa2addr(ip, &addr);
-+
- 	/* we might want a more effective way to find peers by IP */
- 	for (p = peers; p != NULL; p = p->next)
- 		if (!p->conf.template &&
--		    p->conf.remote_addr.af == ip->sa_family) {
--			if (p->conf.remote_addr.af == AF_INET &&
--			    p->conf.remote_addr.v4.s_addr ==
--			    ((struct sockaddr_in *)ip)->sin_addr.s_addr)
--				return (p);
--			if (p->conf.remote_addr.af == AF_INET6 &&
--			    !bcmp(&p->conf.remote_addr.v6,
--			    &((struct sockaddr_in6 *)ip)->sin6_addr,
--			    sizeof(p->conf.remote_addr.v6)))
--				return (p);
--		}
-+		    !memcmp(&addr, &p->conf.remote_addr, sizeof(addr)))
-+			return (p);
- 
- 	/* try template matching */
- 	for (p = peers; p != NULL; p = p->next)
- 		if (p->conf.template &&
--		    p->conf.remote_addr.af == ip->sa_family &&
--		    session_match_mask(p, ip))
-+		    p->conf.remote_addr.aid == addr.aid &&
-+		    session_match_mask(p, &addr))
- 			if (loose == NULL || loose->conf.remote_masklen <
- 			    p->conf.remote_masklen)
- 				loose = p;
-@@ -2653,21 +3044,19 @@ getpeerbyip(struct sockaddr *ip)
- 				break;
- 			}
- 		}
--		if (newpeer->conf.remote_addr.af == AF_INET) {
--			newpeer->conf.remote_addr.v4.s_addr =
--			    ((struct sockaddr_in *)ip)->sin_addr.s_addr;
-+		sa2addr(ip, &newpeer->conf.remote_addr);
-+		switch (ip->sa_family) {
-+		case AF_INET:
- 			newpeer->conf.remote_masklen = 32;
--		}
--		if (newpeer->conf.remote_addr.af == AF_INET6) {
--			memcpy(&p->conf.remote_addr.v6,
--			    &((struct sockaddr_in6 *)ip)->sin6_addr,
--			    sizeof(newpeer->conf.remote_addr.v6));
-+			break;
-+		case AF_INET6:
- 			newpeer->conf.remote_masklen = 128;
-+			break;
- 		}
- 		newpeer->conf.template = 0;
- 		newpeer->conf.cloned = 1;
- 		newpeer->state = newpeer->prev_state = STATE_NONE;
--		newpeer->conf.reconf_action = RECONF_REINIT;
-+		newpeer->conf.reconf_action = RECONF_KEEP;
- 		newpeer->rbuf = NULL;
- 		init_peer(newpeer);
- 		bgp_fsm(newpeer, EVNT_START);
-@@ -2680,40 +3069,24 @@ getpeerbyip(struct sockaddr *ip)
- }
- 
- int
--session_match_mask(struct peer *p, struct sockaddr *ip)
-+session_match_mask(struct peer *p, struct bgpd_addr *a)
- {
--	int		 i;
- 	in_addr_t	 v4mask;
--	struct in6_addr	*in;
--	struct in6_addr	 mask;
-+	struct in6_addr	 masked;
- 
--	if (p->conf.remote_addr.af == AF_INET) {
-+	switch (p->conf.remote_addr.aid) {
-+	case AID_INET:
- 		v4mask = htonl(prefixlen2mask(p->conf.remote_masklen));
--		if (p->conf.remote_addr.v4.s_addr ==
--		    ((((struct sockaddr_in *)ip)->sin_addr.s_addr) & v4mask))
-+		if (p->conf.remote_addr.v4.s_addr == (a->v4.s_addr & v4mask))
- 			return (1);
--		else
--			return (0);
--	}
--
--	if (p->conf.remote_addr.af == AF_INET6) {
--		bzero(&mask, sizeof(mask));
--		for (i = 0; i < p->conf.remote_masklen / 8; i++)
--			mask.s6_addr[i] = 0xff;
--		i = p->conf.remote_masklen % 8;
--		if (i)
--			mask.s6_addr[p->conf.remote_masklen / 8] = 0xff00 >> i;
--
--		in = &((struct sockaddr_in6 *)ip)->sin6_addr;
--
--		for (i = 0; i < 16; i++)
--			if ((in->s6_addr[i] & mask.s6_addr[i]) !=
--			    p->conf.remote_addr.addr8[i])
--				return (0);
-+		return (0);
-+	case AID_INET6:
-+		inet6applymask(&masked, &a->v6, p->conf.remote_masklen);
- 
--		return (1);
-+		if (!memcmp(&masked, &p->conf.remote_addr.v6, sizeof(masked)))
-+			return (1);
-+		return (0);
- 	}
--
- 	return (0);
- }
- 
-@@ -2733,6 +3106,7 @@ getpeerbyid(u_int32_t peerid)
- void
- session_down(struct peer *peer)
- {
-+	bzero(&peer->capa.neg, sizeof(peer->capa.neg));
- 	peer->stats.last_updown = time(NULL);
- 	if (imsg_compose(ibuf_rde, IMSG_SESSION_DOWN, peer->conf.id, 0, -1,
- 	    NULL, 0) == -1)
-@@ -2744,39 +3118,17 @@ session_up(struct peer *p)
- {
- 	struct session_up	 sup;
- 
--	if (imsg_compose(ibuf_rde, IMSG_SESSION_ADD, p->conf.id, 0, -1,
--	    &p->conf, sizeof(p->conf)) == -1)
--		fatalx("imsg_compose error");
-+	if (!session_graceful_is_restarting(p))
-+		if (imsg_compose(ibuf_rde, IMSG_SESSION_ADD, p->conf.id, 0, -1,
-+		    &p->conf, sizeof(p->conf)) == -1)
-+			fatalx("imsg_compose error");
- 
--	switch (p->sa_local.ss_family) {
--	case AF_INET:
--		sup.local_addr.af = AF_INET;
--		memcpy(&sup.local_addr.v4,
--		    &((struct sockaddr_in *)&p->sa_local)->sin_addr,
--		    sizeof(sup.local_addr.v4));
--		sup.remote_addr.af = AF_INET;
--		memcpy(&sup.remote_addr.v4,
--		    &((struct sockaddr_in *)&p->sa_remote)->sin_addr,
--		    sizeof(sup.remote_addr.v4));
--		break;
--	case AF_INET6:
--		sup.local_addr.af = AF_INET6;
--		memcpy(&sup.local_addr.v6,
--		    &((struct sockaddr_in6 *)&p->sa_local)->sin6_addr,
--		    sizeof(sup.local_addr.v6));
--		sup.remote_addr.af = AF_INET6;
--		memcpy(&sup.remote_addr.v6,
--		    &((struct sockaddr_in6 *)&p->sa_remote)->sin6_addr,
--		    sizeof(sup.remote_addr.v6));
--		break;
--	default:
--		fatalx("session_up: unsupported address family");
--	}
-+	sa2addr((struct sockaddr *)&p->sa_local, &sup.local_addr);
-+	sa2addr((struct sockaddr *)&p->sa_remote, &sup.remote_addr);
- 
- 	sup.remote_bgpid = p->remote_bgpid;
- 	sup.short_as = p->short_as;
--	memcpy(&sup.capa_announced, &p->capa.ann, sizeof(sup.capa_announced));
--	memcpy(&sup.capa_received, &p->capa.peer, sizeof(sup.capa_received));
-+	memcpy(&sup.capa, &p->capa.neg, sizeof(sup.capa));
- 	p->stats.last_updown = time(NULL);
- 	if (imsg_compose(ibuf_rde, IMSG_SESSION_UP, p->conf.id, 0, -1,
- 	    &sup, sizeof(sup)) == -1)
-@@ -2784,9 +3136,10 @@ session_up(struct peer *p)
- }
- 
- int
--imsg_compose_parent(int type, pid_t pid, void *data, u_int16_t datalen)
-+imsg_compose_parent(int type, u_int32_t peerid, pid_t pid, void *data,
-+    u_int16_t datalen)
- {
--	return (imsg_compose(ibuf_main, type, 0, pid, -1, data, datalen));
-+	return (imsg_compose(ibuf_main, type, peerid, pid, -1, data, datalen));
- }
- 
- int
-@@ -2795,34 +3148,6 @@ imsg_compose_rde(int type, pid_t pid, vo
- 	return (imsg_compose(ibuf_rde, type, 0, pid, -1, data, datalen));
- }
- 
--static struct sockaddr *
--addr2sa(struct bgpd_addr *addr, u_int16_t port)
--{
--	static struct sockaddr_storage	 ss;
--	struct sockaddr_in		*sa_in = (struct sockaddr_in *)&ss;
--	struct sockaddr_in6		*sa_in6 = (struct sockaddr_in6 *)&ss;
--
--	bzero(&ss, sizeof(ss));
--	switch (addr->af) {
--	case AF_INET:
--		sa_in->sin_family = AF_INET;
--		sa_in->sin_len = sizeof(struct sockaddr_in);
--		sa_in->sin_addr.s_addr = addr->v4.s_addr;
--		sa_in->sin_port = htons(port);
--		break;
--	case AF_INET6:
--		sa_in6->sin6_family = AF_INET6;
--		sa_in6->sin6_len = sizeof(struct sockaddr_in6);
--		memcpy(&sa_in6->sin6_addr, &addr->v6,
--		    sizeof(sa_in6->sin6_addr));
--		sa_in6->sin6_port = htons(port);
--		sa_in6->sin6_scope_id = addr->scope_id;
--		break;
--	}
--
--	return ((struct sockaddr *)&ss);
--}
--
- void
- session_demote(struct peer *p, int level)
- {
-@@ -2837,3 +3162,19 @@ session_demote(struct peer *p, int level
- 
- 	p->demoted += level;
- }
-+
-+void
-+session_stop(struct peer *peer, u_int8_t subcode)
-+{
-+	switch (peer->state) {
-+	case STATE_OPENSENT:
-+	case STATE_OPENCONFIRM:
-+	case STATE_ESTABLISHED:
-+		session_notification(peer, ERR_CEASE, subcode, NULL, 0);
-+		break;
-+	default:
-+		/* session not open, no need to send notification */
-+		break;
-+	}
-+	bgp_fsm(peer, EVNT_STOP);
-+}
diff --git a/net/openbgpd/files/patch-bgpd_session.h b/net/openbgpd/files/patch-bgpd_session.h
deleted file mode 100644
index 6ffbd79abd1f..000000000000
--- a/net/openbgpd/files/patch-bgpd_session.h
+++ /dev/null
@@ -1,188 +0,0 @@
-Index: bgpd/session.h
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/session.h,v
-retrieving revision 1.1.1.7
-retrieving revision 1.1.1.10
-diff -u -p -r1.1.1.7 -r1.1.1.10
---- bgpd/session.h	14 Feb 2010 20:19:57 -0000	1.1.1.7
-+++ bgpd/session.h	13 Oct 2012 18:22:50 -0000	1.1.1.10
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: session.h,v 1.101 2009/06/05 20:26:38 claudio Exp $ */
-+/*	$OpenBSD: session.h,v 1.113 2012/04/12 17:26:09 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -94,6 +94,13 @@ enum suberr_open {
- 	ERR_OPEN_CAPA
- };
- 
-+enum suberr_fsm {
-+	ERR_FSM_UNSPECIFIC = 0,
-+	ERR_FSM_UNEX_OPENSENT,
-+	ERR_FSM_UNEX_OPENCONFIRM,
-+	ERR_FSM_UNEX_ESTABLISHED
-+};
-+
- enum opt_params {
- 	OPT_PARAM_NONE,
- 	OPT_PARAM_AUTH,
-@@ -109,7 +116,7 @@ enum capa_codes {
- };
- 
- struct bgp_msg {
--	struct buf	*buf;
-+	struct ibuf	*buf;
- 	enum msg_type	 type;
- 	u_int16_t	 len;
- };
-@@ -155,8 +162,10 @@ struct peer_stats {
- 	u_int64_t		 msg_sent_rrefresh;
- 	u_int64_t		 prefix_rcvd_update;
- 	u_int64_t		 prefix_rcvd_withdraw;
-+	u_int64_t		 prefix_rcvd_eor;
- 	u_int64_t		 prefix_sent_update;
- 	u_int64_t		 prefix_sent_withdraw;
-+	u_int64_t		 prefix_sent_eor;
- 	time_t			 last_updown;
- 	time_t			 last_read;
- 	u_int32_t		 prefix_cnt;
-@@ -172,6 +181,7 @@ enum Timer {
- 	Timer_IdleHold,
- 	Timer_IdleHoldReset,
- 	Timer_CarpUndemote,
-+	Timer_RestartTimeout,
- 	Timer_Max
- };
- 
-@@ -189,6 +199,7 @@ struct peer {
- 	struct {
- 		struct capabilities	ann;
- 		struct capabilities	peer;
-+		struct capabilities	neg;
- 	}			 capa;
- 	struct {
- 		struct bgpd_addr	local_addr;
-@@ -201,7 +212,7 @@ struct peer {
- 	struct sockaddr_storage	 sa_remote;
- 	struct peer_timer_head	 timers;
- 	struct msgbuf		 wbuf;
--	struct buf_read		*rbuf;
-+	struct ibuf_read	*rbuf;
- 	struct peer		*next;
- 	int			 fd;
- 	int			 lasterr;
-@@ -217,47 +228,25 @@ struct peer {
- 	u_int8_t		 passive;
- };
- 
--struct peer	*peers;
-+extern struct peer	*peers;
-+extern time_t		 pauseaccept;
- 
- struct ctl_timer {
- 	enum Timer	type;
- 	time_t		val;
- };
- 
--/* session.c */
--void		 session_socket_blockmode(int, enum blockmodes);
--pid_t		 session_main(struct bgpd_config *, struct peer *,
--		    struct network_head *, struct filter_head *,
--		    struct mrt_head *, struct rib_names *,
--		    int[2], int[2], int[2], int[2]);
--void		 bgp_fsm(struct peer *, enum session_events);
--int		 session_neighbor_rrefresh(struct peer *p);
--struct peer	*getpeerbyaddr(struct bgpd_addr *);
--struct peer	*getpeerbydesc(const char *);
--int		 imsg_compose_parent(int, pid_t, void *, u_int16_t);
--int		 imsg_compose_rde(int, pid_t, void *, u_int16_t);
--
--/* log.c */
--char		*log_fmt_peer(const struct peer_config *);
--void		 log_statechange(struct peer *, enum session_state,
--		    enum session_events);
--void		 log_notification(const struct peer *, u_int8_t, u_int8_t,
--		    u_char *, u_int16_t);
--void		 log_conn_attempt(const struct peer *, struct sockaddr *);
--
--/* parse.y */
--int	 parse_config(char *, struct bgpd_config *, struct mrt_head *,
--	    struct peer **, struct network_head *, struct filter_head *);
-+/* carp.c */
-+int	 carp_demote_init(char *, int);
-+void	 carp_demote_shutdown(void);
-+int	 carp_demote_get(char *);
-+int	 carp_demote_set(char *, int);
- 
- /* config.c */
- int	 merge_config(struct bgpd_config *, struct bgpd_config *,
- 	    struct peer *, struct listen_addrs *);
- void	 prepare_listeners(struct bgpd_config *);
--
--/* rde.c */
--pid_t	 rde_main(struct bgpd_config *, struct peer *, struct network_head *,
--	    struct filter_head *, struct mrt_head *, struct rib_names *,
--	    int[2], int[2], int[2], int[2], int);
-+int	 get_mpe_label(struct rdomain *);
- 
- /* control.c */
- int	control_init(int, char *);
-@@ -266,7 +255,27 @@ void	control_shutdown(int);
- int	control_dispatch_msg(struct pollfd *, u_int *);
- unsigned int	control_accept(int, int);
- 
-+/* log.c */
-+char		*log_fmt_peer(const struct peer_config *);
-+void		 log_statechange(struct peer *, enum session_state,
-+		    enum session_events);
-+void		 log_notification(const struct peer *, u_int8_t, u_int8_t,
-+		    u_char *, u_int16_t, const char *);
-+void		 log_conn_attempt(const struct peer *, struct sockaddr *);
-+
-+/* mrt.c */
-+void		 mrt_dump_bgp_msg(struct mrt *, void *, u_int16_t,
-+		     struct peer *);
-+void		 mrt_dump_state(struct mrt *, u_int16_t, u_int16_t,
-+		     struct peer *);
-+
-+/* parse.y */
-+int	 parse_config(char *, struct bgpd_config *, struct mrt_head *,
-+	    struct peer **, struct network_head *, struct filter_head *,
-+	    struct rdomain_head *);
-+
- /* pfkey.c */
-+int	pfkey_read(int, struct sadb_msg *);
- int	pfkey_establish(struct peer *);
- int	pfkey_remove(struct peer *);
- int	pfkey_init(struct bgpd_sysdep *);
-@@ -274,15 +283,24 @@ int	pfkey_init(struct bgpd_sysdep *);
- /* printconf.c */
- void	print_config(struct bgpd_config *, struct rib_names *,
- 	    struct network_head *, struct peer *, struct filter_head *,
--	    struct mrt_head *);
-+	    struct mrt_head *, struct rdomain_head *);
- 
--/* carp.c */
--int	 carp_demote_init(char *, int);
--void	 carp_demote_shutdown(void);
--int	 carp_demote_get(char *);
--int	 carp_demote_set(char *, int);
-+/* rde.c */
-+pid_t	 rde_main(int[2], int[2], int[2], int[2], int);
-+
-+/* session.c */
-+void		 session_socket_blockmode(int, enum blockmodes);
-+pid_t		 session_main(int[2], int[2], int[2], int[2]);
-+void		 bgp_fsm(struct peer *, enum session_events);
-+int		 session_neighbor_rrefresh(struct peer *p);
-+struct peer	*getpeerbyaddr(struct bgpd_addr *);
-+struct peer	*getpeerbydesc(const char *);
-+int		 imsg_compose_parent(int, u_int32_t, pid_t, void *, u_int16_t);
-+int		 imsg_compose_rde(int, pid_t, void *, u_int16_t);
-+void	 	 session_stop(struct peer *, u_int8_t);
- 
- /* timer.c */
-+time_t			 getmonotime(void);
- struct peer_timer	*timer_get(struct peer *, enum Timer);
- struct peer_timer	*timer_nextisdue(struct peer *);
- time_t			 timer_nextduein(struct peer *);
diff --git a/net/openbgpd/files/patch-bgpd_timer.c b/net/openbgpd/files/patch-bgpd_timer.c
deleted file mode 100644
index 1238897b94fa..000000000000
--- a/net/openbgpd/files/patch-bgpd_timer.c
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: bgpd/timer.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/timer.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.1.1.4
-diff -u -p -r1.1.1.2 -r1.1.1.4
---- bgpd/timer.c	9 Jul 2009 16:49:54 -0000	1.1.1.2
-+++ bgpd/timer.c	13 Oct 2012 18:22:50 -0000	1.1.1.4
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: timer.c,v 1.13 2009/01/21 20:32:53 henning Exp $ */
-+/*	$OpenBSD: timer.c,v 1.14 2010/10/24 17:20:08 deraadt Exp $ */
- 
- /*
-  * Copyright (c) 2003-2007 Henning Brauer <henning@openbsd.org>
-@@ -23,8 +23,6 @@
- #include "bgpd.h"
- #include "session.h"
- 
--time_t	getmonotime(void);
--
- time_t
- getmonotime(void)
- {
-@@ -43,7 +41,7 @@ timer_get(struct peer *p, enum Timer tim
- 
- 	TAILQ_FOREACH(pt, &p->timers, entry)
- 		if (pt->type == timer)
--				break;
-+			break;
- 
- 	return (pt);
- }
diff --git a/net/openbgpd/files/patch-bgpd_util.c b/net/openbgpd/files/patch-bgpd_util.c
deleted file mode 100644
index 54e74ec9805f..000000000000
--- a/net/openbgpd/files/patch-bgpd_util.c
+++ /dev/null
@@ -1,440 +0,0 @@
-Index: bgpd/util.c
-===================================================================
-RCS file: /home/cvs/private/hrs/openbgpd/bgpd/util.c,v
-retrieving revision 1.1.1.6
-retrieving revision 1.7
-diff -u -p -r1.1.1.6 -r1.7
---- bgpd/util.c	14 Feb 2010 20:19:57 -0000	1.1.1.6
-+++ bgpd/util.c	13 Oct 2012 18:36:00 -0000	1.7
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: util.c,v 1.6 2009/06/12 16:42:53 claudio Exp $ */
-+/*	$OpenBSD: util.c,v 1.11 2010/03/29 09:04:43 claudio Exp $ */
- 
- /*
-  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
-@@ -18,6 +18,9 @@
-  */
- #include <sys/types.h>
- #include <sys/socket.h>
-+#if defined(__FreeBSD__)	/* sys/limits.h */
-+#include <sys/limits.h>
-+#endif /* defined(__FreeBSD__) */
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-@@ -28,15 +31,30 @@
- #include "bgpd.h"
- #include "rde.h"
- 
-+const char	*aspath_delim(u_int8_t, int);
-+
- const char *
- log_addr(const struct bgpd_addr *addr)
- {
- 	static char	buf[48];
-+	char		tbuf[16];
- 
--	if (inet_ntop(addr->af, &addr->ba, buf, sizeof(buf)) == NULL)
--		return ("?");
--	else
-+	switch (addr->aid) {
-+	case AID_INET:
-+	case AID_INET6:
-+		if (inet_ntop(aid2af(addr->aid), &addr->ba, buf,
-+		    sizeof(buf)) == NULL)
-+			return ("?");
- 		return (buf);
-+	case AID_VPN_IPv4:
-+		if (inet_ntop(AF_INET, &addr->vpn4.addr, tbuf,
-+		    sizeof(tbuf)) == NULL)
-+			return ("?");
-+		snprintf(buf, sizeof(buf), "%s %s", log_rd(addr->vpn4.rd),
-+		   tbuf);
-+		return (buf);
-+	}
-+	return ("???");
- }
- 
- const char *
-@@ -90,6 +108,96 @@ log_as(u_int32_t as)
- 	return (buf);
- }
- 
-+const char *
-+log_rd(u_int64_t rd)
-+{
-+	static char	buf[32];
-+	struct in_addr	addr;
-+	u_int32_t	u32;
-+	u_int16_t	u16;
-+
-+	rd = betoh64(rd);
-+	switch (rd >> 48) {
-+	case EXT_COMMUNITY_TWO_AS:
-+		u32 = rd & 0xffffffff;
-+		u16 = (rd >> 32) & 0xffff;
-+		snprintf(buf, sizeof(buf), "rd %i:%i", u16, u32);
-+		break;
-+	case EXT_COMMUNITY_FOUR_AS:
-+		u32 = (rd >> 16) & 0xffffffff;
-+		u16 = rd & 0xffff;
-+		snprintf(buf, sizeof(buf), "rd %s:%i", log_as(u32), u16);
-+		break;
-+	case EXT_COMMUNITY_IPV4:
-+		u32 = (rd >> 16) & 0xffffffff;
-+		u16 = rd & 0xffff;
-+		addr.s_addr = htonl(u32);
-+		snprintf(buf, sizeof(buf), "rd %s:%i", inet_ntoa(addr), u16);
-+		break;
-+	default:
-+		return ("rd ?");
-+	}
-+	return (buf);
-+}
-+
-+/* NOTE: this function does not check if the type/subtype combo is
-+ * actually valid. */
-+const char *
-+log_ext_subtype(u_int8_t subtype)
-+{
-+	static char etype[6];
-+
-+	switch (subtype) {
-+	case EXT_COMMUNITY_ROUTE_TGT:
-+		return ("rt");	/* route target */
-+	case EXT_CUMMUNITY_ROUTE_ORIG:
-+		return ("soo");	/* source of origin */
-+	case EXT_COMMUNITY_OSPF_DOM_ID:
-+		return ("odi");	/* ospf domain id */
-+	case EXT_COMMUNITY_OSPF_RTR_TYPE:
-+		return ("ort");	/* ospf route type */
-+	case EXT_COMMUNITY_OSPF_RTR_ID:
-+		return ("ori");	/* ospf router id */
-+	case EXT_COMMUNITY_BGP_COLLECT:
-+		return ("bdc");	/* bgp data collection */
-+	default:
-+		snprintf(etype, sizeof(etype), "[%u]", subtype);
-+		return (etype);
-+	}
-+}
-+
-+const char *
-+aspath_delim(u_int8_t seg_type, int closing)
-+{
-+	static char db[8];
-+
-+	switch (seg_type) {
-+	case AS_SET:
-+		if (!closing)
-+			return ("{ ");
-+		else
-+			return (" }");
-+	case AS_SEQUENCE:
-+		return ("");
-+	case AS_CONFED_SEQUENCE:
-+		if (!closing)
-+			return ("( ");
-+		else
-+			return (" )");
-+	case AS_CONFED_SET:
-+		if (!closing)
-+			return ("[ ");
-+		else
-+			return (" ]");
-+	default:
-+		if (!closing)
-+			snprintf(db, sizeof(db), "!%u ", seg_type);
-+		else
-+			snprintf(db, sizeof(db), " !%u", seg_type);
-+		return (db);
-+	}
-+}
-+
- int
- aspath_snprint(char *buf, size_t size, void *data, u_int16_t len)
- {
-@@ -118,16 +226,10 @@ aspath_snprint(char *buf, size_t size, v
- 		seg_len = seg[1];
- 		seg_size = 2 + sizeof(u_int32_t) * seg_len;
- 
--		if (seg_type == AS_SET) {
--			if (total_size != 0)
--				r = snprintf(buf, size, " { ");
--			else
--				r = snprintf(buf, size, "{ ");
--			UPDATE();
--		} else if (total_size != 0) {
--			r = snprintf(buf, size, " ");
--			UPDATE();
--		}
-+		r = snprintf(buf, size, "%s%s",
-+		    total_size != 0 ? " " : "",
-+		    aspath_delim(seg_type, 0));
-+		UPDATE();
- 
- 		for (i = 0; i < seg_len; i++) {
- 			r = snprintf(buf, size, "%s",
-@@ -138,10 +240,8 @@ aspath_snprint(char *buf, size_t size, v
- 				UPDATE();
- 			}
- 		}
--		if (seg_type == AS_SET) {
--			r = snprintf(buf, size, " }");
--			UPDATE();
--		}
-+		r = snprintf(buf, size, "%s", aspath_delim(seg_type, 1));
-+		UPDATE();
- 	}
- 	/* ensure that we have a valid C-string especially for empty as path */
- 	if (size > 0)
-@@ -235,6 +335,67 @@ aspath_strlen(void *data, u_int16_t len)
- 	return (total_size);
- }
- 
-+/* we need to be able to search more than one as */
-+int
-+aspath_match(void *data, u_int16_t len, enum as_spec type, u_int32_t as)
-+{
-+	u_int8_t	*seg;
-+	int		 final;
-+	u_int16_t	 seg_size;
-+	u_int8_t	 i, seg_type, seg_len;
-+
-+	if (type == AS_EMPTY) {
-+		if (len == 0)
-+			return (1);
-+		else
-+			return (0);
-+	}
-+
-+	final = 0;
-+	seg = data;
-+	for (; len > 0; len -= seg_size, seg += seg_size) {
-+		seg_type = seg[0];
-+		seg_len = seg[1];
-+		seg_size = 2 + sizeof(u_int32_t) * seg_len;
-+
-+		final = (len == seg_size);
-+
-+		/* just check the first (leftmost) AS */
-+		if (type == AS_PEER) {
-+			if (as == aspath_extract(seg, 0))
-+				return (1);
-+			else
-+				return (0);
-+		}
-+		/* just check the final (rightmost) AS */
-+		if (type == AS_SOURCE) {
-+			/* not yet in the final segment */
-+			if (!final)
-+				continue;
-+
-+			if (as == aspath_extract(seg, seg_len - 1))
-+				return (1);
-+			else
-+				return (0);
-+		}
-+
-+		/* AS_TRANSIT or AS_ALL */
-+		for (i = 0; i < seg_len; i++) {
-+			if (as == aspath_extract(seg, i)) {
-+				/*
-+				 * the source (rightmost) AS is excluded from
-+				 * AS_TRANSIT matches.
-+				 */
-+				if (final && i == seg_len - 1 &&
-+				    type == AS_TRANSIT)
-+					return (0);
-+				return (1);
-+			}
-+		}
-+	}
-+	return (0);
-+}
-+
- /*
-  * Extract the asnum out of the as segment at the specified position.
-  * Direct access is not possible because of non-aligned reads.
-@@ -251,6 +412,66 @@ aspath_extract(const void *seg, int pos)
- 	return (ntohl(as));
- }
- 
-+int
-+prefix_compare(const struct bgpd_addr *a, const struct bgpd_addr *b,
-+    int prefixlen)
-+{
-+	in_addr_t	mask, aa, ba;
-+	int		i;
-+	u_int8_t	m;
-+
-+	if (a->aid != b->aid)
-+		return (a->aid - b->aid);
-+
-+	switch (a->aid) {
-+	case AID_INET:
-+		if (prefixlen > 32)
-+			fatalx("prefix_cmp: bad IPv4 prefixlen");
-+		mask = htonl(prefixlen2mask(prefixlen));
-+		aa = ntohl(a->v4.s_addr & mask);
-+		ba = ntohl(b->v4.s_addr & mask);
-+		if (aa != ba)
-+			return (aa - ba);
-+		return (0);
-+	case AID_INET6:
-+		if (prefixlen > 128)
-+			fatalx("prefix_cmp: bad IPv6 prefixlen");
-+		for (i = 0; i < prefixlen / 8; i++)
-+			if (a->v6.s6_addr[i] != b->v6.s6_addr[i])
-+				return (a->v6.s6_addr[i] - b->v6.s6_addr[i]);
-+		i = prefixlen % 8;
-+		if (i) {
-+			m = 0xff00 >> i;
-+			if ((a->v6.s6_addr[prefixlen / 8] & m) !=
-+			    (b->v6.s6_addr[prefixlen / 8] & m))
-+				return ((a->v6.s6_addr[prefixlen / 8] & m) -
-+				    (b->v6.s6_addr[prefixlen / 8] & m));
-+		}
-+		return (0);
-+	case AID_VPN_IPv4:
-+		if (prefixlen > 32)
-+			fatalx("prefix_cmp: bad IPv4 VPN prefixlen");
-+		if (betoh64(a->vpn4.rd) > betoh64(b->vpn4.rd))
-+			return (1);
-+		if (betoh64(a->vpn4.rd) < betoh64(b->vpn4.rd))
-+			return (-1);
-+		mask = htonl(prefixlen2mask(prefixlen));
-+		aa = ntohl(a->vpn4.addr.s_addr & mask);
-+		ba = ntohl(b->vpn4.addr.s_addr & mask);
-+		if (aa != ba)
-+			return (aa - ba);
-+		if (a->vpn4.labellen > b->vpn4.labellen)
-+			return (1);
-+		if (a->vpn4.labellen < b->vpn4.labellen)
-+			return (-1);
-+		return (memcmp(a->vpn4.labelstack, b->vpn4.labelstack,
-+		    a->vpn4.labellen));
-+	default:
-+		fatalx("prefix_cmp: unknown af");
-+	}
-+	return (-1);
-+}
-+
- in_addr_t
- prefixlen2mask(u_int8_t prefixlen)
- {
-@@ -276,3 +497,115 @@ inet6applymask(struct in6_addr *dest, co
- 	for (i = 0; i < 16; i++)
- 		dest->s6_addr[i] = src->s6_addr[i] & mask.s6_addr[i];
- }
-+
-+/* address family translation functions */
-+const struct aid aid_vals[AID_MAX] = AID_VALS;
-+
-+const char *
-+aid2str(u_int8_t aid)
-+{
-+	if (aid < AID_MAX)
-+		return (aid_vals[aid].name);
-+	return ("unknown AID");
-+}
-+
-+int
-+aid2afi(u_int8_t aid, u_int16_t *afi, u_int8_t *safi)
-+{
-+	if (aid < AID_MAX) {
-+		*afi = aid_vals[aid].afi;
-+		*safi = aid_vals[aid].safi;
-+		return (0);
-+	}
-+	return (-1);
-+}
-+
-+int
-+afi2aid(u_int16_t afi, u_int8_t safi, u_int8_t *aid)
-+{
-+	u_int8_t i;
-+
-+	for (i = 0; i < AID_MAX; i++)
-+		if (aid_vals[i].afi == afi && aid_vals[i].safi == safi) {
-+			*aid = i;
-+			return (0);
-+		}
-+
-+	return (-1);
-+}
-+
-+sa_family_t
-+aid2af(u_int8_t aid)
-+{
-+	if (aid < AID_MAX)
-+		return (aid_vals[aid].af);
-+	return (AF_UNSPEC);
-+}
-+
-+int
-+af2aid(sa_family_t af, u_int8_t safi, u_int8_t *aid)
-+{
-+	u_int8_t i;
-+
-+	if (safi == 0) /* default to unicast subclass */
-+		safi = SAFI_UNICAST;
-+
-+	for (i = 0; i < AID_MAX; i++)
-+		if (aid_vals[i].af == af && aid_vals[i].safi == safi) {
-+			*aid = i;
-+			return (0);
-+		}
-+
-+	return (-1);
-+}
-+
-+struct sockaddr *
-+addr2sa(struct bgpd_addr *addr, u_int16_t port)
-+{
-+	static struct sockaddr_storage	 ss;
-+	struct sockaddr_in		*sa_in = (struct sockaddr_in *)&ss;
-+	struct sockaddr_in6		*sa_in6 = (struct sockaddr_in6 *)&ss;
-+
-+	if (addr->aid == AID_UNSPEC)
-+		return (NULL);
-+
-+	bzero(&ss, sizeof(ss));
-+	switch (addr->aid) {
-+	case AID_INET:
-+		sa_in->sin_family = AF_INET;
-+		sa_in->sin_len = sizeof(struct sockaddr_in);
-+		sa_in->sin_addr.s_addr = addr->v4.s_addr;
-+		sa_in->sin_port = htons(port);
-+		break;
-+	case AID_INET6:
-+		sa_in6->sin6_family = AF_INET6;
-+		sa_in6->sin6_len = sizeof(struct sockaddr_in6);
-+		memcpy(&sa_in6->sin6_addr, &addr->v6,
-+		    sizeof(sa_in6->sin6_addr));
-+		sa_in6->sin6_port = htons(port);
-+		sa_in6->sin6_scope_id = addr->scope_id;
-+		break;
-+	}
-+
-+	return ((struct sockaddr *)&ss);
-+}
-+
-+void
-+sa2addr(struct sockaddr *sa, struct bgpd_addr *addr)
-+{
-+	struct sockaddr_in		*sa_in = (struct sockaddr_in *)sa;
-+	struct sockaddr_in6		*sa_in6 = (struct sockaddr_in6 *)sa;
-+
-+	bzero(addr, sizeof(*addr));
-+	switch (sa->sa_family) {
-+	case AF_INET:
-+		addr->aid = AID_INET;
-+		memcpy(&addr->v4, &sa_in->sin_addr, sizeof(addr->v4));
-+		break;
-+	case AF_INET6:
-+		addr->aid = AID_INET6;
-+		memcpy(&addr->v6, &sa_in6->sin6_addr, sizeof(addr->v6));
-+		addr->scope_id = sa_in6->sin6_scope_id; /* I hate v6 */
-+		break;
-+	}
-+}
diff --git a/net/openbgpd/files/patch-openbsd-compat_fmt_scaled.c b/net/openbgpd/files/patch-openbsd-compat_fmt_scaled.c
deleted file mode 100644
index 65407211cbc8..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_fmt_scaled.c
+++ /dev/null
@@ -1,275 +0,0 @@
-Index: openbsd-compat/fmt_scaled.c
-===================================================================
-RCS file: openbsd-compat/fmt_scaled.c
-diff -N openbsd-compat/fmt_scaled.c
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/fmt_scaled.c	30 Jun 2009 06:40:07 -0000	1.1
-@@ -0,0 +1,268 @@
-+/*	$OpenBSD: fmt_scaled.c,v 1.9 2007/03/20 03:42:52 tedu Exp $	*/
-+
-+/*
-+ * Copyright (c) 2001, 2002, 2003 Ian F. Darwin.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * fmt_scaled: Format numbers scaled for human comprehension
-+ * scan_scaled: Scan numbers in this format.
-+ *
-+ * "Human-readable" output uses 4 digits max, and puts a unit suffix at
-+ * the end.  Makes output compact and easy-to-read esp. on huge disks.
-+ * Formatting code was originally in OpenBSD "df", converted to library routine.
-+ * Scanning code written for OpenBSD libutil.
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <limits.h>
-+
-+#include "util.h"
-+
-+typedef enum {
-+	NONE = 0, KILO = 1, MEGA = 2, GIGA = 3, TERA = 4, PETA = 5, EXA = 6
-+} unit_type;
-+
-+/* These three arrays MUST be in sync!  XXX make a struct */
-+static unit_type units[] = { NONE, KILO, MEGA, GIGA, TERA, PETA, EXA };
-+static char scale_chars[] = "BKMGTPE";
-+static long long scale_factors[] = {
-+	1LL,
-+	1024LL,
-+	1024LL*1024,
-+	1024LL*1024*1024,
-+	1024LL*1024*1024*1024,
-+	1024LL*1024*1024*1024*1024,
-+	1024LL*1024*1024*1024*1024*1024,
-+};
-+#define	SCALE_LENGTH (sizeof(units)/sizeof(units[0]))
-+
-+#define MAX_DIGITS (SCALE_LENGTH * 3)	/* XXX strlen(sprintf("%lld", -1)? */
-+
-+/** Convert the given input string "scaled" into numeric in "result".
-+ * Return 0 on success, -1 and errno set on error.
-+ */
-+int
-+scan_scaled(char *scaled, long long *result)
-+{
-+	char *p = scaled;
-+	int sign = 0;
-+	unsigned int i, ndigits = 0, fract_digits = 0;
-+	long long scale_fact = 1, whole = 0, fpart = 0;
-+
-+	/* Skip leading whitespace */
-+	while (isascii(*p) && isspace(*p))
-+		++p;
-+
-+	/* Then at most one leading + or - */
-+	while (*p == '-' || *p == '+') {
-+		if (*p == '-') {
-+			if (sign) {
-+				errno = EINVAL;
-+				return -1;
-+			}
-+			sign = -1;
-+			++p;
-+		} else if (*p == '+') {
-+			if (sign) {
-+				errno = EINVAL;
-+				return -1;
-+			}
-+			sign = +1;
-+			++p;
-+		}
-+	}
-+
-+	/* Main loop: Scan digits, find decimal point, if present.
-+	 * We don't allow exponentials, so no scientific notation
-+	 * (but note that E for Exa might look like e to some!).
-+	 * Advance 'p' to end, to get scale factor.
-+	 */
-+	for (; isascii(*p) && (isdigit(*p) || *p=='.'); ++p) {
-+		if (*p == '.') {
-+			if (fract_digits > 0) {	/* oops, more than one '.' */
-+				errno = EINVAL;
-+				return -1;
-+			}
-+			fract_digits = 1;
-+			continue;
-+		}
-+
-+		i = (*p) - '0';			/* whew! finally a digit we can use */
-+		if (fract_digits > 0) {
-+			if (fract_digits >= MAX_DIGITS-1)
-+				/* ignore extra fractional digits */
-+				continue;
-+			fract_digits++;		/* for later scaling */
-+			fpart *= 10;
-+			fpart += i;
-+		} else {				/* normal digit */
-+			if (++ndigits >= MAX_DIGITS) {
-+				errno = ERANGE;
-+				return -1;
-+			}
-+			whole *= 10;
-+			whole += i;
-+		}
-+	}
-+
-+	if (sign) {
-+		whole *= sign;
-+		fpart *= sign;
-+	}
-+
-+	/* If no scale factor given, we're done. fraction is discarded. */
-+	if (!*p) {
-+		*result = whole;
-+		return 0;
-+	}
-+
-+	/* Validate scale factor, and scale whole and fraction by it. */
-+	for (i = 0; i < SCALE_LENGTH; i++) {
-+
-+		/** Are we there yet? */
-+		if (*p == scale_chars[i] ||
-+			*p == tolower(scale_chars[i])) {
-+
-+			/* If it ends with alphanumerics after the scale char, bad. */
-+			if (isalnum(*(p+1))) {
-+				errno = EINVAL;
-+				return -1;
-+			}
-+			scale_fact = scale_factors[i];
-+
-+			/* scale whole part */
-+			whole *= scale_fact;
-+
-+			/* truncate fpart so it does't overflow.
-+			 * then scale fractional part.
-+			 */
-+			while (fpart >= LLONG_MAX / scale_fact) {
-+				fpart /= 10;
-+				fract_digits--;
-+			}
-+			fpart *= scale_fact;
-+			if (fract_digits > 0) {
-+				for (i = 0; i < fract_digits -1; i++)
-+					fpart /= 10;
-+			}
-+			whole += fpart;
-+			*result = whole;
-+			return 0;
-+		}
-+	}
-+	errno = ERANGE;
-+	return -1;
-+}
-+
-+/* Format the given "number" into human-readable form in "result".
-+ * Result must point to an allocated buffer of length FMT_SCALED_STRSIZE.
-+ * Return 0 on success, -1 and errno set if error.
-+ */
-+int
-+fmt_scaled(long long number, char *result)
-+{
-+	long long abval, fract = 0;
-+	unsigned int i;
-+	unit_type unit = NONE;
-+
-+	abval = (number < 0LL) ? -number : number;	/* no long long_abs yet */
-+
-+	/* Not every negative long long has a positive representation.
-+	 * Also check for numbers that are just too darned big to format
-+	 */
-+	if (abval < 0 || abval / 1024 >= scale_factors[SCALE_LENGTH-1]) {
-+		errno = ERANGE;
-+		return -1;
-+	}
-+
-+	/* scale whole part; get unscaled fraction */
-+	for (i = 0; i < SCALE_LENGTH; i++) {
-+		if (abval/1024 < scale_factors[i]) {
-+			unit = units[i];
-+			fract = (i == 0) ? 0 : abval % scale_factors[i];
-+			number /= scale_factors[i];
-+			if (i > 0)
-+				fract /= scale_factors[i - 1];
-+			break;
-+		}
-+	}
-+
-+	fract = (10 * fract + 512) / 1024;
-+	/* if the result would be >= 10, round main number */
-+	if (fract == 10) {
-+		if (number >= 0)
-+			number++;
-+		else
-+			number--;
-+		fract = 0;
-+	}
-+
-+	if (number == 0)
-+		strlcpy(result, "0B", FMT_SCALED_STRSIZE);
-+	else if (unit == NONE || number >= 100 || number <= -100) {
-+		if (fract >= 5) {
-+			if (number >= 0)
-+				number++;
-+			else
-+				number--;
-+		}
-+		(void)snprintf(result, FMT_SCALED_STRSIZE, "%lld%c",
-+			number, scale_chars[unit]);
-+	} else
-+		(void)snprintf(result, FMT_SCALED_STRSIZE, "%lld.%1lld%c",
-+			number, fract, scale_chars[unit]);
-+
-+	return 0;
-+}
-+
-+#ifdef	MAIN
-+/*
-+ * This is the original version of the program in the man page.
-+ * Copy-and-paste whatever you need from it.
-+ */
-+int
-+main(int argc, char **argv)
-+{
-+	char *cinput = "1.5K", buf[FMT_SCALED_STRSIZE];
-+	long long ninput = 10483892, result;
-+
-+	if (scan_scaled(cinput, &result) == 0)
-+		printf("\"%s\" -> %lld\n", cinput, result);
-+	else
-+		perror(cinput);
-+
-+	if (fmt_scaled(ninput, buf) == 0)
-+		printf("%lld -> \"%s\"\n", ninput, buf);
-+	else
-+		fprintf(stderr, "%lld invalid (%s)\n", ninput, strerror(errno));
-+
-+	return 0;
-+}
-+#endif
diff --git a/net/openbgpd/files/patch-openbsd-compat_hash.h b/net/openbgpd/files/patch-openbsd-compat_hash.h
deleted file mode 100644
index 0ca34733d041..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_hash.h
+++ /dev/null
@@ -1,134 +0,0 @@
-Index: openbsd-compat/hash.h
-===================================================================
-RCS file: openbsd-compat/hash.h
-diff -N openbsd-compat/hash.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/hash.h	30 Jun 2009 05:48:11 -0000	1.1
-@@ -0,0 +1,127 @@
-+/*	$OpenBSD: hash.h,v 1.4 2004/05/25 18:37:23 jmc Exp $	*/
-+
-+/*
-+ * Copyright (c) 2001 Tobias Weingartner
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef _SYS_HASH_H_
-+#define	_SYS_HASH_H_
-+#include <sys/types.h>
-+
-+/*
-+ * Note: SMALL_KERNEL might be used to shrink these, right now I
-+ * do not see the point, as my kernel did not grow appreciably when
-+ * I switched to these from other inline code.  This may have to be
-+ * revisited when/if these functions become more prevalent in the
-+ * kernel.
-+ */
-+
-+/* Convenience */
-+#ifndef	HASHINIT
-+#define	HASHINIT	5381
-+#define	HASHSTEP(x,c)	(((x << 5) + x) + (c))
-+#endif
-+
-+/*
-+ * Return a 32-bit hash of the given buffer.  The init
-+ * value should be 0, or the previous hash value to extend
-+ * the previous hash.
-+ */
-+static __inline uint32_t
-+hash32_buf(const void *buf, size_t len, uint32_t hash)
-+{
-+	const unsigned char *p = buf;
-+
-+	while (len--)
-+		hash = HASHSTEP(hash, *p++);
-+
-+	return hash;
-+}
-+
-+/*
-+ * Return a 32-bit hash of the given string.
-+ */
-+static __inline uint32_t
-+hash32_str(const void *buf, uint32_t hash)
-+{
-+	const unsigned char *p = buf;
-+
-+	while (*p)
-+		hash = HASHSTEP(hash, *p++);
-+
-+	return hash;
-+}
-+
-+/*
-+ * Return a 32-bit hash of the given string, limited by N.
-+ */
-+static __inline uint32_t
-+hash32_strn(const void *buf, size_t len, uint32_t hash)
-+{
-+	const unsigned char *p = buf;
-+
-+	while (*p && len--)
-+		hash = HASHSTEP(hash, *p++);
-+
-+	return hash;
-+}
-+
-+/*
-+ * Return a 32-bit hash of the given string terminated by C,
-+ * (as well as 0).  This is mainly here as a helper for the
-+ * namei() hashing of path name parts.
-+ */
-+static __inline uint32_t
-+hash32_stre(const void *buf, int end, char **ep, uint32_t hash)
-+{
-+	const unsigned char *p = buf;
-+
-+	while (*p && (*p != end))
-+		hash = HASHSTEP(hash, *p++);
-+
-+	if (ep)
-+		*ep = (char *)p;
-+
-+	return hash;
-+}
-+
-+/*
-+ * Return a 32-bit hash of the given string, limited by N,
-+ * and terminated by C (as well as 0).  This is mainly here
-+ * as a helper for the namei() hashing of path name parts.
-+ */
-+static __inline uint32_t
-+hash32_strne(const void *buf, size_t len, int end, char **ep, uint32_t hash)
-+{
-+	const unsigned char *p = buf;
-+
-+	while (*p && (*p != end) && len--)
-+		hash = HASHSTEP(hash, *p++);
-+
-+	if (ep)
-+		*ep = (char *)p;
-+
-+	return hash;
-+}
-+#endif /* !_SYS_HASH_H_ */
diff --git a/net/openbgpd/files/patch-openbsd-compat_if_media.h b/net/openbgpd/files/patch-openbsd-compat_if_media.h
deleted file mode 100644
index ffd56e0cd429..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_if_media.h
+++ /dev/null
@@ -1,619 +0,0 @@
-Index: openbsd-compat/if_media.h
-===================================================================
-RCS file: openbsd-compat/if_media.h
-diff -N openbsd-compat/if_media.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/if_media.h	30 Jun 2009 05:48:11 -0000	1.1
-@@ -0,0 +1,612 @@
-+/*	$OpenBSD: if_media.h,v 1.17 2004/11/02 02:12:16 reyk Exp $	*/
-+/*	$NetBSD: if_media.h,v 1.22 2000/02/17 21:53:16 sommerfeld Exp $	*/
-+
-+/*-
-+ * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
-+ * All rights reserved.
-+ *
-+ * This code is derived from software contributed to The NetBSD Foundation
-+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
-+ * NASA Ames Research Center.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the NetBSD
-+ *	Foundation, Inc. and its contributors.
-+ * 4. Neither the name of The NetBSD Foundation nor the names of its
-+ *    contributors may be used to endorse or promote products derived
-+ *    from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * Copyright (c) 1997
-+ *	Jonathan Stone and Jason R. Thorpe.  All rights reserved.
-+ *
-+ * This software is derived from information provided by Matt Thomas.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by Jonathan Stone
-+ *	and Jason R. Thorpe for the NetBSD Project.
-+ * 4. The names of the authors may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#ifndef _NET_IF_MEDIA_H_
-+#define _NET_IF_MEDIA_H_
-+
-+/*
-+ * Prototypes and definitions for BSD/OS-compatible network interface
-+ * media selection.
-+ *
-+ * Where it is safe to do so, this code strays slightly from the BSD/OS
-+ * design.  Software which uses the API (device drivers, basically)
-+ * shouldn't notice any difference.
-+ *
-+ * Many thanks to Matt Thomas for providing the information necessary
-+ * to implement this interface.
-+ */
-+
-+#ifdef _KERNEL
-+
-+#include <sys/queue.h>
-+
-+/*
-+ * Driver callbacks for media status and change requests.
-+ */
-+typedef	int (*ifm_change_cb_t)(struct ifnet *ifp);
-+typedef	void (*ifm_stat_cb_t)(struct ifnet *ifp, struct ifmediareq *req);
-+
-+/*
-+ * In-kernel representation of a single supported media type.
-+ */
-+struct ifmedia_entry {
-+	TAILQ_ENTRY(ifmedia_entry) ifm_list;
-+	int	ifm_media;	/* description of this media attachment */
-+	int	ifm_data;	/* for driver-specific use */
-+	void	*ifm_aux;	/* for driver-specific use */
-+};
-+
-+/*
-+ * One of these goes into a network interface's softc structure.
-+ * It is used to keep general media state.
-+ */
-+struct ifmedia {
-+	int	ifm_mask;	/* mask of changes we don't care about */
-+	int	ifm_media;	/* current user-set media word */
-+	struct ifmedia_entry *ifm_cur;	/* currently selected media */
-+	TAILQ_HEAD(, ifmedia_entry) ifm_list; /* list of all supported media */
-+	ifm_change_cb_t	ifm_change;	/* media change driver callback */
-+	ifm_stat_cb_t	ifm_status;	/* media status driver callback */
-+};
-+
-+/* Initialize an interface's struct if_media field. */
-+void	ifmedia_init(struct ifmedia *ifm, int dontcare_mask,
-+	    ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback);
-+
-+/* Add one supported medium to a struct ifmedia. */
-+void	ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux);
-+
-+/* Add an array (of ifmedia_entry) media to a struct ifmedia. */
-+void	ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp,
-+	    int count);
-+
-+/* Set default media type on initialization. */
-+void	ifmedia_set(struct ifmedia *ifm, int mword);
-+
-+/* Common ioctl function for getting/setting media, called by driver. */
-+int	ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr,
-+	    struct ifmedia *ifm, u_long cmd);
-+
-+/* Locate a media entry */
-+struct	ifmedia_entry *ifmedia_match(struct ifmedia *ifm,
-+	     int flags, int mask);
-+
-+/* Delete all media for a given media instance */
-+void	ifmedia_delete_instance(struct ifmedia *, int);
-+
-+/* Compute baudrate for a given media. */
-+int	ifmedia_baudrate(int);
-+#endif /*_KERNEL */
-+
-+/*
-+ * if_media Options word:
-+ *	Bits	Use
-+ *	----	-------
-+ *	0-4	Media subtype		MAX SUBTYPE == 31!
-+ *	5-7	Media type
-+ *	8-15	Type specific options
-+ *	16-19	RFU
-+ *	20-27	Shared (global) options
-+ *	28-31	Instance
-+ */
-+
-+/*
-+ * Ethernet
-+ */
-+#define IFM_ETHER	0x00000020
-+#define	IFM_10_T	3		/* 10BaseT - RJ45 */
-+#define	IFM_10_2	4		/* 10Base2 - Thinnet */
-+#define	IFM_10_5	5		/* 10Base5 - AUI */
-+#define	IFM_100_TX	6		/* 100BaseTX - RJ45 */
-+#define	IFM_100_FX	7		/* 100BaseFX - Fiber */
-+#define	IFM_100_T4	8		/* 100BaseT4 - 4 pair cat 3 */
-+#define	IFM_100_VG	9		/* 100VG-AnyLAN */
-+#define	IFM_100_T2	10		/* 100BaseT2 */
-+#define	IFM_1000_SX	11		/* 1000BaseSX - multi-mode fiber */
-+#define	IFM_10_STP	12		/* 10BaseT over shielded TP */
-+#define	IFM_10_FL	13		/* 10BaseFL - Fiber */
-+#define	IFM_1000_LX	14		/* 1000baseLX - single-mode fiber */
-+#define	IFM_1000_CX	15		/* 1000baseCX - 150ohm STP */
-+#define	IFM_1000_T	16		/* 1000baseT - 4 pair cat 5 */
-+#define	IFM_1000_TX	IFM_1000_T	/* for backwards compatibility */
-+#define	IFM_HPNA_1	17		/* HomePNA 1.0 (1Mb/s) */
-+
-+#define	IFM_ETH_MASTER	0x00000100	/* master mode (1000baseT) */
-+
-+/*
-+ * Token ring
-+ */
-+#define	IFM_TOKEN	0x00000040
-+#define	IFM_TOK_STP4	3		/* Shielded twisted pair 4m - DB9 */
-+#define	IFM_TOK_STP16	4		/* Shielded twisted pair 16m - DB9 */
-+#define	IFM_TOK_UTP4	5		/* Unshielded twisted pair 4m - RJ45 */
-+#define	IFM_TOK_UTP16	6		/* Unshielded twisted pair 16m - RJ45 */
-+#define	IFM_TOK_ETR	0x00000200	/* Early token release */
-+#define	IFM_TOK_SRCRT	0x00000400	/* Enable source routing features */
-+#define	IFM_TOK_ALLR	0x00000800	/* All routes / Single route bcast */
-+
-+/*
-+ * FDDI
-+ */
-+#define	IFM_FDDI	0x00000060
-+#define	IFM_FDDI_SMF	3		/* Single-mode fiber */
-+#define	IFM_FDDI_MMF	4		/* Multi-mode fiber */
-+#define IFM_FDDI_UTP	5		/* CDDI / UTP */
-+#define IFM_FDDI_DA	0x00000100	/* Dual attach / single attach */
-+
-+/*
-+ * IEEE 802.11 Wireless
-+ */
-+#define	IFM_IEEE80211	0x00000080
-+#define	IFM_IEEE80211_FH1	3	/* Frequency Hopping 1Mbps */
-+#define	IFM_IEEE80211_FH2	4	/* Frequency Hopping 2Mbps */
-+#define	IFM_IEEE80211_DS2	5	/* Direct Sequence 2Mbps */
-+#define	IFM_IEEE80211_DS5	6	/* Direct Sequence 5Mbps*/
-+#define	IFM_IEEE80211_DS11	7	/* Direct Sequence 11Mbps*/
-+#define	IFM_IEEE80211_DS1	8	/* Direct Sequence  1Mbps*/
-+#define IFM_IEEE80211_DS22      9	/* Direct Sequence 22Mbps */ 
-+#define IFM_IEEE80211_OFDM6     10	/* OFDM 6Mbps */
-+#define IFM_IEEE80211_OFDM9     11	/* OFDM 9Mbps */
-+#define IFM_IEEE80211_OFDM12    12	/* OFDM 12Mbps */
-+#define IFM_IEEE80211_OFDM18    13	/* OFDM 18Mbps */
-+#define IFM_IEEE80211_OFDM24    14	/* OFDM 24Mbps */
-+#define IFM_IEEE80211_OFDM36    15	/* OFDM 36Mbps */
-+#define IFM_IEEE80211_OFDM48    16	/* OFDM 48Mbps */
-+#define IFM_IEEE80211_OFDM54    17	/* OFDM 54Mbps */
-+#define IFM_IEEE80211_OFDM72    18	/* OFDM 72Mbps */
-+
-+#define	IFM_IEEE80211_ADHOC	0x100	/* Operate in Adhoc mode */
-+#define	IFM_IEEE80211_HOSTAP	0x200	/* Operate in Host AP mode */
-+#define	IFM_IEEE80211_IBSS	0x400	/* Operate in IBSS mode */
-+#define	IFM_IEEE80211_IBSSMASTER 0x800	/* Operate as an IBSS master */
-+#define	IFM_IEEE80211_MONITOR	0x1000	/* Operate in Monitor mode */
-+#define	IFM_IEEE80211_TURBO	0x2000	/* Operate in Turbo mode */
-+
-+/* operating mode for multi-mode devices */
-+#define IFM_IEEE80211_11A	0x00010000	/* 5Ghz, OFDM mode */
-+#define IFM_IEEE80211_11B	0x00020000	/* Direct Sequence mode */
-+#define IFM_IEEE80211_11G	0x00030000	/* 2Ghz, CCK mode */
-+#define IFM_IEEE80211_FH	0x00040000	/* 2Ghz, GFSK mode */
-+
-+/*
-+ * Digitally multiplexed "Carrier" Serial Interfaces
-+ */
-+#define	IFM_TDM		0x000000a0
-+#define IFM_TDM_T1		3	/* T1 B8ZS+ESF 24 ts  */
-+#define IFM_TDM_T1_AMI		4	/* T1 AMI+SF 24 ts */
-+#define IFM_TDM_E1		5	/* E1 HDB3+G.703 clearchannel 32 ts */
-+#define IFM_TDM_E1_G704		6	/* E1 HDB3+G.703+G.704 channelized 31 ts */
-+#define IFM_TDM_E1_AMI		7	/* E1 AMI+G.703 32 ts */
-+#define IFM_TDM_E1_AMI_G704	8	/* E1 AMI+G.703+G.704 31 ts */
-+#define IFM_TDM_T3		9	/* T3 B3ZS+C-bit 672 ts */
-+#define IFM_TDM_T3_M13		10	/* T3 B3ZS+M13 672 ts */
-+#define IFM_TDM_E3		11	/* E3 HDB3+G.751 512? ts */
-+#define IFM_TDM_E3_G751		12	/* E3 G.751 512 ts */
-+#define IFM_TDM_E3_G832		13	/* E3 G.832 512 ts */
-+/*
-+ * 6 major ways that networks talk: Drivers enforce independent selection,
-+ * meaning, a driver will ensure that only one of these is set at a time.
-+ */
-+#define IFM_TDM_HDLC_CRC16	0x0100	/* Use 16-bit CRC for HDLC instead */
-+#define IFM_TDM_PPP		0x0200	/* SPPP (dumb) */
-+#define IFM_TDM_FR_ANSI		0x0400	/* Frame Relay + LMI ANSI "Annex D" */
-+#define IFM_TDM_FR_CISCO	0x0800	/* Frame Relay + LMI Cisco */
-+#define IFM_TDM_FR_ITU		0x1000	/* Frame Relay + LMI ITU "Q933A" */
-+
-+/*
-+ * Common Access Redundancy Protocol
-+ */
-+#define	IFM_CARP		0x000000c0
-+
-+/*
-+ * Shared media sub-types
-+ */
-+#define	IFM_AUTO	0		/* Autoselect best media */
-+#define	IFM_MANUAL	1		/* Jumper/dipswitch selects media */
-+#define	IFM_NONE	2		/* Deselect all media */
-+
-+/*
-+ * Shared options
-+ */
-+#define IFM_FDX		0x00100000	/* Force full duplex */
-+#define	IFM_HDX		0x00200000	/* Force half duplex */
-+#define	IFM_FLOW	0x00400000	/* enable hardware flow control */
-+#define IFM_FLAG0	0x01000000	/* Driver defined flag */
-+#define IFM_FLAG1	0x02000000	/* Driver defined flag */
-+#define IFM_FLAG2	0x04000000	/* Driver defined flag */
-+#define	IFM_LOOP	0x08000000	/* Put hardware in loopback */
-+
-+/*
-+ * Masks
-+ */
-+#define	IFM_NMASK	0x000000e0	/* Network type */
-+#define	IFM_TMASK	0x0000001f	/* Media sub-type */
-+#define	IFM_IMASK	0xf0000000	/* Instance */
-+#define	IFM_ISHIFT	28		/* Instance shift */
-+#define	IFM_OMASK	0x0000ff00	/* Type specific options */
-+#define	IFM_MMASK	0x00070000	/* Mode */
-+#define	IFM_MSHIFT	16		/* Mode shift */
-+#define	IFM_GMASK	0x0ff00000	/* Global options */
-+
-+#define	IFM_NMIN	IFM_ETHER	/* lowest Network type */
-+#define	IFM_NMAX	IFM_NMASK	/* highest Network type */
-+
-+/*
-+ * Status bits
-+ */
-+#define	IFM_AVALID	0x00000001	/* Active bit valid */
-+#define	IFM_ACTIVE	0x00000002	/* Interface attached to working net */
-+
-+/* Mask of "status valid" bits, for ifconfig(8). */
-+#define	IFM_STATUS_VALID	IFM_AVALID
-+
-+/* List of "status valid" bits, for ifconfig(8). */
-+#define	IFM_STATUS_VALID_LIST {						\
-+	IFM_AVALID,							\
-+	0								\
-+}
-+
-+/*
-+ * Macros to extract various bits of information from the media word.
-+ */
-+#define	IFM_TYPE(x)	((x) & IFM_NMASK)
-+#define	IFM_SUBTYPE(x)	((x) & IFM_TMASK)
-+#define	IFM_INST(x)	(((x) & IFM_IMASK) >> IFM_ISHIFT)
-+#define	IFM_OPTIONS(x)	((x) & (IFM_OMASK|IFM_GMASK))
-+#define	IFM_MODE(x)	((x) & IFM_MMASK)
-+
-+#define	IFM_INST_MAX	IFM_INST(IFM_IMASK)
-+#define	IFM_INST_ANY	(-1)
-+
-+/*
-+ * Macro to create a media word.
-+ */
-+#define	IFM_MAKEWORD(type, subtype, options, instance)			\
-+    ((type) | (subtype) | (options) | ((instance) << IFM_ISHIFT))
-+#define IFM_MAKEMODE(mode)                                              \
-+           (((mode) << IFM_MSHIFT) & IFM_MMASK)
-+/*
-+ * NetBSD extension not defined in the BSDI API.  This is used in various
-+ * places to get the canonical description for a given type/subtype.
-+ *
-+ * In the subtype and mediaopt descriptions, the valid TYPE bits are OR'd
-+ * in to indicate which TYPE the subtype/option corresponds to.  If no
-+ * TYPE is present, it is a shared media/mediaopt.
-+ *
-+ * Note that these are parsed case-insensitive.
-+ *
-+ * Order is important.  The first matching entry is the canonical name
-+ * for a media type; subsequent matches are aliases.
-+ */
-+struct ifmedia_description {
-+	int	ifmt_word;		/* word value; may be masked */
-+	const char *ifmt_string;	/* description */
-+};
-+
-+#define	IFM_TYPE_DESCRIPTIONS {						\
-+	{ IFM_ETHER,			"Ethernet" },			\
-+	{ IFM_ETHER,			"ether" },			\
-+	{ IFM_TOKEN,			"TokenRing" },			\
-+	{ IFM_TOKEN,			"token" },			\
-+	{ IFM_FDDI,			"FDDI" },			\
-+	{ IFM_IEEE80211,		"IEEE802.11" },			\
-+	{ IFM_TDM,			"TDM" },			\
-+	{ IFM_CARP,			"CARP" },			\
-+	{ 0, NULL },							\
-+}
-+
-+#define	IFM_TYPE_MATCH(dt, t)						\
-+	(IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t)))
-+
-+#define	IFM_SUBTYPE_DESCRIPTIONS {					\
-+	{ IFM_AUTO,			"autoselect" },			\
-+	{ IFM_AUTO,			"auto" },			\
-+	{ IFM_MANUAL,			"manual" },			\
-+	{ IFM_NONE,			"none" },			\
-+									\
-+	{ IFM_ETHER|IFM_10_T,		"10baseT" },			\
-+	{ IFM_ETHER|IFM_10_T,		"10baseT/UTP" },		\
-+	{ IFM_ETHER|IFM_10_T,		"UTP" },			\
-+	{ IFM_ETHER|IFM_10_T,		"10UTP" },			\
-+	{ IFM_ETHER|IFM_10_2,		"10base2" },			\
-+	{ IFM_ETHER|IFM_10_2,		"10base2/BNC" },		\
-+	{ IFM_ETHER|IFM_10_2,		"BNC" },			\
-+	{ IFM_ETHER|IFM_10_2,		"10BNC" },			\
-+	{ IFM_ETHER|IFM_10_5,		"10base5" },			\
-+	{ IFM_ETHER|IFM_10_5,		"10base5/AUI" },		\
-+	{ IFM_ETHER|IFM_10_5,		"AUI" },			\
-+	{ IFM_ETHER|IFM_10_5,		"10AUI" },			\
-+	{ IFM_ETHER|IFM_100_TX,		"100baseTX" },			\
-+	{ IFM_ETHER|IFM_100_TX,		"100TX" },			\
-+	{ IFM_ETHER|IFM_100_FX,		"100baseFX" },			\
-+	{ IFM_ETHER|IFM_100_FX,		"100FX" },			\
-+	{ IFM_ETHER|IFM_100_T4,		"100baseT4" },			\
-+	{ IFM_ETHER|IFM_100_T4,		"100T4" },			\
-+	{ IFM_ETHER|IFM_100_VG,		"100baseVG" },			\
-+	{ IFM_ETHER|IFM_100_VG,		"100VG" },			\
-+	{ IFM_ETHER|IFM_100_T2,		"100baseT2" },			\
-+	{ IFM_ETHER|IFM_100_T2,		"100T2" },			\
-+	{ IFM_ETHER|IFM_1000_SX,	"1000baseSX" },			\
-+	{ IFM_ETHER|IFM_1000_SX,	"1000SX" },			\
-+	{ IFM_ETHER|IFM_10_STP,		"10baseSTP" },			\
-+	{ IFM_ETHER|IFM_10_STP,		"STP" },			\
-+	{ IFM_ETHER|IFM_10_STP,		"10STP" },			\
-+	{ IFM_ETHER|IFM_10_FL,		"10baseFL" },			\
-+	{ IFM_ETHER|IFM_10_FL,		"FL" },				\
-+	{ IFM_ETHER|IFM_10_FL,		"10FL" },			\
-+	{ IFM_ETHER|IFM_1000_LX,	"1000baseLX" },			\
-+	{ IFM_ETHER|IFM_1000_LX,	"1000LX" },			\
-+	{ IFM_ETHER|IFM_1000_CX,	"1000baseCX" },			\
-+	{ IFM_ETHER|IFM_1000_CX,	"1000CX" },			\
-+	{ IFM_ETHER|IFM_1000_T,		"1000baseT" },			\
-+	{ IFM_ETHER|IFM_1000_T,		"1000T" },			\
-+	{ IFM_ETHER|IFM_1000_T,		"1000baseTX" },			\
-+	{ IFM_ETHER|IFM_1000_T,		"1000TX" },			\
-+	{ IFM_ETHER|IFM_HPNA_1,		"HomePNA1" },			\
-+	{ IFM_ETHER|IFM_HPNA_1,		"HPNA1" },			\
-+									\
-+	{ IFM_TOKEN|IFM_TOK_STP4,	"DB9/4Mbit" },			\
-+	{ IFM_TOKEN|IFM_TOK_STP4,	"4STP" },			\
-+	{ IFM_TOKEN|IFM_TOK_STP16,	"DB9/16Mbit" },			\
-+	{ IFM_TOKEN|IFM_TOK_STP16,	"16STP" },			\
-+	{ IFM_TOKEN|IFM_TOK_UTP4,	"UTP/4Mbit" },			\
-+	{ IFM_TOKEN|IFM_TOK_UTP4,	"4UTP" },			\
-+	{ IFM_TOKEN|IFM_TOK_UTP16,	"UTP/16Mbit" },			\
-+	{ IFM_TOKEN|IFM_TOK_UTP16,	"16UTP" },			\
-+									\
-+	{ IFM_FDDI|IFM_FDDI_SMF,	"Single-mode" },		\
-+	{ IFM_FDDI|IFM_FDDI_SMF,	"SMF" },			\
-+	{ IFM_FDDI|IFM_FDDI_MMF,	"Multi-mode" },			\
-+	{ IFM_FDDI|IFM_FDDI_MMF,	"MMF" },			\
-+	{ IFM_FDDI|IFM_FDDI_UTP,	"UTP" },			\
-+	{ IFM_FDDI|IFM_FDDI_UTP,	"CDDI" },			\
-+									\
-+	{ IFM_IEEE80211|IFM_IEEE80211_FH1,	"FH1" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_FH2,	"FH2" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS2,	"DS2" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS5,	"DS5" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS11,	"DS11" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS1,	"DS1" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS22,	"DS22" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM6,	"OFDM6" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM9,	"OFDM9" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM12,	"OFDM12" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM18,	"OFDM18" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM24,	"OFDM24" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM36,	"OFDM36" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM48,	"OFDM48" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM54,	"OFDM54" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM72,	"OFDM72" },		\
-+									\
-+	{ IFM_TDM|IFM_TDM_T1,		"t1" },				\
-+	{ IFM_TDM|IFM_TDM_T1_AMI,	"t1-ami" },			\
-+	{ IFM_TDM|IFM_TDM_E1,		"e1" },				\
-+	{ IFM_TDM|IFM_TDM_E1_G704,	"e1-g.704" },			\
-+	{ IFM_TDM|IFM_TDM_E1_AMI,	"e1-ami" },			\
-+	{ IFM_TDM|IFM_TDM_E1_AMI_G704,	"e1-ami-g.704" },		\
-+	{ IFM_TDM|IFM_TDM_T3,		"t3" },				\
-+	{ IFM_TDM|IFM_TDM_T3_M13,	"t3-m13" },			\
-+	{ IFM_TDM|IFM_TDM_E3,		"e3" },				\
-+	{ IFM_TDM|IFM_TDM_E3_G751,	"e3-g.751" },			\
-+	{ IFM_TDM|IFM_TDM_E3_G832,	"e3-g.832" },			\
-+									\
-+	{ 0, NULL },							\
-+}
-+
-+#define IFM_MODE_DESCRIPTIONS {                                         \
-+        { IFM_AUTO,                             "autoselect" },         \
-+        { IFM_AUTO,                             "auto" },               \
-+        { IFM_IEEE80211|IFM_IEEE80211_11A,      "11a" },                \
-+        { IFM_IEEE80211|IFM_IEEE80211_11B,      "11b" },                \
-+        { IFM_IEEE80211|IFM_IEEE80211_11G,      "11g" },                \
-+        { IFM_IEEE80211|IFM_IEEE80211_FH,       "fh" },                 \
-+        { 0, NULL },                                                    \
-+}
-+
-+#define	IFM_OPTION_DESCRIPTIONS {					\
-+	{ IFM_FDX,			"full-duplex" },		\
-+	{ IFM_FDX,			"fdx" },			\
-+	{ IFM_HDX,			"half-duplex" },		\
-+	{ IFM_HDX,			"hdx" },			\
-+	{ IFM_FLAG0,			"flag0" },			\
-+	{ IFM_FLAG1,			"flag1" },			\
-+	{ IFM_FLAG2,			"flag2" },			\
-+	{ IFM_LOOP,			"loopback" },			\
-+	{ IFM_LOOP,			"hw-loopback"},			\
-+	{ IFM_LOOP,			"loop" },			\
-+									\
-+	{ IFM_ETHER|IFM_ETH_MASTER,	"master" },			\
-+									\
-+	{ IFM_TOKEN|IFM_TOK_ETR,	"EarlyTokenRelease" },		\
-+	{ IFM_TOKEN|IFM_TOK_ETR,	"ETR" },			\
-+	{ IFM_TOKEN|IFM_TOK_SRCRT,	"SourceRouting" },		\
-+	{ IFM_TOKEN|IFM_TOK_SRCRT,	"SRCRT" },			\
-+	{ IFM_TOKEN|IFM_TOK_ALLR,	"AllRoutes" },			\
-+	{ IFM_TOKEN|IFM_TOK_ALLR,	"ALLR" },			\
-+									\
-+	{ IFM_FDDI|IFM_FDDI_DA,		"dual-attach" },		\
-+	{ IFM_FDDI|IFM_FDDI_DA,		"das" },			\
-+									\
-+	{ IFM_IEEE80211|IFM_IEEE80211_ADHOC,	"adhoc" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_HOSTAP,	"hostap" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_IBSS,	"ibss" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_IBSSMASTER, "ibss-master" },	\
-+	{ IFM_IEEE80211|IFM_IEEE80211_MONITOR,	"monitor" },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_TURBO,	"turbo" },		\
-+									\
-+	{ IFM_TDM|IFM_TDM_HDLC_CRC16,	"hdlc-crc16" },			\
-+	{ IFM_TDM|IFM_TDM_PPP,		"ppp" },			\
-+	{ IFM_TDM|IFM_TDM_FR_ANSI,	"framerelay-ansi" },		\
-+	{ IFM_TDM|IFM_TDM_FR_CISCO,	"framerelay-cisco" },		\
-+	{ IFM_TDM|IFM_TDM_FR_ANSI,	"framerelay-itu" },		\
-+									\
-+	{ 0, NULL },							\
-+}
-+
-+/*
-+ * Baudrate descriptions for the various media types.
-+ */
-+struct ifmedia_baudrate {
-+	int	ifmb_word;		/* media word */
-+	int	ifmb_baudrate;		/* corresponding baudrate */
-+};
-+
-+#define	IFM_BAUDRATE_DESCRIPTIONS {					\
-+	{ IFM_ETHER|IFM_10_T,		IF_Mbps(10) },			\
-+	{ IFM_ETHER|IFM_10_2,		IF_Mbps(10) },			\
-+	{ IFM_ETHER|IFM_10_5,		IF_Mbps(10) },			\
-+	{ IFM_ETHER|IFM_100_TX,		IF_Mbps(100) },			\
-+	{ IFM_ETHER|IFM_100_FX,		IF_Mbps(100) },			\
-+	{ IFM_ETHER|IFM_100_T4,		IF_Mbps(100) },			\
-+	{ IFM_ETHER|IFM_100_VG,		IF_Mbps(100) },			\
-+	{ IFM_ETHER|IFM_100_T2,		IF_Mbps(100) },			\
-+	{ IFM_ETHER|IFM_1000_SX,	IF_Mbps(1000) },		\
-+	{ IFM_ETHER|IFM_10_STP,		IF_Mbps(10) },			\
-+	{ IFM_ETHER|IFM_10_FL,		IF_Mbps(10) },			\
-+	{ IFM_ETHER|IFM_1000_LX,	IF_Mbps(1000) },		\
-+	{ IFM_ETHER|IFM_1000_CX,	IF_Mbps(1000) },		\
-+	{ IFM_ETHER|IFM_1000_T,		IF_Mbps(1000) },		\
-+	{ IFM_ETHER|IFM_HPNA_1,		IF_Mbps(1) },			\
-+									\
-+	{ IFM_TOKEN|IFM_TOK_STP4,	IF_Mbps(4) },			\
-+	{ IFM_TOKEN|IFM_TOK_STP16,	IF_Mbps(16) },			\
-+	{ IFM_TOKEN|IFM_TOK_UTP4,	IF_Mbps(4) },			\
-+	{ IFM_TOKEN|IFM_TOK_UTP16,	IF_Mbps(16) },			\
-+									\
-+	{ IFM_FDDI|IFM_FDDI_SMF,	IF_Mbps(100) },			\
-+	{ IFM_FDDI|IFM_FDDI_MMF,	IF_Mbps(100) },			\
-+	{ IFM_FDDI|IFM_FDDI_UTP,	IF_Mbps(100) },			\
-+									\
-+	{ IFM_IEEE80211|IFM_IEEE80211_FH1, IF_Mbps(1) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_FH2, IF_Mbps(2) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS1, IF_Mbps(1) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS2, IF_Mbps(2) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS5, IF_Mbps(5) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS11, IF_Mbps(11) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_DS22, IF_Mbps(22) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM6, IF_Mbps(6) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM9, IF_Mbps(9) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM12, IF_Mbps(12) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM18, IF_Mbps(18) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM24, IF_Mbps(24) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM36, IF_Mbps(36) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM48, IF_Mbps(48) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM54, IF_Mbps(54) },		\
-+	{ IFM_IEEE80211|IFM_IEEE80211_OFDM72, IF_Mbps(72) },		\
-+									\
-+	{ IFM_TDM|IFM_TDM_T1,		IF_Kbps(1536) },		\
-+	{ IFM_TDM|IFM_TDM_T1_AMI,	IF_Kbps(1536) },		\
-+	{ IFM_TDM|IFM_TDM_E1,		IF_Kbps(2048) },		\
-+	{ IFM_TDM|IFM_TDM_E1_G704,	IF_Kbps(2048) },		\
-+	{ IFM_TDM|IFM_TDM_E1_AMI,	IF_Kbps(2048) },		\
-+	{ IFM_TDM|IFM_TDM_E1_AMI_G704,	IF_Kbps(2048) },		\
-+	{ IFM_TDM|IFM_TDM_T3,		IF_Kbps(44736) },		\
-+	{ IFM_TDM|IFM_TDM_T3_M13,	IF_Kbps(44736) },		\
-+	{ IFM_TDM|IFM_TDM_E3,		IF_Kbps(34368) },		\
-+	{ IFM_TDM|IFM_TDM_E3_G751,	IF_Kbps(34368) },		\
-+	{ IFM_TDM|IFM_TDM_E3_G832,	IF_Kbps(34368) },		\
-+									\
-+	{ 0, 0 },							\
-+}
-+
-+/*
-+ * Status bit descriptions for the various media types.
-+ */
-+struct ifmedia_status_description {
-+	int	ifms_type;
-+	int	ifms_valid;
-+	int	ifms_bit;
-+	const char *ifms_string[2];
-+};
-+
-+#define	IFM_STATUS_DESC(ifms, bit)					\
-+	(ifms)->ifms_string[((ifms)->ifms_bit & (bit)) ? 1 : 0]
-+
-+#define	IFM_STATUS_DESCRIPTIONS {					\
-+	{ IFM_ETHER,		IFM_AVALID,	IFM_ACTIVE,		\
-+	    { "no carrier", "active" } },				\
-+	{ IFM_FDDI,		IFM_AVALID,	IFM_ACTIVE,		\
-+	    { "no ring", "inserted" } },				\
-+	{ IFM_TOKEN,		IFM_AVALID,	IFM_ACTIVE,		\
-+	    { "no ring", "inserted" } },				\
-+	{ IFM_IEEE80211,	IFM_AVALID,	IFM_ACTIVE,		\
-+	    { "no network", "active" } },				\
-+	{ IFM_TDM,		IFM_AVALID,	IFM_ACTIVE,		\
-+	    { "no carrier", "active" } },				\
-+	{ IFM_CARP,		IFM_AVALID,	IFM_ACTIVE,		\
-+	    { "backup", "master" } },					\
-+	{ 0,			0,		0,			\
-+	    { NULL, NULL } }						\
-+}
-+#endif	/* _NET_IF_MEDIA_H_ */
diff --git a/net/openbgpd/files/patch-openbsd-compat_imsg-buffer.c b/net/openbgpd/files/patch-openbsd-compat_imsg-buffer.c
deleted file mode 100644
index 3db0ec22abe8..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_imsg-buffer.c
+++ /dev/null
@@ -1,312 +0,0 @@
-Index: openbsd-compat/imsg-buffer.c
-===================================================================
-RCS file: openbsd-compat/imsg-buffer.c
-diff -N openbsd-compat/imsg-buffer.c
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/imsg-buffer.c	8 Dec 2012 20:17:59 -0000	1.2
-@@ -0,0 +1,305 @@
-+/*	$OpenBSD: imsg-buffer.c,v 1.1 2010/05/26 16:44:32 nicm Exp $	*/
-+
-+/*
-+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <sys/param.h>
-+#include <sys/queue.h>
-+#include <sys/socket.h>
-+#include <sys/uio.h>
-+
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "imsg.h"
-+
-+int	ibuf_realloc(struct ibuf *, size_t);
-+void	ibuf_enqueue(struct msgbuf *, struct ibuf *);
-+void	ibuf_dequeue(struct msgbuf *, struct ibuf *);
-+
-+struct ibuf *
-+ibuf_open(size_t len)
-+{
-+	struct ibuf	*buf;
-+
-+	if ((buf = calloc(1, sizeof(struct ibuf))) == NULL)
-+		return (NULL);
-+	if ((buf->buf = malloc(len)) == NULL) {
-+		free(buf);
-+		return (NULL);
-+	}
-+	buf->size = buf->max = len;
-+	buf->fd = -1;
-+
-+	return (buf);
-+}
-+
-+struct ibuf *
-+ibuf_dynamic(size_t len, size_t max)
-+{
-+	struct ibuf	*buf;
-+
-+	if (max < len)
-+		return (NULL);
-+
-+	if ((buf = ibuf_open(len)) == NULL)
-+		return (NULL);
-+
-+	if (max > 0)
-+		buf->max = max;
-+
-+	return (buf);
-+}
-+
-+int
-+ibuf_realloc(struct ibuf *buf, size_t len)
-+{
-+	u_char	*b;
-+
-+	/* on static buffers max is eq size and so the following fails */
-+	if (buf->wpos + len > buf->max) {
-+		errno = ENOMEM;
-+		return (-1);
-+	}
-+
-+	b = realloc(buf->buf, buf->wpos + len);
-+	if (b == NULL)
-+		return (-1);
-+	buf->buf = b;
-+	buf->size = buf->wpos + len;
-+
-+	return (0);
-+}
-+
-+int
-+ibuf_add(struct ibuf *buf, const void *data, size_t len)
-+{
-+	if (buf->wpos + len > buf->size)
-+		if (ibuf_realloc(buf, len) == -1)
-+			return (-1);
-+
-+	memcpy(buf->buf + buf->wpos, data, len);
-+	buf->wpos += len;
-+	return (0);
-+}
-+
-+void *
-+ibuf_reserve(struct ibuf *buf, size_t len)
-+{
-+	void	*b;
-+
-+	if (buf->wpos + len > buf->size)
-+		if (ibuf_realloc(buf, len) == -1)
-+			return (NULL);
-+
-+	b = buf->buf + buf->wpos;
-+	buf->wpos += len;
-+	return (b);
-+}
-+
-+void *
-+ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
-+{
-+	/* only allowed to seek in already written parts */
-+	if (pos + len > buf->wpos)
-+		return (NULL);
-+
-+	return (buf->buf + pos);
-+}
-+
-+size_t
-+ibuf_size(struct ibuf *buf)
-+{
-+	return (buf->wpos);
-+}
-+
-+size_t
-+ibuf_left(struct ibuf *buf)
-+{
-+	return (buf->max - buf->wpos);
-+}
-+
-+void
-+ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf)
-+{
-+	ibuf_enqueue(msgbuf, buf);
-+}
-+
-+int
-+ibuf_write(struct msgbuf *msgbuf)
-+{
-+	struct iovec	 iov[IOV_MAX];
-+	struct ibuf	*buf;
-+	unsigned int	 i = 0;
-+	ssize_t	n;
-+
-+	bzero(&iov, sizeof(iov));
-+	TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
-+		if (i >= IOV_MAX)
-+			break;
-+		iov[i].iov_base = buf->buf + buf->rpos;
-+		iov[i].iov_len = buf->wpos - buf->rpos;
-+		i++;
-+	}
-+
-+again:
-+	if ((n = writev(msgbuf->fd, iov, i)) == -1) {
-+		if (errno == EAGAIN || errno == EINTR)
-+			goto again;
-+		if (errno == ENOBUFS)
-+			errno = EAGAIN;
-+		return (-1);
-+	}
-+
-+	if (n == 0) {			/* connection closed */
-+		errno = 0;
-+		return (0);
-+	}
-+
-+	msgbuf_drain(msgbuf, n);
-+
-+	return (1);
-+}
-+
-+void
-+ibuf_free(struct ibuf *buf)
-+{
-+	free(buf->buf);
-+	free(buf);
-+}
-+
-+void
-+msgbuf_init(struct msgbuf *msgbuf)
-+{
-+	msgbuf->queued = 0;
-+	msgbuf->fd = -1;
-+	TAILQ_INIT(&msgbuf->bufs);
-+}
-+
-+void
-+msgbuf_drain(struct msgbuf *msgbuf, size_t n)
-+{
-+	struct ibuf	*buf, *next;
-+
-+	for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
-+	    buf = next) {
-+		next = TAILQ_NEXT(buf, entry);
-+		if (buf->rpos + n >= buf->wpos) {
-+			n -= buf->wpos - buf->rpos;
-+			ibuf_dequeue(msgbuf, buf);
-+		} else {
-+			buf->rpos += n;
-+			n = 0;
-+		}
-+	}
-+}
-+
-+void
-+msgbuf_clear(struct msgbuf *msgbuf)
-+{
-+	struct ibuf	*buf;
-+
-+	while ((buf = TAILQ_FIRST(&msgbuf->bufs)) != NULL)
-+		ibuf_dequeue(msgbuf, buf);
-+}
-+
-+int
-+msgbuf_write(struct msgbuf *msgbuf)
-+{
-+	struct iovec	 iov[IOV_MAX];
-+	struct ibuf	*buf;
-+	unsigned int	 i = 0;
-+	ssize_t		 n;
-+	struct msghdr	 msg;
-+	struct cmsghdr	*cmsg;
-+	union {
-+		struct cmsghdr	hdr;
-+		char		buf[CMSG_SPACE(sizeof(int))];
-+	} cmsgbuf;
-+
-+	bzero(&iov, sizeof(iov));
-+	bzero(&msg, sizeof(msg));
-+	TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
-+		if (i >= IOV_MAX)
-+			break;
-+		iov[i].iov_base = buf->buf + buf->rpos;
-+		iov[i].iov_len = buf->wpos - buf->rpos;
-+		i++;
-+		if (buf->fd != -1)
-+			break;
-+	}
-+
-+	msg.msg_iov = iov;
-+	msg.msg_iovlen = i;
-+
-+	if (buf != NULL && buf->fd != -1) {
-+		msg.msg_control = (caddr_t)&cmsgbuf.buf;
-+		msg.msg_controllen = sizeof(cmsgbuf.buf);
-+		cmsg = CMSG_FIRSTHDR(&msg);
-+		cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-+		cmsg->cmsg_level = SOL_SOCKET;
-+		cmsg->cmsg_type = SCM_RIGHTS;
-+		*(int *)CMSG_DATA(cmsg) = buf->fd;
-+	}
-+
-+again:
-+	if ((n = sendmsg(msgbuf->fd, &msg, 0)) == -1) {
-+		if (errno == EAGAIN || errno == EINTR)
-+			goto again;
-+		if (errno == ENOBUFS)
-+			errno = EAGAIN;
-+		return (-1);
-+	}
-+
-+	if (n == 0) {			/* connection closed */
-+		errno = 0;
-+		return (0);
-+	}
-+
-+	/*
-+	 * assumption: fd got sent if sendmsg sent anything
-+	 * this works because fds are passed one at a time
-+	 */
-+	if (buf != NULL && buf->fd != -1) {
-+		close(buf->fd);
-+		buf->fd = -1;
-+	}
-+
-+	msgbuf_drain(msgbuf, n);
-+
-+	return (1);
-+}
-+
-+void
-+ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf)
-+{
-+	TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry);
-+	msgbuf->queued++;
-+}
-+
-+void
-+ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf)
-+{
-+	TAILQ_REMOVE(&msgbuf->bufs, buf, entry);
-+
-+	if (buf->fd != -1)
-+		close(buf->fd);
-+
-+	msgbuf->queued--;
-+	ibuf_free(buf);
-+}
diff --git a/net/openbgpd/files/patch-openbsd-compat_imsg.c b/net/openbgpd/files/patch-openbsd-compat_imsg.c
deleted file mode 100644
index c23d5aa22060..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_imsg.c
+++ /dev/null
@@ -1,312 +0,0 @@
-Index: openbsd-compat/imsg.c
-===================================================================
-RCS file: openbsd-compat/imsg.c
-diff -N openbsd-compat/imsg.c
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/imsg.c	8 Dec 2012 20:17:59 -0000	1.2
-@@ -0,0 +1,305 @@
-+/*	$OpenBSD: imsg.c,v 1.1 2010/05/26 16:44:32 nicm Exp $	*/
-+
-+/*
-+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <sys/param.h>
-+#include <sys/queue.h>
-+#include <sys/socket.h>
-+#include <sys/uio.h>
-+
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "imsg.h"
-+
-+int	 imsg_fd_overhead = 0;
-+
-+int	 imsg_get_fd(struct imsgbuf *);
-+
-+void
-+imsg_init(struct imsgbuf *ibuf, int fd)
-+{
-+	msgbuf_init(&ibuf->w);
-+	bzero(&ibuf->r, sizeof(ibuf->r));
-+	ibuf->fd = fd;
-+	ibuf->w.fd = fd;
-+	ibuf->pid = getpid();
-+	TAILQ_INIT(&ibuf->fds);
-+}
-+
-+ssize_t
-+imsg_read(struct imsgbuf *ibuf)
-+{
-+	struct msghdr		 msg;
-+	struct cmsghdr		*cmsg;
-+	union {
-+		struct cmsghdr hdr;
-+		char	buf[CMSG_SPACE(sizeof(int) * 1)];
-+	} cmsgbuf;
-+	struct iovec		 iov;
-+	ssize_t			 n = -1;
-+	int			 fd;
-+	struct imsg_fd		*ifd;
-+
-+	bzero(&msg, sizeof(msg));
-+
-+	iov.iov_base = ibuf->r.buf + ibuf->r.wpos;
-+	iov.iov_len = sizeof(ibuf->r.buf) - ibuf->r.wpos;
-+	msg.msg_iov = &iov;
-+	msg.msg_iovlen = 1;
-+	msg.msg_control = &cmsgbuf.buf;
-+	msg.msg_controllen = sizeof(cmsgbuf.buf);
-+
-+	if ((ifd = calloc(1, sizeof(struct imsg_fd))) == NULL)
-+		return (-1);
-+
-+again:
-+#if defined(__FreeBSD__)
-+	if (imsg_fd_overhead +
-+#else
-+	if (getdtablecount() + imsg_fd_overhead +
-+#endif
-+	    (CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int)
-+	    >= getdtablesize()) {
-+		errno = EAGAIN;
-+		return (-1);
-+	}
-+	
-+	if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) {
-+		if (errno == EMSGSIZE)
-+			goto fail;
-+		if (errno != EINTR && errno != EAGAIN)
-+			goto fail;
-+		goto again;
-+	}
-+
-+	ibuf->r.wpos += n;
-+
-+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
-+	    cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-+		if (cmsg->cmsg_level == SOL_SOCKET &&
-+		    cmsg->cmsg_type == SCM_RIGHTS) {
-+			int i;
-+			int j;
-+
-+			/*
-+			 * We only accept one file descriptor.  Due to C
-+			 * padding rules, our control buffer might contain
-+			 * more than one fd, and we must close them.
-+			 */
-+			j = ((char *)cmsg + cmsg->cmsg_len -
-+			    (char *)CMSG_DATA(cmsg)) / sizeof(int);
-+			for (i = 0; i < j; i++) {
-+				fd = ((int *)CMSG_DATA(cmsg))[i];
-+				if (i == 0) {
-+					ifd->fd = fd;
-+					TAILQ_INSERT_TAIL(&ibuf->fds, ifd,
-+					    entry);
-+					ifd = NULL;
-+				} else
-+					close(fd);
-+			}
-+		}
-+		/* we do not handle other ctl data level */
-+	}
-+
-+fail:
-+	if (ifd)
-+		free(ifd);
-+	return (n);
-+}
-+
-+ssize_t
-+imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
-+{
-+	size_t			 av, left, datalen;
-+
-+	av = ibuf->r.wpos;
-+
-+	if (IMSG_HEADER_SIZE > av)
-+		return (0);
-+
-+	memcpy(&imsg->hdr, ibuf->r.buf, sizeof(imsg->hdr));
-+	if (imsg->hdr.len < IMSG_HEADER_SIZE ||
-+	    imsg->hdr.len > MAX_IMSGSIZE) {
-+		errno = ERANGE;
-+		return (-1);
-+	}
-+	if (imsg->hdr.len > av)
-+		return (0);
-+	datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
-+	ibuf->r.rptr = ibuf->r.buf + IMSG_HEADER_SIZE;
-+	if ((imsg->data = malloc(datalen)) == NULL)
-+		return (-1);
-+
-+	if (imsg->hdr.flags & IMSGF_HASFD)
-+		imsg->fd = imsg_get_fd(ibuf);
-+	else
-+		imsg->fd = -1;
-+
-+	memcpy(imsg->data, ibuf->r.rptr, datalen);
-+
-+	if (imsg->hdr.len < av) {
-+		left = av - imsg->hdr.len;
-+		memmove(&ibuf->r.buf, ibuf->r.buf + imsg->hdr.len, left);
-+		ibuf->r.wpos = left;
-+	} else
-+		ibuf->r.wpos = 0;
-+
-+	return (datalen + IMSG_HEADER_SIZE);
-+}
-+
-+int
-+imsg_compose(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
-+    pid_t pid, int fd, void *data, u_int16_t datalen)
-+{
-+	struct ibuf	*wbuf;
-+
-+	if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
-+		return (-1);
-+
-+	if (imsg_add(wbuf, data, datalen) == -1)
-+		return (-1);
-+
-+	wbuf->fd = fd;
-+
-+	imsg_close(ibuf, wbuf);
-+
-+	return (1);
-+}
-+
-+int
-+imsg_composev(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
-+    pid_t pid, int fd, const struct iovec *iov, int iovcnt)
-+{
-+	struct ibuf	*wbuf;
-+	int		 i, datalen = 0;
-+
-+	for (i = 0; i < iovcnt; i++)
-+		datalen += iov[i].iov_len;
-+
-+	if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
-+		return (-1);
-+
-+	for (i = 0; i < iovcnt; i++)
-+		if (imsg_add(wbuf, iov[i].iov_base, iov[i].iov_len) == -1)
-+			return (-1);
-+
-+	wbuf->fd = fd;
-+
-+	imsg_close(ibuf, wbuf);
-+
-+	return (1);
-+}
-+
-+/* ARGSUSED */
-+struct ibuf *
-+imsg_create(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
-+    pid_t pid, u_int16_t datalen)
-+{
-+	struct ibuf	*wbuf;
-+	struct imsg_hdr	 hdr;
-+
-+	datalen += IMSG_HEADER_SIZE;
-+	if (datalen > MAX_IMSGSIZE) {
-+		errno = ERANGE;
-+		return (NULL);
-+	}
-+
-+	hdr.type = type;
-+	hdr.flags = 0;
-+	hdr.peerid = peerid;
-+	if ((hdr.pid = pid) == 0)
-+		hdr.pid = ibuf->pid;
-+	if ((wbuf = ibuf_dynamic(datalen, MAX_IMSGSIZE)) == NULL) {
-+		return (NULL);
-+	}
-+	if (imsg_add(wbuf, &hdr, sizeof(hdr)) == -1)
-+		return (NULL);
-+
-+	return (wbuf);
-+}
-+
-+int
-+imsg_add(struct ibuf *msg, void *data, u_int16_t datalen)
-+{
-+	if (datalen)
-+		if (ibuf_add(msg, data, datalen) == -1) {
-+			ibuf_free(msg);
-+			return (-1);
-+		}
-+	return (datalen);
-+}
-+
-+void
-+imsg_close(struct imsgbuf *ibuf, struct ibuf *msg)
-+{
-+	struct imsg_hdr	*hdr;
-+
-+	hdr = (struct imsg_hdr *)msg->buf;
-+
-+	hdr->flags &= ~IMSGF_HASFD;
-+	if (msg->fd != -1)
-+		hdr->flags |= IMSGF_HASFD;
-+
-+	hdr->len = (u_int16_t)msg->wpos;
-+
-+	ibuf_close(&ibuf->w, msg);
-+}
-+
-+void
-+imsg_free(struct imsg *imsg)
-+{
-+	free(imsg->data);
-+}
-+
-+int
-+imsg_get_fd(struct imsgbuf *ibuf)
-+{
-+	int		 fd;
-+	struct imsg_fd	*ifd;
-+
-+	if ((ifd = TAILQ_FIRST(&ibuf->fds)) == NULL)
-+		return (-1);
-+
-+	fd = ifd->fd;
-+	TAILQ_REMOVE(&ibuf->fds, ifd, entry);
-+	free(ifd);
-+
-+	return (fd);
-+}
-+
-+int
-+imsg_flush(struct imsgbuf *ibuf)
-+{
-+	while (ibuf->w.queued)
-+		if (msgbuf_write(&ibuf->w) < 0)
-+			return (-1);
-+	return (0);
-+}
-+
-+void
-+imsg_clear(struct imsgbuf *ibuf)
-+{
-+	int	fd;
-+
-+	msgbuf_clear(&ibuf->w);
-+	while ((fd = imsg_get_fd(ibuf)) != -1)
-+		close(fd);
-+}
diff --git a/net/openbgpd/files/patch-openbsd-compat_imsg.h b/net/openbgpd/files/patch-openbsd-compat_imsg.h
deleted file mode 100644
index 91cf15ea1afd..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_imsg.h
+++ /dev/null
@@ -1,119 +0,0 @@
-Index: openbsd-compat/imsg.h
-===================================================================
-RCS file: openbsd-compat/imsg.h
-diff -N openbsd-compat/imsg.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/imsg.h	8 Dec 2012 20:17:59 -0000	1.2
-@@ -0,0 +1,112 @@
-+/*	$OpenBSD: imsg.h,v 1.1 2010/05/26 16:44:32 nicm Exp $	*/
-+
-+/*
-+ * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
-+ * Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
-+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _IMSG_H_
-+#define _IMSG_H_
-+
-+#define IBUF_READ_SIZE		65535
-+#define IMSG_HEADER_SIZE	sizeof(struct imsg_hdr)
-+#define MAX_IMSGSIZE		16384
-+
-+struct ibuf {
-+	TAILQ_ENTRY(ibuf)	 entry;
-+	u_char			*buf;
-+	size_t			 size;
-+	size_t			 max;
-+	size_t			 wpos;
-+	size_t			 rpos;
-+	int			 fd;
-+};
-+
-+struct msgbuf {
-+	TAILQ_HEAD(, ibuf)	 bufs;
-+	u_int32_t		 queued;
-+	int			 fd;
-+};
-+
-+struct ibuf_read {
-+	u_char			 buf[IBUF_READ_SIZE];
-+	u_char			*rptr;
-+	size_t			 wpos;
-+};
-+
-+struct imsg_fd {
-+	TAILQ_ENTRY(imsg_fd)	entry;
-+	int			fd;
-+};
-+
-+struct imsgbuf {
-+	TAILQ_HEAD(, imsg_fd)	 fds;
-+	struct ibuf_read	 r;
-+	struct msgbuf		 w;
-+	int			 fd;
-+	pid_t			 pid;
-+};
-+
-+#define IMSGF_HASFD	1
-+
-+struct imsg_hdr {
-+	u_int32_t	 type;
-+	u_int16_t	 len;
-+	u_int16_t	 flags;
-+	u_int32_t	 peerid;
-+	u_int32_t	 pid;
-+};
-+
-+struct imsg {
-+	struct imsg_hdr	 hdr;
-+	int		 fd;
-+	void		*data;
-+};
-+
-+
-+/* buffer.c */
-+struct ibuf	*ibuf_open(size_t);
-+struct ibuf	*ibuf_dynamic(size_t, size_t);
-+int		 ibuf_add(struct ibuf *, const void *, size_t);
-+void		*ibuf_reserve(struct ibuf *, size_t);
-+void		*ibuf_seek(struct ibuf *, size_t, size_t);
-+size_t		 ibuf_size(struct ibuf *);
-+size_t		 ibuf_left(struct ibuf *);
-+void		 ibuf_close(struct msgbuf *, struct ibuf *);
-+int		 ibuf_write(struct msgbuf *);
-+void		 ibuf_free(struct ibuf *);
-+void		 msgbuf_init(struct msgbuf *);
-+void		 msgbuf_clear(struct msgbuf *);
-+int		 msgbuf_write(struct msgbuf *);
-+void		 msgbuf_drain(struct msgbuf *, size_t);
-+
-+/* imsg.c */
-+void	 imsg_init(struct imsgbuf *, int);
-+ssize_t	 imsg_read(struct imsgbuf *);
-+ssize_t	 imsg_get(struct imsgbuf *, struct imsg *);
-+int	 imsg_compose(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
-+	    int, void *, u_int16_t);
-+int	 imsg_composev(struct imsgbuf *, u_int32_t, u_int32_t,  pid_t,
-+	    int, const struct iovec *, int);
-+struct ibuf *imsg_create(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
-+	    u_int16_t);
-+int	 imsg_add(struct ibuf *, void *, u_int16_t);
-+void	 imsg_close(struct imsgbuf *, struct ibuf *);
-+void	 imsg_free(struct imsg *);
-+int	 imsg_flush(struct imsgbuf *);
-+void	 imsg_clear(struct imsgbuf *);
-+
-+#endif
diff --git a/net/openbgpd/files/patch-openbsd-compat_openbsd-compat.h b/net/openbgpd/files/patch-openbsd-compat_openbsd-compat.h
deleted file mode 100644
index 3855a8dd3f95..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_openbsd-compat.h
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: openbsd-compat/openbsd-compat.h
-===================================================================
-RCS file: openbsd-compat/openbsd-compat.h
-diff -N openbsd-compat/openbsd-compat.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/openbsd-compat.h	13 Oct 2012 18:50:10 -0000	1.8
-@@ -0,0 +1,91 @@
-+/*
-+ * $hrs: openbgpd/openbsd-compat/openbsd-compat.h,v 1.8 2012/10/13 18:50:10 hrs Exp $
-+ */
-+
-+#ifndef _OPENBSD_COMPAT_H
-+#define _OPENBSD_COMPAT_H
-+
-+#define	__dead
-+
-+/* bgpctl/bgpctl.c */
-+#include <sys/endian.h>
-+#include <inttypes.h>
-+#define betoh64(x)	(be64toh(x))
-+#ifndef IFT_CARP
-+#define	IFT_CARP	0xf8
-+#endif
-+
-+/* bgpd/irrfilter.c */
-+typedef unsigned long	ulong;
-+
-+/* bgpd/bgpd.c */
-+#ifndef	RTLABEL_LEN	/* defined in net/pfvar.h */
-+#define RTLABEL_LEN	32
-+#endif
-+#define RTA_LABEL	0
-+
-+#define SIMPLEQ_FOREACH         STAILQ_FOREACH
-+#define SIMPLEQ_FIRST           STAILQ_FIRST
-+#define SIMPLEQ_REMOVE_HEAD     STAILQ_REMOVE_HEAD
-+#define SIMPLEQ_INSERT_TAIL     STAILQ_INSERT_TAIL
-+#define SIMPLEQ_ENTRY           STAILQ_ENTRY
-+#define SIMPLEQ_HEAD            STAILQ_HEAD
-+#define SIMPLEQ_INIT            STAILQ_INIT
-+#define SIMPLEQ_HEAD_INITIALIZER	STAILQ_HEAD_INITIALIZER
-+
-+/* Routing priorities used by the different routing protocols */
-+#define RTP_NONE        0       /* unset priority use sane default */
-+#define RTP_CONNECTED   4       /* directly connected routes */
-+#define RTP_STATIC      8       /* static routes base priority */
-+#define RTP_OSPF        32      /* OSPF routes */
-+#define RTP_ISIS        36      /* IS-IS routes */
-+#define RTP_RIP         40      /* RIP routes */
-+#define RTP_BGP         48      /* BGP routes */
-+#define RTP_DEFAULT     56      /* routes that have nothing set */
-+#define RTP_MAX         63      /* maximum priority */
-+#define RTP_ANY         64      /* any of the above */
-+#define RTP_MASK        0x7f
-+#define RTP_DOWN        0x80    /* route/link is down */
-+
-+/* missing LINK_STATE_* macros in net/if.h */
-+#define LINK_STATE_INVALID	LINK_STATE_UNKNOWN	/* link invalid */
-+#define LINK_STATE_KALIVE_DOWN	7	/* keepalive reports down */
-+#define LINK_STATE_HALF_DUPLEX	5	/* link is up and half duplex */
-+#define LINK_STATE_FULL_DUPLEX	6	/* link is up and full duplex */
-+
-+/*
-+ * Status bit descriptions for the various interface types.
-+ */
-+struct if_status_description {
-+	unsigned char	ifs_type;
-+	unsigned char	ifs_state;
-+	const char *ifs_string;
-+};
-+
-+#define LINK_STATE_DESC_MATCH(_ifs, _t, _s)				\
-+	(((_ifs)->ifs_type == (_t) || (_ifs)->ifs_type == 0) &&		\
-+	    (_ifs)->ifs_state == (_s))
-+
-+#define LINK_STATE_DESCRIPTIONS {					\
-+	{ IFT_ETHER, LINK_STATE_DOWN, "no carrier" },			\
-+									\
-+	{ IFT_IEEE80211, LINK_STATE_DOWN, "no network" },		\
-+									\
-+	{ IFT_PPP, LINK_STATE_DOWN, "no carrier" },			\
-+									\
-+	{ IFT_CARP, LINK_STATE_DOWN, "backup" },			\
-+	{ IFT_CARP, LINK_STATE_UP, "master" },				\
-+	{ IFT_CARP, LINK_STATE_HALF_DUPLEX, "master" },			\
-+	{ IFT_CARP, LINK_STATE_FULL_DUPLEX, "master" },			\
-+									\
-+	{ 0, LINK_STATE_UP, "active" },					\
-+	{ 0, LINK_STATE_HALF_DUPLEX, "active" },			\
-+	{ 0, LINK_STATE_FULL_DUPLEX, "active" },			\
-+									\
-+/*	{ 0, LINK_STATE_UNKNOWN, "unknown" },	*/			\
-+	{ 0, LINK_STATE_INVALID, "invalid" },				\
-+	{ 0, LINK_STATE_DOWN, "down" },					\
-+	{ 0, LINK_STATE_KALIVE_DOWN, "keepalive down" },		\
-+	{ 0, 0, NULL }							\
-+}
-+#endif /* _OPENBSD_COMPAT_H */
diff --git a/net/openbgpd/files/patch-openbsd-compat_util.h b/net/openbgpd/files/patch-openbsd-compat_util.h
deleted file mode 100644
index c2de585e338a..000000000000
--- a/net/openbgpd/files/patch-openbsd-compat_util.h
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: openbsd-compat/util.h
-===================================================================
-RCS file: openbsd-compat/util.h
-diff -N openbsd-compat/util.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openbsd-compat/util.h	30 Jun 2009 06:40:07 -0000	1.1
-@@ -0,0 +1,119 @@
-+/*	$OpenBSD: util.h,v 1.27 2006/06/14 02:14:25 krw Exp $	*/
-+/*	$NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $	*/
-+
-+/*-
-+ * Copyright (c) 1995
-+ *	The Regents of the University of California.  All rights reserved.
-+ * Portions Copyright (c) 1996, Jason Downs.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#ifndef _UTIL_H_
-+#define _UTIL_H_
-+
-+#include <sys/cdefs.h>
-+#include <sys/types.h>
-+
-+/*
-+ * fparseln() specific operation flags.
-+ */
-+#define FPARSELN_UNESCESC	0x01
-+#define FPARSELN_UNESCCONT	0x02
-+#define FPARSELN_UNESCCOMM	0x04
-+#define FPARSELN_UNESCREST	0x08
-+#define FPARSELN_UNESCALL	0x0f
-+
-+/*
-+ * opendev() specific operation flags.
-+ */
-+#define OPENDEV_PART	0x01		/* Try to open the raw partition. */
-+#define OPENDEV_BLCK	0x04		/* Open block, not character device. */
-+
-+/*
-+ * uucplock(3) specific flags.
-+ */
-+#define UU_LOCK_INUSE (1)
-+#define UU_LOCK_OK (0)
-+#define UU_LOCK_OPEN_ERR (-1)
-+#define UU_LOCK_READ_ERR (-2)
-+#define UU_LOCK_CREAT_ERR (-3)
-+#define UU_LOCK_WRITE_ERR (-4)
-+#define UU_LOCK_LINK_ERR (-5)
-+#define UU_LOCK_TRY_ERR (-6)
-+#define UU_LOCK_OWNER_ERR (-7)
-+
-+/*
-+ * fmt_scaled(3) specific flags.
-+ */
-+#define	FMT_SCALED_STRSIZE	7	/* minus sign, 4 digits, suffix, null byte */
-+
-+/*
-+ * stub struct definitions.
-+ */
-+struct __sFILE;
-+struct login_cap;
-+struct passwd;
-+struct termios;
-+struct utmp;
-+struct winsize;
-+
-+__BEGIN_DECLS
-+char   *fparseln(struct __sFILE *, size_t *, size_t *, const char[3], int);
-+void	login(struct utmp *);
-+int	login_tty(int);
-+int	logout(const char *);
-+void	logwtmp(const char *, const char *, const char *);
-+int	opendev(char *, int, int, char **);
-+int	pidfile(const char *);
-+void	pw_setdir(const char *);
-+char   *pw_file(const char *);
-+int	pw_lock(int retries);
-+int	pw_mkdb(char *, int);
-+int	pw_abort(void);
-+void	pw_init(void);
-+void	pw_edit(int, const char *);
-+void	pw_prompt(void);
-+void	pw_copy(int, int, const struct passwd *, const struct passwd *);
-+int	pw_scan(char *, struct passwd *, int *);
-+void	pw_error(const char *, int, int);
-+int	openpty(int *, int *, char *, struct termios *, struct winsize *);
-+int	opendisk(const char *path, int flags, char *buf, size_t buflen,
-+	    int iscooked);
-+pid_t	forkpty(int *, char *, struct termios *, struct winsize *);
-+int	getmaxpartitions(void);
-+int	getrawpartition(void);
-+void	login_fbtab(const char *, uid_t, gid_t);
-+int	login_check_expire(struct __sFILE *, struct passwd *, char *, int);
-+char   *readlabelfs(char *, int);
-+const char *uu_lockerr(int _uu_lockresult);
-+int     uu_lock(const char *_ttyname);
-+int	uu_lock_txfr(const char *_ttyname, pid_t _pid);
-+int     uu_unlock(const char *_ttyname);
-+int	fmt_scaled(long long number, char *result);
-+int	scan_scaled(char *scaled, long long *result);
-+__END_DECLS
-+
-+#endif /* !_UTIL_H_ */
diff --git a/net/openbgpd/files/pkg-message.in b/net/openbgpd/files/pkg-message.in
deleted file mode 100644
index 4e6b1eb8a3be..000000000000
--- a/net/openbgpd/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-OpenBGPD has been successfully installed.
-
-Configuration file must be created at %%PREFIX%%/etc/bgpd.conf
-and permission set to 0600.
-EOM
-}
-]
diff --git a/net/openbgpd/pkg-descr b/net/openbgpd/pkg-descr
deleted file mode 100644
index 7c8dc68201de..000000000000
--- a/net/openbgpd/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4.
-It allows ordinary machines to be used as routers exchanging routes with
-other systems speaking the BGP protocol.
diff --git a/net/py-GeoIP2/Makefile b/net/py-GeoIP2/Makefile
index 2776be108891..57a4d0553f71 100644
--- a/net/py-GeoIP2/Makefile
+++ b/net/py-GeoIP2/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	GeoIP2
-PORTVERSION=	5.0.1
+PORTVERSION=	5.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net python geography
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-GeoIP2/distinfo b/net/py-GeoIP2/distinfo
index 7b86e7a4e287..863ff0b2822e 100644
--- a/net/py-GeoIP2/distinfo
+++ b/net/py-GeoIP2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743368188
-SHA256 (maxmind-GeoIP2-python-v5.0.1_GH0.tar.gz) = b7bf74209ff212c581efe86a7bf6f4e2e519079efa4e7de7eda13047e3238e69
-SIZE (maxmind-GeoIP2-python-v5.0.1_GH0.tar.gz) = 42723
+TIMESTAMP = 1746561615
+SHA256 (maxmind-GeoIP2-python-v5.1.0_GH0.tar.gz) = be998af2dd3dc9eb33ce449be0438090b317a20671655a9a5583ff3014d74501
+SIZE (maxmind-GeoIP2-python-v5.1.0_GH0.tar.gz) = 133442
diff --git a/net/py-GeoIP2/files/patch-pyproject.toml b/net/py-GeoIP2/files/patch-pyproject.toml
index 45466d37068d..32c1bfd3dd51 100644
--- a/net/py-GeoIP2/files/patch-pyproject.toml
+++ b/net/py-GeoIP2/files/patch-pyproject.toml
@@ -1,11 +1,27 @@
---- pyproject.toml.orig	2025-03-30 21:20:26 UTC
+--- pyproject.toml.orig	2025-05-05 19:38:52 UTC
 +++ pyproject.toml
-@@ -3,7 +3,7 @@ build-backend = "setuptools.build_meta"
- build-backend = "setuptools.build_meta"
- 
+@@ -1,5 +1,5 @@
  [project]
 -name = "geoip2"
 +name = "GeoIP2"
- version = "5.0.1"
+ version = "5.1.0"
  description = "MaxMind GeoIP2 API"
  authors = [
+@@ -12,7 +12,7 @@ readme = "README.rst"
+ ]
+ requires-python = ">=3.9"
+ readme = "README.rst"
+-license = "Apache-2.0"
++license = {file = "LICENSE"}
+ classifiers = [
+     "Development Status :: 5 - Production/Stable",
+     "Environment :: Web Environment",
+@@ -44,7 +44,7 @@ requires = [
+ 
+ [build-system]
+ requires = [
+-    "setuptools>=77.0.3",
++    "setuptools",
+     "setuptools-scm",
+ ]
+ build-backend = "setuptools.build_meta"
diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile
index c8bb3b7d9c17..bf467698fb04 100644
--- a/net/py-maxminddb/Makefile
+++ b/net/py-maxminddb/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	maxminddb
-PORTVERSION=	2.6.3
+PORTVERSION=	2.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net python geography
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-maxminddb/distinfo b/net/py-maxminddb/distinfo
index 3245f91816a2..87df39922aef 100644
--- a/net/py-maxminddb/distinfo
+++ b/net/py-maxminddb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743368281
-SHA256 (maxmind-MaxMind-DB-Reader-python-v2.6.3_GH0.tar.gz) = 48d77eb0c9a3c6ffcd8dceda04451315f29c8cdea792bb3e549af7fb02952fb1
-SIZE (maxmind-MaxMind-DB-Reader-python-v2.6.3_GH0.tar.gz) = 40485
+TIMESTAMP = 1746559870
+SHA256 (maxmind-MaxMind-DB-Reader-python-v2.7.0_GH0.tar.gz) = bf4a2bf9c4e03711800c9ce91720d4d799c66f06c46884ab437073765026162a
+SIZE (maxmind-MaxMind-DB-Reader-python-v2.7.0_GH0.tar.gz) = 56688
diff --git a/net/py-maxminddb/files/patch-pyproject.toml b/net/py-maxminddb/files/patch-pyproject.toml
index 1ed2d81abfd0..8e658038ff5f 100644
--- a/net/py-maxminddb/files/patch-pyproject.toml
+++ b/net/py-maxminddb/files/patch-pyproject.toml
@@ -1,9 +1,20 @@
---- pyproject.toml.orig	2025-03-30 21:02:11 UTC
+--- pyproject.toml.orig	2025-05-05 19:00:49 UTC
 +++ pyproject.toml
-@@ -1,5 +1,5 @@
- [build-system]
--requires = ["setuptools>=68.2.2", "setuptools-scm", "wheel"]
-+requires = ["setuptools", "setuptools-scm", "wheel"]
- build-backend = "setuptools.build_meta"
+@@ -7,7 +7,7 @@ readme = "README.rst"
+ ]
+ requires-python = ">=3.9"
+ readme = "README.rst"
+-license = "Apache-2.0"
++license = {file = "LICENSE"}
+ classifiers = [
+     "Development Status :: 5 - Production/Stable",
+     "Environment :: Web Environment",
+@@ -43,7 +43,7 @@ requires = [
  
- [project]
+ [build-system]
+ requires = [
+-    "setuptools>=77.0.3",
++    "setuptools",
+     "setuptools-scm",
+     "wheel",
+ ]
diff --git a/net/rubygem-devfile-gitlab/Makefile b/net/rubygem-devfile-gitlab/Makefile
index 0d222f36edfb..55085ca8abe1 100644
--- a/net/rubygem-devfile-gitlab/Makefile
+++ b/net/rubygem-devfile-gitlab/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	devfile
-DISTVERSION=	0.4.0
+DISTVERSION=	0.4.4
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
diff --git a/net/rubygem-devfile-gitlab/distinfo b/net/rubygem-devfile-gitlab/distinfo
index 41c6b74ca59d..3f7e9308d15a 100644
--- a/net/rubygem-devfile-gitlab/distinfo
+++ b/net/rubygem-devfile-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745214376
-SHA256 (rubygem/devfile-0.4.0.gem) = 885b7728dae945582321364346f5bb59c4f92457f6cea2231c30ad1e5a168af9
-SIZE (rubygem/devfile-0.4.0.gem) = 121071616
+TIMESTAMP = 1746603888
+SHA256 (rubygem/devfile-0.4.4.gem) = 7ab954cfb23755bba94d188e5927fa66be979084b84c1cf464c413f8501e92b5
+SIZE (rubygem/devfile-0.4.4.gem) = 124867584
diff --git a/net/rubygem-devfile/Makefile b/net/rubygem-devfile/Makefile
index af4d5e5aa39b..cbb12f9bf4e4 100644
--- a/net/rubygem-devfile/Makefile
+++ b/net/rubygem-devfile/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	devfile
-DISTVERSION=	0.4.0
+DISTVERSION=	0.4.4
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
diff --git a/net/rubygem-devfile/distinfo b/net/rubygem-devfile/distinfo
index f21eb3f8c9c8..5c51b69cf566 100644
--- a/net/rubygem-devfile/distinfo
+++ b/net/rubygem-devfile/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289458
-SHA256 (rubygem/devfile-0.4.0.gem) = 885b7728dae945582321364346f5bb59c4f92457f6cea2231c30ad1e5a168af9
-SIZE (rubygem/devfile-0.4.0.gem) = 121071616
+TIMESTAMP = 1746603942
+SHA256 (rubygem/devfile-0.4.4.gem) = 7ab954cfb23755bba94d188e5927fa66be979084b84c1cf464c413f8501e92b5
+SIZE (rubygem/devfile-0.4.4.gem) = 124867584
diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index 2f349c9ce968..9b94cdd35e53 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	siproxd
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+DISTVERSION=	0.8.3
 CATEGORIES=	net
 MASTER_SITES=	SF
 
-MAINTAINER=	frank@dynamical-systems.org
+MAINTAINER=	me@svmhdvn.name
 COMMENT=	Proxy/masquerading daemon for the SIP protocol
 WWW=		http://siproxd.sourceforge.net/
 
@@ -13,7 +12,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libosip2.so:net/libosip2
 
 # :keepla because port uses lt_dlopen
-USES=		libtool:keepla
+USES=		libtool:keepla sqlite
 USE_RC_SUBR=	siproxd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-doc --disable-static --with-libosip-prefix=${PREFIX}
@@ -26,22 +25,22 @@ PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
 
 OPTIONS_DEFINE=	DOCS
 
-post-extract:
-.for docs in ${PORTDOCS2}
-	${CP} ${WRKSRC}/doc/${docs} ${WRKSRC}
-.endfor
-
 post-patch:
 	${REINPLACE_CMD} -e 's,siproxd\.conf\.example,siproxd.conf.sample,g' \
 		${WRKSRC}/doc/Makefile.in
 	${MV} ${WRKSRC}/doc/siproxd.conf.example ${WRKSRC}/doc/siproxd.conf.sample
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
-.endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/siproxd_passwd.cfg \
 		${STAGEDIR}${PREFIX}/etc/siproxd_passwd.cfg.sample
 
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for d in ${PORTDOCS1}
+	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
+.endfor
+.for d in ${PORTDOCS2}
+	${INSTALL_DATA} ${WRKSRC}/doc/${d} ${STAGEDIR}${DOCSDIR}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/net/siproxd/distinfo b/net/siproxd/distinfo
index fb215c441529..34021a322575 100644
--- a/net/siproxd/distinfo
+++ b/net/siproxd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (siproxd-0.8.2.tar.gz) = 526ce491b0cc189e2766c62432aff3ebb995e551d7261ea32c02a90c7bf7ccd0
-SIZE (siproxd-0.8.2.tar.gz) = 846148
+TIMESTAMP = 1746570576
+SHA256 (siproxd-0.8.3.tar.gz) = 9a6d7a6bb6fff162775b1e1fb7018de9c69642cbf8626185dc6ffceeeba07736
+SIZE (siproxd-0.8.3.tar.gz) = 602331
diff --git a/net/siproxd/files/patch-src__dejitter.c b/net/siproxd/files/patch-src__dejitter.c
deleted file mode 100644
index fac55474ee77..000000000000
--- a/net/siproxd/files/patch-src__dejitter.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dejitter.c.orig	2014-07-10 16:37:54.000000000 +0200
-+++ src/dejitter.c	2014-07-10 16:38:40.000000000 +0200
-@@ -24,6 +24,8 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
-+#include <string.h>
- #include <netinet/in.h>
- 
- #include <osipparser2/osip_parser.h>
diff --git a/net/siproxd/files/patch-src_accessctl.c b/net/siproxd/files/patch-src_accessctl.c
deleted file mode 100644
index 4fe0a3050725..000000000000
--- a/net/siproxd/files/patch-src_accessctl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/accessctl.c.orig	2015-09-13 08:43:04 UTC
-+++ src/accessctl.c
-@@ -34,7 +34,7 @@
- static char const ident[]="$Id: accessctl.c 521 2015-09-13 08:43:04Z hb9xar $";
- 
- /* configuration storage */
--struct siproxd_config configuration;
-+extern struct siproxd_config configuration;
- 
- 
- /*
diff --git a/net/siproxd/pkg-plist b/net/siproxd/pkg-plist
index dbe0377b6f14..44e5f928e934 100644
--- a/net/siproxd/pkg-plist
+++ b/net/siproxd/pkg-plist
@@ -1,5 +1,7 @@
 @sample etc/siproxd.conf.sample
 @sample etc/siproxd_passwd.cfg.sample
+lib/siproxd/plugin_blacklist.la
+lib/siproxd/plugin_blacklist.so
 lib/siproxd/plugin_codecfilter.la
 lib/siproxd/plugin_codecfilter.so
 lib/siproxd/plugin_defaulttarget.la
@@ -22,6 +24,8 @@ lib/siproxd/plugin_shortdial.la
 lib/siproxd/plugin_shortdial.so
 lib/siproxd/plugin_siptrunk.la
 lib/siproxd/plugin_siptrunk.so
+lib/siproxd/plugin_stats.la
+lib/siproxd/plugin_stats.so
 lib/siproxd/plugin_stripheader.la
 lib/siproxd/plugin_stripheader.so
 lib/siproxd/plugin_stun.la
diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 5b2acc3a341b..b4299707ace7 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	sslh
-PORTVERSION=	2.1.3
+PORTVERSION=	2.2.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
@@ -32,8 +32,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	sbin/sslh-fork \
 		sbin/sslh-select \
 		sbin/sslh-ev \
-		"@sample etc/sslh.conf.sample" \
-		share/man/man8/sslh.8.gz
+		"@sample etc/sslh.conf.sample"
 
 PORTEXAMPLES=	example.cfg test.cfg udp.cfg
 
@@ -48,7 +47,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sslh-ev ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/basic.cfg \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${STAGEDIR}${PREFIX}/share/man/man8
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/net/sslh/distinfo b/net/sslh/distinfo
index eefdbcdf5c63..1898395b4a4c 100644
--- a/net/sslh/distinfo
+++ b/net/sslh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733677540
-SHA256 (yrutschle-sslh-v2.1.3_GH0.tar.gz) = e5d55db40cd2e0dd886e226465d68e7a3503ca116b2e685d20423be0a7e3b8ab
-SIZE (yrutschle-sslh-v2.1.3_GH0.tar.gz) = 461954
+TIMESTAMP = 1746456545
+SHA256 (yrutschle-sslh-v2.2.3_GH0.tar.gz) = 236a361e203aec839640c9ba9a2968e287ad368f4a0fc9012eef980deb30363f
+SIZE (yrutschle-sslh-v2.2.3_GH0.tar.gz) = 514419
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 21b686f75e20..e4c4df0aa0ec 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	syncthing
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.29.2
-PORTREVISION=	3
+DISTVERSION=	1.29.6
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-source-${DISTVERSIONFULL}
@@ -13,7 +12,7 @@ WWW=		https://syncthing.net/
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/${PORTNAME}/LICENSE
 
-USES=		cpe go:1.22,modules
+USES=		cpe go:1.23,modules
 
 USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv \
 		syncthing-relaypoolsrv
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 4d50fbe76829..483744eece30 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736703459
-SHA256 (syncthing-source-v1.29.2.tar.gz) = c7b6bc36af1af6f1cb304f4ec4c16743760ef6e8b3586f31dc11439d5d5fd427
-SIZE (syncthing-source-v1.29.2.tar.gz) = 15980313
+TIMESTAMP = 1746574524
+SHA256 (syncthing-source-v1.29.6.tar.gz) = 28e7f4984a6a34fb4697448141ce2611a6510f5a4369c1669d4e766eb75cd878
+SIZE (syncthing-source-v1.29.6.tar.gz) = 16265938
diff --git a/net/trippy/Makefile b/net/trippy/Makefile
index cde5ec7e40b2..e3a23255573d 100644
--- a/net/trippy/Makefile
+++ b/net/trippy/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	trippy
-DISTVERSION=	0.12.2
-PORTREVISION=	3
+DISTVERSION=	0.13.0
 CATEGORIES=	net
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/net/trippy/Makefile.crates b/net/trippy/Makefile.crates
index 77eeda908d4e..9ded85f261fa 100644
--- a/net/trippy/Makefile.crates
+++ b/net/trippy/Makefile.crates
@@ -8,185 +8,196 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		anstyle-1.0.10 \
 		anstyle-parse-0.2.6 \
 		anstyle-query-1.1.2 \
-		anstyle-wincon-3.0.6 \
-		anyhow-1.0.94 \
+		anstyle-wincon-3.0.7 \
+		anyhow-1.0.98 \
 		arrayvec-0.7.6 \
 		async-channel-2.3.1 \
 		async-task-4.7.1 \
-		async-trait-0.1.83 \
+		async-trait-0.1.88 \
 		atomic-waker-1.1.2 \
 		autocfg-1.4.0 \
 		backtrace-0.3.74 \
-		bitflags-2.6.0 \
+		bitflags-2.9.0 \
 		blocking-1.6.1 \
-		bumpalo-3.16.0 \
-		byteorder-1.5.0 \
-		bytes-1.9.0 \
+		bumpalo-3.17.0 \
+		bytes-1.10.1 \
 		c2rust-bitfields-0.19.0 \
 		c2rust-bitfields-derive-0.19.0 \
 		caps-0.5.5 \
 		cassowary-0.3.0 \
 		castaway-0.2.3 \
-		cc-1.2.3 \
+		cc-1.2.21 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.2.1 \
-		chrono-0.4.39 \
-		clap-4.5.23 \
-		clap_builder-4.5.23 \
-		clap_complete-4.5.38 \
-		clap_derive-4.5.18 \
+		chrono-0.4.41 \
+		chrono-tz-0.10.3 \
+		chrono-tz-build-0.4.1 \
+		clap-4.5.37 \
+		clap_builder-4.5.37 \
+		clap_complete-4.5.48 \
+		clap_derive-4.5.32 \
 		clap_lex-0.7.4 \
-		clap_mangen-0.2.24 \
+		clap_mangen-0.2.26 \
 		colorchoice-1.0.3 \
-		comfy-table-7.1.3 \
-		compact_str-0.8.0 \
+		comfy-table-7.1.4 \
+		compact_str-0.8.1 \
 		concurrent-queue-2.5.0 \
-		console-0.15.8 \
+		console-0.15.11 \
 		core-foundation-sys-0.8.7 \
 		crossbeam-0.8.4 \
-		crossbeam-channel-0.5.13 \
-		crossbeam-deque-0.8.5 \
+		crossbeam-channel-0.5.15 \
+		crossbeam-deque-0.8.6 \
 		crossbeam-epoch-0.9.18 \
-		crossbeam-queue-0.3.11 \
-		crossbeam-utils-0.8.20 \
+		crossbeam-queue-0.3.12 \
+		crossbeam-utils-0.8.21 \
 		crossterm-0.28.1 \
 		crossterm_winapi-0.9.1 \
 		csv-1.3.1 \
-		csv-core-0.1.11 \
-		darling-0.20.10 \
-		darling_core-0.20.10 \
-		darling_macro-0.20.10 \
-		data-encoding-2.6.0 \
-		derive_more-1.0.0 \
-		derive_more-impl-1.0.0 \
+		csv-core-0.1.12 \
+		darling-0.20.11 \
+		darling_core-0.20.11 \
+		darling_macro-0.20.11 \
+		data-encoding-2.9.0 \
+		derive_more-2.0.1 \
+		derive_more-impl-2.0.1 \
 		diff-0.1.13 \
 		displaydoc-0.2.5 \
 		dns-lookup-2.0.4 \
 		downcast-0.11.0 \
-		either-1.13.0 \
-		encode_unicode-0.3.6 \
+		either-1.15.0 \
+		encode_unicode-1.0.0 \
 		encoding_rs-0.8.35 \
 		encoding_rs_io-0.1.7 \
 		enum-as-inner-0.6.1 \
-		equivalent-1.0.1 \
-		errno-0.3.10 \
+		equivalent-1.0.2 \
+		errno-0.3.11 \
 		etcetera-0.8.0 \
-		event-listener-5.3.1 \
-		event-listener-strategy-0.5.3 \
+		event-listener-5.4.0 \
+		event-listener-strategy-0.5.4 \
 		fastrand-2.3.0 \
-		fixedbitset-0.4.2 \
+		fixedbitset-0.5.7 \
 		fnv-1.0.7 \
-		foldhash-0.1.3 \
+		foldhash-0.1.5 \
 		form_urlencoded-1.2.1 \
-		fragile-2.0.0 \
+		fragile-2.0.1 \
 		futures-0.3.31 \
 		futures-channel-0.3.31 \
 		futures-core-0.3.31 \
 		futures-executor-0.3.31 \
 		futures-io-0.3.31 \
-		futures-lite-2.5.0 \
+		futures-lite-2.6.0 \
 		futures-macro-0.3.31 \
 		futures-sink-0.3.31 \
 		futures-task-0.3.31 \
 		futures-util-0.3.31 \
-		getrandom-0.2.15 \
+		getrandom-0.2.16 \
+		getrandom-0.3.2 \
 		gimli-0.31.1 \
-		hashbrown-0.15.2 \
+		hashbrown-0.15.3 \
 		heck-0.5.0 \
 		hex-literal-0.4.1 \
-		hickory-proto-0.24.2 \
-		hickory-resolver-0.24.2 \
+		hickory-proto-0.24.4 \
+		hickory-resolver-0.24.4 \
 		home-0.5.9 \
-		hostname-0.3.1 \
-		humantime-2.1.0 \
-		iana-time-zone-0.1.61 \
+		humantime-2.2.0 \
+		iana-time-zone-0.1.63 \
 		iana-time-zone-haiku-0.1.2 \
 		icu_collections-1.5.0 \
 		icu_locid-1.5.0 \
 		icu_locid_transform-1.5.0 \
-		icu_locid_transform_data-1.5.0 \
+		icu_locid_transform_data-1.5.1 \
 		icu_normalizer-1.5.0 \
-		icu_normalizer_data-1.5.0 \
+		icu_normalizer_data-1.5.1 \
 		icu_properties-1.5.1 \
-		icu_properties_data-1.5.0 \
+		icu_properties_data-1.5.1 \
 		icu_provider-1.5.0 \
 		icu_provider_macros-1.5.0 \
 		ident_case-1.0.1 \
 		idna-1.0.3 \
 		idna_adapter-1.2.0 \
-		indexmap-2.7.0 \
-		indoc-2.0.5 \
-		insta-1.41.1 \
-		instability-0.3.3 \
+		indexmap-2.9.0 \
+		indoc-2.0.6 \
+		insta-1.43.1 \
+		instability-0.3.7 \
 		ipconfig-0.3.2 \
-		ipnet-2.10.1 \
-		ipnetwork-0.20.0 \
+		ipnet-2.11.0 \
+		ipnetwork-0.21.1 \
 		is_terminal_polyfill-1.70.1 \
 		itertools-0.13.0 \
-		itoa-1.0.14 \
-		js-sys-0.3.76 \
+		itertools-0.14.0 \
+		itoa-1.0.15 \
+		js-sys-0.3.77 \
 		lazy_static-1.5.0 \
-		libc-0.2.168 \
+		libc-0.2.172 \
 		libloading-0.8.6 \
 		linked-hash-map-0.5.6 \
-		linux-raw-sys-0.4.14 \
+		linux-raw-sys-0.4.15 \
+		linux-raw-sys-0.9.4 \
 		litemap-0.7.4 \
 		lock_api-0.4.12 \
-		log-0.4.22 \
+		log-0.4.27 \
 		lru-0.12.5 \
 		lru-cache-0.1.2 \
-		match_cfg-0.1.0 \
 		matchers-0.1.0 \
-		maxminddb-0.24.0 \
+		maxminddb-0.25.0 \
 		memchr-2.7.4 \
 		memoffset-0.9.1 \
-		miniz_oxide-0.8.0 \
+		miniz_oxide-0.8.8 \
 		mio-1.0.3 \
 		mockall-0.13.1 \
 		mockall_derive-0.13.1 \
 		nix-0.29.0 \
 		nu-ansi-term-0.46.0 \
 		num-traits-0.2.19 \
-		object-0.36.5 \
-		once_cell-1.20.2 \
+		object-0.36.7 \
+		once_cell-1.21.3 \
 		overload-0.1.1 \
 		parking-2.2.1 \
 		parking_lot-0.12.3 \
 		parking_lot_core-0.9.10 \
+		parse-zoneinfo-0.3.1 \
 		paste-1.0.15 \
 		percent-encoding-2.3.1 \
-		petgraph-0.6.5 \
-		pin-project-lite-0.2.15 \
+		petgraph-0.7.1 \
+		phf-0.11.3 \
+		phf_codegen-0.11.3 \
+		phf_generator-0.11.3 \
+		phf_shared-0.11.3 \
+		pin-project-lite-0.2.16 \
 		pin-utils-0.1.0 \
 		piper-0.2.4 \
-		ppv-lite86-0.2.20 \
-		predicates-3.1.2 \
-		predicates-core-1.0.8 \
-		predicates-tree-1.0.11 \
+		ppv-lite86-0.2.21 \
+		predicates-3.1.3 \
+		predicates-core-1.0.9 \
+		predicates-tree-1.0.12 \
 		pretty_assertions-1.4.1 \
-		proc-macro2-1.0.92 \
-		quick-error-1.2.3 \
-		quote-1.0.37 \
+		proc-macro2-1.0.95 \
+		quote-1.0.40 \
+		r-efi-5.2.0 \
 		rand-0.8.5 \
+		rand-0.9.1 \
 		rand_chacha-0.3.1 \
+		rand_chacha-0.9.0 \
 		rand_core-0.6.4 \
+		rand_core-0.9.3 \
 		ratatui-0.29.0 \
-		redox_syscall-0.5.7 \
+		redox_syscall-0.5.12 \
 		regex-1.11.1 \
 		regex-automata-0.1.10 \
 		regex-automata-0.4.9 \
 		regex-syntax-0.6.29 \
 		regex-syntax-0.8.5 \
-		resolv-conf-0.7.0 \
+		resolv-conf-0.7.3 \
 		roff-0.2.2 \
 		rustc-demangle-0.1.24 \
-		rustix-0.38.42 \
-		rustversion-1.0.18 \
-		ryu-1.0.18 \
+		rustix-0.38.44 \
+		rustix-1.0.7 \
+		rustversion-1.0.20 \
+		ryu-1.0.20 \
 		scopeguard-1.2.0 \
-		serde-1.0.216 \
-		serde_derive-1.0.216 \
-		serde_json-1.0.133 \
+		serde-1.0.219 \
+		serde_derive-1.0.219 \
+		serde_json-1.0.140 \
 		serde_spanned-0.6.8 \
 		serde_with-3.12.0 \
 		serde_with_macros-3.12.0 \
@@ -194,39 +205,42 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		shlex-1.3.0 \
 		signal-hook-0.3.17 \
 		signal-hook-mio-0.2.4 \
-		signal-hook-registry-1.4.2 \
-		similar-2.6.0 \
+		signal-hook-registry-1.4.5 \
+		similar-2.7.0 \
+		siphasher-1.0.1 \
 		slab-0.4.9 \
-		smallvec-1.13.2 \
-		socket2-0.5.8 \
+		smallvec-1.15.0 \
+		socket2-0.5.9 \
 		stable_deref_trait-1.2.0 \
 		static_assertions-1.1.0 \
 		strsim-0.11.1 \
 		strum-0.26.3 \
+		strum-0.27.1 \
 		strum_macros-0.26.4 \
+		strum_macros-0.27.1 \
 		syn-1.0.109 \
-		syn-2.0.90 \
-		synstructure-0.13.1 \
+		syn-2.0.101 \
+		synstructure-0.13.2 \
 		sys-locale-0.3.2 \
-		terminal_size-0.4.1 \
-		termtree-0.4.1 \
+		terminal_size-0.4.2 \
+		termtree-0.5.1 \
 		test-case-3.3.1 \
 		test-case-core-3.3.1 \
 		test-case-macros-3.3.1 \
 		thiserror-1.0.69 \
-		thiserror-2.0.6 \
+		thiserror-2.0.12 \
 		thiserror-impl-1.0.69 \
-		thiserror-impl-2.0.6 \
+		thiserror-impl-2.0.12 \
 		thread_local-1.1.8 \
 		tinystr-0.7.6 \
-		tinyvec-1.8.0 \
+		tinyvec-1.9.0 \
 		tinyvec_macros-0.1.1 \
-		tokio-1.42.0 \
-		tokio-macros-2.4.0 \
-		tokio-util-0.7.13 \
-		toml-0.8.19 \
-		toml_datetime-0.6.8 \
-		toml_edit-0.22.22 \
+		tokio-1.44.2 \
+		tokio-macros-2.5.0 \
+		tokio-util-0.7.15 \
+		toml-0.8.22 \
+		toml_datetime-0.6.9 \
+		toml_edit-0.22.26 \
 		tracing-0.1.41 \
 		tracing-attributes-0.1.28 \
 		tracing-chrome-0.7.2 \
@@ -235,7 +249,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		tracing-serde-0.2.0 \
 		tracing-subscriber-0.3.19 \
 		tun2-4.0.0 \
-		unicode-ident-1.0.14 \
+		unicode-ident-1.0.18 \
 		unicode-segmentation-1.12.0 \
 		unicode-truncate-1.1.0 \
 		unicode-width-0.1.14 \
@@ -244,18 +258,24 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		utf16_iter-1.0.5 \
 		utf8_iter-1.0.4 \
 		utf8parse-0.2.2 \
-		valuable-0.1.0 \
+		valuable-0.1.1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.99 \
-		wasm-bindgen-backend-0.2.99 \
-		wasm-bindgen-macro-0.2.99 \
-		wasm-bindgen-macro-support-0.2.99 \
-		wasm-bindgen-shared-0.2.99 \
-		widestring-1.1.0 \
+		wasi-0.14.2+wasi-0.2.4 \
+		wasm-bindgen-0.2.100 \
+		wasm-bindgen-backend-0.2.100 \
+		wasm-bindgen-macro-0.2.100 \
+		wasm-bindgen-macro-support-0.2.100 \
+		wasm-bindgen-shared-0.2.100 \
+		widestring-1.2.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-core-0.52.0 \
+		windows-core-0.61.0 \
+		windows-implement-0.60.0 \
+		windows-interface-0.59.1 \
+		windows-link-0.1.1 \
+		windows-result-0.3.2 \
+		windows-strings-0.4.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
 		windows-sys-0.59.0 \
@@ -276,18 +296,18 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_msvc-0.48.5 \
 		windows_x86_64_msvc-0.52.6 \
-		winnow-0.6.20 \
+		winnow-0.7.9 \
 		winreg-0.50.0 \
-		winreg-0.52.0 \
-		wintun-bindings-0.7.20 \
+		wintun-bindings-0.7.31 \
+		wit-bindgen-rt-0.39.0 \
 		write16-1.0.0 \
 		writeable-0.5.5 \
 		yansi-1.0.1 \
 		yoke-0.7.5 \
 		yoke-derive-0.7.5 \
-		zerocopy-0.7.35 \
-		zerocopy-derive-0.7.35 \
+		zerocopy-0.8.25 \
+		zerocopy-derive-0.8.25 \
 		zerofrom-0.1.5 \
-		zerofrom-derive-0.1.5 \
+		zerofrom-derive-0.1.6 \
 		zerovec-0.10.4 \
 		zerovec-derive-0.10.3
diff --git a/net/trippy/distinfo b/net/trippy/distinfo
index 7d463f04b064..f596c9a3e32f 100644
--- a/net/trippy/distinfo
+++ b/net/trippy/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1736017894
+TIMESTAMP = 1746469798
 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
@@ -19,34 +19,32 @@ SHA256 (rust/crates/anstyle-parse-0.2.6.crate) = 3b2d16507662817a6a20a9ea92df665
 SIZE (rust/crates/anstyle-parse-0.2.6.crate) = 22343
 SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c
 SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
-SHA256 (rust/crates/anstyle-wincon-3.0.6.crate) = 2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125
-SIZE (rust/crates/anstyle-wincon-3.0.6.crate) = 12271
-SHA256 (rust/crates/anyhow-1.0.94.crate) = c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7
-SIZE (rust/crates/anyhow-1.0.94.crate) = 51731
+SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e
+SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400
+SHA256 (rust/crates/anyhow-1.0.98.crate) = e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487
+SIZE (rust/crates/anyhow-1.0.98.crate) = 53334
 SHA256 (rust/crates/arrayvec-0.7.6.crate) = 7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50
 SIZE (rust/crates/arrayvec-0.7.6.crate) = 31237
 SHA256 (rust/crates/async-channel-2.3.1.crate) = 89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a
 SIZE (rust/crates/async-channel-2.3.1.crate) = 14576
 SHA256 (rust/crates/async-task-4.7.1.crate) = 8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de
 SIZE (rust/crates/async-task-4.7.1.crate) = 38077
-SHA256 (rust/crates/async-trait-0.1.83.crate) = 721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd
-SIZE (rust/crates/async-trait-0.1.83.crate) = 29054
+SHA256 (rust/crates/async-trait-0.1.88.crate) = e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5
+SIZE (rust/crates/async-trait-0.1.88.crate) = 32084
 SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0
 SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
 SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
 SIZE (rust/crates/backtrace-0.3.74.crate) = 88516
-SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de
-SIZE (rust/crates/bitflags-2.6.0.crate) = 45357
+SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd
+SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
 SHA256 (rust/crates/blocking-1.6.1.crate) = 703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea
 SIZE (rust/crates/blocking-1.6.1.crate) = 17788
-SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
-SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
-SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
-SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
-SHA256 (rust/crates/bytes-1.9.0.crate) = 325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b
-SIZE (rust/crates/bytes-1.9.0.crate) = 67320
+SHA256 (rust/crates/bumpalo-3.17.0.crate) = 1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf
+SIZE (rust/crates/bumpalo-3.17.0.crate) = 91975
+SHA256 (rust/crates/bytes-1.10.1.crate) = d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a
+SIZE (rust/crates/bytes-1.10.1.crate) = 76779
 SHA256 (rust/crates/c2rust-bitfields-0.19.0.crate) = 367e5d1b30f28be590b6b3868da1578361d29d9bfac516d22f497d28ed7c9055
 SIZE (rust/crates/c2rust-bitfields-0.19.0.crate) = 5885
 SHA256 (rust/crates/c2rust-bitfields-derive-0.19.0.crate) = a279db9c50c4024eeca1a763b6e0f033848ce74e83e47454bcf8a8a98f7b0b56
@@ -57,70 +55,74 @@ SHA256 (rust/crates/cassowary-0.3.0.crate) = df8670b8c7b9dae1793364eafadf7239c40
 SIZE (rust/crates/cassowary-0.3.0.crate) = 22876
 SHA256 (rust/crates/castaway-0.2.3.crate) = 0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5
 SIZE (rust/crates/castaway-0.2.3.crate) = 11509
-SHA256 (rust/crates/cc-1.2.3.crate) = 27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d
-SIZE (rust/crates/cc-1.2.3.crate) = 99421
+SHA256 (rust/crates/cc-1.2.21.crate) = 8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0
+SIZE (rust/crates/cc-1.2.21.crate) = 106117
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
 SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
-SHA256 (rust/crates/chrono-0.4.39.crate) = 7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825
-SIZE (rust/crates/chrono-0.4.39.crate) = 222248
-SHA256 (rust/crates/clap-4.5.23.crate) = 3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84
-SIZE (rust/crates/clap-4.5.23.crate) = 56460
-SHA256 (rust/crates/clap_builder-4.5.23.crate) = 30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838
-SIZE (rust/crates/clap_builder-4.5.23.crate) = 164180
-SHA256 (rust/crates/clap_complete-4.5.38.crate) = d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01
-SIZE (rust/crates/clap_complete-4.5.38.crate) = 47669
-SHA256 (rust/crates/clap_derive-4.5.18.crate) = 4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab
-SIZE (rust/crates/clap_derive-4.5.18.crate) = 30131
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
+SHA256 (rust/crates/chrono-tz-0.10.3.crate) = efdce149c370f133a071ca8ef6ea340b7b88748ab0810097a9e2976eaa34b4f3
+SIZE (rust/crates/chrono-tz-0.10.3.crate) = 380709
+SHA256 (rust/crates/chrono-tz-build-0.4.1.crate) = 8f10f8c9340e31fc120ff885fcdb54a0b48e474bbd77cab557f0c30a3e569402
+SIZE (rust/crates/chrono-tz-build-0.4.1.crate) = 11798
+SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071
+SIZE (rust/crates/clap-4.5.37.crate) = 56962
+SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2
+SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761
+SHA256 (rust/crates/clap_complete-4.5.48.crate) = be8c97f3a6f02b9e24cadc12aaba75201d18754b53ea0a9d99642f806ccdb4c9
+SIZE (rust/crates/clap_complete-4.5.48.crate) = 48036
+SHA256 (rust/crates/clap_derive-4.5.32.crate) = 09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7
+SIZE (rust/crates/clap_derive-4.5.32.crate) = 33441
 SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6
 SIZE (rust/crates/clap_lex-0.7.4.crate) = 12858
-SHA256 (rust/crates/clap_mangen-0.2.24.crate) = fbae9cbfdc5d4fa8711c09bd7b83f644cb48281ac35bf97af3e47b0675864bdf
-SIZE (rust/crates/clap_mangen-0.2.24.crate) = 15380
+SHA256 (rust/crates/clap_mangen-0.2.26.crate) = 724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a
+SIZE (rust/crates/clap_mangen-0.2.26.crate) = 15630
 SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990
 SIZE (rust/crates/colorchoice-1.0.3.crate) = 7923
-SHA256 (rust/crates/comfy-table-7.1.3.crate) = 24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9
-SIZE (rust/crates/comfy-table-7.1.3.crate) = 73951
-SHA256 (rust/crates/compact_str-0.8.0.crate) = 6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644
-SIZE (rust/crates/compact_str-0.8.0.crate) = 70994
+SHA256 (rust/crates/comfy-table-7.1.4.crate) = 4a65ebfec4fb190b6f90e944a817d60499ee0744e582530e2c9900a22e591d9a
+SIZE (rust/crates/comfy-table-7.1.4.crate) = 77044
+SHA256 (rust/crates/compact_str-0.8.1.crate) = 3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32
+SIZE (rust/crates/compact_str-0.8.1.crate) = 71371
 SHA256 (rust/crates/concurrent-queue-2.5.0.crate) = 4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973
 SIZE (rust/crates/concurrent-queue-2.5.0.crate) = 22654
-SHA256 (rust/crates/console-0.15.8.crate) = 0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb
-SIZE (rust/crates/console-0.15.8.crate) = 36364
+SHA256 (rust/crates/console-0.15.11.crate) = 054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8
+SIZE (rust/crates/console-0.15.11.crate) = 37822
 SHA256 (rust/crates/core-foundation-sys-0.8.7.crate) = 773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b
 SIZE (rust/crates/core-foundation-sys-0.8.7.crate) = 37712
 SHA256 (rust/crates/crossbeam-0.8.4.crate) = 1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8
 SIZE (rust/crates/crossbeam-0.8.4.crate) = 10500
-SHA256 (rust/crates/crossbeam-channel-0.5.13.crate) = 33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2
-SIZE (rust/crates/crossbeam-channel-0.5.13.crate) = 91174
-SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
-SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726
+SHA256 (rust/crates/crossbeam-channel-0.5.15.crate) = 82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2
+SIZE (rust/crates/crossbeam-channel-0.5.15.crate) = 92716
+SHA256 (rust/crates/crossbeam-deque-0.8.6.crate) = 9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51
+SIZE (rust/crates/crossbeam-deque-0.8.6.crate) = 22471
 SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
 SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875
-SHA256 (rust/crates/crossbeam-queue-0.3.11.crate) = df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35
-SIZE (rust/crates/crossbeam-queue-0.3.11.crate) = 15581
-SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
-SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
+SHA256 (rust/crates/crossbeam-queue-0.3.12.crate) = 0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115
+SIZE (rust/crates/crossbeam-queue-0.3.12.crate) = 16270
+SHA256 (rust/crates/crossbeam-utils-0.8.21.crate) = d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28
+SIZE (rust/crates/crossbeam-utils-0.8.21.crate) = 42691
 SHA256 (rust/crates/crossterm-0.28.1.crate) = 829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6
 SIZE (rust/crates/crossterm-0.28.1.crate) = 132275
 SHA256 (rust/crates/crossterm_winapi-0.9.1.crate) = acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b
 SIZE (rust/crates/crossterm_winapi-0.9.1.crate) = 16027
 SHA256 (rust/crates/csv-1.3.1.crate) = acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf
 SIZE (rust/crates/csv-1.3.1.crate) = 888542
-SHA256 (rust/crates/csv-core-0.1.11.crate) = 5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70
-SIZE (rust/crates/csv-core-0.1.11.crate) = 25852
-SHA256 (rust/crates/darling-0.20.10.crate) = 6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989
-SIZE (rust/crates/darling-0.20.10.crate) = 32031
-SHA256 (rust/crates/darling_core-0.20.10.crate) = 95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5
-SIZE (rust/crates/darling_core-0.20.10.crate) = 65015
-SHA256 (rust/crates/darling_macro-0.20.10.crate) = d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806
-SIZE (rust/crates/darling_macro-0.20.10.crate) = 1874
-SHA256 (rust/crates/data-encoding-2.6.0.crate) = e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2
-SIZE (rust/crates/data-encoding-2.6.0.crate) = 20769
-SHA256 (rust/crates/derive_more-1.0.0.crate) = 4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05
-SIZE (rust/crates/derive_more-1.0.0.crate) = 64854
-SHA256 (rust/crates/derive_more-impl-1.0.0.crate) = cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22
-SIZE (rust/crates/derive_more-impl-1.0.0.crate) = 76182
+SHA256 (rust/crates/csv-core-0.1.12.crate) = 7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d
+SIZE (rust/crates/csv-core-0.1.12.crate) = 26298
+SHA256 (rust/crates/darling-0.20.11.crate) = fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee
+SIZE (rust/crates/darling-0.20.11.crate) = 37614
+SHA256 (rust/crates/darling_core-0.20.11.crate) = 0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e
+SIZE (rust/crates/darling_core-0.20.11.crate) = 68006
+SHA256 (rust/crates/darling_macro-0.20.11.crate) = fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead
+SIZE (rust/crates/darling_macro-0.20.11.crate) = 2532
+SHA256 (rust/crates/data-encoding-2.9.0.crate) = 2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476
+SIZE (rust/crates/data-encoding-2.9.0.crate) = 21564
+SHA256 (rust/crates/derive_more-2.0.1.crate) = 093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678
+SIZE (rust/crates/derive_more-2.0.1.crate) = 70127
+SHA256 (rust/crates/derive_more-impl-2.0.1.crate) = bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3
+SIZE (rust/crates/derive_more-impl-2.0.1.crate) = 78233
 SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8
 SIZE (rust/crates/diff-0.1.13.crate) = 46216
 SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
@@ -129,38 +131,38 @@ SHA256 (rust/crates/dns-lookup-2.0.4.crate) = e5766087c2235fec47fafa4cfecc81e494
 SIZE (rust/crates/dns-lookup-2.0.4.crate) = 13733
 SHA256 (rust/crates/downcast-0.11.0.crate) = 1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1
 SIZE (rust/crates/downcast-0.11.0.crate) = 5976
-SHA256 (rust/crates/either-1.13.0.crate) = 60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0
-SIZE (rust/crates/either-1.13.0.crate) = 19169
-SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
-SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719
+SIZE (rust/crates/either-1.15.0.crate) = 20114
+SHA256 (rust/crates/encode_unicode-1.0.0.crate) = 34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0
+SIZE (rust/crates/encode_unicode-1.0.0.crate) = 56986
 SHA256 (rust/crates/encoding_rs-0.8.35.crate) = 75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3
 SIZE (rust/crates/encoding_rs-0.8.35.crate) = 1381050
 SHA256 (rust/crates/encoding_rs_io-0.1.7.crate) = 1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83
 SIZE (rust/crates/encoding_rs_io-0.1.7.crate) = 16969
 SHA256 (rust/crates/enum-as-inner-0.6.1.crate) = a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc
 SIZE (rust/crates/enum-as-inner-0.6.1.crate) = 12190
-SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
-SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.10.crate) = 33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d
-SIZE (rust/crates/errno-0.3.10.crate) = 11824
+SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
+SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
+SHA256 (rust/crates/errno-0.3.11.crate) = 976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e
+SIZE (rust/crates/errno-0.3.11.crate) = 12048
 SHA256 (rust/crates/etcetera-0.8.0.crate) = 136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943
 SIZE (rust/crates/etcetera-0.8.0.crate) = 13295
-SHA256 (rust/crates/event-listener-5.3.1.crate) = 6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba
-SIZE (rust/crates/event-listener-5.3.1.crate) = 42576
-SHA256 (rust/crates/event-listener-strategy-0.5.3.crate) = 3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2
-SIZE (rust/crates/event-listener-strategy-0.5.3.crate) = 10920
+SHA256 (rust/crates/event-listener-5.4.0.crate) = 3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae
+SIZE (rust/crates/event-listener-5.4.0.crate) = 43452
+SHA256 (rust/crates/event-listener-strategy-0.5.4.crate) = 8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93
+SIZE (rust/crates/event-listener-strategy-0.5.4.crate) = 16179
 SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be
 SIZE (rust/crates/fastrand-2.3.0.crate) = 15076
-SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
-SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
+SHA256 (rust/crates/fixedbitset-0.5.7.crate) = 1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99
+SIZE (rust/crates/fixedbitset-0.5.7.crate) = 26537
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
-SHA256 (rust/crates/foldhash-0.1.3.crate) = f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2
-SIZE (rust/crates/foldhash-0.1.3.crate) = 13712
+SHA256 (rust/crates/foldhash-0.1.5.crate) = d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2
+SIZE (rust/crates/foldhash-0.1.5.crate) = 21901
 SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
 SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
-SHA256 (rust/crates/fragile-2.0.0.crate) = 6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa
-SIZE (rust/crates/fragile-2.0.0.crate) = 14668
+SHA256 (rust/crates/fragile-2.0.1.crate) = 28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619
+SIZE (rust/crates/fragile-2.0.1.crate) = 14648
 SHA256 (rust/crates/futures-0.3.31.crate) = 65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876
 SIZE (rust/crates/futures-0.3.31.crate) = 54953
 SHA256 (rust/crates/futures-channel-0.3.31.crate) = 2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10
@@ -171,8 +173,8 @@ SHA256 (rust/crates/futures-executor-0.3.31.crate) = 1e28d1d997f585e54aebc3f97d3
 SIZE (rust/crates/futures-executor-0.3.31.crate) = 17965
 SHA256 (rust/crates/futures-io-0.3.31.crate) = 9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6
 SIZE (rust/crates/futures-io-0.3.31.crate) = 9047
-SHA256 (rust/crates/futures-lite-2.5.0.crate) = cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1
-SIZE (rust/crates/futures-lite-2.5.0.crate) = 41117
+SHA256 (rust/crates/futures-lite-2.6.0.crate) = f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532
+SIZE (rust/crates/futures-lite-2.6.0.crate) = 45157
 SHA256 (rust/crates/futures-macro-0.3.31.crate) = 162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650
 SIZE (rust/crates/futures-macro-0.3.31.crate) = 11341
 SHA256 (rust/crates/futures-sink-0.3.31.crate) = e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7
@@ -181,28 +183,28 @@ SHA256 (rust/crates/futures-task-0.3.31.crate) = f90f7dce0722e95104fcb095585910c
 SIZE (rust/crates/futures-task-0.3.31.crate) = 11217
 SHA256 (rust/crates/futures-util-0.3.31.crate) = 9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81
 SIZE (rust/crates/futures-util-0.3.31.crate) = 162124
-SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
-SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592
+SIZE (rust/crates/getrandom-0.2.16.crate) = 40163
+SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0
+SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
 SHA256 (rust/crates/gimli-0.31.1.crate) = 07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f
 SIZE (rust/crates/gimli-0.31.1.crate) = 279515
-SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
-SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
+SHA256 (rust/crates/hashbrown-0.15.3.crate) = 84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3
+SIZE (rust/crates/hashbrown-0.15.3.crate) = 140413
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hex-literal-0.4.1.crate) = 6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46
 SIZE (rust/crates/hex-literal-0.4.1.crate) = 8559
-SHA256 (rust/crates/hickory-proto-0.24.2.crate) = 447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5
-SIZE (rust/crates/hickory-proto-0.24.2.crate) = 372860
-SHA256 (rust/crates/hickory-resolver-0.24.2.crate) = 0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4
-SIZE (rust/crates/hickory-resolver-0.24.2.crate) = 90292
+SHA256 (rust/crates/hickory-proto-0.24.4.crate) = 92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248
+SIZE (rust/crates/hickory-proto-0.24.4.crate) = 383461
+SHA256 (rust/crates/hickory-resolver-0.24.4.crate) = cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e
+SIZE (rust/crates/hickory-resolver-0.24.4.crate) = 89596
 SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
 SIZE (rust/crates/home-0.5.9.crate) = 8760
-SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
-SIZE (rust/crates/hostname-0.3.1.crate) = 9272
-SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
-SIZE (rust/crates/humantime-2.1.0.crate) = 16749
-SHA256 (rust/crates/iana-time-zone-0.1.61.crate) = 235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220
-SIZE (rust/crates/iana-time-zone-0.1.61.crate) = 27685
+SHA256 (rust/crates/humantime-2.2.0.crate) = 9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f
+SIZE (rust/crates/humantime-2.2.0.crate) = 20646
+SHA256 (rust/crates/iana-time-zone-0.1.63.crate) = b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8
+SIZE (rust/crates/iana-time-zone-0.1.63.crate) = 32919
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
 SHA256 (rust/crates/icu_collections-1.5.0.crate) = db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526
@@ -211,16 +213,16 @@ SHA256 (rust/crates/icu_locid-1.5.0.crate) = 13acbb8371917fc971be86fc8057c41a64b
 SIZE (rust/crates/icu_locid-1.5.0.crate) = 55131
 SHA256 (rust/crates/icu_locid_transform-1.5.0.crate) = 01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e
 SIZE (rust/crates/icu_locid_transform-1.5.0.crate) = 29094
-SHA256 (rust/crates/icu_locid_transform_data-1.5.0.crate) = fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e
-SIZE (rust/crates/icu_locid_transform_data-1.5.0.crate) = 44727
+SHA256 (rust/crates/icu_locid_transform_data-1.5.1.crate) = 7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d
+SIZE (rust/crates/icu_locid_transform_data-1.5.1.crate) = 42937
 SHA256 (rust/crates/icu_normalizer-1.5.0.crate) = 19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f
 SIZE (rust/crates/icu_normalizer-1.5.0.crate) = 53113
-SHA256 (rust/crates/icu_normalizer_data-1.5.0.crate) = f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516
-SIZE (rust/crates/icu_normalizer_data-1.5.0.crate) = 50561
+SHA256 (rust/crates/icu_normalizer_data-1.5.1.crate) = c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7
+SIZE (rust/crates/icu_normalizer_data-1.5.1.crate) = 50737
 SHA256 (rust/crates/icu_properties-1.5.1.crate) = 93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5
 SIZE (rust/crates/icu_properties-1.5.1.crate) = 64479
-SHA256 (rust/crates/icu_properties_data-1.5.0.crate) = 67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569
-SIZE (rust/crates/icu_properties_data-1.5.0.crate) = 227993
+SHA256 (rust/crates/icu_properties_data-1.5.1.crate) = 85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2
+SIZE (rust/crates/icu_properties_data-1.5.1.crate) = 229231
 SHA256 (rust/crates/icu_provider-1.5.0.crate) = 6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9
 SIZE (rust/crates/icu_provider-1.5.0.crate) = 52722
 SHA256 (rust/crates/icu_provider_macros-1.5.0.crate) = 1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6
@@ -231,60 +233,62 @@ SHA256 (rust/crates/idna-1.0.3.crate) = 686f825264d630750a544639377bae737628043f
 SIZE (rust/crates/idna-1.0.3.crate) = 142515
 SHA256 (rust/crates/idna_adapter-1.2.0.crate) = daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71
 SIZE (rust/crates/idna_adapter-1.2.0.crate) = 8206
-SHA256 (rust/crates/indexmap-2.7.0.crate) = 62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f
-SIZE (rust/crates/indexmap-2.7.0.crate) = 85335
-SHA256 (rust/crates/indoc-2.0.5.crate) = b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5
-SIZE (rust/crates/indoc-2.0.5.crate) = 14396
-SHA256 (rust/crates/insta-1.41.1.crate) = 7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8
-SIZE (rust/crates/insta-1.41.1.crate) = 93609
-SHA256 (rust/crates/instability-0.3.3.crate) = b829f37dead9dc39df40c2d3376c179fdfd2ac771f53f55d3c30dc096a3c0c6e
-SIZE (rust/crates/instability-0.3.3.crate) = 11591
+SHA256 (rust/crates/indexmap-2.9.0.crate) = cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e
+SIZE (rust/crates/indexmap-2.9.0.crate) = 91214
+SHA256 (rust/crates/indoc-2.0.6.crate) = f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd
+SIZE (rust/crates/indoc-2.0.6.crate) = 17164
+SHA256 (rust/crates/insta-1.43.1.crate) = 154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371
+SIZE (rust/crates/insta-1.43.1.crate) = 101047
+SHA256 (rust/crates/instability-0.3.7.crate) = 0bf9fed6d91cfb734e7476a06bde8300a1b94e217e1b523b6f0cd1a01998c71d
+SIZE (rust/crates/instability-0.3.7.crate) = 13682
 SHA256 (rust/crates/ipconfig-0.3.2.crate) = b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f
 SIZE (rust/crates/ipconfig-0.3.2.crate) = 24468
-SHA256 (rust/crates/ipnet-2.10.1.crate) = ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708
-SIZE (rust/crates/ipnet-2.10.1.crate) = 28407
-SHA256 (rust/crates/ipnetwork-0.20.0.crate) = bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e
-SIZE (rust/crates/ipnetwork-0.20.0.crate) = 16556
+SHA256 (rust/crates/ipnet-2.11.0.crate) = 469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130
+SIZE (rust/crates/ipnet-2.11.0.crate) = 29718
+SHA256 (rust/crates/ipnetwork-0.21.1.crate) = cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763
+SIZE (rust/crates/ipnetwork-0.21.1.crate) = 19565
 SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
 SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
 SHA256 (rust/crates/itertools-0.13.0.crate) = 413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186
 SIZE (rust/crates/itertools-0.13.0.crate) = 146261
-SHA256 (rust/crates/itoa-1.0.14.crate) = d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674
-SIZE (rust/crates/itoa-1.0.14.crate) = 11210
-SHA256 (rust/crates/js-sys-0.3.76.crate) = 6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7
-SIZE (rust/crates/js-sys-0.3.76.crate) = 54420
+SHA256 (rust/crates/itertools-0.14.0.crate) = 2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285
+SIZE (rust/crates/itertools-0.14.0.crate) = 152715
+SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
+SIZE (rust/crates/itoa-1.0.15.crate) = 11231
+SHA256 (rust/crates/js-sys-0.3.77.crate) = 1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f
+SIZE (rust/crates/js-sys-0.3.77.crate) = 55538
 SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
-SHA256 (rust/crates/libc-0.2.168.crate) = 5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d
-SIZE (rust/crates/libc-0.2.168.crate) = 757025
+SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa
+SIZE (rust/crates/libc-0.2.172.crate) = 791646
 SHA256 (rust/crates/libloading-0.8.6.crate) = fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34
 SIZE (rust/crates/libloading-0.8.6.crate) = 28922
 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
-SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
-SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
+SHA256 (rust/crates/linux-raw-sys-0.4.15.crate) = d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab
+SIZE (rust/crates/linux-raw-sys-0.4.15.crate) = 2150898
+SHA256 (rust/crates/linux-raw-sys-0.9.4.crate) = cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12
+SIZE (rust/crates/linux-raw-sys-0.9.4.crate) = 2311088
 SHA256 (rust/crates/litemap-0.7.4.crate) = 4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104
 SIZE (rust/crates/litemap-0.7.4.crate) = 28257
 SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
 SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
-SHA256 (rust/crates/log-0.4.22.crate) = a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24
-SIZE (rust/crates/log-0.4.22.crate) = 44027
+SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
+SIZE (rust/crates/log-0.4.27.crate) = 48120
 SHA256 (rust/crates/lru-0.12.5.crate) = 234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38
 SIZE (rust/crates/lru-0.12.5.crate) = 16047
 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
 SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
-SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4
-SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153
 SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
 SIZE (rust/crates/matchers-0.1.0.crate) = 6948
-SHA256 (rust/crates/maxminddb-0.24.0.crate) = d6087e5d8ea14861bb7c7f573afbc7be3798d3ef0fae87ec4fd9a4de9a127c3c
-SIZE (rust/crates/maxminddb-0.24.0.crate) = 20232
+SHA256 (rust/crates/maxminddb-0.25.0.crate) = 144de2546bf4846c6c84b7f76be035f7ebbc1e7d40cfb05810ba45c129508321
+SIZE (rust/crates/maxminddb-0.25.0.crate) = 22241
 SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
 SIZE (rust/crates/memchr-2.7.4.crate) = 96670
 SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a
 SIZE (rust/crates/memoffset-0.9.1.crate) = 9032
-SHA256 (rust/crates/miniz_oxide-0.8.0.crate) = e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1
-SIZE (rust/crates/miniz_oxide-0.8.0.crate) = 56343
+SHA256 (rust/crates/miniz_oxide-0.8.8.crate) = 3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a
+SIZE (rust/crates/miniz_oxide-0.8.8.crate) = 67065
 SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
 SIZE (rust/crates/mio-1.0.3.crate) = 103703
 SHA256 (rust/crates/mockall-0.13.1.crate) = 39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2
@@ -297,10 +301,10 @@ SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb4545924260
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
 SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
 SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
-SHA256 (rust/crates/object-0.36.5.crate) = aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e
-SIZE (rust/crates/object-0.36.5.crate) = 327435
-SHA256 (rust/crates/once_cell-1.20.2.crate) = 1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775
-SIZE (rust/crates/once_cell-1.20.2.crate) = 33394
+SHA256 (rust/crates/object-0.36.7.crate) = 62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87
+SIZE (rust/crates/object-0.36.7.crate) = 329938
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
 SHA256 (rust/crates/parking-2.2.1.crate) = f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba
@@ -309,44 +313,60 @@ SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646
 SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
 SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
 SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
+SHA256 (rust/crates/parse-zoneinfo-0.3.1.crate) = 1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24
+SIZE (rust/crates/parse-zoneinfo-0.3.1.crate) = 97290
 SHA256 (rust/crates/paste-1.0.15.crate) = 57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a
 SIZE (rust/crates/paste-1.0.15.crate) = 18374
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
-SHA256 (rust/crates/petgraph-0.6.5.crate) = b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db
-SIZE (rust/crates/petgraph-0.6.5.crate) = 710970
-SHA256 (rust/crates/pin-project-lite-0.2.15.crate) = 915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff
-SIZE (rust/crates/pin-project-lite-0.2.15.crate) = 29683
+SHA256 (rust/crates/petgraph-0.7.1.crate) = 3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772
+SIZE (rust/crates/petgraph-0.7.1.crate) = 736025
+SHA256 (rust/crates/phf-0.11.3.crate) = 1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078
+SIZE (rust/crates/phf-0.11.3.crate) = 23231
+SHA256 (rust/crates/phf_codegen-0.11.3.crate) = aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a
+SIZE (rust/crates/phf_codegen-0.11.3.crate) = 13741
+SHA256 (rust/crates/phf_generator-0.11.3.crate) = 3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d
+SIZE (rust/crates/phf_generator-0.11.3.crate) = 15431
+SHA256 (rust/crates/phf_shared-0.11.3.crate) = 67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5
+SIZE (rust/crates/phf_shared-0.11.3.crate) = 15199
+SHA256 (rust/crates/pin-project-lite-0.2.16.crate) = 3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b
+SIZE (rust/crates/pin-project-lite-0.2.16.crate) = 30504
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
 SHA256 (rust/crates/piper-0.2.4.crate) = 96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066
 SIZE (rust/crates/piper-0.2.4.crate) = 15950
-SHA256 (rust/crates/ppv-lite86-0.2.20.crate) = 77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04
-SIZE (rust/crates/ppv-lite86-0.2.20.crate) = 22478
-SHA256 (rust/crates/predicates-3.1.2.crate) = 7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97
-SIZE (rust/crates/predicates-3.1.2.crate) = 23986
-SHA256 (rust/crates/predicates-core-1.0.8.crate) = ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931
-SIZE (rust/crates/predicates-core-1.0.8.crate) = 8552
-SHA256 (rust/crates/predicates-tree-1.0.11.crate) = 41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13
-SIZE (rust/crates/predicates-tree-1.0.11.crate) = 8393
+SHA256 (rust/crates/ppv-lite86-0.2.21.crate) = 85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9
+SIZE (rust/crates/ppv-lite86-0.2.21.crate) = 22522
+SHA256 (rust/crates/predicates-3.1.3.crate) = a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573
+SIZE (rust/crates/predicates-3.1.3.crate) = 24063
+SHA256 (rust/crates/predicates-core-1.0.9.crate) = 727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa
+SIZE (rust/crates/predicates-core-1.0.9.crate) = 8618
+SHA256 (rust/crates/predicates-tree-1.0.12.crate) = 72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c
+SIZE (rust/crates/predicates-tree-1.0.12.crate) = 8392
 SHA256 (rust/crates/pretty_assertions-1.4.1.crate) = 3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d
 SIZE (rust/crates/pretty_assertions-1.4.1.crate) = 78952
-SHA256 (rust/crates/proc-macro2-1.0.92.crate) = 37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0
-SIZE (rust/crates/proc-macro2-1.0.92.crate) = 52353
-SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
-SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
-SHA256 (rust/crates/quote-1.0.37.crate) = b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af
-SIZE (rust/crates/quote-1.0.37.crate) = 28558
+SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
+SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
+SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
+SIZE (rust/crates/r-efi-5.2.0.crate) = 64764
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand-0.9.1.crate) = 9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97
+SIZE (rust/crates/rand-0.9.1.crate) = 97986
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_chacha-0.9.0.crate) = d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb
+SIZE (rust/crates/rand_chacha-0.9.0.crate) = 18258
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rand_core-0.9.3.crate) = 99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38
+SIZE (rust/crates/rand_core-0.9.3.crate) = 24543
 SHA256 (rust/crates/ratatui-0.29.0.crate) = eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b
 SIZE (rust/crates/ratatui-0.29.0.crate) = 543514
-SHA256 (rust/crates/redox_syscall-0.5.7.crate) = 9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f
-SIZE (rust/crates/redox_syscall-0.5.7.crate) = 26249
+SHA256 (rust/crates/redox_syscall-0.5.12.crate) = 928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af
+SIZE (rust/crates/redox_syscall-0.5.12.crate) = 29544
 SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191
 SIZE (rust/crates/regex-1.11.1.crate) = 254170
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
@@ -357,26 +377,28 @@ SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
 SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c
 SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
-SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
-SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352
+SHA256 (rust/crates/resolv-conf-0.7.3.crate) = fc7c8f7f733062b66dc1c63f9db168ac0b97a9210e247fa90fdc9ad08f51b302
+SIZE (rust/crates/resolv-conf-0.7.3.crate) = 16929
 SHA256 (rust/crates/roff-0.2.2.crate) = 88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3
 SIZE (rust/crates/roff-0.2.2.crate) = 11648
 SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
-SHA256 (rust/crates/rustix-0.38.42.crate) = f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85
-SIZE (rust/crates/rustix-0.38.42.crate) = 378683
-SHA256 (rust/crates/rustversion-1.0.18.crate) = 0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248
-SIZE (rust/crates/rustversion-1.0.18.crate) = 17794
-SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
-SIZE (rust/crates/ryu-1.0.18.crate) = 47713
+SHA256 (rust/crates/rustix-0.38.44.crate) = fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154
+SIZE (rust/crates/rustix-0.38.44.crate) = 379347
+SHA256 (rust/crates/rustix-1.0.7.crate) = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+SIZE (rust/crates/rustix-1.0.7.crate) = 414500
+SHA256 (rust/crates/rustversion-1.0.20.crate) = eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2
+SIZE (rust/crates/rustversion-1.0.20.crate) = 20666
+SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f
+SIZE (rust/crates/ryu-1.0.20.crate) = 48738
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/serde-1.0.216.crate) = 0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e
-SIZE (rust/crates/serde-1.0.216.crate) = 79000
-SHA256 (rust/crates/serde_derive-1.0.216.crate) = 46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e
-SIZE (rust/crates/serde_derive-1.0.216.crate) = 57674
-SHA256 (rust/crates/serde_json-1.0.133.crate) = c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377
-SIZE (rust/crates/serde_json-1.0.133.crate) = 150739
+SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
+SIZE (rust/crates/serde-1.0.219.crate) = 78983
+SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
+SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798
+SHA256 (rust/crates/serde_json-1.0.140.crate) = 20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373
+SIZE (rust/crates/serde_json-1.0.140.crate) = 154852
 SHA256 (rust/crates/serde_spanned-0.6.8.crate) = 87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1
 SIZE (rust/crates/serde_spanned-0.6.8.crate) = 9330
 SHA256 (rust/crates/serde_with-3.12.0.crate) = d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa
@@ -391,16 +413,18 @@ SHA256 (rust/crates/signal-hook-0.3.17.crate) = 8621587d4798caf8eb44879d42e56b9a
 SIZE (rust/crates/signal-hook-0.3.17.crate) = 50296
 SHA256 (rust/crates/signal-hook-mio-0.2.4.crate) = 34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd
 SIZE (rust/crates/signal-hook-mio-0.2.4.crate) = 9314
-SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
-SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
-SHA256 (rust/crates/similar-2.6.0.crate) = 1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e
-SIZE (rust/crates/similar-2.6.0.crate) = 51659
+SHA256 (rust/crates/signal-hook-registry-1.4.5.crate) = 9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410
+SIZE (rust/crates/signal-hook-registry-1.4.5.crate) = 19004
+SHA256 (rust/crates/similar-2.7.0.crate) = bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa
+SIZE (rust/crates/similar-2.7.0.crate) = 53928
+SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
+SIZE (rust/crates/siphasher-1.0.1.crate) = 10351
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
-SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
-SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
-SHA256 (rust/crates/socket2-0.5.8.crate) = c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8
-SIZE (rust/crates/socket2-0.5.8.crate) = 56309
+SHA256 (rust/crates/smallvec-1.15.0.crate) = 8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9
+SIZE (rust/crates/smallvec-1.15.0.crate) = 38113
+SHA256 (rust/crates/socket2-0.5.9.crate) = 4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef
+SIZE (rust/crates/socket2-0.5.9.crate) = 57432
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
 SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
@@ -409,20 +433,24 @@ SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3
 SIZE (rust/crates/strsim-0.11.1.crate) = 14266
 SHA256 (rust/crates/strum-0.26.3.crate) = 8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06
 SIZE (rust/crates/strum-0.26.3.crate) = 7237
+SHA256 (rust/crates/strum-0.27.1.crate) = f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32
+SIZE (rust/crates/strum-0.27.1.crate) = 7467
 SHA256 (rust/crates/strum_macros-0.26.4.crate) = 4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be
 SIZE (rust/crates/strum_macros-0.26.4.crate) = 27531
+SHA256 (rust/crates/strum_macros-0.27.1.crate) = c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8
+SIZE (rust/crates/strum_macros-0.27.1.crate) = 29670
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.90.crate) = 919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31
-SIZE (rust/crates/syn-2.0.90.crate) = 290584
-SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
-SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
+SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf
+SIZE (rust/crates/syn-2.0.101.crate) = 299250
+SHA256 (rust/crates/synstructure-0.13.2.crate) = 728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2
+SIZE (rust/crates/synstructure-0.13.2.crate) = 18950
 SHA256 (rust/crates/sys-locale-0.3.2.crate) = 8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4
 SIZE (rust/crates/sys-locale-0.3.2.crate) = 15072
-SHA256 (rust/crates/terminal_size-0.4.1.crate) = 5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9
-SIZE (rust/crates/terminal_size-0.4.1.crate) = 10037
-SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76
-SIZE (rust/crates/termtree-0.4.1.crate) = 4557
+SHA256 (rust/crates/terminal_size-0.4.2.crate) = 45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed
+SIZE (rust/crates/terminal_size-0.4.2.crate) = 9976
+SHA256 (rust/crates/termtree-0.5.1.crate) = 8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683
+SIZE (rust/crates/termtree-0.5.1.crate) = 8498
 SHA256 (rust/crates/test-case-3.3.1.crate) = eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8
 SIZE (rust/crates/test-case-3.3.1.crate) = 8797
 SHA256 (rust/crates/test-case-core-3.3.1.crate) = adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f
@@ -431,32 +459,32 @@ SHA256 (rust/crates/test-case-macros-3.3.1.crate) = 5c89e72a01ed4c579669add59014
 SIZE (rust/crates/test-case-macros-3.3.1.crate) = 4961
 SHA256 (rust/crates/thiserror-1.0.69.crate) = b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52
 SIZE (rust/crates/thiserror-1.0.69.crate) = 22198
-SHA256 (rust/crates/thiserror-2.0.6.crate) = 8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47
-SIZE (rust/crates/thiserror-2.0.6.crate) = 28433
+SHA256 (rust/crates/thiserror-2.0.12.crate) = 567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708
+SIZE (rust/crates/thiserror-2.0.12.crate) = 28693
 SHA256 (rust/crates/thiserror-impl-1.0.69.crate) = 4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1
 SIZE (rust/crates/thiserror-impl-1.0.69.crate) = 18365
-SHA256 (rust/crates/thiserror-impl-2.0.6.crate) = d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312
-SIZE (rust/crates/thiserror-impl-2.0.6.crate) = 20946
+SHA256 (rust/crates/thiserror-impl-2.0.12.crate) = 7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d
+SIZE (rust/crates/thiserror-impl-2.0.12.crate) = 21141
 SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
 SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
 SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f
 SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
-SHA256 (rust/crates/tinyvec-1.8.0.crate) = 445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938
-SIZE (rust/crates/tinyvec-1.8.0.crate) = 46796
+SHA256 (rust/crates/tinyvec-1.9.0.crate) = 09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71
+SIZE (rust/crates/tinyvec-1.9.0.crate) = 54137
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.42.0.crate) = 5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551
-SIZE (rust/crates/tokio-1.42.0.crate) = 806998
-SHA256 (rust/crates/tokio-macros-2.4.0.crate) = 693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752
-SIZE (rust/crates/tokio-macros-2.4.0.crate) = 12501
-SHA256 (rust/crates/tokio-util-0.7.13.crate) = d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078
-SIZE (rust/crates/tokio-util-0.7.13.crate) = 115191
-SHA256 (rust/crates/toml-0.8.19.crate) = a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e
-SIZE (rust/crates/toml-0.8.19.crate) = 50974
-SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
-SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
-SHA256 (rust/crates/toml_edit-0.22.22.crate) = 4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5
-SIZE (rust/crates/toml_edit-0.22.22.crate) = 106387
+SHA256 (rust/crates/tokio-1.44.2.crate) = e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48
+SIZE (rust/crates/tokio-1.44.2.crate) = 841618
+SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
+SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
+SHA256 (rust/crates/tokio-util-0.7.15.crate) = 66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df
+SIZE (rust/crates/tokio-util-0.7.15.crate) = 124255
+SHA256 (rust/crates/toml-0.8.22.crate) = 05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae
+SIZE (rust/crates/toml-0.8.22.crate) = 76224
+SHA256 (rust/crates/toml_datetime-0.6.9.crate) = 3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3
+SIZE (rust/crates/toml_datetime-0.6.9.crate) = 12622
+SHA256 (rust/crates/toml_edit-0.22.26.crate) = 310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e
+SIZE (rust/crates/toml_edit-0.22.26.crate) = 121714
 SHA256 (rust/crates/tracing-0.1.41.crate) = 784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0
 SIZE (rust/crates/tracing-0.1.41.crate) = 82448
 SHA256 (rust/crates/tracing-attributes-0.1.28.crate) = 395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d
@@ -473,8 +501,8 @@ SHA256 (rust/crates/tracing-subscriber-0.3.19.crate) = e8189decb5ac0fa7bc8b96b7c
 SIZE (rust/crates/tracing-subscriber-0.3.19.crate) = 198345
 SHA256 (rust/crates/tun2-4.0.0.crate) = 21afe73d3d42581a7400fbf5aec057a646ffe3f8bb5ae3f61d88c7e7f4ac77be
 SIZE (rust/crates/tun2-4.0.0.crate) = 34496
-SHA256 (rust/crates/unicode-ident-1.0.14.crate) = adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83
-SIZE (rust/crates/unicode-ident-1.0.14.crate) = 47547
+SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
+SIZE (rust/crates/unicode-ident-1.0.18.crate) = 47743
 SHA256 (rust/crates/unicode-segmentation-1.12.0.crate) = f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493
 SIZE (rust/crates/unicode-segmentation-1.12.0.crate) = 106323
 SHA256 (rust/crates/unicode-truncate-1.1.0.crate) = b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf
@@ -491,30 +519,42 @@ SHA256 (rust/crates/utf8_iter-1.0.4.crate) = b6c140620e7ffbb22c2dee59cafe6084a59
 SIZE (rust/crates/utf8_iter-1.0.4.crate) = 10437
 SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
 SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
-SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
-SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/valuable-0.1.1.crate) = ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65
+SIZE (rust/crates/valuable-0.1.1.crate) = 28679
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasm-bindgen-0.2.99.crate) = a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396
-SIZE (rust/crates/wasm-bindgen-0.2.99.crate) = 46136
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.99.crate) = 5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79
-SIZE (rust/crates/wasm-bindgen-backend-0.2.99.crate) = 30928
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.99.crate) = 2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe
-SIZE (rust/crates/wasm-bindgen-macro-0.2.99.crate) = 7011
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.99.crate) = 30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.99.crate) = 22800
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.99.crate) = 943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6
-SIZE (rust/crates/wasm-bindgen-shared-0.2.99.crate) = 7773
-SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311
-SIZE (rust/crates/widestring-1.1.0.crate) = 85046
+SHA256 (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3
+SIZE (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 140921
+SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
+SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
+SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
+SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
+SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
+SHA256 (rust/crates/widestring-1.2.0.crate) = dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d
+SIZE (rust/crates/widestring-1.2.0.crate) = 89105
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
-SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-core-0.61.0.crate) = 4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980
+SIZE (rust/crates/windows-core-0.61.0.crate) = 36707
+SHA256 (rust/crates/windows-implement-0.60.0.crate) = a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836
+SIZE (rust/crates/windows-implement-0.60.0.crate) = 15073
+SHA256 (rust/crates/windows-interface-0.59.1.crate) = bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8
+SIZE (rust/crates/windows-interface-0.59.1.crate) = 11735
+SHA256 (rust/crates/windows-link-0.1.1.crate) = 76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38
+SIZE (rust/crates/windows-link-0.1.1.crate) = 6154
+SHA256 (rust/crates/windows-result-0.3.2.crate) = c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252
+SIZE (rust/crates/windows-result-0.3.2.crate) = 13399
+SHA256 (rust/crates/windows-strings-0.4.0.crate) = 7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97
+SIZE (rust/crates/windows-strings-0.4.0.crate) = 13939
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
 SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
 SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
@@ -555,14 +595,14 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b738
 SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
-SHA256 (rust/crates/winnow-0.6.20.crate) = 36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b
-SIZE (rust/crates/winnow-0.6.20.crate) = 163617
+SHA256 (rust/crates/winnow-0.7.9.crate) = d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3
+SIZE (rust/crates/winnow-0.7.9.crate) = 174763
 SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
 SIZE (rust/crates/winreg-0.50.0.crate) = 29703
-SHA256 (rust/crates/winreg-0.52.0.crate) = a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5
-SIZE (rust/crates/winreg-0.52.0.crate) = 30148
-SHA256 (rust/crates/wintun-bindings-0.7.20.crate) = 60fd13b6a4b74da60d900adee51da24efdc03f77297dd7a723fafbfb1ffec844
-SIZE (rust/crates/wintun-bindings-0.7.20.crate) = 793222
+SHA256 (rust/crates/wintun-bindings-0.7.31.crate) = 605f50b13e12e1f9f99dc5e93701d779dbe47282fec186cb8a079165368d3124
+SIZE (rust/crates/wintun-bindings-0.7.31.crate) = 794078
+SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
+SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241
 SHA256 (rust/crates/write16-1.0.0.crate) = d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936
 SIZE (rust/crates/write16-1.0.0.crate) = 7218
 SHA256 (rust/crates/writeable-0.5.5.crate) = 1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51
@@ -573,17 +613,17 @@ SHA256 (rust/crates/yoke-0.7.5.crate) = 120e6aef9aa629e3d4f52dc8cc43a015c7724194
 SIZE (rust/crates/yoke-0.7.5.crate) = 29673
 SHA256 (rust/crates/yoke-derive-0.7.5.crate) = 2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154
 SIZE (rust/crates/yoke-derive-0.7.5.crate) = 7525
-SHA256 (rust/crates/zerocopy-0.7.35.crate) = 1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0
-SIZE (rust/crates/zerocopy-0.7.35.crate) = 152645
-SHA256 (rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e
-SIZE (rust/crates/zerocopy-derive-0.7.35.crate) = 37829
+SHA256 (rust/crates/zerocopy-0.8.25.crate) = a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb
+SIZE (rust/crates/zerocopy-0.8.25.crate) = 252714
+SHA256 (rust/crates/zerocopy-derive-0.8.25.crate) = 28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef
+SIZE (rust/crates/zerocopy-derive-0.8.25.crate) = 87671
 SHA256 (rust/crates/zerofrom-0.1.5.crate) = cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e
 SIZE (rust/crates/zerofrom-0.1.5.crate) = 5091
-SHA256 (rust/crates/zerofrom-derive-0.1.5.crate) = 595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808
-SIZE (rust/crates/zerofrom-derive-0.1.5.crate) = 8285
+SHA256 (rust/crates/zerofrom-derive-0.1.6.crate) = d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502
+SIZE (rust/crates/zerofrom-derive-0.1.6.crate) = 8305
 SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079
 SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
-SHA256 (fujiapple852-trippy-0.12.2_GH0.tar.gz) = 6f23549e5f398113ecd0d2f15c829f5ab84fcdf99dde9942c61746e72f990085
-SIZE (fujiapple852-trippy-0.12.2_GH0.tar.gz) = 20922811
+SHA256 (fujiapple852-trippy-0.13.0_GH0.tar.gz) = 72e598d2e0b947e8bc46706021c511f169b7e7634a734c326e492e0f30725c35
+SIZE (fujiapple852-trippy-0.13.0_GH0.tar.gz) = 21102128
diff --git a/net/wangle/Makefile b/net/wangle/Makefile
index 89351dfa4c35..6789ae5682f4 100644
--- a/net/wangle/Makefile
+++ b/net/wangle/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wangle
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/wangle/distinfo b/net/wangle/distinfo
index d0f90b7997d6..c997e09ab5c4 100644
--- a/net/wangle/distinfo
+++ b/net/wangle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891836
-SHA256 (facebook-wangle-v2025.04.28.00_GH0.tar.gz) = 2cd2a8eb2865569fe220b3893f7e9660fa5490fbe01950e4636017ecd34052e1
-SIZE (facebook-wangle-v2025.04.28.00_GH0.tar.gz) = 368611
+TIMESTAMP = 1746504538
+SHA256 (facebook-wangle-v2025.05.05.00_GH0.tar.gz) = 8654caf6b8ea683801832fce3339fe6f3fe5ff8e0378b794b546b2212ae7dc01
+SIZE (facebook-wangle-v2025.05.05.00_GH0.tar.gz) = 368568
diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index dc7e506e594f..1e2f8330740b 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -8,7 +8,7 @@ GH_TAGNAME=	dd177d4a3b6ea2e538da17bbb2a74772cea4a49a
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Spam filter for Usenet news servers
-WWW=		http://www.exit109.com/~jeremy/news/cleanfeed.html
+WWW=		https://github.com/crooks/cleanfeed
 
 FLAVORS=	inn inncurrent
 FLAVOR?=	${FLAVORS:[1]}
diff --git a/ports-mgmt/hs-cabal2tuple/Makefile b/ports-mgmt/hs-cabal2tuple/Makefile
index 1695f8f61438..6f3b1332dbaa 100644
--- a/ports-mgmt/hs-cabal2tuple/Makefile
+++ b/ports-mgmt/hs-cabal2tuple/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cabal2tuple
 PORTVERSION=	2.0.2.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt haskell
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -16,27 +17,28 @@ GL_ACCOUNT=	bsdutils
 GL_TAGNAME=	6c4f13ce36297c5bcd44260ec3f0e51fa47bb691
 
 # Version of the 'hashable' package should be the same as in devel/hs-cabal-install
-USE_CABAL=	hashable-1.4.6.0
+USE_CABAL=	hashable-1.5.0.0_1
 USE_CABAL+=	OneTuple-0.4.1.1_1 \
 		QuickCheck-2.14.3 \
 		StateVar-1.2.2 \
-		aeson-2.2.1.0_1 \
+		aeson-2.2.3.0_3 \
 		ansi-terminal-1.1 \
 		ansi-terminal-types-1.1 \
-		assoc-1.1_1 \
-		base-orphans-0.9.1 \
+		assoc-1.1.1_1 \
+		base-orphans-0.9.3 \
 		base16-bytestring-1.0.2.0_1 \
 		bifunctors-5.6.1_2 \
 		cabal-plan-0.7.3.0_2 \
+		character-ps-0.1 \
 		colour-2.3.6 \
 		comonad-5.0.8_2 \
 		contravariant-1.5.5 \
-		data-fix-0.3.2_5 \
+		data-fix-0.3.4_1 \
 		distributive-0.6.2.1_1 \
 		dlist-1.0_1 \
 		generically-0.1.1_2 \
-		indexed-traversable-0.1.3 \
-		indexed-traversable-instances-0.1.1.2_2 \
+		indexed-traversable-0.1.4_1 \
+		indexed-traversable-instances-0.1.2_1 \
 		integer-conversion-0.1.0.1_1 \
 		integer-logarithms-1.0.3.1_5 \
 		network-uri-2.6.4.2_1 \
@@ -46,23 +48,23 @@ USE_CABAL+=	OneTuple-0.4.1.1_1 \
 		prettyprinter-ansi-terminal-1.1.3 \
 		primitive-0.9.0.0 \
 		random-1.2.1.2 \
-		scientific-0.3.7.0_7 \
-		semialign-1.3_1 \
-		semigroupoids-6.0.0.1_1 \
+		scientific-0.3.8.0_2 \
+		semialign-1.3.1_2 \
+		semigroupoids-6.0.1_2 \
 		splitmix-0.1.0.5 \
-		strict-0.5_1 \
+		strict-0.5.1_1 \
 		tagged-0.8.8 \
-		text-iso8601-0.1_1 \
-		text-short-0.1.5_3 \
+		text-iso8601-0.1.1_2 \
+		text-short-0.1.6_3 \
 		th-abstraction-0.6.0.0_1 \
 		th-compat-0.1.4_4 \
-		these-1.2_1 \
-		time-compat-1.9.6.1_6 \
+		these-1.2.1_2 \
+		time-compat-1.9.8 \
 		transformers-compat-0.7.2 \
-		unordered-containers-0.2.20_1 \
-		uuid-types-1.0.5.1 \
+		unordered-containers-0.2.20_4 \
+		uuid-types-1.0.6_3 \
 		vector-0.13.1.0 \
 		vector-stream-0.1.0.1 \
-		witherable-0.4.2_4
+		witherable-0.5_1
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/hs-cabal2tuple/distinfo b/ports-mgmt/hs-cabal2tuple/distinfo
index 8a674e0df4a9..798f09dd7122 100644
--- a/ports-mgmt/hs-cabal2tuple/distinfo
+++ b/ports-mgmt/hs-cabal2tuple/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1729446343
+TIMESTAMP = 1746433397
 SHA256 (cabal/OneTuple-0.4.1.1/OneTuple-0.4.1.1.tar.gz) = c9e764d4ee1e57cad8341bd5d0de33ba3a52b6793fc1309679f2bf60c030bb2b
 SIZE (cabal/OneTuple-0.4.1.1/OneTuple-0.4.1.1.tar.gz) = 5601
 SHA256 (cabal/OneTuple-0.4.1.1/revision/1.cabal) = 632dfded172086fb9f0e26d3578bcfffa3fb6d135ea5a8de17b7a33ff6e6e682
@@ -7,20 +7,20 @@ SHA256 (cabal/QuickCheck-2.14.3/QuickCheck-2.14.3.tar.gz) = 5c0f22b36b28a1a8fa11
 SIZE (cabal/QuickCheck-2.14.3/QuickCheck-2.14.3.tar.gz) = 76849
 SHA256 (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5e4b39da395656a59827b0280508aafdc70335798b50e5d6fd52596026251825
 SIZE (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5048
-SHA256 (cabal/aeson-2.2.1.0/aeson-2.2.1.0.tar.gz) = 914eefd0e80d12db5c721daa2cbab427acee39795f125c5460c1fe48cf9a5d7f
-SIZE (cabal/aeson-2.2.1.0/aeson-2.2.1.0.tar.gz) = 341038
-SHA256 (cabal/aeson-2.2.1.0/revision/1.cabal) = a23a61aada8233e10573e1612c0b2efe5a1aba0d59b05dbe2f63301822f136cb
-SIZE (cabal/aeson-2.2.1.0/revision/1.cabal) = 6582
+SHA256 (cabal/aeson-2.2.3.0/aeson-2.2.3.0.tar.gz) = daa25cf428256ad05d21f2bfa44077c1b14d6c784b7930a202ee901f11cc6baa
+SIZE (cabal/aeson-2.2.3.0/aeson-2.2.3.0.tar.gz) = 340855
+SHA256 (cabal/aeson-2.2.3.0/revision/3.cabal) = 61e559f2bad61a98aac564f2a4fd892d21e9e1712e14e3db93326317aa944a9b
+SIZE (cabal/aeson-2.2.3.0/revision/3.cabal) = 6378
 SHA256 (cabal/ansi-terminal-1.1/ansi-terminal-1.1.tar.gz) = 525d6257bebad9755fa528ce03e64c6a439fbc129aa307a14063896e4871b253
 SIZE (cabal/ansi-terminal-1.1/ansi-terminal-1.1.tar.gz) = 34897
 SHA256 (cabal/ansi-terminal-types-1.1/ansi-terminal-types-1.1.tar.gz) = f2e5333eb78da5f4dd330fca0c81a59276cc150c625647cd20f57b7f297a5d25
 SIZE (cabal/ansi-terminal-types-1.1/ansi-terminal-types-1.1.tar.gz) = 4746
-SHA256 (cabal/assoc-1.1/assoc-1.1.tar.gz) = 7aa2e6548b3d9d49a286ac20639479aaf6c47a1446113ed784d98737c5f60df4
-SIZE (cabal/assoc-1.1/assoc-1.1.tar.gz) = 3193
-SHA256 (cabal/assoc-1.1/revision/1.cabal) = 56d0fd1c17aaf6268e81bf19ba5afe186128d7f88126bd546d5b3151ab692652
-SIZE (cabal/assoc-1.1/revision/1.cabal) = 1617
-SHA256 (cabal/base-orphans-0.9.1/base-orphans-0.9.1.tar.gz) = 5bbf2da382c5b212d6a8be2f8c49edee0eba30f272a15fd32c13e6e4091ef172
-SIZE (cabal/base-orphans-0.9.1/base-orphans-0.9.1.tar.gz) = 26418
+SHA256 (cabal/assoc-1.1.1/assoc-1.1.1.tar.gz) = 231149b7fef09f5dd95af51228615e3b296dbd0faadeca053e0644a4b13b0ff6
+SIZE (cabal/assoc-1.1.1/assoc-1.1.1.tar.gz) = 3158
+SHA256 (cabal/assoc-1.1.1/revision/1.cabal) = 0ab39b4d1feb4caca95ac6e314f48782b27a86a6b8d1f5e8dc4be9fbed11185f
+SIZE (cabal/assoc-1.1.1/revision/1.cabal) = 1420
+SHA256 (cabal/base-orphans-0.9.3/base-orphans-0.9.3.tar.gz) = 17a35079c8719014560c028d9805ec1301b900972adf212e00af23fe3ebfabd8
+SIZE (cabal/base-orphans-0.9.3/base-orphans-0.9.3.tar.gz) = 19923
 SHA256 (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784
 SIZE (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 7219
 SHA256 (cabal/base16-bytestring-1.0.2.0/revision/1.cabal) = a694e88f9ec9fc79f0b03f233d3fea592b68f70a34aac2ddb5bcaecb6562e2fd
@@ -33,6 +33,8 @@ SHA256 (cabal/cabal-plan-0.7.3.0/cabal-plan-0.7.3.0.tar.gz) = ccdc54854b111727d9
 SIZE (cabal/cabal-plan-0.7.3.0/cabal-plan-0.7.3.0.tar.gz) = 53399
 SHA256 (cabal/cabal-plan-0.7.3.0/revision/2.cabal) = ba2aab93e43db335b669fd2c7b5ab63b19fe584b5f95285ace910f73e8f5c78f
 SIZE (cabal/cabal-plan-0.7.3.0/revision/2.cabal) = 5510
+SHA256 (cabal/character-ps-0.1/character-ps-0.1.tar.gz) = 22de71fde38b236d3e9168a832b5e1e75d1fb4f4028667bdf747b3b4c8c1529c
+SIZE (cabal/character-ps-0.1/character-ps-0.1.tar.gz) = 8192
 SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871
 SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675
 SHA256 (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = ef6cdf2cc292cc43ee6aa96c581b235fdea8ab44a0bffb24dc79ae2b2ef33d13
@@ -41,10 +43,10 @@ SHA256 (cabal/comonad-5.0.8/revision/2.cabal) = 4a4dbfbd03fb4963987710fca994e8b5
 SIZE (cabal/comonad-5.0.8/revision/2.cabal) = 3631
 SHA256 (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 062fd66580d7aad0b5ba93e644ffa7feee69276ef50f20d4ed9f1deb7642dffa
 SIZE (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 13815
-SHA256 (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 3a172d3bc0639c327345e965f9d9023e099425814b28dcdb7b60ff66d66219cc
-SIZE (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 5842
-SHA256 (cabal/data-fix-0.3.2/revision/5.cabal) = cd7d6ff8b68aca3b51d8116870fc8ccdbc557989562cd3d5c941e4f0b7bc5af1
-SIZE (cabal/data-fix-0.3.2/revision/5.cabal) = 1734
+SHA256 (cabal/data-fix-0.3.4/data-fix-0.3.4.tar.gz) = 8df052d18c047ab9e9200536a8799b5af3997ebecbbb091a7384b6be8416ab37
+SIZE (cabal/data-fix-0.3.4/data-fix-0.3.4.tar.gz) = 5992
+SHA256 (cabal/data-fix-0.3.4/revision/1.cabal) = ee78be6168ca0878d670fede957195d3debf4a37a806d13d72182b274901261b
+SIZE (cabal/data-fix-0.3.4/revision/1.cabal) = 1406
 SHA256 (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = d7351392e078f58caa46630a4b9c643e1e2e9dddee45848c5c8358e7b1316b91
 SIZE (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = 8140
 SHA256 (cabal/distributive-0.6.2.1/revision/1.cabal) = 0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c
@@ -57,14 +59,18 @@ SHA256 (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 04c5a436bec4b041f71a
 SIZE (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 2870
 SHA256 (cabal/generically-0.1.1/revision/2.cabal) = 378ec049bc2853b8011df116647fbd34bb9f00edce9840e4957f98abc097597c
 SIZE (cabal/generically-0.1.1/revision/2.cabal) = 1169
-SHA256 (cabal/hashable-1.4.6.0/hashable-1.4.6.0.tar.gz) = 34652a7a1d2fc9e3d764b150bd35bcd2220761c1d4c6b446b0cfac5ad5b778cb
-SIZE (cabal/hashable-1.4.6.0/hashable-1.4.6.0.tar.gz) = 89426
-SHA256 (cabal/indexed-traversable-0.1.3/indexed-traversable-0.1.3.tar.gz) = 1d32925fb6f78e3a52a849b29fc4360df51c97be95ba8ac642517d3ff01a53d9
-SIZE (cabal/indexed-traversable-0.1.3/indexed-traversable-0.1.3.tar.gz) = 9824
-SHA256 (cabal/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances-0.1.1.2.tar.gz) = 0f9b4e895ccc819f74d15f913c93613cc74cab74dbb05d7e305aa387bdbe374a
-SIZE (cabal/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances-0.1.1.2.tar.gz) = 3769
-SHA256 (cabal/indexed-traversable-instances-0.1.1.2/revision/2.cabal) = 00d5e3e149e2bee0f7a547e0093294c306d4276e73a619abe7d8e69f7ce03c7b
-SIZE (cabal/indexed-traversable-instances-0.1.1.2/revision/2.cabal) = 2550
+SHA256 (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = e58b3a8e18da5f6cd7e937e5fd683e500bb1f8276b3768269759119ca0cddb6a
+SIZE (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = 89062
+SHA256 (cabal/hashable-1.5.0.0/revision/1.cabal) = 2f23146cbe0325029927b221647695a4c7d6e97548ff731110979e34361f58ef
+SIZE (cabal/hashable-1.5.0.0/revision/1.cabal) = 5914
+SHA256 (cabal/indexed-traversable-0.1.4/indexed-traversable-0.1.4.tar.gz) = 58be09afdf3ad5a25c2aa0d2a7df80d602df09f4e76d3abf2b7cdb0e75d03b22
+SIZE (cabal/indexed-traversable-0.1.4/indexed-traversable-0.1.4.tar.gz) = 9465
+SHA256 (cabal/indexed-traversable-0.1.4/revision/1.cabal) = 42d9e84a65a0c17c248233cab98ada872ff6140dfa24d109d6eb285204d07e7d
+SIZE (cabal/indexed-traversable-0.1.4/revision/1.cabal) = 2098
+SHA256 (cabal/indexed-traversable-instances-0.1.2/indexed-traversable-instances-0.1.2.tar.gz) = 3c2bb62fba141d6696177070d63b88bc56b194bc60f6b73d2263b0244e2fc7c1
+SIZE (cabal/indexed-traversable-instances-0.1.2/indexed-traversable-instances-0.1.2.tar.gz) = 3673
+SHA256 (cabal/indexed-traversable-instances-0.1.2/revision/1.cabal) = 68df0fc8070ae2c15f9e6febf1449fee364c131a6d1e93cac45e7895ba86dd89
+SIZE (cabal/indexed-traversable-instances-0.1.2/revision/1.cabal) = 2401
 SHA256 (cabal/integer-conversion-0.1.0.1/integer-conversion-0.1.0.1.tar.gz) = 20ac70cf1cb65458bba2c562c209a8930e45bdb89886182d644d0a457fc46f39
 SIZE (cabal/integer-conversion-0.1.0.1/integer-conversion-0.1.0.1.tar.gz) = 6166
 SHA256 (cabal/integer-conversion-0.1.0.1/revision/1.cabal) = 0e57a82635323f015b5d6c242bcfbbeeaa9854fe9c8058e57052254dbb24bb14
@@ -89,34 +95,34 @@ SHA256 (cabal/primitive-0.9.0.0/primitive-0.9.0.0.tar.gz) = 696d4bd291c94d736142
 SIZE (cabal/primitive-0.9.0.0/primitive-0.9.0.0.tar.gz) = 60580
 SHA256 (cabal/random-1.2.1.2/random-1.2.1.2.tar.gz) = 790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4
 SIZE (cabal/random-1.2.1.2/random-1.2.1.2.tar.gz) = 47229
-SHA256 (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = a3a121c4b3d68fb8b9f8c709ab012e48f090ed553609247a805ad070d6b343a9
-SIZE (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = 24723
-SHA256 (cabal/scientific-0.3.7.0/revision/7.cabal) = 909755ab19b453169ff85281323da1488407776b2360bd9f7afdd219fd306ef2
-SIZE (cabal/scientific-0.3.7.0/revision/7.cabal) = 4869
-SHA256 (cabal/semialign-1.3/semialign-1.3.tar.gz) = 628e43319f584a8dd46c124ee0685cac586e0f6f877c5ceff37c3dbb2e3cc56c
-SIZE (cabal/semialign-1.3/semialign-1.3.tar.gz) = 10543
-SHA256 (cabal/semialign-1.3/revision/1.cabal) = 7be9ef5ca1d6b052991f68c053aab68b9d1ab3b1938c9557ac84c97937815223
-SIZE (cabal/semialign-1.3/revision/1.cabal) = 2888
-SHA256 (cabal/semigroupoids-6.0.0.1/semigroupoids-6.0.0.1.tar.gz) = 7da38a9891bdf8205fd6522cdb712956b8c0bf5c52983da60295c8e057d77934
-SIZE (cabal/semigroupoids-6.0.0.1/semigroupoids-6.0.0.1.tar.gz) = 36222
-SHA256 (cabal/semigroupoids-6.0.0.1/revision/1.cabal) = 47a23b451c114e65361e713e8fe36828fca3a84285325e8f444254b2ab0c43c5
-SIZE (cabal/semigroupoids-6.0.0.1/revision/1.cabal) = 7465
+SHA256 (cabal/scientific-0.3.8.0/scientific-0.3.8.0.tar.gz) = 13b343bca8aa26d7718e52e622e5a118056653edafcbc7ccc5333be7217218cf
+SIZE (cabal/scientific-0.3.8.0/scientific-0.3.8.0.tar.gz) = 24314
+SHA256 (cabal/scientific-0.3.8.0/revision/2.cabal) = ba83a6701dd0110138443757aca4a42786afa94272b73045ef878fd860d1732e
+SIZE (cabal/scientific-0.3.8.0/revision/2.cabal) = 4397
+SHA256 (cabal/semialign-1.3.1/semialign-1.3.1.tar.gz) = 66e87bc254ffec2ee908bf625c42d3b7363238d6ab1cfba8934bbee7590c9df7
+SIZE (cabal/semialign-1.3.1/semialign-1.3.1.tar.gz) = 10117
+SHA256 (cabal/semialign-1.3.1/revision/2.cabal) = dfe515a9e43230f5308564a649a04ea1538499ed98b944644b77bed5394b9deb
+SIZE (cabal/semialign-1.3.1/revision/2.cabal) = 2224
+SHA256 (cabal/semigroupoids-6.0.1/semigroupoids-6.0.1.tar.gz) = 1d532030862414f5d4f2f6f001783f77aa14e5f05ee8e3c4a2d2129fca29cc1f
+SIZE (cabal/semigroupoids-6.0.1/semigroupoids-6.0.1.tar.gz) = 36372
+SHA256 (cabal/semigroupoids-6.0.1/revision/2.cabal) = bfee06a6d88038a88ddd10fc21c230bf5ee3a14d0584dc6ab7ad54a9252c2c21
+SIZE (cabal/semigroupoids-6.0.1/revision/2.cabal) = 7539
 SHA256 (cabal/splitmix-0.1.0.5/splitmix-0.1.0.5.tar.gz) = 9df07a9611ef45f1b1258a0b412f4d02c920248f69d2e2ce8ccda328f7e13002
 SIZE (cabal/splitmix-0.1.0.5/splitmix-0.1.0.5.tar.gz) = 22399
-SHA256 (cabal/strict-0.5/strict-0.5.tar.gz) = 3f4f0995dec2d520d0e321542f71412dac023658fdab603db04364d75269a0fd
-SIZE (cabal/strict-0.5/strict-0.5.tar.gz) = 12564
-SHA256 (cabal/strict-0.5/revision/1.cabal) = bd57d7b3655951dfaa7d1e1374d7352dfe83f82a9c98309bf3a6587ef8cbd87d
-SIZE (cabal/strict-0.5/revision/1.cabal) = 4120
+SHA256 (cabal/strict-0.5.1/strict-0.5.1.tar.gz) = 77719280c2a86312e748227bfa732eeaae0e7df48d57acc3c2e5b7b07afe2f8b
+SIZE (cabal/strict-0.5.1/strict-0.5.1.tar.gz) = 11798
+SHA256 (cabal/strict-0.5.1/revision/1.cabal) = 58c373b7c7748cbb4a5a6c8c15073f99a1c10a9a9bb6894ac33f43a5cdb901f2
+SIZE (cabal/strict-0.5.1/revision/1.cabal) = 3557
 SHA256 (cabal/tagged-0.8.8/tagged-0.8.8.tar.gz) = a083fa7835516203c168433a1c8dfc0290a94b05fedab566ad0640fc9137a6a7
 SIZE (cabal/tagged-0.8.8/tagged-0.8.8.tar.gz) = 10094
-SHA256 (cabal/text-iso8601-0.1/text-iso8601-0.1.tar.gz) = f58e7a46f951f1f13d2929e0a2f84f6db7894d55a641169aaf300aea9ada5fcf
-SIZE (cabal/text-iso8601-0.1/text-iso8601-0.1.tar.gz) = 9578
-SHA256 (cabal/text-iso8601-0.1/revision/1.cabal) = ac86f2500ca751db3c0de029dd7e7826bef7366d59dc0085b00fc695c43b9f76
-SIZE (cabal/text-iso8601-0.1/revision/1.cabal) = 2407
-SHA256 (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = a35ec6cde2ada084c1a050dc5885be5ab01f851b93d744cf0facbc1c18002dda
-SIZE (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = 25113
-SHA256 (cabal/text-short-0.1.5/revision/3.cabal) = 9c73c9c9182ca69ee92ce3758f515b1c078cd167d882ccc8c46f92f68c65e190
-SIZE (cabal/text-short-0.1.5/revision/3.cabal) = 3216
+SHA256 (cabal/text-iso8601-0.1.1/text-iso8601-0.1.1.tar.gz) = 9dead2b7ceeae40fe0fc060bd54795c32e9926c9d1aebae8f9b9a621fba88202
+SIZE (cabal/text-iso8601-0.1.1/text-iso8601-0.1.1.tar.gz) = 9599
+SHA256 (cabal/text-iso8601-0.1.1/revision/2.cabal) = e07a625eef969338992bf9bba8e5dc73f07ac65f991ba636b8f1175890d15849
+SIZE (cabal/text-iso8601-0.1.1/revision/2.cabal) = 2411
+SHA256 (cabal/text-short-0.1.6/text-short-0.1.6.tar.gz) = 8173ea138d7dc398747b636012bf6e79e17186560b8a7a7fc9e6456d78556eab
+SIZE (cabal/text-short-0.1.6/text-short-0.1.6.tar.gz) = 24691
+SHA256 (cabal/text-short-0.1.6/revision/3.cabal) = 41be94ccd3f6646ab69b0b05c5130ea3c7911a4598ab9b9192f21ad25a69163a
+SIZE (cabal/text-short-0.1.6/revision/3.cabal) = 2827
 SHA256 (cabal/th-abstraction-0.6.0.0/th-abstraction-0.6.0.0.tar.gz) = 69ea6eca1f0c00b6e1e1f8329c908ec76e73855e2ce6e91ace2f8bbf92c51a30
 SIZE (cabal/th-abstraction-0.6.0.0/th-abstraction-0.6.0.0.tar.gz) = 43152
 SHA256 (cabal/th-abstraction-0.6.0.0/revision/1.cabal) = d8959fa6a2812afcdd5f6f255fd6be8b3e0ca01e425586a554544fcb70b0ec7c
@@ -125,29 +131,29 @@ SHA256 (cabal/th-compat-0.1.4/th-compat-0.1.4.tar.gz) = d8f97ac14ab47b6b8a7b0fdb
 SIZE (cabal/th-compat-0.1.4/th-compat-0.1.4.tar.gz) = 14838
 SHA256 (cabal/th-compat-0.1.4/revision/4.cabal) = f5f2c679ecc1c1b83d2d68db6cc564e5c78d53425e69e1b9e36784820e122d37
 SIZE (cabal/th-compat-0.1.4/revision/4.cabal) = 3224
-SHA256 (cabal/these-1.2/these-1.2.tar.gz) = a8ed7174b7f790764360f48aab72fea382a6093ed369c7bc6881fae1abacd4b8
-SIZE (cabal/these-1.2/these-1.2.tar.gz) = 10606
-SHA256 (cabal/these-1.2/revision/1.cabal) = 011e22f6891ca028f87c04ea48796696c92d593313a9c699f7ff4f9ffd7aec6e
-SIZE (cabal/these-1.2/revision/1.cabal) = 2882
-SHA256 (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = ad07bb00eb9678c2136d3680752b00acc4cbc522654bb3199bf31c61ef1e6b80
-SIZE (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = 59964
-SHA256 (cabal/time-compat-1.9.6.1/revision/6.cabal) = 17631ef01a03a6f55fbe131690f87f6dee9a1572acc99b6c06f04882470ffb52
-SIZE (cabal/time-compat-1.9.6.1/revision/6.cabal) = 5076
+SHA256 (cabal/these-1.2.1/these-1.2.1.tar.gz) = 17d6d933365edabf801a16842c1403bdd37cc5300faa2fcca980decdab22e4de
+SIZE (cabal/these-1.2.1/these-1.2.1.tar.gz) = 9906
+SHA256 (cabal/these-1.2.1/revision/2.cabal) = 35c57aede96c15ea1fed559ac287b1168eb2b2869d79e62ed8c845780b7ea136
+SIZE (cabal/these-1.2.1/revision/2.cabal) = 2294
+SHA256 (cabal/time-compat-1.9.8/time-compat-1.9.8.tar.gz) = 502ef8694a5b131b47c0e5df2e9053d005a3b345b30f5225af04f081d3ef5cf0
+SIZE (cabal/time-compat-1.9.8/time-compat-1.9.8.tar.gz) = 63414
 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a
 SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485
 SHA256 (cabal/unordered-containers-0.2.20/unordered-containers-0.2.20.tar.gz) = d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d
 SIZE (cabal/unordered-containers-0.2.20/unordered-containers-0.2.20.tar.gz) = 59823
-SHA256 (cabal/unordered-containers-0.2.20/revision/1.cabal) = 746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff
-SIZE (cabal/unordered-containers-0.2.20/revision/1.cabal) = 3921
-SHA256 (cabal/uuid-types-1.0.5.1/uuid-types-1.0.5.1.tar.gz) = 0bec6d6982b3c92bfa5eab1d213be2d4b6696b9a2c3a1f1f05812dc3762dca2c
-SIZE (cabal/uuid-types-1.0.5.1/uuid-types-1.0.5.1.tar.gz) = 11965
+SHA256 (cabal/unordered-containers-0.2.20/revision/4.cabal) = 233cbcdda6c2698932bb391ce0935fb44f80c115621ee815a21ed33ac8ede422
+SIZE (cabal/unordered-containers-0.2.20/revision/4.cabal) = 3921
+SHA256 (cabal/uuid-types-1.0.6/uuid-types-1.0.6.tar.gz) = 7e0dd953483d6fd3ca49bcaed6b11f9e3c2787213479b2581e07747836b8357e
+SIZE (cabal/uuid-types-1.0.6/uuid-types-1.0.6.tar.gz) = 11222
+SHA256 (cabal/uuid-types-1.0.6/revision/3.cabal) = 5ac2b681a8d7676f6a51ac1b113bfdcf18dd7fdbb313034850ed6493eef96da0
+SIZE (cabal/uuid-types-1.0.6/revision/3.cabal) = 2619
 SHA256 (cabal/vector-0.13.1.0/vector-0.13.1.0.tar.gz) = 63f272279eab8ab9411a0fffb1252ac309b297313f8e33be9ebbc2f981edecee
 SIZE (cabal/vector-0.13.1.0/vector-0.13.1.0.tar.gz) = 156855
 SHA256 (cabal/vector-stream-0.1.0.1/vector-stream-0.1.0.1.tar.gz) = d0f507334bdea5431a2f07f525a97f29e76522c32210f5de6d5a2b4f1d42bf7c
 SIZE (cabal/vector-stream-0.1.0.1/vector-stream-0.1.0.1.tar.gz) = 12577
-SHA256 (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 790d2bb274283419173bd89104439860675a9410f70f21912973ecd9098b4104
-SIZE (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 11876
-SHA256 (cabal/witherable-0.4.2/revision/4.cabal) = cec516b35df0ff53ab0068e70a912a0ba7b65c672fbc554727183faa195ad3b8
-SIZE (cabal/witherable-0.4.2/revision/4.cabal) = 2342
+SHA256 (cabal/witherable-0.5/witherable-0.5.tar.gz) = 48434cc1e465b13cbc0133a90c3ec0d827c93b77ce95807fe0a38b65f4918cd1
+SIZE (cabal/witherable-0.5/witherable-0.5.tar.gz) = 10819
+SHA256 (cabal/witherable-0.5/revision/1.cabal) = 85bab588ebca37996fc3171b9d8b2e065eb0536c9f44224bcf037c0849a881de
+SIZE (cabal/witherable-0.5/revision/1.cabal) = 2343
 SHA256 (cabal/bsdutils-cabal2tuple-6c4f13ce36297c5bcd44260ec3f0e51fa47bb691_GL0.tar.gz) = 16c20b5e95dba9d05a4d1249682976f28e4d7ee29892bbd741ac392df513be48
 SIZE (cabal/bsdutils-cabal2tuple-6c4f13ce36297c5bcd44260ec3f0e51fa47bb691_GL0.tar.gz) = 5814
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index fe6dc01a8ea9..d8adda613828 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	PackageKit
-PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTVERSION=	1.3.1
 CATEGORIES=	ports-mgmt sysutils
 MASTER_SITES=	https://www.freedesktop.org/software/PackageKit/releases/
 
diff --git a/ports-mgmt/packagekit/distinfo b/ports-mgmt/packagekit/distinfo
index e345a1c14d9b..8ed82959e58d 100644
--- a/ports-mgmt/packagekit/distinfo
+++ b/ports-mgmt/packagekit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712064110
-SHA256 (PackageKit-1.2.8.tar.xz) = d834250a0f121483027db2cfd93e8b2cba8dc48ff854395bfd88aa9511898be4
-SIZE (PackageKit-1.2.8.tar.xz) = 2790440
+TIMESTAMP = 1746369099
+SHA256 (PackageKit-1.3.1.tar.xz) = 8c5d5272821d61b50aba24736ca0f4812c28bc6334922f17396b43fd2ed7a7e1
+SIZE (PackageKit-1.3.1.tar.xz) = 2815264
diff --git a/print/epson-inkjet-printer-escpr2/Makefile b/print/epson-inkjet-printer-escpr2/Makefile
index 9d404c4346a2..2787fc8473f8 100644
--- a/print/epson-inkjet-printer-escpr2/Makefile
+++ b/print/epson-inkjet-printer-escpr2/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	epson-inkjet-printer-escpr2
 DISTVERSION=	1.1.62
 DISTVERSIONSUFFIX=	-1lsb3.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/14/47/10/b9bc8fe2cd3b8e463afa21598b27f2d264723e6e/:i386 \
 		https://download3.ebz.epson.net/dsc/f/03/00/14/47/10/c4d50ad4c82cd65680d65a76ddde83a4fcae9b73/:amd64 \
@@ -18,8 +19,8 @@ WWW=		https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 LICENSE=	EPSON LGPL21
 LICENSE_COMB=	multi
 LICENSE_NAME_EPSON=	SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT
-LICENSE_FILE_EPSON=	${WRKSRC}/${PKGNAME}/COPYING.EPSON
-LICENSE_FILE_LGPL21=	${WRKSRC}/${PKGNAME}/COPYING.LIB
+LICENSE_FILE_EPSON=	${WRKSRC}/${PORTNAME}-${DISTVERSION}/COPYING.EPSON
+LICENSE_FILE_LGPL21=	${WRKSRC}/${PORTNAME}-${DISTVERSION}/COPYING.LIB
 LICENSE_PERMS_EPSON=		no-dist-mirror no-dist-sell no-pkg-mirror \
 				no-pkg-sell
 LICENSE_DISTFILES_EPSON=	${DISTNAME}.i486${EXTRACT_SUFX} \
@@ -30,6 +31,7 @@ LEGAL_TEXT=	License does not permit public sharing and revenue earning, and rest
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	${PORTNAME} for ARM is available. But binaries that can be used on aarch64 need to be built.
 
+BUILD_DEPENDS=	patchelf:sysutils/patchelf
 RUN_DEPENDS=	${LOCALBASE}/libexec/cups/filter/gstoraster:print/cups-filters \
 		cupsfilter:print/cups
 
@@ -56,7 +58,7 @@ PLIST_SUB+=	ARCH_AMD64="@comment " \
 post-extract:
 	(cd ${EXTRACT_WRKDIR} && \
 		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.tar.gz \
-		${EXTRACT_AFTER_ARGS} -- ${PKGNAME}/COPYING.\*)
+		${EXTRACT_AFTER_ARGS} -- ${PORTNAME}-${DISTVERSION}/COPYING.\*)
 	${FIND} -- ${WRKSRC}/opt/${PORTNAME}/ppds/Epson -iname \*.ppd.gz \
 		-exec ${GUNZIP_CMD} -- {} +
 
@@ -71,5 +73,9 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model
 	${RLN} ${STAGEDIR}${LINUXBASE}/opt/${PORTNAME}/ppds/Epson \
 		${STAGEDIR}${PREFIX}/share/cups/model/${PORTNAME}
+	patchelf --no-sort --set-interpreter /lib64/ld-linux-x86-64.so.2 \
+		${WRKSRC}/opt/epson-inkjet-printer-escpr2/cups/lib/filter/epson-escpr-wrapper2
+	patchelf --no-sort --set-interpreter /lib64/ld-linux-x86-64.so.2 \
+		${WRKSRC}/opt/epson-inkjet-printer-escpr2/cups/lib/filter/epson-escpr2
 
 .include <bsd.port.mk>
diff --git a/science/Makefile b/science/Makefile
index a304ac0a74e7..72853a4fae99 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -115,7 +115,6 @@
     SUBDIR += gramps
     SUBDIR += gromacs
     SUBDIR += gsmc
-    SUBDIR += gtamsanalyzer
     SUBDIR += h5utils
     SUBDIR += h5z-zfp
     SUBDIR += harminv
diff --git a/science/R-cran-ks/Makefile b/science/R-cran-ks/Makefile
index e7f9c611b92e..1438abf28fc0 100644
--- a/science/R-cran-ks/Makefile
+++ b/science/R-cran-ks/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ks
-PORTVERSION=	1.14.3
+PORTVERSION=	1.15.0
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/science/R-cran-ks/distinfo b/science/R-cran-ks/distinfo
index f728f466c39d..f01b9af0b157 100644
--- a/science/R-cran-ks/distinfo
+++ b/science/R-cran-ks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736362891
-SHA256 (ks_1.14.3.tar.gz) = 5108cb699647b3cf2b10bcfefb9544042f8546c2527dde792db1e33b5eb44036
-SIZE (ks_1.14.3.tar.gz) = 1120759
+TIMESTAMP = 1746363887
+SHA256 (ks_1.15.0.tar.gz) = da5ba3b24015071563c51a82a6e322631f2ce0112f5a3103d40f65e7e487a1f2
+SIZE (ks_1.15.0.tar.gz) = 1125580
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 244b9ff7c5f3..4e81f12f071d 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		afni
 DISTVERSIONPREFIX=	AFNI_
-DISTVERSION=		25.1.04
+DISTVERSION=		25.1.08
 CATEGORIES=		science biology graphics perl5 python
 
 MAINTAINER=	fernape@FreeBSD.org
diff --git a/science/afni/distinfo b/science/afni/distinfo
index 5bdccf8e5418..cc36808f49c4 100644
--- a/science/afni/distinfo
+++ b/science/afni/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745475141
-SHA256 (afni-afni-AFNI_25.1.04_GH0.tar.gz) = 5e43381cf5fc2fc38ea27c8dd0b28a1c9162f1ae349741882d03a967424d6be5
-SIZE (afni-afni-AFNI_25.1.04_GH0.tar.gz) = 53272429
+TIMESTAMP = 1746597097
+SHA256 (afni-afni-AFNI_25.1.08_GH0.tar.gz) = 300b83cee2f9e1bb3943a3eb5a2dcb18fecca9cb33f22bc2407789ca5c1631b6
+SIZE (afni-afni-AFNI_25.1.08_GH0.tar.gz) = 53278260
diff --git a/science/bout++/Makefile b/science/bout++/Makefile
index 88f8ea40179b..2eb36e82ec9e 100644
--- a/science/bout++/Makefile
+++ b/science/bout++/Makefile
@@ -48,7 +48,9 @@ SHEBANG_FILES=	bin/bout-add-mod-path \
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		BOUT_USE_SYSTEM_FMT
 CMAKE_OFF=	BOUT_TESTS
-CMAKE_TESTING_ON=	BOUT_TESTS # 6 tests fail, see https://github.com/boutproject/BOUT-dev/issues/2980
+CMAKE_TESTING_ON=	BOUT_TESTS
+
+TESTING_UNSAFE=	6 tests fail, see https://github.com/boutproject/BOUT-dev/issues/2980
 
 CXXFLAGS+=	-I${WRKSRC}/include
 LDFLAGS+=	-lexecinfo
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 63167e8c876b..7051f227dae6 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -26,6 +26,7 @@ CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
+TESTING_UNSAFE=		765 tests fail
 TEST_TARGET=	check
 USE_CXXSTD=	c++20
 USE_LDCONFIG=	yes
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index 0939a799221b..471819e7794c 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cgnslib
-PORTVERSION=	4.4.0
+PORTVERSION=	4.5.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	science
@@ -13,10 +13,11 @@ LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	CGNS
 GH_PROJECT=	CGNS
+
+USES=		cmake
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
@@ -58,6 +59,9 @@ TOOLS_CMAKE_ON=		-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
+pre-configure:
+	${REINPLACE_CMD} -e 's|tk-private/||' ${WRKSRC}/src/cgnstools/tkogl/tkogl.c
+
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R} \
 		${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R:R}
diff --git a/science/cgnslib/distinfo b/science/cgnslib/distinfo
index 14cbf4aeb12c..11544b1458c4 100644
--- a/science/cgnslib/distinfo
+++ b/science/cgnslib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686946301
-SHA256 (CGNS-CGNS-v4.4.0_GH0.tar.gz) = 3b0615d1e6b566aa8772616ba5fd9ca4eca1a600720e36eadd914be348925fe2
-SIZE (CGNS-CGNS-v4.4.0_GH0.tar.gz) = 1979828
+TIMESTAMP = 1738068224
+SHA256 (CGNS-CGNS-v4.5.0_GH0.tar.gz) = c72355219318755ba0a8646a8e56ee1c138cf909c1d738d258d2774fa4b529e9
+SIZE (CGNS-CGNS-v4.5.0_GH0.tar.gz) = 2085289
diff --git a/science/cgnslib/pkg-plist b/science/cgnslib/pkg-plist
index 3464553a17b3..cfbaa4060d00 100644
--- a/science/cgnslib/pkg-plist
+++ b/science/cgnslib/pkg-plist
@@ -49,12 +49,14 @@ include/cgnstypes.h
 include/cgnstypes_f.h
 include/cgnstypes_f03.h
 include/cgnswin_f.h
+lib/cmake/cgns/cgns-config-version.cmake
+lib/cmake/cgns/cgns-config.cmake
 lib/cmake/cgns/cgns-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/cgns/cgns-targets.cmake
 lib/libcgns.a
 lib/libcgns.so
 lib/libcgns.so.4
-lib/libcgns.so.4.4
+lib/libcgns.so.4.5
 %%TOOLS%%share/cgnstools/aflr3.tcl
 %%TOOLS%%share/cgnstools/balloon.tcl
 %%TOOLS%%share/cgnstools/cgns-icon.xbm
diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index 6f35e3dea8dc..e1ea21b89e25 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	code_saturne
 PORTVERSION=	8.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science parallel
 MASTER_SITES=	https://www.code-saturne.org/releases/
 
diff --git a/science/code_saturne/pkg-plist b/science/code_saturne/pkg-plist
index b2fe4ad72e39..f97fecfd65dc 100644
--- a/science/code_saturne/pkg-plist
+++ b/science/code_saturne/pkg-plist
@@ -503,63 +503,92 @@ lib/libsaturne-8.1.so
 lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_batch%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_batch%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_batch%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_bdiff%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_bdiff%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_bdiff%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_bdump%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_bdump%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_bdump%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case_coupling%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case_coupling%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case_coupling%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case_domain%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case_domain%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_case_domain%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_compile%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_compile%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_compile%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_config%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_config%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_control%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_control%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_control%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_create%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_create%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_create%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_debug_symbol%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_debug_symbol%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_debug_symbol%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_debug_wrapper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_debug_wrapper%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_debug_wrapper%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_exec_environment%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_exec_environment%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_exec_environment%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_info%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_info%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_info%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_math_parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_math_parser%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_math_parser%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_meg_to_c%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_meg_to_c%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_meg_to_c%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_package%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_package%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_package%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_parametric_setup%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_parametric_setup%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_parametric_setup%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_parametric_study%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_parametric_study%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_parametric_study%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_run%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_run%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_run%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_run_conf%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_run_conf%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_run_conf%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_runcase%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_runcase%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_runcase%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_script%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_script%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_script%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_studymanager%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_studymanager%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_studymanager%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_submit%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_submit%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_submit%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_update%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_update%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_update%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_xml_reader%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_xml_reader%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/__pycache__/cs_xml_reader%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/base/cs_batch.py
 %%PYTHON_SITELIBDIR%%/code_saturne/base/cs_bdiff.py
@@ -590,12 +619,16 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/base/cs_xml_reader.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_gui%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_gui%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_gui%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_studymanager_gui%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_studymanager_gui%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_studymanager_gui%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_trackcvg%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_trackcvg%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/__pycache__/cs_trackcvg%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/BrowserForm.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/BrowserView.py
@@ -617,44 +650,64 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/Toolbox.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/BrowserForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/BrowserForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/BrowserForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/BrowserView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/BrowserView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/BrowserView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrDialogView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrDialogView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrDialogView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrLinesDisplayedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrLinesDisplayedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CommandMgrLinesDisplayedDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CompletionTextEditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CompletionTextEditor%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/CompletionTextEditor%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/NewCaseDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/NewCaseDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/NewCaseDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QCouplingEditorView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QCouplingEditorView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QCouplingEditorView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QFileEditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QFileEditor%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QFileEditor%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtCase%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtCase%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtCase%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtCore%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtCore%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtCore%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtGui%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtGui%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtGui%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtPage%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtPage%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtPage%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtWidgets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtWidgets%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/QtWidgets%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/SearchBar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/SearchBar%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/SearchBar%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/Toolbox%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/Toolbox%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/Toolbox%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/logo_salome_cfd.png
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/base/resource_base_rc.py
@@ -881,450 +934,673 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/XMLEditorView.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AnalysisFeaturesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AnalysisFeaturesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AnalysisFeaturesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AnalysisFeaturesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AnalysisFeaturesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AnalysisFeaturesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AtmosphericFlowsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AtmosphericFlowsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AtmosphericFlowsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AtmosphericFlowsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AtmosphericFlowsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/AtmosphericFlowsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BalanceViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDebugOptionsHelpDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDebugOptionsHelpDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDebugOptionsHelpDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDialogView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDialogView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningDialogView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningStopByIterationDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningStopByIterationDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BatchRunningStopByIterationDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BodyForcesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BodyForcesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BodyForcesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BodyForcesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BodyForcesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BodyForcesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCoalInletForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCoalInletForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCoalInletForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCoalInletView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCoalInletView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCoalInletView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCompressibleOutletForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCompressibleOutletForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCompressibleOutletForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCompressibleOutletView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCompressibleOutletView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsCompressibleOutletView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsConvectiveInletForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsConvectiveInletForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsConvectiveInletForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsConvectiveInletView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsConvectiveInletView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsConvectiveInletView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsElectricalForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsElectricalForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsElectricalForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsElectricalView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsElectricalView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsElectricalView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsEnergy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsEnergy%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsEnergy%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsEnergyView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsEnergyView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsEnergyView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsExternalHeadLossesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsExternalHeadLossesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsExternalHeadLossesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsExternalHeadLossesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsExternalHeadLossesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsExternalHeadLossesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsFraction%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsFraction%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsFraction%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsFractionView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsFractionView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsFractionView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsHydraulicHeadForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsHydraulicHeadForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsHydraulicHeadForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsHydraulicHeadView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsHydraulicHeadView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsHydraulicHeadView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsInterfacialArea%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsInterfacialArea%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsInterfacialArea%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsInterfacialAreaView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsInterfacialAreaView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsInterfacialAreaView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMappedInletForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMappedInletForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMappedInletForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMappedInletView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMappedInletView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMappedInletView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMeteoForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMeteoForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMeteoForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMeteoView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMeteoView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMeteoView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMobileMeshForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMobileMeshForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMobileMeshForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMobileMeshView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMobileMeshView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsMobileMeshView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNonCondensable%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNonCondensable%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNonCondensable%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNonCondensableView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNonCondensableView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsNonCondensableView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressure%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressure%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressure%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsPressureViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsRoughWallForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsRoughWallForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsRoughWallForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsRoughWallView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsRoughWallView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsRoughWallView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalar%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalar%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsScalarsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsSlidingWallForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsSlidingWallForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsSlidingWallForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsSlidingWallView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsSlidingWallView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsSlidingWallView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsTurbulenceInletViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsVelocityInletViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWall%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWall%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWall%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallRadiativeTransferForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallRadiativeTransferForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallRadiativeTransferForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallRadiativeTransferView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallRadiativeTransferView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallRadiativeTransferView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryConditionsWallView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryNatureForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryNatureForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryNatureForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryNatureView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryNatureView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/BoundaryNatureView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CathareCouplingForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CathareCouplingForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CathareCouplingForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CathareCouplingView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CathareCouplingView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CathareCouplingView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CoalCombustionForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CoalCombustionForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CoalCombustionForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CoalCombustionView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CoalCombustionView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CoalCombustionView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CompressibleForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CompressibleForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CompressibleForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ConjugateHeatTransferForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ConjugateHeatTransferForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ConjugateHeatTransferForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ConjugateHeatTransferView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ConjugateHeatTransferView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ConjugateHeatTransferView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CouplingParametersForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CouplingParametersForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CouplingParametersForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CouplingParametersView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CouplingParametersView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/CouplingParametersView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DefineUserScalarsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DefineUserScalarsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DefineUserScalarsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DefineUserScalarsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DefineUserScalarsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DefineUserScalarsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DropletCondensationEvaporation%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DropletCondensationEvaporation%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DropletCondensationEvaporation%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DropletCondensationEvaporationView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DropletCondensationEvaporationView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/DropletCondensationEvaporationView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ElectricalForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ElectricalForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ElectricalForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ElectricalView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ElectricalView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ElectricalView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FacesSelectionForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FacesSelectionForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FacesSelectionForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FacesSelectionView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FacesSelectionView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FacesSelectionView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FansForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FansForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FansForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FansView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FansView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FansView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidCharacteristicsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidCharacteristicsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidCharacteristicsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidCharacteristicsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidCharacteristicsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidCharacteristicsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionAdvancedOptionsDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionAdvancedOptionsDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionAdvancedOptionsDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/FluidStructureInteractionView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GasCombustionForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GasCombustionForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GasCombustionForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GasCombustionView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GasCombustionView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GasCombustionView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParameters%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParameters%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParameters%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParametersAdvancedOptionsDialog%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParametersAdvancedOptionsDialog%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParametersAdvancedOptionsDialog%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParametersView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParametersView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GlobalNumericalParametersView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterLawForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterLawForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterLawForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterLawView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterLawView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterLawView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/GroundwaterView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/HeadLossesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/HeadLossesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/HeadLossesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/HeadLossesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/HeadLossesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/HeadLossesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/IdentityAndPathesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/IdentityAndPathesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/IdentityAndPathesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/IdentityAndPathesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/IdentityAndPathesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/IdentityAndPathesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ImmersedBoundariesNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ImmersedBoundariesNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ImmersedBoundariesNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ImmersedBoundariesViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ImmersedBoundariesViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ImmersedBoundariesViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InitializationForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InitializationForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InitializationForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InitializationView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InitializationView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InitializationView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialArea%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialArea%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialArea%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialAreaView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialAreaView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialAreaView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialEnthalpy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialEnthalpy%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialEnthalpy%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialEnthalpyView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialEnthalpyView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialEnthalpyView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialForces%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialForces%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialForces%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialForcesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialForcesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InterfacialForcesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InternalCouplingView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InternalCouplingView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/InternalCouplingView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianBoundaryForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianBoundaryForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianBoundaryForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianBoundaryView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianBoundaryView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianBoundaryView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianOutputForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianOutputForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianOutputForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianOutputView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianOutputView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianOutputView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianStatisticsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianStatisticsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianStatisticsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianStatisticsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianStatisticsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianStatisticsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LagrangianView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LocalizationForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LocalizationForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LocalizationForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LocalizationView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LocalizationView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/LocalizationView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFields%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFields%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFields%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsInitialization%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsInitialization%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsInitialization%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsInitializationView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsInitializationView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsInitializationView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsSourceTerms%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsSourceTerms%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsSourceTerms%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsSourceTermsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsSourceTermsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsSourceTermsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MainFieldsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MeshQualityCriteriaLogDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MeshQualityCriteriaLogDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MeshQualityCriteriaLogDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MobileMeshForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MobileMeshForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MobileMeshForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MobileMeshView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MobileMeshView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/MobileMeshView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneThermodynamics%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneThermodynamics%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneThermodynamics%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneThermodynamicsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneThermodynamicsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneThermodynamicsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneWallTransferForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneWallTransferForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneWallTransferForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneWallTransferView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneWallTransferView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NeptuneWallTransferView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NonCondensableView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NonCondensableView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NonCondensableView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Noncondensable%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Noncondensable%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Noncondensable%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NotebookForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NotebookForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NotebookForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NotebookView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NotebookView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NotebookView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NucleateBoiling%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NucleateBoiling%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NucleateBoiling%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NucleateBoilingView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NucleateBoilingView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NucleateBoilingView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamEquationViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamGlobalForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamGlobalForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamGlobalForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamGlobalView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamGlobalView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/NumericalParamGlobalView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OpenTurnsDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OpenTurnsDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OpenTurnsDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OpenTurnsDialogView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OpenTurnsDialogView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OpenTurnsDialogView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputControlForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputControlForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputControlForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputControlView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputControlView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputControlView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputFields%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputFields%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputFields%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputFieldsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputFieldsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputFieldsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputSurfacicVariablesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputSurfacicVariablesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputSurfacicVariablesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputSurfacicVariablesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputSurfacicVariablesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputSurfacicVariablesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputVolumicVariablesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputVolumicVariablesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputVolumicVariablesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputVolumicVariablesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputVolumicVariablesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/OutputVolumicVariablesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PerformanceTuningForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PerformanceTuningForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PerformanceTuningForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PerformanceTuningView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PerformanceTuningView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PerformanceTuningView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PorosityForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PorosityForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PorosityForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PorosityView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PorosityView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PorosityView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreProcessingInformationsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreProcessingInformationsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreProcessingInformationsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreprocessingForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreprocessingForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreprocessingForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreprocessingView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreprocessingView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/PreprocessingView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ProfilesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ProfilesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ProfilesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ProfilesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ProfilesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ProfilesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/QMegEditorForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/QMegEditorForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/QMegEditorForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/QMegEditorView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/QMegEditorView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/QMegEditorView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SalomeActors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SalomeActors%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SalomeActors%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SalomeHandler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SalomeHandler%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SalomeHandler%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Solid%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Solid%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Solid%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolidView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolidView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolidView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolutionDomainForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolutionDomainForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolutionDomainForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolutionDomainView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolutionDomainView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SolutionDomainView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SourceTermsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SourceTermsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SourceTermsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SourceTermsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SourceTermsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SourceTermsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Species%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Species%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Species%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SpeciesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SpeciesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/SpeciesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/StartRestartView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalRadiationAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalRadiationAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalRadiationAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermalView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsField%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsField%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsField%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsFieldView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsFieldView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsFieldView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsInteraction%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsInteraction%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsInteraction%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsInteractionView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsInteractionView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsInteractionView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsSaturation%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsSaturation%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsSaturation%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsSaturationView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsSaturationView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/ThermodynamicsSaturationView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeAveragesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeAveragesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeAveragesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeAveragesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeAveragesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeAveragesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStep%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStep%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStep%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepViewNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeStepViewNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeTablesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeTablesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeTablesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeTablesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeTablesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TimeTablesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurboMachineryForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurboMachineryForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurboMachineryForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurboMachineryView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurboMachineryView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurboMachineryView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Turbulence%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Turbulence%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/Turbulence%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceNeptuneView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceNeptuneView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceNeptuneView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/TurbulenceView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/UsersControl%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/UsersControl%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/UsersControl%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/UsersControlView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/UsersControlView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/UsersControlView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VerifyExistenceLabelDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VerifyExistenceLabelDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VerifyExistenceLabelDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VerifyExistenceLabelDialogView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VerifyExistenceLabelDialogView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VerifyExistenceLabelDialogView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicConditionsForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicConditionsForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicConditionsForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicConditionsView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicConditionsView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicConditionsView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicNatureForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicNatureForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicNatureForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicNatureView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicNatureView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicNatureView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicZoneAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicZoneAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/VolumicZoneAdvancedDialogForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/WelcomeForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/WelcomeForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/WelcomeForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/WelcomeView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/WelcomeView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/WelcomeView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/XMLEditorForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/XMLEditorForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/XMLEditorForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/XMLEditorView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/XMLEditorView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/XMLEditorView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/resources_pages_rc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/resources_pages_rc%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/__pycache__/resources_pages_rc%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/case/resources_pages_rc.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/cs_gui.py
@@ -1346,48 +1622,68 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/Toolbox.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/BrowserView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/BrowserView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/BrowserView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManageCasesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterSubplotForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterSubplotForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterSubplotForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/ManagePlotterView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/PathesForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/PathesForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/PathesForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/PathesView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/PathesView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/PathesView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/Toolbox%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/Toolbox%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/Toolbox%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/studymanager_gui/resource_base_rc.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/MainForm.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/MainView.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/MainForm%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/MainView%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/__pycache__/resource_base_rc%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/gui/trackcvg/resource_base_rc.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/AtmosphericFlowsModel.py
@@ -1476,191 +1772,284 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/model/XMLvariables.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/AtmosphericFlowsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/AtmosphericFlowsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/AtmosphericFlowsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BalanceModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BalanceModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BalanceModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BalanceModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BalanceModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BalanceModelNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BatchRunningModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BatchRunningModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BatchRunningModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BodyForcesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BodyForcesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BodyForcesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/Boundary%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/Boundary%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/Boundary%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BoundaryConditionsModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BoundaryConditionsModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BoundaryConditionsModelNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BoundaryNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BoundaryNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/BoundaryNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CathareCouplingModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CathareCouplingModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CathareCouplingModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CoalCombustionModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CoalCombustionModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CoalCombustionModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/Common%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/Common%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/Common%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CompressibleModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CompressibleModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CompressibleModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ConjugateHeatTransferModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ConjugateHeatTransferModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ConjugateHeatTransferModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CoriolisSourceTermsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CoriolisSourceTermsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/CoriolisSourceTermsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/DefineUserScalarsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/DefineUserScalarsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/DefineUserScalarsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/DropletCondensationEvaporationModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/DropletCondensationEvaporationModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/DropletCondensationEvaporationModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ElectricalModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ElectricalModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ElectricalModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/EosWrapper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/EosWrapper%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/EosWrapper%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FansModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FansModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FansModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FluidCharacteristicsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FluidCharacteristicsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FluidCharacteristicsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FluidStructureInteractionModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FluidStructureInteractionModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/FluidStructureInteractionModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GasCombustionModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GasCombustionModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GasCombustionModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GlobalNumericalParametersModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GlobalNumericalParametersModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GlobalNumericalParametersModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GroundwaterLawModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GroundwaterLawModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GroundwaterLawModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GroundwaterModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GroundwaterModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/GroundwaterModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/HeadLossesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/HeadLossesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/HeadLossesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/HgnModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/HgnModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/HgnModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/IdentityAndPathesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/IdentityAndPathesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/IdentityAndPathesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ImmersedBoundariesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ImmersedBoundariesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ImmersedBoundariesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InitializationModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InitializationModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InitializationModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialAreaModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialAreaModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialAreaModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialEnthalpyModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialEnthalpyModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialEnthalpyModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialForcesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialForcesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialForcesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InternalCouplingModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InternalCouplingModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InternalCouplingModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianBoundariesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianBoundariesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianBoundariesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianOutputModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianOutputModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianOutputModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianStatisticsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianStatisticsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LagrangianStatisticsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LocalizationModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LocalizationModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LocalizationModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LocalizationModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LocalizationModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/LocalizationModelNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsInitializationModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsInitializationModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsInitializationModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsSourceTermsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsSourceTermsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MainFieldsSourceTermsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MobileMeshModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MobileMeshModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/MobileMeshModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NeptuneFieldModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NeptuneFieldModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NeptuneFieldModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NeptuneWallTransferModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NeptuneWallTransferModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NeptuneWallTransferModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NonCondensableModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NonCondensableModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NonCondensableModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NotebookModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NotebookModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NotebookModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NucleateBoilingModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NucleateBoilingModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NucleateBoilingModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamEquationModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamEquationModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamEquationModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamEquationModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamEquationModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamEquationModelNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamGlobalModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamGlobalModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/NumericalParamGlobalModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OpenTurnsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OpenTurnsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OpenTurnsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputControlModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputControlModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputControlModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputFieldsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputFieldsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputFieldsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputSurfacicFieldsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputSurfacicFieldsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputSurfacicFieldsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputSurfacicVariablesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputSurfacicVariablesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputSurfacicVariablesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputVolumicVariablesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputVolumicVariablesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/OutputVolumicVariablesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/PerformanceTuningModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/PerformanceTuningModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/PerformanceTuningModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/PorosityModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/PorosityModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/PorosityModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ProfilesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ProfilesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ProfilesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ScriptRunningModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ScriptRunningModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ScriptRunningModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SolidModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SolidModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SolidModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SolutionDomainModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SolutionDomainModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SolutionDomainModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SourceTermsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SourceTermsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SourceTermsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SpeciesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SpeciesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/SpeciesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/StartRestartModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/StartRestartModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/StartRestartModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalParticlesRadiationModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalParticlesRadiationModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalParticlesRadiationModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalRadiationModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalRadiationModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalRadiationModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalScalarModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalScalarModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermalScalarModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermodynamicsModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermodynamicsModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ThermodynamicsModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeAveragesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeAveragesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeAveragesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeStepModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeStepModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeStepModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeStepModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeStepModelNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeStepModelNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeTablesModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeTablesModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TimeTablesModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurboMachineryModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurboMachineryModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurboMachineryModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurbulenceModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurbulenceModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurbulenceModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurbulenceNeptuneModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurbulenceNeptuneModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/TurbulenceNeptuneModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/UsersControlModel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/UsersControlModel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/UsersControlModel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLengine%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLengine%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLengine%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLinitialize%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLinitialize%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLinitialize%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLinitializeNeptune%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLinitializeNeptune%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLinitializeNeptune%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLmodel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLmodel%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLmodel%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLvariables%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLvariables%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/XMLvariables%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_drawing%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_drawing%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_drawing%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_parser%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_parser%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_pathes_model%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_pathes_model%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_pathes_model%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_run%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_run%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_run%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_study%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_study%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_study%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_texmaker%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_texmaker%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_texmaker%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_xml_init%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_xml_init%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_xml_init%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_drawing.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_parser.py
@@ -1673,12 +2062,16 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/ple/Init.py
 %%PYTHON_SITELIBDIR%%/ple/__init__.py
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/Coupling%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ple/__pycache__/Coupling%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/Coupling%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/Init%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ple/__pycache__/Init%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/Init%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ple/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/pyple_coupler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ple/__pycache__/pyple_coupler%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/ple/__pycache__/pyple_coupler%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ple/libpyplecoupling.so
 %%PYTHON_SITELIBDIR%%/ple/pyple_coupler.py
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
deleted file mode 100644
index 2ad1f69e10c5..000000000000
--- a/science/gtamsanalyzer/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-PORTNAME=	gtamsanalyzer
-PORTVERSION=	0.42
-PORTREVISION=	12
-CATEGORIES=	science gnustep
-MASTER_SITES=	SF/tamsys/gnustep%20tams/GTAMSAnalyzer%2${PORTVERSION}
-DISTNAME=	GTAMSAnalyzer.src.${PORTVERSION}
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Qualitative Research Software for the Free World for GNUstep
-WWW=		http://tamsys.sourceforge.net/gtams/
-
-LICENSE=	GPLv2
-
-DEPRECATED=		Upstream unmaintained as last release was in 2004
-EXPIRATION_DATE=		2025-05-04
-
-USES=		gnustep
-USE_GNUSTEP=	back build
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/Source
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=int-conversion
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
-post-patch:
-	${RM} "${WRKSRC}/obj"
-	@${REINPLACE_CMD} '/^GNUSTEP_INSTALLATION_DIR/ s|=|=$$(DESTDIR)|' \
-		${WRKSRC}/GNUmakefile
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/GTAMSAnalyzer.app/GTAMSAnalyzer
-
-.include <bsd.port.mk>
diff --git a/science/gtamsanalyzer/distinfo b/science/gtamsanalyzer/distinfo
deleted file mode 100644
index 983df581f4be..000000000000
--- a/science/gtamsanalyzer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (GTAMSAnalyzer.src.0.42.tar.gz) = 3be09220f713ce47e73049a93abf8555d6b7ff1d16cef0c18c2cd525e30b3816
-SIZE (GTAMSAnalyzer.src.0.42.tar.gz) = 1014662
diff --git a/science/gtamsanalyzer/pkg-descr b/science/gtamsanalyzer/pkg-descr
deleted file mode 100644
index 66b970036321..000000000000
--- a/science/gtamsanalyzer/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-GTAMS Analyzer is a complete coding and analysis package. It is a "port" of
-TAMS Analyzer for Macintosh OS X. Note, at some point the two projects will
-have identical file formats, at which point  the initial G (for GNUstep)
-will be dropped. GTAMS stands for GNUstep Text Analysis Markup System, it
-is a convention for identifying themes in text. The software offers a wide
-range of tools for applying themes to texts and identifying patterns of
-themes within and between texts.
-
-LICENSE: GPL2
diff --git a/science/gtamsanalyzer/pkg-plist b/science/gtamsanalyzer/pkg-plist
deleted file mode 100644
index 60f149c2c38d..000000000000
--- a/science/gtamsanalyzer/pkg-plist
+++ /dev/null
@@ -1,100 +0,0 @@
-GNUstep/System/Applications/GTAMSAnalyzer.app/GTAMSAnalyzer
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FileIcon_rtf.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FileIcon_txt.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FindPanel.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FindPanel.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FindPanel.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FindPanel.strings
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FreqCount.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/FreqCount.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/GTAMSAnalyzer.desktop
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/GTAMSAnalyzer.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/GTAMSAnalyzer.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/GTAMSAnalyzer.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/GTAMSAnalyzerInfo.plist
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/Info-gnustep.plist
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/MWSummaryReport.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/MWSummaryReport.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/MWSummaryReport.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/MyPanedDocument.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/MyPanedDocument.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/MyPanedDocument.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/Save.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/codeBrowser.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/codeBrowser.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/codeicn.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/column.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/comment.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/dataSumm2.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/dataSummary.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/decolorTags.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/def.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/defFromSel.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/delRoot.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/delRoot2.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/delRoot3.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/docTemplate.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/docback.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/export.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/findRecord.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/kappa.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/kappa.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/kappa.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/largeApp.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/markRec.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/metaicn.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/myPanedResults.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/myPanedResults.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/myPanedResults.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/myProject.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/myProject.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/myProject.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/nextTag.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/playMedia.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/preference.gorm/data.classes
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/preference.gorm/data.info
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/preference.gorm/objects.gorm
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/prevTag.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/prevTag3.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/reCode.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/reCode2.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/reColor.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/refresh.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/removeFrom.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/sel2codeset.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selCodeSet.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selCodeSet2.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selOtherTag.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selectAll.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selectAll2.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selectAll3.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selectReverse.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/selectSome.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/smartSort.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/sort09.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/sort09Within.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/sortAZ.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/sortAZWithin.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/sortCode.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/sortCodeWithin.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/ta-rslt.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/taSmallProj.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/taSmallestProj.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tag2.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tag3.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tag4.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tags.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tamsanalysis-1.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tamsanalysis-2.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tamsanalysis-3.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tamsanalysis-3.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tamsanalysis-4.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/tamsanalysis-proj.tiff
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/twoTagBasic.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/twoTagBasicNot.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/txt2Button.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/unmarkRec.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/unmarkRec2.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/Resources/wbicn.tif
-GNUstep/System/Applications/GTAMSAnalyzer.app/stamp.make
-GNUstep/System/Tools/GTAMSAnalyzer
diff --git a/science/packmol/Makefile b/science/packmol/Makefile
index 3aa16e6b875a..258cb4887b23 100644
--- a/science/packmol/Makefile
+++ b/science/packmol/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	packmol
 DISTVERSIONPREFIX=	v
-DISTVERSION=	21.0.1
+DISTVERSION=	21.0.2
 CATEGORIES=	science
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/science/packmol/distinfo b/science/packmol/distinfo
index 441a3cb59349..a29aecb117ea 100644
--- a/science/packmol/distinfo
+++ b/science/packmol/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743451529
-SHA256 (m3g-packmol-v21.0.1_GH0.tar.gz) = 554a8a88348ad82b46e6195ff7c7698356b4a5a815c4f1c8615ef1b0651a5b9e
-SIZE (m3g-packmol-v21.0.1_GH0.tar.gz) = 630498
+TIMESTAMP = 1746477631
+SHA256 (m3g-packmol-v21.0.2_GH0.tar.gz) = 4b63d73400f7702347d9ff0cc4d0009be5a752afa7af00ad612554e8918f00fd
+SIZE (m3g-packmol-v21.0.2_GH0.tar.gz) = 630603
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 339d17d1f4fd..95df05404a9c 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	paraview
 DISTVERSION=	${PARAVIEW_VER}.3
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v${PARAVIEW_VER}/
 DISTNAME=	ParaView-v${PORTVERSION}
diff --git a/science/py-pysal/Makefile b/science/py-pysal/Makefile
index 01e7df6247e0..9fb0d4ef1b18 100644
--- a/science/py-pysal/Makefile
+++ b/science/py-pysal/Makefile
@@ -12,6 +12,9 @@ WWW=		https://pysal.org/ \
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+DEPRECATED=	Depends on expired math/py-spvcm
+EXPIRATION_DATE=2025-06-04
+
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}access>=1.1.8:science/py-access@${PY_FLAVOR} \
diff --git a/science/qbox/Makefile b/science/qbox/Makefile
index 26cf63461ad5..6eaf55eb80d3 100644
--- a/science/qbox/Makefile
+++ b/science/qbox/Makefile
@@ -30,7 +30,8 @@ WRKSRC_SUBDIR=	src
 MAKE_ARGS=	TARGET=freebsd
 
 ALL_TARGET=	qb
-TEST_TARGET=	tests # only builds tests, but doesn't run them: https://github.com/qboxcode/qbox-public/issues/6, tests fail to link, see https://github.com/qboxcode/qbox-public/issues/11
+TEST_TARGET=	tests
+TESTING_UNSAFE=	only builds tests, but doesn't run them: https://github.com/qboxcode/qbox-public/issues/6, tests fail to link, see https://github.com/qboxcode/qbox-public/issues/11
 
 PLIST_FILES=	bin/qb
 
diff --git a/science/thermofun/Makefile b/science/thermofun/Makefile
index 6e9e9d4e39f0..652e289dbc1c 100644
--- a/science/thermofun/Makefile
+++ b/science/thermofun/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	thermofun
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.0
+DISTVERSION=	0.5.1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/science/thermofun/distinfo b/science/thermofun/distinfo
index b37f2129f913..59f3dc735b4f 100644
--- a/science/thermofun/distinfo
+++ b/science/thermofun/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721889621
-SHA256 (thermohub-thermofun-v0.5.0_GH0.tar.gz) = 620f42a1f11753a0e6c5bfa8b9ce8b7319cd5582859da41f0fcddea4f60db536
-SIZE (thermohub-thermofun-v0.5.0_GH0.tar.gz) = 2087924
+TIMESTAMP = 1746512235
+SHA256 (thermohub-thermofun-v0.5.1_GH0.tar.gz) = 9f3bcd20112155f5b0d65e39768eceaef3f041485812c9211c281a318b3f057d
+SIZE (thermohub-thermofun-v0.5.1_GH0.tar.gz) = 2087867
diff --git a/science/thermofun/files/patch-python_thermofun_CMakeLists.txt b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt
index 96ea83360240..1f43ef2f810b 100644
--- a/science/thermofun/files/patch-python_thermofun_CMakeLists.txt
+++ b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt
@@ -1,4 +1,4 @@
---- python/thermofun/CMakeLists.txt.orig	2023-03-02 11:19:26 UTC
+--- python/thermofun/CMakeLists.txt.orig	2025-05-05 07:34:58 UTC
 +++ python/thermofun/CMakeLists.txt
 @@ -26,7 +26,7 @@ add_custom_target(thermofun ALL
      COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:PyThermoFun> 
@@ -9,12 +9,12 @@
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
  
  # Set dependencies of thermofun target
-@@ -54,7 +54,7 @@ install(CODE
+@@ -71,7 +71,7 @@ install(CODE
      endif()
  
      execute_process(
--        COMMAND ${PYTHON_EXECUTABLE} -m pip install --prefix \${THERMOFUN_PYTHON_INSTALL_PREFIX_NATIVE} ${CMAKE_CURRENT_BINARY_DIR}
-+        COMMAND ${PYTHON_EXECUTABLE} -m pip install --root ${FREEBSD_STAGEDIR} --prefix ${FREEBSD_PREFIX} ${CMAKE_CURRENT_BINARY_DIR}
-         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+-        COMMAND \"${PYTHON_EXECUTABLE}\" -m pip install --prefix \"${THERMOFUN_PYTHON_INSTALL_PREFIX}\" \"${CMAKE_CURRENT_BINARY_DIR}\"
++        COMMAND \"${PYTHON_EXECUTABLE}\" -m pip install --root ${FREEBSD_STAGEDIR} --prefix ${FREEBSD_PREFIX} \"${CMAKE_CURRENT_BINARY_DIR}\"
+         WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")
  "
  )
diff --git a/security/Makefile b/security/Makefile
index dc3322defa4e..1e346d56358b 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -74,6 +74,7 @@
     SUBDIR += cargo-audit
     SUBDIR += ccrypt
     SUBDIR += ccsrch
+    SUBDIR += certificate_maker
     SUBDIR += certmgr
     SUBDIR += certspotter
     SUBDIR += cfssl
@@ -100,6 +101,7 @@
     SUBDIR += clamtk
     SUBDIR += cloak
     SUBDIR += cops
+    SUBDIR += cosign
     SUBDIR += courier-authlib
     SUBDIR += courier-authlib-base
     SUBDIR += courierpassd
@@ -186,6 +188,7 @@
     SUBDIR += gnupg1
     SUBDIR += gnutls
     SUBDIR += go-cve-dictionary
+    SUBDIR += go-tuf
     SUBDIR += gokart
     SUBDIR += gokey
     SUBDIR += gonepass
@@ -229,7 +232,6 @@
     SUBDIR += hs-cryptol
     SUBDIR += hydra
     SUBDIR += hyperhotp
-    SUBDIR += i2p
     SUBDIR += i2pd
     SUBDIR += iaikpkcs11wrapper
     SUBDIR += iddawc
@@ -327,7 +329,6 @@
     SUBDIR += libtatsu
     SUBDIR += libtomcrypt
     SUBDIR += libu2f-host
-    SUBDIR += libuecc
     SUBDIR += libwhisker
     SUBDIR += libxcrypt
     SUBDIR += libyubikey
@@ -356,7 +357,6 @@
     SUBDIR += linux-rl9-libsecret
     SUBDIR += linux-rl9-libssh
     SUBDIR += linux-rl9-libtasn1
-    SUBDIR += linux-rl9-libxcrypt
     SUBDIR += linux-rl9-nettle
     SUBDIR += linux-rl9-nss
     SUBDIR += linux-rl9-p11-kit
@@ -1105,6 +1105,7 @@
     SUBDIR += ratproxy
     SUBDIR += rats
     SUBDIR += rcracki_mt
+    SUBDIR += rekor
     SUBDIR += reop
     SUBDIR += rhash
     SUBDIR += rhonabwy
@@ -1353,6 +1354,7 @@
     SUBDIR += testssl.sh
     SUBDIR += tfhe
     SUBDIR += theonionbox
+    SUBDIR += timestamp-authority
     SUBDIR += tinc
     SUBDIR += tinc-devel
     SUBDIR += tinyca
@@ -1368,6 +1370,7 @@
     SUBDIR += tpm2-tss
     SUBDIR += transcrypt
     SUBDIR += trezord
+    SUBDIR += trillian
     SUBDIR += tripwire
     SUBDIR += trivy
     SUBDIR += trousers
diff --git a/security/afl++/Makefile b/security/afl++/Makefile
index 79aa9bae2fb6..41e79b781385 100644
--- a/security/afl++/Makefile
+++ b/security/afl++/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	afl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.30c
+DISTVERSION=	4.32c
 CATEGORIES=	security
 PKGNAMESUFFIX=	++-${FLAVOR}
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast instrumented fuzzer
 WWW=		https://aflplus.plus/
 
@@ -19,11 +19,11 @@ BUILD_DEPENDS=	ginstall:sysutils/coreutils
 FLAVORS=	llvm # gcc
 FLAVOR?=	${FLAVORS:[1]}
 
-_LLVM_VER=		16
-llvm_BUILD_DEPENDS=	clang${_LLVM_VER}:devel/llvm${_LLVM_VER}
-llvm_RUN_DEPENDS=	clang${_LLVM_VER}:devel/llvm${_LLVM_VER}
-
 USES=		gmake shebangfix tar:tgz
+.if ${FLAVOR} == llvm
+USES+=		llvm:build,run
+.endif
+
 .if ${FLAVOR} == gcc
 USE_GCC=	yes
 .endif
@@ -37,9 +37,9 @@ MAKE_ARGS=	${${ARCH} != amd64 && ${ARCH} != i386:?AFL_NO_X86=1:} \
 		PREFIX="${PREFIX}/${PKGBASE}"
 .if ${FLAVOR} == llvm
 CFLAGS_riscv64=	-mno-relax
-MAKE_ARGS+=	CC=clang${_LLVM_VER} \
-		CXX=clang++${_LLVM_VER} \
-		LLVM_CONFIG=llvm-config${_LLVM_VER}
+MAKE_ARGS+=	CC=clang${LLVM_VERSION} \
+		CXX=clang++${LLVM_VERSION} \
+		LLVM_CONFIG=llvm-config${LLVM_VERSION}
 .endif
 ALL_TARGET=	distrib
 QA_ENV=		IGNORE_QA_stripped=1 # unstripped to keep it functional
diff --git a/security/afl++/distinfo b/security/afl++/distinfo
index 6be3eb843216..21befac35cea 100644
--- a/security/afl++/distinfo
+++ b/security/afl++/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737032978
-SHA256 (AFLplusplus-AFLplusplus-v4.30c_GH0.tar.gz) = 7c08c81f59b6c1f0bc2428fdee9fb880520e72c50be0683072e66bcde662b480
-SIZE (AFLplusplus-AFLplusplus-v4.30c_GH0.tar.gz) = 3031558
+TIMESTAMP = 1746197618
+SHA256 (AFLplusplus-AFLplusplus-v4.32c_GH0.tar.gz) = dc7f59a11ce8cf67a3ed09a5ac78028c6f793b239b21fd83e5b2370cea166926
+SIZE (AFLplusplus-AFLplusplus-v4.32c_GH0.tar.gz) = 3045679
diff --git a/security/archlinux-keyring/Makefile b/security/archlinux-keyring/Makefile
index 3c8828154e6f..3f22e747abeb 100644
--- a/security/archlinux-keyring/Makefile
+++ b/security/archlinux-keyring/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	archlinux-keyring
-DISTVERSION=	20240520
+DISTVERSION=	20250430.1
 CATEGORIES=	security
 
 MAINTAINER=	vishwin@FreeBSD.org
diff --git a/security/archlinux-keyring/distinfo b/security/archlinux-keyring/distinfo
index 765da2debe8b..49b95f8a2bbc 100644
--- a/security/archlinux-keyring/distinfo
+++ b/security/archlinux-keyring/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717104228
-SHA256 (archlinux-keyring-20240520.tar.bz2) = 43f3191409f3c5f787fa2c0b27c28bef1bbc72a9b13f121381f57e11e29f3911
-SIZE (archlinux-keyring-20240520.tar.bz2) = 1465845
+TIMESTAMP = 1746375267
+SHA256 (archlinux-keyring-20250430.1.tar.bz2) = 003e84dd0848cf9a784f4d87bd763651a311482d29bf1bca8e185f3109a4ff6e
+SIZE (archlinux-keyring-20250430.1.tar.bz2) = 1484629
diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile
index 14f102236bb0..36ff7202337c 100644
--- a/security/cargo-audit/Makefile
+++ b/security/cargo-audit/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	cargo-audit
 DISTVERSIONPREFIX=	${PORTNAME}/v
-DISTVERSION=	0.21.0
-PORTREVISION=	4
+DISTVERSION=	0.21.2
 PORTEPOCH=	1
 CATEGORIES=	security
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Audit Cargo.lock for crates with security vulnerabilities
 WWW=		https://rustsec.org/
 
@@ -23,11 +22,11 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	RustSec
 GH_PROJECT=	rustsec
 
+CARGO_CARGOTOML=	${WRKSRC}/${PORTNAME}/Cargo.toml
+CARGO_INSTALL_PATH=	${PORTNAME}
+
 NO_TEST=	yes
 
 PLIST_FILES=	bin/cargo-audit
 
-CARGO_CARGOTOML=	${WRKSRC}/${PORTNAME}/Cargo.toml
-CARGO_INSTALL_PATH=	${PORTNAME}
-
 .include <bsd.port.mk>
diff --git a/security/cargo-audit/Makefile.crates b/security/cargo-audit/Makefile.crates
index cdc9c1f08f65..35f0b9f6ecee 100644
--- a/security/cargo-audit/Makefile.crates
+++ b/security/cargo-audit/Makefile.crates
@@ -1,5 +1,5 @@
-CARGO_CRATES=	abscissa_core-0.8.1 \
-		abscissa_derive-0.8.0 \
+CARGO_CRATES=	abscissa_core-0.8.2 \
+		abscissa_derive-0.8.2 \
 		addr2line-0.21.0 \
 		adler-1.0.2 \
 		adler2-2.0.0 \
@@ -71,6 +71,7 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		digest-0.10.7 \
 		diligent-date-parser-0.1.4 \
 		display-error-chain-0.2.2 \
+		displaydoc-0.2.5 \
 		dunce-1.0.5 \
 		either-1.13.0 \
 		encoding_rs-0.8.35 \
@@ -95,63 +96,64 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		generic-array-0.14.7 \
 		getrandom-0.2.15 \
 		gimli-0.28.1 \
-		gix-0.66.0 \
-		gix-actor-0.32.0 \
-		gix-attributes-0.22.5 \
-		gix-bitmap-0.2.12 \
-		gix-chunk-0.4.9 \
-		gix-command-0.3.10 \
-		gix-commitgraph-0.24.3 \
-		gix-config-0.40.0 \
-		gix-config-value-0.14.9 \
-		gix-credentials-0.24.5 \
-		gix-date-0.9.1 \
-		gix-diff-0.46.0 \
-		gix-discover-0.35.0 \
-		gix-features-0.38.2 \
-		gix-filter-0.13.0 \
-		gix-fs-0.11.3 \
-		gix-glob-0.16.5 \
-		gix-hash-0.14.2 \
-		gix-hashtable-0.5.2 \
-		gix-ignore-0.11.4 \
-		gix-index-0.35.0 \
-		gix-lock-14.0.0 \
-		gix-negotiate-0.15.0 \
-		gix-object-0.44.0 \
-		gix-odb-0.63.0 \
-		gix-pack-0.53.0 \
-		gix-packetline-0.17.6 \
-		gix-packetline-blocking-0.17.5 \
-		gix-path-0.10.12 \
-		gix-pathspec-0.7.7 \
-		gix-prompt-0.8.8 \
-		gix-protocol-0.45.3 \
-		gix-quote-0.4.13 \
-		gix-ref-0.47.0 \
-		gix-refspec-0.25.0 \
-		gix-revision-0.29.0 \
-		gix-revwalk-0.15.0 \
-		gix-sec-0.10.9 \
-		gix-submodule-0.14.0 \
-		gix-tempfile-14.0.2 \
-		gix-trace-0.1.11 \
-		gix-transport-0.42.3 \
-		gix-traverse-0.41.0 \
-		gix-url-0.27.5 \
-		gix-utils-0.1.13 \
-		gix-validate-0.9.1 \
-		gix-worktree-0.36.0 \
-		gix-worktree-state-0.13.0 \
+		gix-0.70.0 \
+		gix-actor-0.33.2 \
+		gix-attributes-0.24.0 \
+		gix-bitmap-0.2.14 \
+		gix-chunk-0.4.11 \
+		gix-command-0.4.1 \
+		gix-commitgraph-0.26.0 \
+		gix-config-0.43.0 \
+		gix-config-value-0.14.11 \
+		gix-credentials-0.27.0 \
+		gix-date-0.9.3 \
+		gix-diff-0.50.0 \
+		gix-discover-0.38.0 \
+		gix-features-0.40.0 \
+		gix-filter-0.17.0 \
+		gix-fs-0.13.0 \
+		gix-glob-0.18.0 \
+		gix-hash-0.16.0 \
+		gix-hashtable-0.7.0 \
+		gix-ignore-0.13.0 \
+		gix-index-0.38.0 \
+		gix-lock-16.0.0 \
+		gix-negotiate-0.18.0 \
+		gix-object-0.47.0 \
+		gix-odb-0.67.0 \
+		gix-pack-0.57.0 \
+		gix-packetline-0.18.3 \
+		gix-packetline-blocking-0.18.2 \
+		gix-path-0.10.14 \
+		gix-pathspec-0.9.0 \
+		gix-prompt-0.9.1 \
+		gix-protocol-0.48.0 \
+		gix-quote-0.4.15 \
+		gix-ref-0.50.0 \
+		gix-refspec-0.28.0 \
+		gix-revision-0.32.0 \
+		gix-revwalk-0.18.0 \
+		gix-sec-0.10.11 \
+		gix-shallow-0.2.0 \
+		gix-submodule-0.17.0 \
+		gix-tempfile-16.0.0 \
+		gix-trace-0.1.12 \
+		gix-transport-0.45.0 \
+		gix-traverse-0.44.0 \
+		gix-url-0.29.0 \
+		gix-utils-0.1.14 \
+		gix-validate-0.9.3 \
+		gix-worktree-0.39.0 \
+		gix-worktree-state-0.17.0 \
 		gumdrop-0.8.1 \
 		gumdrop_derive-0.8.1 \
 		h2-0.4.6 \
 		hashbrown-0.14.5 \
-		hashbrown-0.15.0 \
+		hashbrown-0.15.2 \
 		heck-0.5.0 \
 		hermit-abi-0.3.9 \
 		home-0.5.9 \
-		http-1.1.0 \
+		http-1.2.0 \
 		http-body-1.0.1 \
 		http-body-util-0.1.2 \
 		httparse-1.9.5 \
@@ -161,8 +163,19 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		hyper-util-0.1.10 \
 		iana-time-zone-0.1.61 \
 		iana-time-zone-haiku-0.1.2 \
+		icu_collections-1.5.0 \
+		icu_locid-1.5.0 \
+		icu_locid_transform-1.5.0 \
+		icu_locid_transform_data-1.5.0 \
+		icu_normalizer-1.5.0 \
+		icu_normalizer_data-1.5.0 \
+		icu_properties-1.5.1 \
+		icu_properties_data-1.5.0 \
+		icu_provider-1.5.0 \
+		icu_provider_macros-1.5.0 \
 		ident_case-1.0.1 \
-		idna-0.5.0 \
+		idna-1.0.3 \
+		idna_adapter-1.2.0 \
 		indenter-0.3.3 \
 		indexmap-2.6.0 \
 		io-close-0.3.7 \
@@ -175,10 +188,11 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		js-sys-0.3.72 \
 		kstring-2.0.2 \
 		lazy_static-1.5.0 \
-		libc-0.2.161 \
+		libc-0.2.169 \
 		libm-0.2.10 \
 		libredox-0.1.3 \
 		linux-raw-sys-0.4.14 \
+		litemap-0.7.4 \
 		lock_api-0.4.12 \
 		log-0.4.22 \
 		matchers-0.1.0 \
@@ -210,8 +224,8 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		pin-utils-0.1.0 \
 		powerfmt-0.2.0 \
 		ppv-lite86-0.2.20 \
-		proc-macro2-1.0.89 \
-		prodash-28.0.0 \
+		proc-macro2-1.0.93 \
+		prodash-29.0.0 \
 		quick-xml-0.36.2 \
 		quinn-0.11.5 \
 		quinn-proto-0.11.8 \
@@ -235,8 +249,9 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		rust-embed-utils-8.5.0 \
 		rustc-demangle-0.1.24 \
 		rustc-hash-2.0.0 \
+		rustc-stable-hash-0.1.1 \
 		rustix-0.38.38 \
-		rustls-0.23.16 \
+		rustls-0.23.19 \
 		rustls-native-certs-0.8.0 \
 		rustls-pemfile-2.2.0 \
 		rustls-pki-types-1.10.0 \
@@ -265,31 +280,36 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		smol_str-0.3.2 \
 		socket2-0.5.7 \
 		spin-0.9.8 \
+		stable_deref_trait-1.2.0 \
 		static_assertions-1.1.0 \
 		strsim-0.11.1 \
 		subtle-2.6.1 \
 		syn-1.0.109 \
-		syn-2.0.85 \
+		syn-2.0.96 \
 		sync_wrapper-1.0.1 \
 		synstructure-0.12.6 \
+		synstructure-0.13.1 \
 		system-configuration-0.6.1 \
 		system-configuration-sys-0.6.0 \
-		tame-index-0.14.0 \
+		tame-index-0.18.1 \
 		tempfile-3.13.0 \
 		termcolor-1.4.1 \
 		thiserror-1.0.65 \
+		thiserror-2.0.11 \
 		thiserror-impl-1.0.65 \
+		thiserror-impl-2.0.11 \
 		thread_local-1.1.8 \
 		time-0.3.36 \
 		time-core-0.1.2 \
 		time-macros-0.2.18 \
+		tinystr-0.7.6 \
 		tinyvec-1.8.0 \
 		tinyvec_macros-0.1.1 \
-		tokio-1.41.0 \
+		tokio-1.43.0 \
 		tokio-rustls-0.26.0 \
 		tokio-util-0.7.12 \
 		toml-0.8.19 \
-		toml-span-0.3.0 \
+		toml-span-0.4.1 \
 		toml_datetime-0.6.8 \
 		toml_edit-0.22.22 \
 		topological-sort-0.2.2 \
@@ -300,19 +320,20 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		tracing-log-0.2.0 \
 		tracing-subscriber-0.3.18 \
 		try-lock-0.2.5 \
-		twox-hash-1.6.3 \
+		twox-hash-2.1.0 \
 		typed-arena-2.0.2 \
 		typenum-1.17.0 \
 		uluru-3.1.0 \
 		unicase-2.8.0 \
-		unicode-bidi-0.3.17 \
 		unicode-bom-2.0.3 \
 		unicode-ident-1.0.13 \
 		unicode-normalization-0.1.24 \
 		unicode-xid-0.2.6 \
 		unicode_categories-0.1.1 \
 		untrusted-0.9.0 \
-		url-2.5.2 \
+		url-2.5.4 \
+		utf16_iter-1.0.5 \
+		utf8_iter-1.0.4 \
 		utf8parse-0.2.2 \
 		valuable-0.1.0 \
 		version_check-0.9.5 \
@@ -348,7 +369,15 @@ CARGO_CRATES=	abscissa_core-0.8.1 \
 		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_msvc-0.52.6 \
 		winnow-0.6.20 \
+		write16-1.0.0 \
+		writeable-0.5.5 \
 		xml-rs-0.8.22 \
+		yoke-0.7.5 \
+		yoke-derive-0.7.5 \
 		zerocopy-0.7.35 \
 		zerocopy-derive-0.7.35 \
-		zeroize-1.8.1
+		zerofrom-0.1.5 \
+		zerofrom-derive-0.1.5 \
+		zeroize-1.8.1 \
+		zerovec-0.10.4 \
+		zerovec-derive-0.10.3
diff --git a/security/cargo-audit/distinfo b/security/cargo-audit/distinfo
index 71a79da2f22d..ec8486875491 100644
--- a/security/cargo-audit/distinfo
+++ b/security/cargo-audit/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1731889858
-SHA256 (rust/crates/abscissa_core-0.8.1.crate) = de5df09bc18cb069dec8524aff811cbe9d7bf5f4b78ef739ef125a37b9d3f044
-SIZE (rust/crates/abscissa_core-0.8.1.crate) = 30366
-SHA256 (rust/crates/abscissa_derive-0.8.0.crate) = e04c7df69b2c6b9b6dba8422d1295e58ac4bcfc7c9e7e7d4c55a38aaff2ad92a
-SIZE (rust/crates/abscissa_derive-0.8.0.crate) = 4872
+TIMESTAMP = 1746604765
+SHA256 (rust/crates/abscissa_core-0.8.2.crate) = 3083187ad864402d6bde86c5b51767b921edf4d02bf03b8ba40172dbd2a9773b
+SIZE (rust/crates/abscissa_core-0.8.2.crate) = 36702
+SHA256 (rust/crates/abscissa_derive-0.8.2.crate) = 08d914621d2ef4da433fe01907e323ee3f2807738d392d5a34c287b381f87fe2
+SIZE (rust/crates/abscissa_derive-0.8.2.crate) = 5521
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -145,6 +145,8 @@ SHA256 (rust/crates/diligent-date-parser-0.1.4.crate) = f6cf7fe294274a222363f84b
 SIZE (rust/crates/diligent-date-parser-0.1.4.crate) = 8019
 SHA256 (rust/crates/display-error-chain-0.2.2.crate) = 0bc2146e86bc19f52f4c064a64782f05f139ca464ed72937301631e73f8d6cf5
 SIZE (rust/crates/display-error-chain-0.2.2.crate) = 8240
+SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
+SIZE (rust/crates/displaydoc-0.2.5.crate) = 24219
 SHA256 (rust/crates/dunce-1.0.5.crate) = 92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813
 SIZE (rust/crates/dunce-1.0.5.crate) = 8244
 SHA256 (rust/crates/either-1.13.0.crate) = 60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0
@@ -193,102 +195,104 @@ SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3
 SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
 SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
 SIZE (rust/crates/gimli-0.28.1.crate) = 270497
-SHA256 (rust/crates/gix-0.66.0.crate) = 9048b8d1ae2104f045cb37e5c450fc49d5d8af22609386bfc739c11ba88995eb
-SIZE (rust/crates/gix-0.66.0.crate) = 276687
-SHA256 (rust/crates/gix-actor-0.32.0.crate) = fc19e312cd45c4a66cd003f909163dc2f8e1623e30a0c0c6df3776e89b308665
-SIZE (rust/crates/gix-actor-0.32.0.crate) = 9327
-SHA256 (rust/crates/gix-attributes-0.22.5.crate) = ebccbf25aa4a973dd352564a9000af69edca90623e8a16dad9cbc03713131311
-SIZE (rust/crates/gix-attributes-0.22.5.crate) = 19163
-SHA256 (rust/crates/gix-bitmap-0.2.12.crate) = 10f78312288bd02052be5dbc2ecbc342c9f4eb791986d86c0a5c06b92dc72efa
-SIZE (rust/crates/gix-bitmap-0.2.12.crate) = 7695
-SHA256 (rust/crates/gix-chunk-0.4.9.crate) = 6c28b58ba04f0c004722344390af9dbc85888fbb84be1981afb934da4114d4cf
-SIZE (rust/crates/gix-chunk-0.4.9.crate) = 10132
-SHA256 (rust/crates/gix-command-0.3.10.crate) = c201d2b9e9cce2365a6638fd0a966f751ed92d74be5c0727ac331e6a29ef5846
-SIZE (rust/crates/gix-command-0.3.10.crate) = 11670
-SHA256 (rust/crates/gix-commitgraph-0.24.3.crate) = 133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78
-SIZE (rust/crates/gix-commitgraph-0.24.3.crate) = 18242
-SHA256 (rust/crates/gix-config-0.40.0.crate) = 78e797487e6ca3552491de1131b4f72202f282fb33f198b1c34406d765b42bb0
-SIZE (rust/crates/gix-config-0.40.0.crate) = 63360
-SHA256 (rust/crates/gix-config-value-0.14.9.crate) = f3de3fdca9c75fa4b83a76583d265fa49b1de6b088ebcd210749c24ceeb74660
-SIZE (rust/crates/gix-config-value-0.14.9.crate) = 13598
-SHA256 (rust/crates/gix-credentials-0.24.5.crate) = 8ce391d305968782f1ae301c4a3d42c5701df7ff1d8bc03740300f6fd12bce78
-SIZE (rust/crates/gix-credentials-0.24.5.crate) = 20026
-SHA256 (rust/crates/gix-date-0.9.1.crate) = d10d543ac13c97292a15e8e8b7889cd006faf739777437ed95362504b8fe81a0
-SIZE (rust/crates/gix-date-0.9.1.crate) = 11268
-SHA256 (rust/crates/gix-diff-0.46.0.crate) = 92c9afd80fff00f8b38b1c1928442feb4cd6d2232a6ed806b6b193151a3d336c
-SIZE (rust/crates/gix-diff-0.46.0.crate) = 32657
-SHA256 (rust/crates/gix-discover-0.35.0.crate) = 0577366b9567376bc26e815fd74451ebd0e6218814e242f8e5b7072c58d956d2
-SIZE (rust/crates/gix-discover-0.35.0.crate) = 16625
-SHA256 (rust/crates/gix-features-0.38.2.crate) = ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69
-SIZE (rust/crates/gix-features-0.38.2.crate) = 30604
-SHA256 (rust/crates/gix-filter-0.13.0.crate) = 4121790ae140066e5b953becc72e7496278138d19239be2e63b5067b0843119e
-SIZE (rust/crates/gix-filter-0.13.0.crate) = 35610
-SHA256 (rust/crates/gix-fs-0.11.3.crate) = f2bfe6249cfea6d0c0e0990d5226a4cb36f030444ba9e35e0639275db8f98575
-SIZE (rust/crates/gix-fs-0.11.3.crate) = 14867
-SHA256 (rust/crates/gix-glob-0.16.5.crate) = 74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111
-SIZE (rust/crates/gix-glob-0.16.5.crate) = 13425
-SHA256 (rust/crates/gix-hash-0.14.2.crate) = f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e
-SIZE (rust/crates/gix-hash-0.14.2.crate) = 12759
-SHA256 (rust/crates/gix-hashtable-0.5.2.crate) = 7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242
-SIZE (rust/crates/gix-hashtable-0.5.2.crate) = 6421
-SHA256 (rust/crates/gix-ignore-0.11.4.crate) = e447cd96598460f5906a0f6c75e950a39f98c2705fc755ad2f2020c9e937fab7
-SIZE (rust/crates/gix-ignore-0.11.4.crate) = 9154
-SHA256 (rust/crates/gix-index-0.35.0.crate) = 0cd4203244444017682176e65fd0180be9298e58ed90bd4a8489a357795ed22d
-SIZE (rust/crates/gix-index-0.35.0.crate) = 45850
-SHA256 (rust/crates/gix-lock-14.0.0.crate) = e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d
-SIZE (rust/crates/gix-lock-14.0.0.crate) = 9795
-SHA256 (rust/crates/gix-negotiate-0.15.0.crate) = b4063bf329a191a9e24b6f948a17ccf6698c0380297f5e169cee4f1d2ab9475b
-SIZE (rust/crates/gix-negotiate-0.15.0.crate) = 9762
-SHA256 (rust/crates/gix-object-0.44.0.crate) = 2f5b801834f1de7640731820c2df6ba88d95480dc4ab166a5882f8ff12b88efa
-SIZE (rust/crates/gix-object-0.44.0.crate) = 32479
-SHA256 (rust/crates/gix-odb-0.63.0.crate) = a3158068701c17df54f0ab2adda527f5a6aca38fd5fd80ceb7e3c0a2717ec747
-SIZE (rust/crates/gix-odb-0.63.0.crate) = 54304
-SHA256 (rust/crates/gix-pack-0.53.0.crate) = 3223aa342eee21e1e0e403cad8ae9caf9edca55ef84c347738d10681676fd954
-SIZE (rust/crates/gix-pack-0.53.0.crate) = 96726
-SHA256 (rust/crates/gix-packetline-0.17.6.crate) = 8c43ef4d5fe2fa222c606731c8bdbf4481413ee4ef46d61340ec39e4df4c5e49
-SIZE (rust/crates/gix-packetline-0.17.6.crate) = 20390
-SHA256 (rust/crates/gix-packetline-blocking-0.17.5.crate) = b9802304baa798dd6f5ff8008a2b6516d54b74a69ca2d3a2b9e2d6c3b5556b40
-SIZE (rust/crates/gix-packetline-blocking-0.17.5.crate) = 20238
-SHA256 (rust/crates/gix-path-0.10.12.crate) = c04e5a94fdb56b1e91eb7df2658ad16832428b8eeda24ff1a0f0288de2bce554
-SIZE (rust/crates/gix-path-0.10.12.crate) = 22834
-SHA256 (rust/crates/gix-pathspec-0.7.7.crate) = 5d23bf239532b4414d0e63b8ab3a65481881f7237ed9647bb10c1e3cc54c5ceb
-SIZE (rust/crates/gix-pathspec-0.7.7.crate) = 18137
-SHA256 (rust/crates/gix-prompt-0.8.8.crate) = 57944bbdb87f7a9893907032276e99ff4eba3640d8db1bdfb1eba8c07edfd006
-SIZE (rust/crates/gix-prompt-0.8.8.crate) = 13365
-SHA256 (rust/crates/gix-protocol-0.45.3.crate) = cc43a1006f01b5efee22a003928c9eb83dde2f52779ded9d4c0732ad93164e3e
-SIZE (rust/crates/gix-protocol-0.45.3.crate) = 35179
-SHA256 (rust/crates/gix-quote-0.4.13.crate) = f89f9a1525dcfd9639e282ea939f5ab0d09d93cf2b90c1fc6104f1b9582a8e49
-SIZE (rust/crates/gix-quote-0.4.13.crate) = 7835
-SHA256 (rust/crates/gix-ref-0.47.0.crate) = ae0d8406ebf9aaa91f55a57f053c5a1ad1a39f60fdf0303142b7be7ea44311e5
-SIZE (rust/crates/gix-ref-0.47.0.crate) = 56887
-SHA256 (rust/crates/gix-refspec-0.25.0.crate) = ebb005f82341ba67615ffdd9f7742c87787544441c88090878393d0682869ca6
-SIZE (rust/crates/gix-refspec-0.25.0.crate) = 16162
-SHA256 (rust/crates/gix-revision-0.29.0.crate) = ba4621b219ac0cdb9256883030c3d56a6c64a6deaa829a92da73b9a576825e1e
-SIZE (rust/crates/gix-revision-0.29.0.crate) = 19189
-SHA256 (rust/crates/gix-revwalk-0.15.0.crate) = b41e72544b93084ee682ef3d5b31b1ba4d8fa27a017482900e5e044d5b1b3984
-SIZE (rust/crates/gix-revwalk-0.15.0.crate) = 11849
-SHA256 (rust/crates/gix-sec-0.10.9.crate) = a2007538eda296445c07949cf04f4a767307d887184d6b3e83e2d636533ddc6e
-SIZE (rust/crates/gix-sec-0.10.9.crate) = 10208
-SHA256 (rust/crates/gix-submodule-0.14.0.crate) = 529d0af78cc2f372b3218f15eb1e3d1635a21c8937c12e2dd0b6fc80c2ca874b
-SIZE (rust/crates/gix-submodule-0.14.0.crate) = 12142
-SHA256 (rust/crates/gix-tempfile-14.0.2.crate) = 046b4927969fa816a150a0cda2e62c80016fe11fb3c3184e4dddf4e542f108aa
-SIZE (rust/crates/gix-tempfile-14.0.2.crate) = 17489
-SHA256 (rust/crates/gix-trace-0.1.11.crate) = 04bdde120c29f1fc23a24d3e115aeeea3d60d8e65bab92cc5f9d90d9302eb952
-SIZE (rust/crates/gix-trace-0.1.11.crate) = 10424
-SHA256 (rust/crates/gix-transport-0.42.3.crate) = 421dcccab01b41a15d97b226ad97a8f9262295044e34fbd37b10e493b0a6481f
-SIZE (rust/crates/gix-transport-0.42.3.crate) = 50131
-SHA256 (rust/crates/gix-traverse-0.41.0.crate) = 030da39af94e4df35472e9318228f36530989327906f38e27807df305fccb780
-SIZE (rust/crates/gix-traverse-0.41.0.crate) = 17286
-SHA256 (rust/crates/gix-url-0.27.5.crate) = fd280c5e84fb22e128ed2a053a0daeacb6379469be6a85e3d518a0636e160c89
-SIZE (rust/crates/gix-url-0.27.5.crate) = 14367
-SHA256 (rust/crates/gix-utils-0.1.13.crate) = ba427e3e9599508ed98a6ddf8ed05493db114564e338e41f6a996d2e4790335f
-SIZE (rust/crates/gix-utils-0.1.13.crate) = 10194
-SHA256 (rust/crates/gix-validate-0.9.1.crate) = e187b263461bc36cea17650141567753bc6207d036cedd1de6e81a52f277ff68
-SIZE (rust/crates/gix-validate-0.9.1.crate) = 11930
-SHA256 (rust/crates/gix-worktree-0.36.0.crate) = c312ad76a3f2ba8e865b360d5cb3aa04660971d16dec6dd0ce717938d903149a
-SIZE (rust/crates/gix-worktree-0.36.0.crate) = 16840
-SHA256 (rust/crates/gix-worktree-state-0.13.0.crate) = 7b05c4b313fa702c0bacd5068dd3e01671da73b938fade97676859fee286de43
-SIZE (rust/crates/gix-worktree-state-0.13.0.crate) = 14349
+SHA256 (rust/crates/gix-0.70.0.crate) = 736f14636705f3a56ea52b553e67282519418d9a35bb1e90b3a9637a00296b68
+SIZE (rust/crates/gix-0.70.0.crate) = 290002
+SHA256 (rust/crates/gix-actor-0.33.2.crate) = 20018a1a6332e065f1fcc8305c1c932c6b8c9985edea2284b3c79dc6fa3ee4b2
+SIZE (rust/crates/gix-actor-0.33.2.crate) = 10094
+SHA256 (rust/crates/gix-attributes-0.24.0.crate) = f151000bf662ef5f641eca6102d942ee31ace80f271a3ef642e99776ce6ddb38
+SIZE (rust/crates/gix-attributes-0.24.0.crate) = 19878
+SHA256 (rust/crates/gix-bitmap-0.2.14.crate) = b1db9765c69502650da68f0804e3dc2b5f8ccc6a2d104ca6c85bc40700d37540
+SIZE (rust/crates/gix-bitmap-0.2.14.crate) = 7704
+SHA256 (rust/crates/gix-chunk-0.4.11.crate) = 0b1f1d8764958699dc764e3f727cef280ff4d1bd92c107bbf8acd85b30c1bd6f
+SIZE (rust/crates/gix-chunk-0.4.11.crate) = 10144
+SHA256 (rust/crates/gix-command-0.4.1.crate) = cb410b84d6575db45e62025a9118bdbf4d4b099ce7575a76161e898d9ca98df1
+SIZE (rust/crates/gix-command-0.4.1.crate) = 11830
+SHA256 (rust/crates/gix-commitgraph-0.26.0.crate) = e23a8ec2d8a16026a10dafdb6ed51bcfd08f5d97f20fa52e200bc50cb72e4877
+SIZE (rust/crates/gix-commitgraph-0.26.0.crate) = 18954
+SHA256 (rust/crates/gix-config-0.43.0.crate) = 377c1efd2014d5d469e0b3cd2952c8097bce9828f634e04d5665383249f1d9e9
+SIZE (rust/crates/gix-config-0.43.0.crate) = 64327
+SHA256 (rust/crates/gix-config-value-0.14.11.crate) = 11365144ef93082f3403471dbaa94cfe4b5e72743bdb9560719a251d439f4cee
+SIZE (rust/crates/gix-config-value-0.14.11.crate) = 13612
+SHA256 (rust/crates/gix-credentials-0.27.0.crate) = cf950f9ee1690bb9c4388b5152baa8a9f41ad61e5cf1ba0ec8c207b08dab9e45
+SIZE (rust/crates/gix-credentials-0.27.0.crate) = 22145
+SHA256 (rust/crates/gix-date-0.9.3.crate) = c57c477b645ee248b173bb1176b52dd528872f12c50375801a58aaf5ae91113f
+SIZE (rust/crates/gix-date-0.9.3.crate) = 11299
+SHA256 (rust/crates/gix-diff-0.50.0.crate) = 62afb7f4ca0acdf4e9dad92065b2eb1bf2993bcc5014b57bc796e3a365b17c4d
+SIZE (rust/crates/gix-diff-0.50.0.crate) = 46347
+SHA256 (rust/crates/gix-discover-0.38.0.crate) = d0c2414bdf04064e0f5a5aa029dfda1e663cf9a6c4bfc8759f2d369299bb65d8
+SIZE (rust/crates/gix-discover-0.38.0.crate) = 16684
+SHA256 (rust/crates/gix-features-0.40.0.crate) = 8bfdd4838a8d42bd482c9f0cb526411d003ee94cc7c7b08afe5007329c71d554
+SIZE (rust/crates/gix-features-0.40.0.crate) = 31239
+SHA256 (rust/crates/gix-filter-0.17.0.crate) = bdcc36cd7dbc63ed0ec3558645886553d1afd3cd09daa5efb9cba9cceb942bbb
+SIZE (rust/crates/gix-filter-0.17.0.crate) = 36669
+SHA256 (rust/crates/gix-fs-0.13.0.crate) = 182e7fa7bfdf44ffb7cfe7451b373cdf1e00870ac9a488a49587a110c562063d
+SIZE (rust/crates/gix-fs-0.13.0.crate) = 15742
+SHA256 (rust/crates/gix-glob-0.18.0.crate) = 4e9c7249fa0a78f9b363aa58323db71e0a6161fd69860ed6f48dedf0ef3a314e
+SIZE (rust/crates/gix-glob-0.18.0.crate) = 14155
+SHA256 (rust/crates/gix-hash-0.16.0.crate) = e81c5ec48649b1821b3ed066a44efb95f1a268b35c1d91295e61252539fbe9f8
+SIZE (rust/crates/gix-hash-0.16.0.crate) = 13529
+SHA256 (rust/crates/gix-hashtable-0.7.0.crate) = 189130bc372accd02e0520dc5ab1cef318dcc2bc829b76ab8d84bbe90ac212d1
+SIZE (rust/crates/gix-hashtable-0.7.0.crate) = 7199
+SHA256 (rust/crates/gix-ignore-0.13.0.crate) = 4f529dcb80bf9855c0a7c49f0ac588df6d6952d63a63fefc254b9c869d2cdf6f
+SIZE (rust/crates/gix-ignore-0.13.0.crate) = 9891
+SHA256 (rust/crates/gix-index-0.38.0.crate) = acd12e3626879369310fffe2ac61acc828613ef656b50c4ea984dd59d7dc85d8
+SIZE (rust/crates/gix-index-0.38.0.crate) = 46639
+SHA256 (rust/crates/gix-lock-16.0.0.crate) = 9739815270ff6940968441824d162df9433db19211ca9ba8c3fc1b50b849c642
+SIZE (rust/crates/gix-lock-16.0.0.crate) = 10524
+SHA256 (rust/crates/gix-negotiate-0.18.0.crate) = a6a8af1ef7bbe303d30b55312b7f4d33e955de43a3642ae9b7347c623d80ef80
+SIZE (rust/crates/gix-negotiate-0.18.0.crate) = 10508
+SHA256 (rust/crates/gix-object-0.47.0.crate) = ddc4b3a0044244f0fe22347fb7a79cca165e37829d668b41b85ff46a43e5fd68
+SIZE (rust/crates/gix-object-0.47.0.crate) = 40801
+SHA256 (rust/crates/gix-odb-0.67.0.crate) = 3e93457df69cd09573608ce9fa4f443fbd84bc8d15d8d83adecd471058459c1b
+SIZE (rust/crates/gix-odb-0.67.0.crate) = 56316
+SHA256 (rust/crates/gix-pack-0.57.0.crate) = fc13a475b3db735617017fb35f816079bf503765312d4b1913b18cf96f3fa515
+SIZE (rust/crates/gix-pack-0.57.0.crate) = 97452
+SHA256 (rust/crates/gix-packetline-0.18.3.crate) = c7e5ae6bc3ac160a6bf44a55f5537813ca3ddb08549c0fd3e7ef699c73c439cd
+SIZE (rust/crates/gix-packetline-0.18.3.crate) = 21143
+SHA256 (rust/crates/gix-packetline-blocking-0.18.2.crate) = c1cbf8767c6abd5a6779f586702b5bcd8702380f4208219449cf1c9d0cd1e17c
+SIZE (rust/crates/gix-packetline-blocking-0.18.2.crate) = 20992
+SHA256 (rust/crates/gix-path-0.10.14.crate) = c40f12bb65a8299be0cfb90fe718e3be236b7a94b434877012980863a883a99f
+SIZE (rust/crates/gix-path-0.10.14.crate) = 23150
+SHA256 (rust/crates/gix-pathspec-0.9.0.crate) = 6430d3a686c08e9d59019806faa78c17315fe22ae73151a452195857ca02f86c
+SIZE (rust/crates/gix-pathspec-0.9.0.crate) = 18875
+SHA256 (rust/crates/gix-prompt-0.9.1.crate) = 79f2185958e1512b989a007509df8d61dca014aa759a22bee80cfa6c594c3b6d
+SIZE (rust/crates/gix-prompt-0.9.1.crate) = 13418
+SHA256 (rust/crates/gix-protocol-0.48.0.crate) = 6c61bd61afc6b67d213241e2100394c164be421e3f7228d3521b04f48ca5ba90
+SIZE (rust/crates/gix-protocol-0.48.0.crate) = 44956
+SHA256 (rust/crates/gix-quote-0.4.15.crate) = e49357fccdb0c85c0d3a3292a9f6db32d9b3535959b5471bb9624908f4a066c6
+SIZE (rust/crates/gix-quote-0.4.15.crate) = 7847
+SHA256 (rust/crates/gix-ref-0.50.0.crate) = 47adf4c5f933429f8554e95d0d92eee583cfe4b95d2bf665cd6fd4a1531ee20c
+SIZE (rust/crates/gix-ref-0.50.0.crate) = 58093
+SHA256 (rust/crates/gix-refspec-0.28.0.crate) = 59650228d8f612f68e7f7a25f517fcf386c5d0d39826085492e94766858b0a90
+SIZE (rust/crates/gix-refspec-0.28.0.crate) = 17399
+SHA256 (rust/crates/gix-revision-0.32.0.crate) = 3fe28bbccca55da6d66e6c6efc6bb4003c29d407afd8178380293729733e6b53
+SIZE (rust/crates/gix-revision-0.32.0.crate) = 22676
+SHA256 (rust/crates/gix-revwalk-0.18.0.crate) = d4ecb80c235b1e9ef2b99b23a81ea50dd569a88a9eb767179793269e0e616247
+SIZE (rust/crates/gix-revwalk-0.18.0.crate) = 13338
+SHA256 (rust/crates/gix-sec-0.10.11.crate) = d84dae13271f4313f8d60a166bf27e54c968c7c33e2ffd31c48cafe5da649875
+SIZE (rust/crates/gix-sec-0.10.11.crate) = 10218
+SHA256 (rust/crates/gix-shallow-0.2.0.crate) = ab72543011e303e52733c85bef784603ef39632ddf47f69723def52825e35066
+SIZE (rust/crates/gix-shallow-0.2.0.crate) = 7553
+SHA256 (rust/crates/gix-submodule-0.17.0.crate) = 74972fe8d46ac8a09490ae1e843b4caf221c5b157c5ac17057e8e1c38417a3ac
+SIZE (rust/crates/gix-submodule-0.17.0.crate) = 12829
+SHA256 (rust/crates/gix-tempfile-16.0.0.crate) = 2558f423945ef24a8328c55d1fd6db06b8376b0e7013b1bb476cc4ffdf678501
+SIZE (rust/crates/gix-tempfile-16.0.0.crate) = 18453
+SHA256 (rust/crates/gix-trace-0.1.12.crate) = 7c396a2036920c69695f760a65e7f2677267ccf483f25046977d87e4cb2665f7
+SIZE (rust/crates/gix-trace-0.1.12.crate) = 10435
+SHA256 (rust/crates/gix-transport-0.45.0.crate) = 11187418489477b1b5b862ae1aedbbac77e582f2c4b0ef54280f20cfe5b964d9
+SIZE (rust/crates/gix-transport-0.45.0.crate) = 50868
+SHA256 (rust/crates/gix-traverse-0.44.0.crate) = 2bec70e53896586ef32a3efa7e4427b67308531ed186bb6120fb3eca0f0d61b4
+SIZE (rust/crates/gix-traverse-0.44.0.crate) = 19475
+SHA256 (rust/crates/gix-url-0.29.0.crate) = 29218c768b53dd8f116045d87fec05b294c731a4b2bdd257eeca2084cc150b13
+SIZE (rust/crates/gix-url-0.29.0.crate) = 15305
+SHA256 (rust/crates/gix-utils-0.1.14.crate) = ff08f24e03ac8916c478c8419d7d3c33393da9bb41fa4c24455d5406aeefd35f
+SIZE (rust/crates/gix-utils-0.1.14.crate) = 10203
+SHA256 (rust/crates/gix-validate-0.9.3.crate) = 9eaa01c3337d885617c0a42e92823922a2aea71f4caeace6fe87002bdcadbd90
+SIZE (rust/crates/gix-validate-0.9.3.crate) = 11917
+SHA256 (rust/crates/gix-worktree-0.39.0.crate) = 6673512f7eaa57a6876adceca6978a501d6c6569a4f177767dc405f8b9778958
+SIZE (rust/crates/gix-worktree-0.39.0.crate) = 17560
+SHA256 (rust/crates/gix-worktree-state-0.17.0.crate) = 86f5e199ad5af972086683bd31d640c82cb85885515bf86d86236c73ce575bf0
+SIZE (rust/crates/gix-worktree-state-0.17.0.crate) = 15969
 SHA256 (rust/crates/gumdrop-0.8.1.crate) = 5bc700f989d2f6f0248546222d9b4258f5b02a171a431f8285a81c08142629e3
 SIZE (rust/crates/gumdrop-0.8.1.crate) = 17522
 SHA256 (rust/crates/gumdrop_derive-0.8.1.crate) = 729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d
@@ -297,16 +301,16 @@ SHA256 (rust/crates/h2-0.4.6.crate) = 524e8ac6999421f49a846c2d4411f337e53497d8ec
 SIZE (rust/crates/h2-0.4.6.crate) = 173912
 SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
 SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
-SHA256 (rust/crates/hashbrown-0.15.0.crate) = 1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb
-SIZE (rust/crates/hashbrown-0.15.0.crate) = 136460
+SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
+SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
 SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
 SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
 SIZE (rust/crates/home-0.5.9.crate) = 8760
-SHA256 (rust/crates/http-1.1.0.crate) = 21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258
-SIZE (rust/crates/http-1.1.0.crate) = 103144
+SHA256 (rust/crates/http-1.2.0.crate) = f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea
+SIZE (rust/crates/http-1.2.0.crate) = 105932
 SHA256 (rust/crates/http-body-1.0.1.crate) = 1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184
 SIZE (rust/crates/http-body-1.0.1.crate) = 6125
 SHA256 (rust/crates/http-body-util-0.1.2.crate) = 793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f
@@ -325,10 +329,32 @@ SHA256 (rust/crates/iana-time-zone-0.1.61.crate) = 235e081f3925a06703c2d0117ea8b
 SIZE (rust/crates/iana-time-zone-0.1.61.crate) = 27685
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/icu_collections-1.5.0.crate) = db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526
+SIZE (rust/crates/icu_collections-1.5.0.crate) = 82762
+SHA256 (rust/crates/icu_locid-1.5.0.crate) = 13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637
+SIZE (rust/crates/icu_locid-1.5.0.crate) = 55131
+SHA256 (rust/crates/icu_locid_transform-1.5.0.crate) = 01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e
+SIZE (rust/crates/icu_locid_transform-1.5.0.crate) = 29094
+SHA256 (rust/crates/icu_locid_transform_data-1.5.0.crate) = fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e
+SIZE (rust/crates/icu_locid_transform_data-1.5.0.crate) = 44727
+SHA256 (rust/crates/icu_normalizer-1.5.0.crate) = 19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f
+SIZE (rust/crates/icu_normalizer-1.5.0.crate) = 53113
+SHA256 (rust/crates/icu_normalizer_data-1.5.0.crate) = f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516
+SIZE (rust/crates/icu_normalizer_data-1.5.0.crate) = 50561
+SHA256 (rust/crates/icu_properties-1.5.1.crate) = 93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5
+SIZE (rust/crates/icu_properties-1.5.1.crate) = 64479
+SHA256 (rust/crates/icu_properties_data-1.5.0.crate) = 67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569
+SIZE (rust/crates/icu_properties_data-1.5.0.crate) = 227993
+SHA256 (rust/crates/icu_provider-1.5.0.crate) = 6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9
+SIZE (rust/crates/icu_provider-1.5.0.crate) = 52722
+SHA256 (rust/crates/icu_provider_macros-1.5.0.crate) = 1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6
+SIZE (rust/crates/icu_provider_macros-1.5.0.crate) = 6436
 SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
 SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
-SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
-SIZE (rust/crates/idna-0.5.0.crate) = 271940
+SHA256 (rust/crates/idna-1.0.3.crate) = 686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e
+SIZE (rust/crates/idna-1.0.3.crate) = 142515
+SHA256 (rust/crates/idna_adapter-1.2.0.crate) = daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71
+SIZE (rust/crates/idna_adapter-1.2.0.crate) = 8206
 SHA256 (rust/crates/indenter-0.3.3.crate) = ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683
 SIZE (rust/crates/indenter-0.3.3.crate) = 6587
 SHA256 (rust/crates/indexmap-2.6.0.crate) = 707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da
@@ -353,14 +379,16 @@ SHA256 (rust/crates/kstring-2.0.2.crate) = 558bf9508a558512042d3095138b1f7b8fe90
 SIZE (rust/crates/kstring-2.0.2.crate) = 23044
 SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
-SHA256 (rust/crates/libc-0.2.161.crate) = 8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1
-SIZE (rust/crates/libc-0.2.161.crate) = 765389
+SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a
+SIZE (rust/crates/libc-0.2.169.crate) = 757901
 SHA256 (rust/crates/libm-0.2.10.crate) = a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047
 SIZE (rust/crates/libm-0.2.10.crate) = 110961
 SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
 SIZE (rust/crates/libredox-0.1.3.crate) = 6068
 SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
 SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
+SHA256 (rust/crates/litemap-0.7.4.crate) = 4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104
+SIZE (rust/crates/litemap-0.7.4.crate) = 28257
 SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
 SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
 SHA256 (rust/crates/log-0.4.22.crate) = a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24
@@ -423,10 +451,10 @@ SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff9416
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
 SHA256 (rust/crates/ppv-lite86-0.2.20.crate) = 77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04
 SIZE (rust/crates/ppv-lite86-0.2.20.crate) = 22478
-SHA256 (rust/crates/proc-macro2-1.0.89.crate) = f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e
-SIZE (rust/crates/proc-macro2-1.0.89.crate) = 49446
-SHA256 (rust/crates/prodash-28.0.0.crate) = 744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79
-SIZE (rust/crates/prodash-28.0.0.crate) = 90695
+SHA256 (rust/crates/proc-macro2-1.0.93.crate) = 60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99
+SIZE (rust/crates/proc-macro2-1.0.93.crate) = 52388
+SHA256 (rust/crates/prodash-29.0.0.crate) = a266d8d6020c61a437be704c5e618037588e1985c7dbb7bf8d265db84cffe325
+SIZE (rust/crates/prodash-29.0.0.crate) = 90594
 SHA256 (rust/crates/quick-xml-0.36.2.crate) = f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe
 SIZE (rust/crates/quick-xml-0.36.2.crate) = 185201
 SHA256 (rust/crates/quinn-0.11.5.crate) = 8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684
@@ -473,10 +501,12 @@ SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
 SHA256 (rust/crates/rustc-hash-2.0.0.crate) = 583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152
 SIZE (rust/crates/rustc-hash-2.0.0.crate) = 12691
+SHA256 (rust/crates/rustc-stable-hash-0.1.1.crate) = 2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1
+SIZE (rust/crates/rustc-stable-hash-0.1.1.crate) = 20183
 SHA256 (rust/crates/rustix-0.38.38.crate) = aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a
 SIZE (rust/crates/rustix-0.38.38.crate) = 377665
-SHA256 (rust/crates/rustls-0.23.16.crate) = eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e
-SIZE (rust/crates/rustls-0.23.16.crate) = 339595
+SHA256 (rust/crates/rustls-0.23.19.crate) = 934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1
+SIZE (rust/crates/rustls-0.23.19.crate) = 333921
 SHA256 (rust/crates/rustls-native-certs-0.8.0.crate) = fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a
 SIZE (rust/crates/rustls-native-certs-0.8.0.crate) = 32185
 SHA256 (rust/crates/rustls-pemfile-2.2.0.crate) = dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50
@@ -533,6 +563,8 @@ SHA256 (rust/crates/socket2-0.5.7.crate) = ce305eb0b4296696835b71df73eb912e0f1ff
 SIZE (rust/crates/socket2-0.5.7.crate) = 55758
 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
 SIZE (rust/crates/spin-0.9.8.crate) = 38958
+SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
+SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
 SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
 SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
 SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
@@ -541,26 +573,32 @@ SHA256 (rust/crates/subtle-2.6.1.crate) = 13c2bddecc57b384dee18652358fb23172facb
 SIZE (rust/crates/subtle-2.6.1.crate) = 14562
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.85.crate) = 5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56
-SIZE (rust/crates/syn-2.0.85.crate) = 275231
+SHA256 (rust/crates/syn-2.0.96.crate) = d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80
+SIZE (rust/crates/syn-2.0.96.crate) = 297497
 SHA256 (rust/crates/sync_wrapper-1.0.1.crate) = a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394
 SIZE (rust/crates/sync_wrapper-1.0.1.crate) = 6939
 SHA256 (rust/crates/synstructure-0.12.6.crate) = f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f
 SIZE (rust/crates/synstructure-0.12.6.crate) = 18429
+SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
+SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
 SHA256 (rust/crates/system-configuration-0.6.1.crate) = 3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b
 SIZE (rust/crates/system-configuration-0.6.1.crate) = 17935
 SHA256 (rust/crates/system-configuration-sys-0.6.0.crate) = 8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4
 SIZE (rust/crates/system-configuration-sys-0.6.0.crate) = 11090
-SHA256 (rust/crates/tame-index-0.14.0.crate) = c46e79ebf09a3740c583fc8df63b1b8b5844bf756074c6bf5d392d5a2b708269
-SIZE (rust/crates/tame-index-0.14.0.crate) = 78716
+SHA256 (rust/crates/tame-index-0.18.1.crate) = ffce9e61c14d088a18efafe197ce1906e639cc1980e21e7e09e45c3cb0bfc50c
+SIZE (rust/crates/tame-index-0.18.1.crate) = 98842
 SHA256 (rust/crates/tempfile-3.13.0.crate) = f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b
 SIZE (rust/crates/tempfile-3.13.0.crate) = 34910
 SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
 SIZE (rust/crates/termcolor-1.4.1.crate) = 18773
 SHA256 (rust/crates/thiserror-1.0.65.crate) = 5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5
 SIZE (rust/crates/thiserror-1.0.65.crate) = 21825
+SHA256 (rust/crates/thiserror-2.0.11.crate) = d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc
+SIZE (rust/crates/thiserror-2.0.11.crate) = 28648
 SHA256 (rust/crates/thiserror-impl-1.0.65.crate) = ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602
 SIZE (rust/crates/thiserror-impl-1.0.65.crate) = 16077
+SHA256 (rust/crates/thiserror-impl-2.0.11.crate) = 26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2
+SIZE (rust/crates/thiserror-impl-2.0.11.crate) = 21067
 SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
 SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
 SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
@@ -569,20 +607,22 @@ SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d
 SIZE (rust/crates/time-core-0.1.2.crate) = 7191
 SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf
 SIZE (rust/crates/time-macros-0.2.18.crate) = 24361
+SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f
+SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
 SHA256 (rust/crates/tinyvec-1.8.0.crate) = 445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938
 SIZE (rust/crates/tinyvec-1.8.0.crate) = 46796
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.41.0.crate) = 145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb
-SIZE (rust/crates/tokio-1.41.0.crate) = 805168
+SHA256 (rust/crates/tokio-1.43.0.crate) = 3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e
+SIZE (rust/crates/tokio-1.43.0.crate) = 817422
 SHA256 (rust/crates/tokio-rustls-0.26.0.crate) = 0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4
 SIZE (rust/crates/tokio-rustls-0.26.0.crate) = 34253
 SHA256 (rust/crates/tokio-util-0.7.12.crate) = 61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a
 SIZE (rust/crates/tokio-util-0.7.12.crate) = 115177
 SHA256 (rust/crates/toml-0.8.19.crate) = a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e
 SIZE (rust/crates/toml-0.8.19.crate) = 50974
-SHA256 (rust/crates/toml-span-0.3.0.crate) = ce0e1be49e3b9bf33d1a8077c081a3b7afcfc94e4bc1002c80376784381bc106
-SIZE (rust/crates/toml-span-0.3.0.crate) = 32780
+SHA256 (rust/crates/toml-span-0.4.1.crate) = 757f36f490e7b3a25ed9fb692d7a0beb1424eabec3f7e8f40f576bece9a8cdc5
+SIZE (rust/crates/toml-span-0.4.1.crate) = 32747
 SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
 SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
 SHA256 (rust/crates/toml_edit-0.22.22.crate) = 4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5
@@ -603,8 +643,8 @@ SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df563
 SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
 SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
 SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
-SHA256 (rust/crates/twox-hash-1.6.3.crate) = 97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675
-SIZE (rust/crates/twox-hash-1.6.3.crate) = 21842
+SHA256 (rust/crates/twox-hash-2.1.0.crate) = e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908
+SIZE (rust/crates/twox-hash-2.1.0.crate) = 35275
 SHA256 (rust/crates/typed-arena-2.0.2.crate) = 6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a
 SIZE (rust/crates/typed-arena-2.0.2.crate) = 11848
 SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
@@ -613,8 +653,6 @@ SHA256 (rust/crates/uluru-3.1.0.crate) = 7c8a2469e56e6e5095c82ccd3afb98dad95f7af
 SIZE (rust/crates/uluru-3.1.0.crate) = 9664
 SHA256 (rust/crates/unicase-2.8.0.crate) = 7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df
 SIZE (rust/crates/unicase-2.8.0.crate) = 23843
-SHA256 (rust/crates/unicode-bidi-0.3.17.crate) = 5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893
-SIZE (rust/crates/unicode-bidi-0.3.17.crate) = 58120
 SHA256 (rust/crates/unicode-bom-2.0.3.crate) = 7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217
 SIZE (rust/crates/unicode-bom-2.0.3.crate) = 10773
 SHA256 (rust/crates/unicode-ident-1.0.13.crate) = e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe
@@ -627,8 +665,12 @@ SHA256 (rust/crates/unicode_categories-0.1.1.crate) = 39ec24b3121d976906ece63c9d
 SIZE (rust/crates/unicode_categories-0.1.1.crate) = 87298
 SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
 SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
-SHA256 (rust/crates/url-2.5.2.crate) = 22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c
-SIZE (rust/crates/url-2.5.2.crate) = 79704
+SHA256 (rust/crates/url-2.5.4.crate) = 32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60
+SIZE (rust/crates/url-2.5.4.crate) = 81097
+SHA256 (rust/crates/utf16_iter-1.0.5.crate) = c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246
+SIZE (rust/crates/utf16_iter-1.0.5.crate) = 9736
+SHA256 (rust/crates/utf8_iter-1.0.4.crate) = b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be
+SIZE (rust/crates/utf8_iter-1.0.4.crate) = 10437
 SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
 SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
 SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
@@ -699,13 +741,29 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
 SHA256 (rust/crates/winnow-0.6.20.crate) = 36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b
 SIZE (rust/crates/winnow-0.6.20.crate) = 163617
+SHA256 (rust/crates/write16-1.0.0.crate) = d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936
+SIZE (rust/crates/write16-1.0.0.crate) = 7218
+SHA256 (rust/crates/writeable-0.5.5.crate) = 1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51
+SIZE (rust/crates/writeable-0.5.5.crate) = 22354
 SHA256 (rust/crates/xml-rs-0.8.22.crate) = af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26
 SIZE (rust/crates/xml-rs-0.8.22.crate) = 54737
+SHA256 (rust/crates/yoke-0.7.5.crate) = 120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40
+SIZE (rust/crates/yoke-0.7.5.crate) = 29673
+SHA256 (rust/crates/yoke-derive-0.7.5.crate) = 2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154
+SIZE (rust/crates/yoke-derive-0.7.5.crate) = 7525
 SHA256 (rust/crates/zerocopy-0.7.35.crate) = 1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0
 SIZE (rust/crates/zerocopy-0.7.35.crate) = 152645
 SHA256 (rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e
 SIZE (rust/crates/zerocopy-derive-0.7.35.crate) = 37829
+SHA256 (rust/crates/zerofrom-0.1.5.crate) = cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e
+SIZE (rust/crates/zerofrom-0.1.5.crate) = 5091
+SHA256 (rust/crates/zerofrom-derive-0.1.5.crate) = 595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808
+SIZE (rust/crates/zerofrom-derive-0.1.5.crate) = 8285
 SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
 SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
-SHA256 (RustSec-rustsec-cargo-audit-v0.21.0_GH0.tar.gz) = 343242874edd00c2aa49c7481af0c4735ebcf682d04710f0c02a56a9015f6092
-SIZE (RustSec-rustsec-cargo-audit-v0.21.0_GH0.tar.gz) = 1066205
+SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079
+SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
+SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
+SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
+SHA256 (RustSec-rustsec-cargo-audit-v0.21.2_GH0.tar.gz) = caf8914af7f95ebb45590c95b5f9bfd71bd6f9f57c1ffcf69dc9d20f0430e578
+SIZE (RustSec-rustsec-cargo-audit-v0.21.2_GH0.tar.gz) = 1071525
diff --git a/security/certificate_maker/Makefile b/security/certificate_maker/Makefile
new file mode 100644
index 000000000000..c520d1e66d57
--- /dev/null
+++ b/security/certificate_maker/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	certificate_maker
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.7.1
+CATEGORIES=	security
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Certificate creation utility for Fulcio
+WWW=		https://www.sigstore.dev/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cpe go:1.24,modules
+CPE_VENDOR=	sigstore
+
+GO_MODULE=	github.com/sigstore/fulcio
+GO_BUILDFLAGS=	-ldflags="-X \
+		sigs.k8s.io/release-utils/version.gitVersion=${DISTVERSIONPREFIX}${DISTVERSION}"
+GO_TARGET=	./cmd/${PORTNAME}
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/security/certificate_maker/distinfo b/security/certificate_maker/distinfo
new file mode 100644
index 000000000000..fadf33354c58
--- /dev/null
+++ b/security/certificate_maker/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746359699
+SHA256 (go/security_certificate_maker/certificate_maker-v1.7.1/v1.7.1.mod) = f73db55e2700414badd445bbbd28a504fdf60ba8208dc64693b9fee081af96b1
+SIZE (go/security_certificate_maker/certificate_maker-v1.7.1/v1.7.1.mod) = 8422
+SHA256 (go/security_certificate_maker/certificate_maker-v1.7.1/v1.7.1.zip) = 10ef150900b5fc340fe7393523377d815a19c70cb9b37b61b7360f05b9ef76b9
+SIZE (go/security_certificate_maker/certificate_maker-v1.7.1/v1.7.1.zip) = 1235824
diff --git a/security/certificate_maker/pkg-descr b/security/certificate_maker/pkg-descr
new file mode 100644
index 000000000000..26782da77723
--- /dev/null
+++ b/security/certificate_maker/pkg-descr
@@ -0,0 +1 @@
+Certificate creation utility for Fulcio
diff --git a/security/cloak/Makefile b/security/cloak/Makefile
index cd562ee9c440..9ebc5270e39f 100644
--- a/security/cloak/Makefile
+++ b/security/cloak/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.3.0
 PORTREVISION=	29
 CATEGORIES=	security
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command line OTP Authenticator application
 WWW=		https://github.com/evansmurithi/cloak
 
diff --git a/security/cosign/Makefile b/security/cosign/Makefile
new file mode 100644
index 000000000000..5a8e00d37bc2
--- /dev/null
+++ b/security/cosign/Makefile
@@ -0,0 +1,35 @@
+PORTNAME=	cosign
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.5.0
+CATEGORIES=	security
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Signing OCI containers and other artifacts using Sigstore
+WWW=		https://www.sigstore.dev/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cpe go:1.23,modules
+CPE_VENDOR=	sigstore
+
+GO_MODULE=	github.com/sigstore/cosign/v2
+GO_TARGET=	./cmd/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags="-buildid= \
+		-X sigs.k8s.io/release-utils/version.gitVersion=$(DISTVERSION) \
+		-X sigs.k8s.io/release-utils/version.gitCommit=$(GIT_HASH) \
+		-X sigs.k8s.io/release-utils/version.gitTreeState=clean \
+		-X sigs.k8s.io/release-utils/version.buildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}}"
+
+PLIST_FILES=	bin/${PORTNAME}
+
+GIT_HASH=	38bb98697005cdc5c092f031594c0e45d039f4a0
+
+.include <bsd.port.pre.mk>
+
+# Bring DISTINFO_FILE into scope so we can get the timestamp.
+SOURCE_DATE_EPOCH_CMD=	date -ur \
+			$$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
+			'+%Y-%m-%dT%H:%M:%SZ'
+
+.include <bsd.port.post.mk>
diff --git a/security/cosign/distinfo b/security/cosign/distinfo
new file mode 100644
index 000000000000..6a77534390e6
--- /dev/null
+++ b/security/cosign/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746276026
+SHA256 (go/security_cosign/cosign-v2.5.0/v2.5.0.mod) = fc290766dd5324141caa63fed997ce4b975b0a5b9eb2345c43db315bd8969e4e
+SIZE (go/security_cosign/cosign-v2.5.0/v2.5.0.mod) = 14751
+SHA256 (go/security_cosign/cosign-v2.5.0/v2.5.0.zip) = 930d7c766f230d56063bc42a2a4cee77260e4fd5d79a6200c531e5e99b354b0c
+SIZE (go/security_cosign/cosign-v2.5.0/v2.5.0.zip) = 1260158
diff --git a/security/cosign/pkg-descr b/security/cosign/pkg-descr
new file mode 100644
index 000000000000..7e8fb80af2d7
--- /dev/null
+++ b/security/cosign/pkg-descr
@@ -0,0 +1,9 @@
+Cosign aims to make signatures invisible infrastructure.
+
+Cosign supports:
+- "Keyless signing" with the Sigstore public good Fulcio certificate
+   authority and Rekor transparency log (default)
+- Hardware and KMS signing
+- Signing with a cosign generated encrypted private/public keypair
+- Container Signing, Verification and Storage in an OCI registry.
+- Bring-your-own PKI
diff --git a/security/crowdsec-firewall-bouncer/Makefile b/security/crowdsec-firewall-bouncer/Makefile
index 67b2a33f6837..1a3b07c4adaf 100644
--- a/security/crowdsec-firewall-bouncer/Makefile
+++ b/security/crowdsec-firewall-bouncer/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	crowdsec-firewall-bouncer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.31
-PORTREVISION=	2
+DISTVERSION=	0.0.32
 CATEGORIES=	security
 
 MAINTAINER=	marco@crowdsec.net
@@ -11,8 +10,8 @@ WWW=		https://github.com/crowdsecurity/cs-firewall-bouncer
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
-_COMMIT=	2884c0f0
+USES=		go:1.24,modules
+_COMMIT=	910a36b2
 _BUILD_DATE=	$$(date -u "+%F_%T")
 USE_RC_SUBR=	crowdsec_firewall
 
@@ -20,8 +19,8 @@ GO_MODULE=	github.com/crowdsecurity/cs-firewall-bouncer
 GO_TARGET=	${PORTNAME}:./${PORTNAME}
 GO_BUILDFLAGS=	-trimpath -tags netgo \
 		-ldflags="\
-		-a -s -w \
-		-X github.com/crowdsecurity/go-cs-lib/version.Version=${DISTVERSIONPREFIX}${DISTVERSION}-freebsd \
+		-a -s \
+		-X github.com/crowdsecurity/go-cs-lib/version.Version=${DISTVERSIONPREFIX}${PKGVERSION}-freebsd \
 		-X github.com/crowdsecurity/go-cs-lib/version.BuildDate=${_BUILD_DATE} \
 		-X github.com/crowdsecurity/go-cs-lib/version.Tag=${_COMMIT}"
 # to allow WITH_PIE with a non PIC libc
diff --git a/security/crowdsec-firewall-bouncer/distinfo b/security/crowdsec-firewall-bouncer/distinfo
index 4c5e90e222e5..8b13c33a8ea1 100644
--- a/security/crowdsec-firewall-bouncer/distinfo
+++ b/security/crowdsec-firewall-bouncer/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1732707419
-SHA256 (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.31/v0.0.31.mod) = c16baf9f23dec795974bdb4b453f44af2d2a136e3bf583841b2e69531ae42f70
-SIZE (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.31/v0.0.31.mod) = 2664
-SHA256 (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.31/v0.0.31.zip) = 3e51140674ef2cc6d469c15081389bf5def02408efb86c11080c34214368adc7
-SIZE (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.31/v0.0.31.zip) = 189421
+TIMESTAMP = 1746452385
+SHA256 (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.32/v0.0.32.mod) = 89a0eff0745387c40e1e612b414e79c4c5652ef33ec356e39b1c1e5e52ed7928
+SIZE (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.32/v0.0.32.mod) = 2749
+SHA256 (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.32/v0.0.32.zip) = 8ec7560afebfa33b7bd24220e684a3b42b11d674f15d29405d72ec577392286f
+SIZE (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.32/v0.0.32.zip) = 199454
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 31723fac10a3..86a98ed52493 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dropbear
-PORTVERSION=	2025.87
+PORTVERSION=	2025.88
 CATEGORIES=	security
 MASTER_SITES=	https://matt.ucc.asn.au/dropbear/releases/
 
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index bc2b2084b527..8eccf5f9f7b0 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741554412
-SHA256 (dropbear-2025.87.tar.bz2) = 738b7f358547f0c64c3e1a56bbc5ef98d34d9ec6adf9ccdf01dc0bf2caa2bc8d
-SIZE (dropbear-2025.87.tar.bz2) = 2368085
+TIMESTAMP = 1746647982
+SHA256 (dropbear-2025.88.tar.bz2) = 783f50ea27b17c16da89578fafdb6decfa44bb8f6590e5698a4e4d3672dc53d4
+SIZE (dropbear-2025.88.tar.bz2) = 2370480
diff --git a/security/fizz/Makefile b/security/fizz/Makefile
index 7a180c96079b..8bf1cfeab4b0 100644
--- a/security/fizz/Makefile
+++ b/security/fizz/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fizz
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/security/fizz/distinfo b/security/fizz/distinfo
index a10aebb23c26..a96749dd9f1f 100644
--- a/security/fizz/distinfo
+++ b/security/fizz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891834
-SHA256 (facebookincubator-fizz-v2025.04.28.00_GH0.tar.gz) = fdd78e1d240882e09e1fda0823736860fa826545d766ffcb081021deb1946194
-SIZE (facebookincubator-fizz-v2025.04.28.00_GH0.tar.gz) = 754293
+TIMESTAMP = 1746504537
+SHA256 (facebookincubator-fizz-v2025.05.05.00_GH0.tar.gz) = 424c8bfb229ff3e46ab878cb7fb91b79ce785f9b61d85d4dc0eb5a0cd370cda6
+SIZE (facebookincubator-fizz-v2025.05.05.00_GH0.tar.gz) = 754049
diff --git a/security/git-credential-oauth/Makefile b/security/git-credential-oauth/Makefile
index 89728e1fdbc4..013666a97707 100644
--- a/security/git-credential-oauth/Makefile
+++ b/security/git-credential-oauth/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	git-credential-oauth
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.15.0
-PORTREVISION=	2
+DISTVERSION=	0.15.1
 CATEGORIES=	security
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/security/git-credential-oauth/distinfo b/security/git-credential-oauth/distinfo
index a4371e8537c1..a803519342ad 100644
--- a/security/git-credential-oauth/distinfo
+++ b/security/git-credential-oauth/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1740816463
-SHA256 (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.0_GH0/v0.15.0.mod) = 776081eb21f0acdf6bceccae816d21c1267efb22ab5c2f63736fcb463989389f
-SIZE (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.0_GH0/v0.15.0.mod) = 96
-SHA256 (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.0_GH0/v0.15.0.zip) = 3c5f7dbcd7be23618bc80ffd1a1504954995aafff02d822a22e8e9a8d1d34a40
-SIZE (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.0_GH0/v0.15.0.zip) = 20286
-SHA256 (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.0_GH0/hickford-git-credential-oauth-v0.15.0_GH0.tar.gz) = c9b067fde5849b597aceba15b76c5b9ccacee4e5736e88c9ae430553bb7f2898
-SIZE (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.0_GH0/hickford-git-credential-oauth-v0.15.0_GH0.tar.gz) = 16190
+TIMESTAMP = 1746510492
+SHA256 (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.1_GH0/v0.15.1.mod) = f1a282a6deb3e2bd50204306f038b40bdfdef48efb45a2dbe1316ff8df06f162
+SIZE (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.1_GH0/v0.15.1.mod) = 116
+SHA256 (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.1_GH0/v0.15.1.zip) = fb80bf76eb0bac087218d1ffd58ed98bc214005c10e0408ba87af74b8e4b637e
+SIZE (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.1_GH0/v0.15.1.zip) = 20205
+SHA256 (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.1_GH0/hickford-git-credential-oauth-v0.15.1_GH0.tar.gz) = 0a0aea60bfeb19c9fa9d8bc2428c71a8b08c2b20b939a16b0709baf24d2ec7fa
+SIZE (go/security_git-credential-oauth/hickford-git-credential-oauth-v0.15.1_GH0/hickford-git-credential-oauth-v0.15.1_GH0.tar.gz) = 16105
diff --git a/security/gnupg-pkcs11-scd/Makefile b/security/gnupg-pkcs11-scd/Makefile
index 4e141fa975f7..0a75d8a76601 100644
--- a/security/gnupg-pkcs11-scd/Makefile
+++ b/security/gnupg-pkcs11-scd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gnupg-pkcs11-scd
-DISTVERSION=	0.10.0
-PORTREVISION=	2
+DISTVERSION=	0.11.0
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/alonbl/${PORTNAME}/releases/download/${DISTNAME}/
 
diff --git a/security/gnupg-pkcs11-scd/distinfo b/security/gnupg-pkcs11-scd/distinfo
index 0f6b8b587533..53d29ead9716 100644
--- a/security/gnupg-pkcs11-scd/distinfo
+++ b/security/gnupg-pkcs11-scd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649057256
-SHA256 (gnupg-pkcs11-scd-0.10.0.tar.bz2) = 29bf29e7780f921c6d3a11f608e2b0483c1bb510c5afa8473090249dd57c5249
-SIZE (gnupg-pkcs11-scd-0.10.0.tar.bz2) = 149036
+TIMESTAMP = 1746528375
+SHA256 (gnupg-pkcs11-scd-0.11.0.tar.bz2) = 954787e562f2b3d9294212c32dd0d81a2cd37aca250e6685002d2893bb959087
+SIZE (gnupg-pkcs11-scd-0.11.0.tar.bz2) = 154497
diff --git a/security/gnupg-pkcs11-scd/files/patch-configure b/security/gnupg-pkcs11-scd/files/patch-configure
deleted file mode 100644
index f75bd055ca8d..000000000000
--- a/security/gnupg-pkcs11-scd/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch to be able to use libassuan 3.x
-
---- configure.orig	2024-07-09 07:00:07 UTC
-+++ configure
-@@ -6801,7 +6801,7 @@ if test -z "${LIBASSUAN_LIBS}"; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libassuan" >&5
- $as_echo_n "checking for libassuan... " >&6; }
- 	test -x "${with_libassuan_prefix}/bin/libassuan-config" || as_fn_error $? "Cannot locate libassuan" "$LINENO" 5
--	"${with_libassuan_prefix}/bin/libassuan-config" --version | grep "^2\." > /dev/null || as_fn_error $? "Need assuan-2" "$LINENO" 5
-+	"${with_libassuan_prefix}/bin/libassuan-config" --version | grep "^3\." > /dev/null || as_fn_error $? "Need assuan-3" "$LINENO" 5
- 
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
- $as_echo "found" >&6; }
diff --git a/security/go-tuf/Makefile b/security/go-tuf/Makefile
new file mode 100644
index 000000000000..d4e021af7a30
--- /dev/null
+++ b/security/go-tuf/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	go-tuf
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0.2
+CATEGORIES=	security
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Framework for Securing Software
+WWW=		https://theupdateframework.io
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cpe go:1.24,modules
+CPE_VENDOR=	theupdateframework
+
+GO_TARGET=	./examples/cli/tuf-client
+GO_MODULE=	github.com/theupdateframework/go-tuf/v2
+
+PLIST_FILES=	bin/tuf-client
+
+.include <bsd.port.mk>
diff --git a/security/go-tuf/distinfo b/security/go-tuf/distinfo
new file mode 100644
index 000000000000..a680b151a5df
--- /dev/null
+++ b/security/go-tuf/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746287010
+SHA256 (go/security_go-tuf/go-tuf-v2.0.2/v2.0.2.mod) = 7ae5e66c0313581c799cf442f5b943b1019141661e89e777d214148d5ed2650f
+SIZE (go/security_go-tuf/go-tuf-v2.0.2/v2.0.2.mod) = 1078
+SHA256 (go/security_go-tuf/go-tuf-v2.0.2/v2.0.2.zip) = d9345cc6c4b84e3654392288f4bb345dac815dfe724f501a6be95a4647201721
+SIZE (go/security_go-tuf/go-tuf-v2.0.2/v2.0.2.zip) = 160960
diff --git a/security/go-tuf/pkg-descr b/security/go-tuf/pkg-descr
new file mode 100644
index 000000000000..d29ec9064870
--- /dev/null
+++ b/security/go-tuf/pkg-descr
@@ -0,0 +1,9 @@
+The Update Framework (TUF) is a framework for secure content delivery
+and updates. It protects against various types of supply chain attacks
+and provides resilience to compromise.
+
+The Update Framework (TUF) design helps developers maintain the security
+of a software update system, even against attackers that compromise the
+repository or signing keys. TUF provides a flexible specification
+defining functionality that developers can use in any software update
+system or re-implement to fit their needs.
diff --git a/security/i2p/Makefile b/security/i2p/Makefile
deleted file mode 100644
index 900c0eb45d04..000000000000
--- a/security/i2p/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-PORTNAME=	i2p
-DISTVERSION=	0.9.48
-CATEGORIES=	security java net-p2p
-MASTER_SITES=	http://download.i2p2.de/releases/${PORTVERSION}/
-DISTNAME=	i2psource_${PORTVERSION}
-
-MAINTAINER=	m.muenz@gmail.com
-COMMENT=	Anonymizing network
-WWW=		https://geti2p.net/
-
-LICENSE=	EULA
-LICENSE_NAME=	End User License Agreement
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_DISTFILES=	i2psource_${PORTVERSION}${EXTRACT_SUFX}
-
-BROKEN=		Unfetchable
-DEPRECATED=	Outdated and unsupported upstream
-EXPIRATION_DATE=2025-04-30
-
-ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	i2p libwrapper.so library binary only available for i386 and amd64
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:math/gmp
-LIB_DEPENDS=	libiconv.so:converters/libiconv
-
-USES=		cpe gettext java:ant tar:bz2
-CPE_VENDOR=	geti2p
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
-USE_RC_SUBR=	i2p
-NO_ARCH=	yes
-USE_LOCALE=	en_US.UTF-8
-ALL_TARGET=	updater tarball
-
-SUB_FILES=	wrapper.sh
-
-PORTDATA=	*
-PLIST_FILES=	sbin/i2prouter
-
-post-patch:
-# postinstall.sh SHOULD only do post installation house keeping
-	@${REINPLACE_CMD} -E \
-		-e 's|./i2prouter[[:space:]]+start||' \
-		${WRKSRC}/installer/resources/postinstall.sh
-	@${REINPLACE_CMD} -E \
-		-e 's|%INSTALL_PATH|$${HOME}/i2p|' \
-		-e 's|%USER_HOME|$${HOME}|' \
-		${WRKSRC}/installer/resources/i2prouter \
-		${WRKSRC}/installer/resources/runplain.sh
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 ${STAGEDIR}${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip ${STAGEDIR}${DATADIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/sbin/i2prouter
-
-.include <bsd.port.mk>
diff --git a/security/i2p/distinfo b/security/i2p/distinfo
deleted file mode 100644
index 79834fc4cc48..000000000000
--- a/security/i2p/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1607097374
-SHA256 (i2psource_0.9.48.tar.bz2) = e8c55b17b2066d8eab82bc407128f1f0366530c5429a1413ea0cbf40f922d532
-SIZE (i2psource_0.9.48.tar.bz2) = 33029295
diff --git a/security/i2p/files/i2p.in b/security/i2p/files/i2p.in
deleted file mode 100644
index 43dadf945867..000000000000
--- a/security/i2p/files/i2p.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Under a BSDL license. Copyright 2005. Mario S F Ferreira <lioux@FreeBSD.org>
-
-# PROVIDE: i2p
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable i2p:
-#
-# i2p_enable="YES"
-# i2p_user
-
-. /etc/rc.subr
-
-name="i2p"
-rcvar=i2p_enable
-command="%%PREFIX%%/sbin/i2prouter"
-extra_commands="install uninstall update"
-
-i2p_check_vars()
-{
-  if [ -z "${i2p_user}" ]; then
-    i2p_user=$(whoami)
-  fi
-
-  if [ "x${i2p_user}" = "xroot" ]; then
-    err 1 "You have to set i2p_user to a non-root user for security reasons"
-  fi
-}
-
-start_cmd="start_cmd"
-stop_cmd="stop_cmd"
-status_cmd="status_cmd"
-restart_cmd="restart_cmd"
-install_cmd="install_cmd"
-uninstall_cmd="uninstall_cmd"
-update_cmd="update_cmd"
-
-generic_cmd()
-{
-  i2p_check_vars
-  su -l ${i2p_user} -c "${command} ${1}"
-}
-
-start_cmd()
-{
-  generic_cmd start
-}
-
-stop_cmd()
-{
-  generic_cmd stop
-}
-
-status_cmd()
-{
-  generic_cmd status
-}
-
-restart_cmd()
-{
-  generic_cmd restart
-}
-
-install_cmd()
-{
-  generic_cmd install
-}
-
-uninstall_cmd()
-{
-  generic_cmd uninstall
-}
-
-update_cmd()
-{
-  generic_cmd update
-}
-
-load_rc_config "${name}"
-: ${i2p_enable="NO"}
-: ${i2p_user=""}
-
-run_rc_command "$1"
diff --git a/security/i2p/files/patch-installer_resources_postinstall.sh b/security/i2p/files/patch-installer_resources_postinstall.sh
deleted file mode 100644
index 32697f4221df..000000000000
--- a/security/i2p/files/patch-installer_resources_postinstall.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- installer/resources/postinstall.sh.orig	2020-02-24 17:37:40 UTC
-+++ installer/resources/postinstall.sh
-@@ -57,7 +57,7 @@ case $HOST_OS in
-         else
-             wrapperpath="./lib/wrapper/linux64"
-             # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
--            cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
-+            cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
-         fi
-         cp ${wrapperpath}/libwrapper.so ./lib/
-         ;;
diff --git a/security/i2p/files/wrapper.sh.in b/security/i2p/files/wrapper.sh.in
deleted file mode 100644
index 314ac513cd20..000000000000
--- a/security/i2p/files/wrapper.sh.in
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# Under a BSDL license. Copyright by Mario S F Ferreira <lioux@FreeBSD.org>
-
-DATADIR="%%DATADIR%%"
-#
-I2P_HOME="${HOME}/i2p"
-I2P_RC_SCRIPT=i2prouter
-I2P_POSTINSTALL_SCRIPT=postinstall.sh
-#
-I2P_INSTALL_TARBALL=i2p.tar.bz2
-I2P_UPDATE_ZIP=i2pupdate.zip
-
-if [ -z "${HOME}" -o ! -d "${HOME}" ]; then
-	echo 'ERROR: Please, set HOME environment variable to a valid value!'
-	echo 'ERROR: You may LOSE data if the variable is pointed at an'
-	echo 'ERROR: incorrect location!'
-	exit 1
-fi
-
-case "$1" in
-	restart|start|status|stop)
-		echo "i2p ${1}"
-		if [ -f "${I2P_HOME}/${I2P_RC_SCRIPT}" ]; then
-			case "$1" in
-				restart|start)
-					echo 'To access i2p:'
-					echo 'Point your browser at http://localhost:7657/ to access configuration'
-					echo 'Point your browser proxy at http://localhost:4444/ to access i2p network'
-				;;
-			esac
-			exec sh "${I2P_HOME}/${I2P_RC_SCRIPT}" ${1}
-		else
-			echo 'ERROR: i2p is not installed'
-			echo 'ERROR: Please install i2p first'
-			exit 2
-		fi
-		;;
-	install)
-		echo "i2p ${1}"
-		if [ ! -d "${I2P_HOME}" ]; then
-			rm -Rf "${I2P_HOME}"
-			mkdir -p "${I2P_HOME}"
-		fi
-		cd "${HOME}" && \
-			tar -xvjf "${DATADIR}/${I2P_INSTALL_TARBALL}" && \
-			cd "${I2P_HOME}" &&  \
-				exec sh "${I2P_HOME}/${I2P_POSTINSTALL_SCRIPT}"
-		;;
-	uninstall)
-		echo "i2p ${1}"
-		exec rm -Rf "${I2P_HOME}"
-		;;
-	update)
-		echo "i2p ${1}"
-		if [ ! -d "${I2P_HOME}" ]; then
-			echo 'ERROR: i2p is not installed'
-			echo 'ERROR: Please install i2p before trying to update it'
-			exit 3
-		fi
-		cd "${I2P_HOME}" &&  \
-			exec unzip -o "${DATADIR}/${I2P_UPDATE_ZIP}"
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop | status | restart | install | uninstall | update }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/security/i2p/pkg-descr b/security/i2p/pkg-descr
deleted file mode 100644
index 679beb89e343..000000000000
--- a/security/i2p/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-[ excerpt from developer's web site ]
-
-I2P is an anonymous overlay network - a network within a network.
-It is intended to protect communication from dragnet surveillance
-and monitoring by third parties such as ISPs.
-
-I2P is used by many people who care about their privacy: activists,
-oppressed people, journalists and whistleblowers, as well as the
-average person.
-
-No network can be "perfectly anonymous". The continued goal of I2P
-is to make attacks more and more difficult to mount. Its anonymity
-will get stronger as the size of the network increases and with
-ongoing academic review.
diff --git a/security/i2p/pkg-message b/security/i2p/pkg-message
deleted file mode 100644
index 91c837769ce4..000000000000
--- a/security/i2p/pkg-message
+++ /dev/null
@@ -1,24 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-
-The wrapper and rc script are currently broken and under review,
-so you have to install and run i2p in the following way:
-
-- Install security/i2p port (which you might have now)
-- As normal user run /usr/local/sbin/i2prouter install (root is not allowed)
-  to extract all data into $HOME/i2p.
-- Go to users home i2p/ and edit runplain.sh to map I2PTEMP to the same 
-  directory as I2P
-- Now you can start the process in I2P home directory with ./runplain.sh
-
-You first have to walk through an initial setup via 
-
-http://localhost:7657
-
-Follow the instructions and map your browser to the configured ports.
-You can also host hidden services and many more via the UI.
-
-EOM
-}
-]
diff --git a/security/libuecc/Makefile b/security/libuecc/Makefile
deleted file mode 100644
index d8e5464afb75..000000000000
--- a/security/libuecc/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	libuecc
-PORTVERSION=	7
-PORTREVISION=	3
-CATEGORIES=	security
-MASTER_SITES=	https://git.universe-factory.net/libuecc/snapshot/ \
-		http://git.universe-factory.net/libuecc/snapshot/
-
-MAINTAINER=	crest_maintainer@rlwinm.de
-COMMENT=	Very small Elliptic Curve Cryptography library
-WWW=		https://git.universe-factory.net/libuecc
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-
-BROKEN=		Unfetchable
-DEPRECATED=	Deprecated, only user was some never properly ported FreiFunk control plane software
-EXPIRATION_DATE=2025-04-30
-
-LIB_DEPENDS=	libsodium.so:security/libsodium
-
-USES=		cmake pkgconfig tar
-USE_LDCONFIG=	yes
-
-.include <bsd.port.mk>
diff --git a/security/libuecc/distinfo b/security/libuecc/distinfo
deleted file mode 100644
index fc6950a8528c..000000000000
--- a/security/libuecc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1464514013
-SHA256 (libuecc-7.tar) = 0120aee869f56289204255ba81535369816655264dd018c63969bf35b71fd707
-SIZE (libuecc-7.tar) = 174080
diff --git a/security/libuecc/files/patch-CMakeLists.txt b/security/libuecc/files/patch-CMakeLists.txt
deleted file mode 100644
index 878efdddeafa..000000000000
--- a/security/libuecc/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2015-11-11 17:23:47 UTC
-+++ CMakeLists.txt
-@@ -14,7 +14,7 @@ set(LIBDIR "lib${LIB_SUFFIX}")
- add_subdirectory(src)
- 
- configure_file(${LIBUECC_SOURCE_DIR}/libuecc.pc.in ${LIBUECC_BINARY_DIR}/libuecc.pc @ONLY)
--install(FILES ${LIBUECC_BINARY_DIR}/libuecc.pc DESTINATION "${LIBDIR}/pkgconfig")
-+install(FILES ${LIBUECC_BINARY_DIR}/libuecc.pc DESTINATION "libdata/pkgconfig")
- 
- FILE(GLOB include_files "${CMAKE_CURRENT_SOURCE_DIR}/include/libuecc/*.h")
- install(FILES ${include_files} DESTINATION "include/libuecc-${PROJECT_VERSION}/libuecc")
diff --git a/security/libuecc/pkg-descr b/security/libuecc/pkg-descr
deleted file mode 100644
index e0a95f962701..000000000000
--- a/security/libuecc/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This is a very small Elliptic Curve Cryptography library.
diff --git a/security/libuecc/pkg-plist b/security/libuecc/pkg-plist
deleted file mode 100644
index 248535fba56c..000000000000
--- a/security/libuecc/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-include/libuecc-7/libuecc/ecc.h
-lib/libuecc.a
-lib/libuecc.so
-lib/libuecc.so.0
-lib/libuecc.so.0.7
-libdata/pkgconfig/libuecc.pc
diff --git a/security/linux-rl9-libxcrypt/Makefile b/security/linux-rl9-libxcrypt/Makefile
deleted file mode 100644
index fd5792c866cd..000000000000
--- a/security/linux-rl9-libxcrypt/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	libxcrypt
-PORTVERSION=	4.4.18
-DISTVERSIONSUFFIX=	-3.el9
-PORTREVISION=	1
-CATEGORIES=	security linux
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Extended crypt library for descrypt, md5crypt, bcrypt, and others (Rocky Linux ${LINUX_DIST_VER})
-WWW=		https://github.com/besser82/libxcrypt
-
-LICENSE=	LGPL21+
-
-USES=		linux:rl9
-USE_LDCONFIG=	yes
-USE_LINUX_RPM=	yes
-WANT_LINUX32=	yes
-
-CONFLICTS=	linux-c7-${PORTNAME}
-DESCR=		${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/security/linux-rl9-libxcrypt/distinfo b/security/linux-rl9-libxcrypt/distinfo
deleted file mode 100644
index 0b651d869db5..000000000000
--- a/security/linux-rl9-libxcrypt/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-TIMESTAMP = 1731422805
-SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.aarch64.rpm) = ec12e0266ce1f96af43495c95f95fbb6d972af576f19473ea231985f8cd4d2d6
-SIZE (rocky/l/libxcrypt-4.4.18-3.el9.aarch64.rpm) = 122619
-SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.i686.rpm) = a9df06cdddf956ae3de2052767bc8d1c9307b990a9de0e43e68b3880cc287658
-SIZE (rocky/l/libxcrypt-4.4.18-3.el9.i686.rpm) = 124057
-SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.x86_64.rpm) = e3c178ed2e04ac25699d5af612fad51694a23f5d544b72cab2f65d35b8db5f28
-SIZE (rocky/l/libxcrypt-4.4.18-3.el9.x86_64.rpm) = 117617
-SHA256 (rocky/l/libxcrypt-4.4.18-3.el9.src.rpm) = dba21a9a96b6532e452b45190b9ba38b56c2a1fbaecae037505c5315de014b3d
-SIZE (rocky/l/libxcrypt-4.4.18-3.el9.src.rpm) = 542268
diff --git a/security/linux-rl9-libxcrypt/pkg-plist.aarch64 b/security/linux-rl9-libxcrypt/pkg-plist.aarch64
deleted file mode 100644
index 875ffa2ffdee..000000000000
--- a/security/linux-rl9-libxcrypt/pkg-plist.aarch64
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/lib/.build-id/65/ca3a887a1060062108aa70583fb6809a97e522
-usr/lib64/fipscheck/libcrypt.so.2.0.0.hmac
-usr/lib64/fipscheck/libcrypt.so.2.hmac
-usr/lib64/libcrypt.so.2
-usr/lib64/libcrypt.so.2.0.0
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.rhel
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-usr/share/licenses/libxcrypt/AUTHORS
-usr/share/licenses/libxcrypt/COPYING.LIB
-usr/share/licenses/libxcrypt/LICENSING
-usr/share/man/man5/crypt.5.gz
diff --git a/security/linux-rl9-libxcrypt/pkg-plist.amd64 b/security/linux-rl9-libxcrypt/pkg-plist.amd64
deleted file mode 100644
index f89f281b9073..000000000000
--- a/security/linux-rl9-libxcrypt/pkg-plist.amd64
+++ /dev/null
@@ -1,18 +0,0 @@
-usr/lib/.build-id/07/177b20d9cc92b5d2efd1b676101479a7e0f792
-usr/lib/.build-id/43/cc909d67a7573957be572f25a1bda51b9d72d6
-usr/lib/fipscheck/libcrypt.so.2.0.0.hmac
-usr/lib/fipscheck/libcrypt.so.2.hmac
-usr/lib/libcrypt.so.2
-usr/lib/libcrypt.so.2.0.0
-usr/lib64/fipscheck/libcrypt.so.2.0.0.hmac
-usr/lib64/fipscheck/libcrypt.so.2.hmac
-usr/lib64/libcrypt.so.2
-usr/lib64/libcrypt.so.2.0.0
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.rhel
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-usr/share/licenses/libxcrypt/AUTHORS
-usr/share/licenses/libxcrypt/COPYING.LIB
-usr/share/licenses/libxcrypt/LICENSING
-usr/share/man/man5/crypt.5.gz
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 8d29dd5b2cf6..870facde151b 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	logcheck
-DISTVERSION=	1.4.3
-PORTREVISION=	2
+DISTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -71,10 +71,8 @@ do-build:
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/detectrotate \
 		  ${STAGEDIR}${DBDIR} \
-		  ${STAGEDIR}${DOCSDIR} \
 		  ${STAGEDIR}${ETCDIR} \
 		  ${STAGEDIR}${ETCDIR}/logcheck.logfiles.d \
-		  ${STAGEDIR}${EXAMPLESDIR} \
 		  ${STAGEDIR}${RUNDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logcheck-test ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logcheck ${STAGEDIR}${PREFIX}/sbin
@@ -93,14 +91,20 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr \
 		${STAGEDIR}${DATADIR}/detectrotate
-	${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
-		${STAGEDIR}${EXAMPLESDIR}/crontab.in
 .for i in ${MAN1_FILES}
 	${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 .for i in ${MAN8_FILES}
 	${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${PREFIX}/share/man/man8
 .endfor
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
+		${STAGEDIR}${EXAMPLESDIR}/crontab.in
+
 .include <bsd.port.post.mk>
diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo
index 207cfec31bed..a361a9724258 100644
--- a/security/logcheck/distinfo
+++ b/security/logcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689704376
-SHA256 (logcheck_1.4.3.tar.xz) = ad83ae80bd780bdae5eefd40ad59a3e97b85ad3a4962aa7c00d98ed3bdffcdd0
-SIZE (logcheck_1.4.3.tar.xz) = 138740
+TIMESTAMP = 1746315311
+SHA256 (logcheck_1.4.4.tar.xz) = d40e1a92707e19581cdc5f1596a56d26396f18b061612e84fb0fbd957bc03864
+SIZE (logcheck_1.4.4.tar.xz) = 143220
diff --git a/security/logcheck/files/patch-debian_logcheck.cron.d b/security/logcheck/files/patch-debian_logcheck.cron.d
index 0f33b88cb62a..733a58186071 100644
--- a/security/logcheck/files/patch-debian_logcheck.cron.d
+++ b/security/logcheck/files/patch-debian_logcheck.cron.d
@@ -1,16 +1,14 @@
---- debian/logcheck.cron.d.orig	2023-07-18 10:54:00 UTC
+--- debian/logcheck.cron.d.orig	2025-04-28 15:28:43 UTC
 +++ debian/logcheck.cron.d
-@@ -1,9 +1,5 @@
--# /etc/cron.d/logcheck: crontab entries for the logcheck package
--
+@@ -1,8 +1,8 @@
+ # /etc/cron.d/logcheck: crontab entries for the logcheck package
+ # These do nothing under systemd because the systemd timer will take precedence
+ 
 -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+# crontab entries for the logcheck package
-+PATH=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/sbin:%%PREFIX%%/bin
++PATH=%%PREFIX%%/sbin:%%PREFIX%%/bin:/sbin:/bin:/usr/sbin:/usr/bin
  MAILTO=root
--
--@reboot         logcheck    if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck -R; fi
--2 * * * *       logcheck    if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck; fi
--
--# EOF
-+@reboot    if [ -x %%PREFIX%%/sbin/logcheck ]; then /usr/bin/lockf -t 0 /tmp/.logcheck nice -n10 %%PREFIX%%/sbin/logcheck -R; fi
-+2 * * * *  if [ -x %%PREFIX%%/sbin/logcheck ]; then /usr/bin/lockf -t 0 /tmp/.logcheck nice -n10 %%PREFIX%%/sbin/logcheck; fi
+ 
+-@reboot         logcheck    if [ ! -d /run/systemd/system ] && [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck -R; fi
+-2 * * * *       logcheck    if [ ! -d /run/systemd/system ] && [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck; fi
++@reboot         if [ ! -d /run/systemd/system ] && [ -x %%PREFIX%%/sbin/logcheck ]; then /usr/bin/lockf -t 0 /tmp/.logcheck nice -n10 %%PREFIX%%/sbin/logcheck -R; fi
++2 * * * *       if [ ! -d /run/systemd/system ] && [ -x %%PREFIX%%/sbin/logcheck ]; then /usr/bin/lockf -t 0 /tmp/.logcheck nice -n10 %%PREFIX%%/sbin/logcheck; fi
diff --git a/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh b/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh
deleted file mode 100644
index b54cf2add4de..000000000000
--- a/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh
+++ /dev/null
@@ -1,11 +0,0 @@
---- rulefiles/linux/ignore.d.server/ssh.orig	2022-12-22 23:03:11 UTC
-+++ rulefiles/linux/ignore.d.server/ssh
-@@ -14,7 +14,7 @@
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Postponed keyboard-interactive(/pam)? for (invalid user )?[^[:space:]]+ from [^[:space:]]+ port [[:digit:]]{1,5}( (ssh|ssh2)( \[preauth\])?)?$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:.[:xdigit:]]+: [12]: Timeout, server not responding\.$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:.[:xdigit:]]+(: | port [[:digit:]]{1,5}:)11: (disconnected by user|Closed due to user request\.|Bye Bye \[preauth\])$
--^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: .{0,256} \[preauth\]$
-+^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: .{0,255} \[preauth\]$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: Client disconnect$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Received disconnect from [:[:xdigit:].]+: [[:digit:]]+: Disconnect requested by Windows SSH Client\.$
- ^(\w{3} [ :[:digit:]]{11}|[0-9T:.+-]{32}) [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: Disconnected from( (invalid|authenticating))?( user [^[:space:]]+)? [:[:xdigit:].]+ port [[:digit:]]{1,5}( \[preauth\])?$
diff --git a/security/logcheck/files/patch-src_logcheck b/security/logcheck/files/patch-src_logcheck
index 933a2cd2bf81..dc1f0636f23b 100644
--- a/security/logcheck/files/patch-src_logcheck
+++ b/security/logcheck/files/patch-src_logcheck
@@ -1,6 +1,6 @@
---- src/logcheck.orig	2023-03-02 08:19:09 UTC
+--- src/logcheck.orig	2025-05-03 23:35:17 UTC
 +++ src/logcheck
-@@ -24,16 +24,16 @@
+@@ -24,16 +24,16 @@ if [ "$(id -u)" = 0 ]; then
  
  if [ "$(id -u)" = 0 ]; then
      echo "logcheck should not be run as root. Use su to invoke logcheck:"
@@ -22,7 +22,7 @@
      echo "fatal: lockfile-progs is a prerequisite for logcheck, but was not found."
      exit 1
  fi
-@@ -71,13 +71,13 @@ EVENTSSUBJECT="System Events"
+@@ -71,13 +71,13 @@ ADDTAG="no"
  ADDTAG="no"
  
  # Default paths
@@ -43,7 +43,7 @@
  SYSLOG_SUMMARY="/usr/bin/syslog-summary"
  
  # Defaults for options
-@@ -92,7 +92,7 @@ FQDN=0
+@@ -92,7 +92,7 @@ SYSLOGSUMMARY=0
  SORTUNIQ=0
  SUPPORT_CRACKING_IGNORE=0
  SYSLOGSUMMARY=0
@@ -52,14 +52,14 @@
  LOCKFILE="$LOCKDIR/logcheck"
  
  # Allow globs to return zero files
-@@ -183,8 +183,8 @@ ${TMPDIR:+"- Check temporary directory: $TMPDIR"
+@@ -183,8 +183,8 @@ logfiles specified in;
  }
  - verify that the logcheck user can read all
  logfiles specified in;
 -  /etc/logcheck/logcheck.logfiles
--  /etc/logcheck/logcheck.logfiled.d/*.logfiles
-+  %%ETCDIR%%/logcheck.logfiles
-+  %%ETCDIR%%/logcheck.logfiled.d/*.logfiles
+-  /etc/logcheck/logcheck.logfiles.d/*.logfiles
++  %%ETCDIR%%/logcheck/logcheck.logfiles
++  %%ETCDIR%%/logcheck/logcheck.logfiles.d/*.logfiles
  - check the system has enough space; (df -h output follows):
  $(df -h 2>&1|| :)
  - check the settings (environment follows):
@@ -81,7 +81,7 @@
  										 >> "$TMPDIR/report" || error "Could not write message about first-time check of journal to report"
  								offsettime="--since=-5h"
  						fi
-@@ -587,7 +587,7 @@ debug "Sourcing - $CONFFILE"
+@@ -589,7 +589,7 @@ if [ -r "$CONFFILE" ]; then
  
  # Now source the config file - before things that should not be changed
  if [ -r "$CONFFILE" ]; then
@@ -90,7 +90,7 @@
  		. "$CONFFILE"
  elif [ -f "$CONFFILE" ]; then
  		error  "Config file $CONFFILE could not be read"
-@@ -618,9 +618,9 @@ fi
+@@ -620,9 +620,9 @@ if [ "$FQDN" -eq 1 ]; then
  
  # HOSTNAME is either 'fully qualified' or 'short'
  if [ "$FQDN" -eq 1 ]; then
@@ -102,7 +102,7 @@
  fi
  
  # Now check for the other options
-@@ -725,8 +725,8 @@ else
+@@ -727,8 +727,8 @@ fi
  fi
  
  # Create a secure temporary working directory (or exit)
diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist
index 09b74d5f028f..55dc71fbef56 100644
--- a/security/logcheck/pkg-plist
+++ b/security/logcheck/pkg-plist
@@ -14,7 +14,6 @@
 %%ETCDIR%%/ignore.d.paranoid/logcheck
 %%ETCDIR%%/ignore.d.paranoid/postfix
 %%ETCDIR%%/ignore.d.paranoid/ppp
-%%ETCDIR%%/ignore.d.paranoid/pureftp
 %%ETCDIR%%/ignore.d.paranoid/qpopper
 %%ETCDIR%%/ignore.d.paranoid/squid
 %%ETCDIR%%/ignore.d.paranoid/ssh
@@ -44,6 +43,7 @@
 %%ETCDIR%%/ignore.d.server/cvs-pserver
 %%ETCDIR%%/ignore.d.server/cvsd
 %%ETCDIR%%/ignore.d.server/cyrus
+%%ETCDIR%%/ignore.d.server/dbus-daemon
 %%ETCDIR%%/ignore.d.server/dcc
 %%ETCDIR%%/ignore.d.server/ddclient
 %%ETCDIR%%/ignore.d.server/dhclient
@@ -80,6 +80,7 @@
 %%ETCDIR%%/ignore.d.server/krb5-kdc
 %%ETCDIR%%/ignore.d.server/libpam-krb5
 %%ETCDIR%%/ignore.d.server/libpam-mount
+%%ETCDIR%%/ignore.d.server/libpam-systemd
 %%ETCDIR%%/ignore.d.server/logcheck
 %%ETCDIR%%/ignore.d.server/login
 %%ETCDIR%%/ignore.d.server/maradns
@@ -92,6 +93,8 @@
 %%ETCDIR%%/ignore.d.server/nntpcache
 %%ETCDIR%%/ignore.d.server/nscd
 %%ETCDIR%%/ignore.d.server/nslcd
+%%ETCDIR%%/ignore.d.server/opendkim
+%%ETCDIR%%/ignore.d.server/opendmarc
 %%ETCDIR%%/ignore.d.server/openvpn
 %%ETCDIR%%/ignore.d.server/otrs
 %%ETCDIR%%/ignore.d.server/passwd
@@ -106,12 +109,12 @@
 %%ETCDIR%%/ignore.d.server/procmail
 %%ETCDIR%%/ignore.d.server/proftpd
 %%ETCDIR%%/ignore.d.server/pure-ftpd
-%%ETCDIR%%/ignore.d.server/pureftp
 %%ETCDIR%%/ignore.d.server/qpopper
 %%ETCDIR%%/ignore.d.server/rbldnsd
 %%ETCDIR%%/ignore.d.server/rpc_statd
 %%ETCDIR%%/ignore.d.server/rsnapshot
 %%ETCDIR%%/ignore.d.server/rsync
+%%ETCDIR%%/ignore.d.server/runuser
 %%ETCDIR%%/ignore.d.server/sa-exim
 %%ETCDIR%%/ignore.d.server/samba
 %%ETCDIR%%/ignore.d.server/saned
@@ -135,7 +138,9 @@
 %%ETCDIR%%/ignore.d.server/sympa
 %%ETCDIR%%/ignore.d.server/syslogd
 %%ETCDIR%%/ignore.d.server/systemd
+%%ETCDIR%%/ignore.d.server/systemd-journald
 %%ETCDIR%%/ignore.d.server/systemd-logind
+%%ETCDIR%%/ignore.d.server/systemd-networkd
 %%ETCDIR%%/ignore.d.server/systemd-timesyncd
 %%ETCDIR%%/ignore.d.server/teapop
 %%ETCDIR%%/ignore.d.server/telnetd
@@ -149,6 +154,7 @@
 %%ETCDIR%%/ignore.d.server/watchdog
 %%ETCDIR%%/ignore.d.server/wu-ftpd
 %%ETCDIR%%/ignore.d.server/xinetd
+%%ETCDIR%%/ignore.d.workstation/NetworkManager
 %%ETCDIR%%/ignore.d.workstation/automount
 %%ETCDIR%%/ignore.d.workstation/bind
 %%ETCDIR%%/ignore.d.workstation/bluetooth-alsa
@@ -176,6 +182,7 @@
 %%ETCDIR%%/ignore.d.workstation/ppp
 %%ETCDIR%%/ignore.d.workstation/proftpd
 %%ETCDIR%%/ignore.d.workstation/pump
+%%ETCDIR%%/ignore.d.workstation/rtkit-daemon
 %%ETCDIR%%/ignore.d.workstation/sendfile
 %%ETCDIR%%/ignore.d.workstation/slim
 %%ETCDIR%%/ignore.d.workstation/squid
diff --git a/security/nmap-devel/Makefile b/security/nmap-devel/Makefile
index 108bf3a940b9..4ae8f7fe5084 100644
--- a/security/nmap-devel/Makefile
+++ b/security/nmap-devel/Makefile
@@ -27,8 +27,8 @@ EXTRACT_AFTER_ARGS=	--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/mswin3
 			--no-same-owner --no-same-permissions
 
 USE_GITHUB=	yes
-GH_TAGNAME=	4ab57093d
-NMAP_COMMIT_DATE=	20250323
+GH_TAGNAME=	eddc779a0
+NMAP_COMMIT_DATE=	20250430
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--without-localdirs \
@@ -63,6 +63,10 @@ STRIP_FILES+=	nmap nping
 
 .include <bsd.port.options.mk>
 
+.if defined(SSL_DEFAULT) && ${SSL_DEFAULT} == libressl
+BROKEN=	error: OpenSSL-1.1.1 is the minimum supported version. LibreSSLis not supported
+.endif
+
 .if exists(/usr/lib/libibverbs.a)
 # Link with libibverbs is needed by static libpcap
 post-patch-PCAP-on:
diff --git a/security/nmap-devel/distinfo b/security/nmap-devel/distinfo
index e37f4264abf9..8098b0d35901 100644
--- a/security/nmap-devel/distinfo
+++ b/security/nmap-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743051294
-SHA256 (nmap-nmap-7.95.20250323-4ab57093d_GH0.tar.gz) = 14cfca5207b5770c8d7556561f29d2a4d76ec8a5639ee8f339e073f7003173c9
-SIZE (nmap-nmap-7.95.20250323-4ab57093d_GH0.tar.gz) = 15445384
+TIMESTAMP = 1746453321
+SHA256 (nmap-nmap-7.95.20250430-eddc779a0_GH0.tar.gz) = 4050bd2f708e25d8f3d95ad6dd74f5becf682d447e78f314cfdbb86fb56b00db
+SIZE (nmap-nmap-7.95.20250430-eddc779a0_GH0.tar.gz) = 15802043
diff --git a/security/nmap-devel/files/patch-libdnet-stripped_configure b/security/nmap-devel/files/patch-libdnet-stripped_configure
index 74170ec491a6..06520638f3ea 100644
--- a/security/nmap-devel/files/patch-libdnet-stripped_configure
+++ b/security/nmap-devel/files/patch-libdnet-stripped_configure
@@ -1,8 +1,8 @@
---- libdnet-stripped/configure.orig	2017-08-02 18:48:27 UTC
+--- libdnet-stripped/configure.orig	2025-04-30 19:58:18 UTC
 +++ libdnet-stripped/configure
-@@ -764,6 +764,9 @@ ac_includes_default="\
- #ifdef HAVE_STDINT_H
- # include <stdint.h>
+@@ -650,6 +650,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
  #endif
 +#ifdef HAVE_SYS_SOCKET_H
 +# include <sys/socket.h>
@@ -10,17 +10,3 @@
  #ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
-@@ -11828,11 +11831,8 @@ $as_echo_n "checking for Berkeley Packet Filter... " >
-     if ${ac_cv_dnet_bsd_bpf+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test -c /dev/bpf0 ; then
--	    ac_cv_dnet_bsd_bpf=yes
--	else
--	    ac_cv_dnet_bsd_bpf=no
--	fi
-+# PR ports/154353 : support building in FreeBSD jail
-+    ac_cv_dnet_bsd_bpf=yes
- fi
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dnet_bsd_bpf" >&5
diff --git a/security/nmap-devel/files/patch-libdnet-stripped_src_eth-bsd.c b/security/nmap-devel/files/patch-libdnet-stripped_src_eth-bsd.c
deleted file mode 100644
index 24d538b095f8..000000000000
--- a/security/nmap-devel/files/patch-libdnet-stripped_src_eth-bsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdnet-stripped/src/eth-bsd.c.orig	2009-11-09 04:49:32 UTC
-+++ libdnet-stripped/src/eth-bsd.c
-@@ -45,7 +45,7 @@ eth_open(const char *device)
- 	int i;
- 
- 	if ((e = calloc(1, sizeof(*e))) != NULL) {
--		for (i = 0; i < 128; i++) {
-+		for (i = 0; i < 1024; i++) {
- 			snprintf(file, sizeof(file), "/dev/bpf%d", i);
- 			/* This would be O_WRONLY, but Mac OS X 10.6 has a bug
- 			   where that prevents other users of the interface
diff --git a/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c b/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c
index 188374dfaaee..649d6bedb578 100644
--- a/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c
+++ b/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c
@@ -1,11 +1,11 @@
---- libdnet-stripped/src/intf.c.orig	2016-07-27 20:11:27 UTC
+--- libdnet-stripped/src/intf.c.orig	2025-04-30 19:58:18 UTC
 +++ libdnet-stripped/src/intf.c
-@@ -163,7 +163,7 @@ intf_open(void)
+@@ -178,7 +178,7 @@ intf_open(void)
  #if defined(SIOCGLIFCONF) || defined(SIOCGIFNETMASK_IN6) || defined(SIOCGIFNETMASK6)
  		if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
  #  ifdef EPROTONOSUPPORT
 -			if (errno != EPROTONOSUPPORT)
 +			if (errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT)
- #  endif
+ #endif
  				return (intf_close(intf));
  		}
diff --git a/security/nmap-devel/files/patch-liblua_Makefile b/security/nmap-devel/files/patch-liblua_Makefile
index 5ff1968b2350..d21c7f3f7947 100644
--- a/security/nmap-devel/files/patch-liblua_Makefile
+++ b/security/nmap-devel/files/patch-liblua_Makefile
@@ -1,8 +1,8 @@
---- liblua/Makefile.orig	2016-07-02 17:02:27 UTC
+--- liblua/Makefile.orig	2025-04-30 19:58:18 UTC
 +++ liblua/Makefile
-@@ -6,8 +6,8 @@
+@@ -6,8 +6,8 @@ PLAT= guess
  # Your platform. See PLATS for possible values.
- PLAT= none
+ PLAT= guess
  
 -CC= gcc -std=gnu99
 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
diff --git a/security/nmap-devel/files/patch-libpcap_Makefile.in b/security/nmap-devel/files/patch-libpcap_Makefile.in
index 91bae33073bf..60dcc4e7d17e 100644
--- a/security/nmap-devel/files/patch-libpcap_Makefile.in
+++ b/security/nmap-devel/files/patch-libpcap_Makefile.in
@@ -1,13 +1,11 @@
---- libpcap/Makefile.in.orig	2022-08-31 11:39:55.000000000 -0700
-+++ libpcap/Makefile.in	2022-09-28 08:38:02.131119000 -0700
-@@ -70,8 +70,8 @@
- EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@
+--- libpcap/Makefile.in.orig	2025-04-30 19:58:18 UTC
++++ libpcap/Makefile.in
+@@ -69,7 +69,7 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@
+ INSTALL_RPCAPD=@INSTALL_RPCAPD@
  
  # Standard CFLAGS for building members of a shared library
 -FULL_CFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
--CXXFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
 +FULL_CFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
-+CXXFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index c3b20bc1ae9d..8f320aecd5db 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -59,6 +59,10 @@ CONFIGURE_ARGS+=--without-localdirs \
 
 .include <bsd.port.options.mk>
 
+.if defined(SSL_DEFAULT) && ${SSL_DEFAULT} == libressl
+BROKEN=	error: OpenSSL-1.1.1 is the minimum supported version. LibreSSLis not supported
+.endif
+
 .if exists(/usr/lib/libibverbs.a)
 # Link with libibverbs is needed by static libpcap
 post-patch-PCAP-on:
diff --git a/security/p5-CryptX/Makefile b/security/p5-CryptX/Makefile
index d2814f1679b9..2461447203d5 100644
--- a/security/p5-CryptX/Makefile
+++ b/security/p5-CryptX/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	CryptX
-PORTVERSION=	0.085
+PORTVERSION=	0.086
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN/Crypt
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-CryptX/distinfo b/security/p5-CryptX/distinfo
index cfc957045e2e..008744f2ef04 100644
--- a/security/p5-CryptX/distinfo
+++ b/security/p5-CryptX/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739158542
-SHA256 (CryptX-0.085.tar.gz) = be817c6d254c236d2c42958a1bcba4b9dbee1855b7160fa2ecf9cf2934b33ffe
-SIZE (CryptX-0.085.tar.gz) = 1786764
+TIMESTAMP = 1746337696
+SHA256 (CryptX-0.086.tar.gz) = 98aab87a25fed222fb15370b60ced96ac1755b53221eb1d6eb6ea732a6ecfd37
+SIZE (CryptX-0.086.tar.gz) = 1793617
diff --git a/security/plasma6-kwallet-pam/Makefile b/security/plasma6-kwallet-pam/Makefile
index fc57101bf941..b4aad08a3703 100644
--- a/security/plasma6-kwallet-pam/Makefile
+++ b/security/plasma6-kwallet-pam/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kwallet-pam
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	security kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,6 +12,9 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 USES=		cmake kde:6 pkgconfig qt:6 tar:xz
 USE_KDE=	wallet \
 		ecm:build
-USE_QT=		base
+USE_QT=		# dummy
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,socat,nc,' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/security/plasma6-kwallet-pam/files/patch-pam__kwallet.c b/security/plasma6-kwallet-pam/files/patch-pam__kwallet.c
new file mode 100644
index 000000000000..84d1e9568396
--- /dev/null
+++ b/security/plasma6-kwallet-pam/files/patch-pam__kwallet.c
@@ -0,0 +1,12 @@
+---pam_kwallet.c	2019-08-28 10:45:20.619019000 +0200
+--- pam_kwallet.c.orig	2021-09-16 08:40:28 UTC
++++ pam_kwallet.c
+@@ -367,7 +367,7 @@ static void execute_kwallet(pam_handle_t *pamh, struct
+     struct sockaddr_un local = {};
+     local.sun_family = AF_UNIX;
+ 
+-    if (strlen(fullSocket) > sizeof(local.sun_path)) {
++    if (strlen(fullSocket) >= sizeof(local.sun_path)) {
+         syslog(LOG_ERR, "%s: socket path %s too long to open",
+                    logPrefix, fullSocket);
+         free(fullSocket);
diff --git a/security/plasma6-kwallet-pam/files/patch-pam__kwallet__init b/security/plasma6-kwallet-pam/files/patch-pam__kwallet__init
new file mode 100644
index 000000000000..ccc444322cbb
--- /dev/null
+++ b/security/plasma6-kwallet-pam/files/patch-pam__kwallet__init
@@ -0,0 +1,10 @@
+--- pam_kwallet_init.orig	2019-08-09 12:51:25.200806000 +0200
++++ pam_kwallet_init	2019-08-09 12:51:41.765221000 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+ if test -n "$PAM_KWALLET5_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
++    env | nc -U "$PAM_KWALLET5_LOGIN" | :
+ fi
+ 
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index f3573a70fcaa..08d78f689405 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}josepy>=1.13.0<2:security/py-josepy@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}josepy>=2.0.0:security/py-josepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=25.0.0,1:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>=0:devel/py-pyrfc3339@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.3,1:devel/py-pytz@${PY_FLAVOR} \
diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo
index d8896acf9e88..a2264f2b9272 100644
--- a/security/py-acme/distinfo
+++ b/security/py-acme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474694
-SHA256 (acme-3.2.0.tar.gz) = e11d0ccf43ec19244ada40df1dc4ca49c9ce407749f3771d2cefe0674e206d84
-SIZE (acme-3.2.0.tar.gz) = 92875
+TIMESTAMP = 1745167596
+SHA256 (acme-4.0.0.tar.gz) = 972d6e0b160000ae833aaa9619901896336e5dc7ca82003fa6ff465bafcbdf52
+SIZE (acme-4.0.0.tar.gz) = 91684
diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk
index 8f10d5788b75..07cd2b1dd4f4 100644
--- a/security/py-acme/version.mk
+++ b/security/py-acme/version.mk
@@ -1 +1 @@
-ACME_VERSION=	3.2.0
+ACME_VERSION=	4.0.0
diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo
index 8c8ef9b1b8e8..0e68734f0cac 100644
--- a/security/py-certbot-apache/distinfo
+++ b/security/py-certbot-apache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474695
-SHA256 (certbot_apache-3.2.0.tar.gz) = f453c09c8dc26ddbb70a191ec4b8953171dcbfbeb66cd8a9d83cd9420d61d195
-SIZE (certbot_apache-3.2.0.tar.gz) = 182997
+TIMESTAMP = 1745167597
+SHA256 (certbot_apache-4.0.0.tar.gz) = 507f9a336bd95c25548f449d8307eead6f875186a13049de173d6833371910a2
+SIZE (certbot_apache-4.0.0.tar.gz) = 183105
diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo
index 346195616e00..59543aa2a2d4 100644
--- a/security/py-certbot-dns-cloudflare/distinfo
+++ b/security/py-certbot-dns-cloudflare/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474695
-SHA256 (certbot_dns_cloudflare-3.2.0.tar.gz) = 845bf474d51d1c6fc7060591b23a61b1ec0ba72fb948457715abf6d59b513b18
-SIZE (certbot_dns_cloudflare-3.2.0.tar.gz) = 16405
+TIMESTAMP = 1745167597
+SHA256 (certbot_dns_cloudflare-4.0.0.tar.gz) = 3cc9752b1fbca8e16de8ccd23675d345505a529737855398db655b3413e711f8
+SIZE (certbot_dns_cloudflare-4.0.0.tar.gz) = 16391
diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo
index b39cdcf2ec80..524a886863d4 100644
--- a/security/py-certbot-dns-digitalocean/distinfo
+++ b/security/py-certbot-dns-digitalocean/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474695
-SHA256 (certbot_dns_digitalocean-3.2.0.tar.gz) = 47b206fffebb1ceb8a433141f37be65c85326f44e209c956aa579d34495c511f
-SIZE (certbot_dns_digitalocean-3.2.0.tar.gz) = 14579
+TIMESTAMP = 1745167598
+SHA256 (certbot_dns_digitalocean-4.0.0.tar.gz) = 00ce5b7c6fdcf360ab65558ec0e9c9a7247ddeb7ac8355bca3f5ca43496b0b87
+SIZE (certbot_dns_digitalocean-4.0.0.tar.gz) = 14571
diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo
index 9209da90d7f0..98efb380fd24 100644
--- a/security/py-certbot-dns-dnsimple/distinfo
+++ b/security/py-certbot-dns-dnsimple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474696
-SHA256 (certbot_dns_dnsimple-3.2.0.tar.gz) = 892a66cd9b9ff183f568f64e93fb6e5b8870251394643399f3359824d6bff39c
-SIZE (certbot_dns_dnsimple-3.2.0.tar.gz) = 11913
+TIMESTAMP = 1745167599
+SHA256 (certbot_dns_dnsimple-4.0.0.tar.gz) = 3dbe24c0cd5ada5c833d6de174c7ced9fd2a215547d18ad569ee4fe45aafb41b
+SIZE (certbot_dns_dnsimple-4.0.0.tar.gz) = 11885
diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo
index 128638e1b49b..792674798234 100644
--- a/security/py-certbot-dns-dnsmadeeasy/distinfo
+++ b/security/py-certbot-dns-dnsmadeeasy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474696
-SHA256 (certbot_dns_dnsmadeeasy-3.2.0.tar.gz) = 195ea30d0d29c224ecfb810780af4ccb10a853492c5eca094a228964e2ae9d54
-SIZE (certbot_dns_dnsmadeeasy-3.2.0.tar.gz) = 12094
+TIMESTAMP = 1745167599
+SHA256 (certbot_dns_dnsmadeeasy-4.0.0.tar.gz) = bd42dc87844d764c80e27221b81371670ccce65e564119fe1c99fafe7b0b441e
+SIZE (certbot_dns_dnsmadeeasy-4.0.0.tar.gz) = 12069
diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo
index f8527327fda2..d888dffea618 100644
--- a/security/py-certbot-dns-gehirn/distinfo
+++ b/security/py-certbot-dns-gehirn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474696
-SHA256 (certbot_dns_gehirn-3.2.0.tar.gz) = eaef650e266b5837ea3cca744823dc33874150168999fa1920df0881a2ea96ca
-SIZE (certbot_dns_gehirn-3.2.0.tar.gz) = 11995
+TIMESTAMP = 1745167600
+SHA256 (certbot_dns_gehirn-4.0.0.tar.gz) = 554c35ab3582b37d3fa628cd0c8186f0801b2925bf21fcb08c9db502b276471f
+SIZE (certbot_dns_gehirn-4.0.0.tar.gz) = 11966
diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo
index cbf914761802..ee603d75d370 100644
--- a/security/py-certbot-dns-google/distinfo
+++ b/security/py-certbot-dns-google/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474696
-SHA256 (certbot_dns_google-3.2.0.tar.gz) = 401d1a26a3e4fd29f5e3f0246fd62423c4c61c11c178958a431d55f08035c1b2
-SIZE (certbot_dns_google-3.2.0.tar.gz) = 25241
+TIMESTAMP = 1745167601
+SHA256 (certbot_dns_google-4.0.0.tar.gz) = 07f78292c7e9b76552a9eed5152c46b285acf3231338850195e895eb3a62a6d3
+SIZE (certbot_dns_google-4.0.0.tar.gz) = 25242
diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo
index 031140fc7de0..c20d0009f043 100644
--- a/security/py-certbot-dns-linode/distinfo
+++ b/security/py-certbot-dns-linode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474696
-SHA256 (certbot_dns_linode-3.2.0.tar.gz) = 51ae72543ff62ee9966f91b2fb73a2558bda06ba54808bb1397d0ffedf175d41
-SIZE (certbot_dns_linode-3.2.0.tar.gz) = 12171
+TIMESTAMP = 1745167601
+SHA256 (certbot_dns_linode-4.0.0.tar.gz) = a8487117a2c57606e9e554bf967058c598f6f559fdddd13a4c763c97416c999b
+SIZE (certbot_dns_linode-4.0.0.tar.gz) = 12181
diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo
index b2bd217ba83f..34df1fda5087 100644
--- a/security/py-certbot-dns-luadns/distinfo
+++ b/security/py-certbot-dns-luadns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474697
-SHA256 (certbot_dns_luadns-3.2.0.tar.gz) = 71c0e69e66d355213328d636c2885b516644b332e37c3e4b6188e10fca24eb23
-SIZE (certbot_dns_luadns-3.2.0.tar.gz) = 11912
+TIMESTAMP = 1745167602
+SHA256 (certbot_dns_luadns-4.0.0.tar.gz) = 2fb5bcd8eeada94f9ad9a5a213d0d90480071a5b5411c326e279fa352bc42ea6
+SIZE (certbot_dns_luadns-4.0.0.tar.gz) = 11888
diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo
index 2ebee2d2b432..351b033e7fe7 100644
--- a/security/py-certbot-dns-nsone/distinfo
+++ b/security/py-certbot-dns-nsone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474697
-SHA256 (certbot_dns_nsone-3.2.0.tar.gz) = 01a5df35ca17bb292ff7d064750545cc0e0fb535479361888131f3c44c8351ea
-SIZE (certbot_dns_nsone-3.2.0.tar.gz) = 11964
+TIMESTAMP = 1745167603
+SHA256 (certbot_dns_nsone-4.0.0.tar.gz) = c0bdd769e88147e7b45371c4892c68404a014aa9c4aa48a505f011a94b5e18eb
+SIZE (certbot_dns_nsone-4.0.0.tar.gz) = 11966
diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo
index e43985696d38..5b6e491f4289 100644
--- a/security/py-certbot-dns-ovh/distinfo
+++ b/security/py-certbot-dns-ovh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474697
-SHA256 (certbot_dns_ovh-3.2.0.tar.gz) = 86b0d1f16b1ae222e7555c9e94f89cb14d157b36d3bb0ae83b194332ccc35b50
-SIZE (certbot_dns_ovh-3.2.0.tar.gz) = 12360
+TIMESTAMP = 1745167603
+SHA256 (certbot_dns_ovh-4.0.0.tar.gz) = 54b1637572d2ac5bbe78bddc180966ad9c7d90bb6baf820c4e7da4c02e6f21ab
+SIZE (certbot_dns_ovh-4.0.0.tar.gz) = 12324
diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo
index 22bb756f3df4..107400db71f4 100644
--- a/security/py-certbot-dns-rfc2136/distinfo
+++ b/security/py-certbot-dns-rfc2136/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474697
-SHA256 (certbot_dns_rfc2136-3.2.0.tar.gz) = 0fff814398ed3437d6e72698d59d6a59a888611f5d02893e6ef317b4c0a5fe14
-SIZE (certbot_dns_rfc2136-3.2.0.tar.gz) = 16934
+TIMESTAMP = 1745167604
+SHA256 (certbot_dns_rfc2136-4.0.0.tar.gz) = 9d403198294c6e2e4bc9df6a5e82a4ed35ab3ffef534307f732e967fec3292d7
+SIZE (certbot_dns_rfc2136-4.0.0.tar.gz) = 16948
diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo
index ab62b1e39335..bf6178bc02fd 100644
--- a/security/py-certbot-dns-route53/distinfo
+++ b/security/py-certbot-dns-route53/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474698
-SHA256 (certbot_dns_route53-3.2.0.tar.gz) = a6186d32adee3f310b27b79beea1f04f61f55cf8c25fc7e0910ff8050f3dbf12
-SIZE (certbot_dns_route53-3.2.0.tar.gz) = 15664
+TIMESTAMP = 1745167605
+SHA256 (certbot_dns_route53-4.0.0.tar.gz) = 9b6397d5a0b3a23242346238cdf423b111b16114e59798638b47d1be9a84fc2e
+SIZE (certbot_dns_route53-4.0.0.tar.gz) = 15688
diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo
index bca270b56159..17fdf8768906 100644
--- a/security/py-certbot-dns-sakuracloud/distinfo
+++ b/security/py-certbot-dns-sakuracloud/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474698
-SHA256 (certbot_dns_sakuracloud-3.2.0.tar.gz) = 14e8a5f7b503b231998c448d189c1fbf021f7e05884725b5577dc88fd4d2a47d
-SIZE (certbot_dns_sakuracloud-3.2.0.tar.gz) = 11990
+TIMESTAMP = 1745167606
+SHA256 (certbot_dns_sakuracloud-4.0.0.tar.gz) = b658870de64ffab5f302575f391b8b37774a1cd5d294e8dbbe6db46a794bdd36
+SIZE (certbot_dns_sakuracloud-4.0.0.tar.gz) = 11967
diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo
index 3560896e1212..c4a16deb245b 100644
--- a/security/py-certbot-nginx/distinfo
+++ b/security/py-certbot-nginx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474698
-SHA256 (certbot_nginx-3.2.0.tar.gz) = 90d75ecb3da76e0aa063fbf73dee92558da2447da48ada6fa9d13cb18bffc272
-SIZE (certbot_nginx-3.2.0.tar.gz) = 79404
+TIMESTAMP = 1745167606
+SHA256 (certbot_nginx-4.0.0.tar.gz) = 4478c3e13e04b49f95675d83adaacdcf1356f8fac0824e236f893f2f5a1d991c
+SIZE (certbot_nginx-4.0.0.tar.gz) = 79653
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index 3c28f628cd7a..5e66ba0a7c54 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	certbot
 PORTVERSION=	${ACME_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI \
@@ -22,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${P
 		${PYTHON_PKGNAMEPREFIX}configargparse>=1.5.3:devel/py-configargparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=1.0.1:sysutils/py-distro@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}josepy>=1.13.0<2:security/py-josepy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}josepy>=2.0.0:security/py-josepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.4:devel/py-parsedatetime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>=0:devel/py-pyrfc3339@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.3,1:devel/py-pytz@${PY_FLAVOR} \
diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo
index 0f0402199bd5..05ecc6071f5a 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739474695
-SHA256 (certbot-3.2.0.tar.gz) = 2939a248def1a8bce661f8d92f9add975108741d7d96fcbfff2936031e72930c
-SIZE (certbot-3.2.0.tar.gz) = 439207
+TIMESTAMP = 1745167596
+SHA256 (certbot-4.0.0.tar.gz) = a867bfbb5126516c12d4c8a93909ef1e4d5309fc4e9f5b97b2d987b0ffd4bbe3
+SIZE (certbot-4.0.0.tar.gz) = 439556
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index eb08a64c5e1c..9d54b98375ce 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fail2ban
 DISTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/security/py-fail2ban/pkg-message b/security/py-fail2ban/pkg-message
index 0513a2e53aa9..9e4a5301d403 100644
--- a/security/py-fail2ban/pkg-message
+++ b/security/py-fail2ban/pkg-message
@@ -2,7 +2,7 @@
 { type: install
   message: <<EOM
 Please do not edit the fail2ban.conf, jail.conf, or any other 
-files in the distributen as they will be overwritten upon each 
+files in the distribution as they will be overwritten upon each 
 upgrade of the port. Instead, create new files named *.local e.g. 
 fail2ban.local or jail.local.
 
diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile
index 30eedf03f29c..c8b91ecf0550 100644
--- a/security/py-josepy/Makefile
+++ b/security/py-josepy/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	josepy
-PORTVERSION=	1.15.0
+PORTVERSION=	2.0.0
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,12 +13,8 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.8:devel/py-poetry-core@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=4.0:devel/py-coverage@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-cache>=1.0:devel/py-pytest-cache@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0.5:devel/py-pytest-flake8@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent cryptography pep517 pytest
diff --git a/security/py-josepy/distinfo b/security/py-josepy/distinfo
index 90ff0ae8452c..7b968e5afc63 100644
--- a/security/py-josepy/distinfo
+++ b/security/py-josepy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738090244
-SHA256 (josepy-1.15.0.tar.gz) = 46c9b13d1a5104ffbfa5853e555805c915dcde71c2cd91ce5386e84211281223
-SIZE (josepy-1.15.0.tar.gz) = 59310
+TIMESTAMP = 1745140066
+SHA256 (josepy-2.0.0.tar.gz) = e7d7acd2fe77435cda76092abe4950bb47b597243a8fb733088615fa6de9ec40
+SIZE (josepy-2.0.0.tar.gz) = 55767
diff --git a/security/rekor/Makefile b/security/rekor/Makefile
new file mode 100644
index 000000000000..fc47905048e5
--- /dev/null
+++ b/security/rekor/Makefile
@@ -0,0 +1,65 @@
+PORTNAME=	rekor
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.3.10
+CATEGORIES=	security
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Software Supply Chain Transparency Log ${${FLAVOR}_COMMENT}
+WWW=		https://www.sigstore.dev/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+FLAVORS=	client server
+FLAVOR?=	${FLAVORS:[1]}
+client_PKGNAMESUFFIX=	-client
+client_COMMENT=		(client only)
+client_PLIST=	${.CURDIR}/pkg-plist.client
+server_PKGNAMESUFFIX=	-server
+server_COMMENT=		(server only)
+server_PLIST=	${.CURDIR}/pkg-plist.server
+
+USES=		cpe go:1.24,modules
+CPE_VENDOR=	linuxfoundation
+.if ${FLAVOR} == server
+USE_RC_SUBR=	rekor
+.endif
+
+GO_MODULE=	github.com/sigstore/rekor
+.if ${FLAVOR} == client
+GO_TARGET=	./cmd/rekor-cli
+.elif ${FLAVOR} == server
+GO_TARGET=	./cmd/rekor-server \
+		./cmd/backfill-index \
+		./cmd/cleanup-index \
+		./cmd/copy-index
+.endif
+GO_BUILDFLAGS=	-ldflags="\
+	-X sigs.k8s.io/release-utils/version.gitVersion=$(DISTVERSION) \
+	-X sigs.k8s.io/release-utils/version.gitCommit=$(GIT_HASH) \
+	-X sigs.k8s.io/release-utils/version.gitTreeState=clean \
+	-X sigs.k8s.io/release-utils/version.buildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}}"
+
+.if ${FLAVOR} == server
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+.endif
+
+GIT_HASH=	4118a64b4b9c228a968b2d935a00807ca1b33aed
+
+.include <bsd.port.pre.mk>
+
+# Bring DISTINFO_FILE into scope so we can get the timestamp.
+SOURCE_DATE_EPOCH_CMD=	date -ur \
+			$$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
+			'+%Y-%m-%dT%H:%M:%SZ'
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rekor
+.if ${FLAVOR} == client
+	${INSTALL_DATA} ${WRKSRC}/config/rekor.yaml ${STAGEDIR}${PREFIX}/etc/rekor/rekor.yaml.sample
+.elif ${FLAVOR} == server
+	${INSTALL_DATA} ${WRKSRC}/rekor-server.yaml ${STAGEDIR}${PREFIX}/etc/rekor/rekor-server.yaml.sample
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/rekor/distinfo b/security/rekor/distinfo
new file mode 100644
index 000000000000..2c16c79e10d2
--- /dev/null
+++ b/security/rekor/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746289423
+SHA256 (go/security_rekor/rekor-v1.3.10/v1.3.10.mod) = 788c563e936db5816de40e7ff4a7f58ffa8d184fbe99842eec058da0d3b8f65d
+SIZE (go/security_rekor/rekor-v1.3.10/v1.3.10.mod) = 11137
+SHA256 (go/security_rekor/rekor-v1.3.10/v1.3.10.zip) = 6a65d2c266a8ac2351061716142c9cb373abec19c892d4b5c0c83e21bf2b3789
+SIZE (go/security_rekor/rekor-v1.3.10/v1.3.10.zip) = 1193215
diff --git a/security/rekor/files/rekor.in b/security/rekor/files/rekor.in
new file mode 100644
index 000000000000..a8f145e34d2c
--- /dev/null
+++ b/security/rekor/files/rekor.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# PROVIDE: rekor
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# rekor_enable (bool):	Set it to YES to enable rekor.
+#			Default is "NO".
+# rekor_user (user):	Set user to run rekor.
+#			Default is "rekor".
+# rekor_group (group):	Set group to run rekor.
+#			Default is "rekor".
+# rekor_config (file):	Set rekor config file.
+#			Default is "%%PREFIX%%/etc/rekor/rekor-server.yaml".
+
+. /etc/rc.subr
+
+name=rekor-server
+rcvar=rekor_enable
+
+load_rc_config $name
+
+: ${rekor_enable:="NO"}
+: ${rekor_user:="rekor"}
+: ${rekor_group:="rekor"}
+: ${rekor_config:="%%PREFIX%%/etc/rekor/rekor-server.yaml"}
+
+pidfile=/var/run/rekor.pid
+procname="%%PREFIX%%/bin/rekor-server"
+command="/usr/sbin/daemon"
+command_args="-f -t ${name} -p ${pidfile} ${procname} server -config=${rekor_config}"
+
+start_precmd=rekor_startprecmd
+required_files="$rekor_config"
+
+rekor_startprecmd()
+{
+        if [ ! -e ${pidfile} ]; then
+                install -o ${rekor_user} -g ${rekor_group} /dev/null ${pidfile};
+        fi
+}
+
+run_rc_command "$1"
diff --git a/security/rekor/pkg-descr b/security/rekor/pkg-descr
new file mode 100644
index 000000000000..3bcbf74dd9a5
--- /dev/null
+++ b/security/rekor/pkg-descr
@@ -0,0 +1,17 @@
+Rekor's goals are to provide an immutable tamper resistant ledger of
+metadata generated within a software projects supply chain. Rekor will
+enable software maintainers and build systems to record signed metadata
+to an immutable record.  Other parties can then query said metadata to
+enable them to make informed decisions on trust and non-repudiation of
+an object's lifecycle.
+
+The Rekor project provides a restful API based server for validation and
+a transparency log for storage. A CLI application is available to make
+and verify entries, query the transparency log for inclusion proof,
+integrity verification of the transparency log or retrieval of entries
+by either public key or artifact.
+
+Rekor fulfils the signature transparency role of sigstore's software
+signing infrastructure. However, Rekor can be run on its own and is
+designed to be extensible to working with different manifest schemas and
+PKI tooling.
diff --git a/security/rekor/pkg-plist.client b/security/rekor/pkg-plist.client
new file mode 100644
index 000000000000..e2d5c1237f63
--- /dev/null
+++ b/security/rekor/pkg-plist.client
@@ -0,0 +1,2 @@
+bin/rekor-cli
+@sample etc/rekor/rekor.yaml.sample
diff --git a/security/rekor/pkg-plist.server b/security/rekor/pkg-plist.server
new file mode 100644
index 000000000000..665e4deed750
--- /dev/null
+++ b/security/rekor/pkg-plist.server
@@ -0,0 +1,5 @@
+bin/backfill-index
+bin/cleanup-index
+bin/copy-index
+bin/rekor-server
+@sample etc/rekor/rekor-server.yaml.sample
diff --git a/security/rustscan/Makefile b/security/rustscan/Makefile
index 11b60b058345..8f1bffc91cd2 100644
--- a/security/rustscan/Makefile
+++ b/security/rustscan/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	2.4.1
 PORTREVISION=	1
 CATEGORIES=	security
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Faster Nmap Scanning with Rust
 WWW=		https://github.com/RustScan/RustScan
 
diff --git a/security/sequoia-sq/Makefile b/security/sequoia-sq/Makefile
index fce5bd9f0124..b3029705b52e 100644
--- a/security/sequoia-sq/Makefile
+++ b/security/sequoia-sq/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	sq
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.36.0
-PORTREVISION=	8
+DISTVERSION=	1.3.1
 CATEGORIES=	security
 PKGNAMEPREFIX=	sequoia-
 
@@ -13,8 +12,7 @@ LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	capnp:devel/capnproto
-LIB_DEPENDS=	libnettle.so:security/nettle \
-		libgmp.so:math/gmp
+LIB_DEPENDS=	libnettle.so:security/nettle
 
 USES=	cargo llvm sqlite ssl
 
diff --git a/security/sequoia-sq/Makefile.crates b/security/sequoia-sq/Makefile.crates
index b93616f08484..e024b9ff73bc 100644
--- a/security/sequoia-sq/Makefile.crates
+++ b/security/sequoia-sq/Makefile.crates
@@ -1,5 +1,5 @@
-CARGO_CRATES=	addr2line-0.21.0 \
-		adler-1.0.2 \
+CARGO_CRATES=	addr2line-0.24.2 \
+		adler2-2.0.0 \
 		aead-0.5.2 \
 		aes-0.8.4 \
 		aes-gcm-0.10.3 \
@@ -8,229 +8,253 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		aligned-0.4.2 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.5 \
-		anstream-0.6.14 \
-		anstyle-1.0.7 \
-		anstyle-parse-0.2.4 \
-		anstyle-query-1.0.3 \
-		anstyle-wincon-3.0.3 \
-		anyhow-1.0.76 \
+		anstream-0.6.18 \
+		anstyle-1.0.10 \
+		anstyle-parse-0.2.6 \
+		anstyle-query-1.1.2 \
+		anstyle-wincon-3.0.7 \
+		anyhow-1.0.97 \
+		argon2-0.5.3 \
+		arraydeque-0.5.1 \
 		as-slice-0.2.1 \
 		ascii-canvas-3.0.0 \
-		assert_cmd-2.0.13 \
-		async-trait-0.1.80 \
-		autocfg-1.3.0 \
-		backtrace-0.3.71 \
+		ascii-canvas-4.0.0 \
+		assert_cmd-2.0.16 \
+		async-generic-1.1.2 \
+		async-trait-0.1.87 \
+		atomic-waker-1.1.2 \
+		autocfg-1.4.0 \
+		backtrace-0.3.74 \
 		base16ct-0.2.0 \
-		base64-0.21.7 \
 		base64-0.22.1 \
 		base64ct-1.6.0 \
-		bindgen-0.68.1 \
+		bindgen-0.70.1 \
 		bit-set-0.5.3 \
+		bit-set-0.8.0 \
 		bit-vec-0.6.3 \
-		bitflags-1.3.2 \
-		bitflags-2.5.0 \
+		bit-vec-0.8.0 \
+		bitflags-2.9.0 \
+		blake2-0.10.6 \
 		block-buffer-0.10.4 \
 		block-padding-0.3.3 \
 		blowfish-0.9.1 \
-		botan-0.10.7 \
-		botan-sys-0.10.5 \
-		bstr-1.9.1 \
-		buffered-reader-1.3.1 \
-		bumpalo-3.16.0 \
+		botan-0.11.1 \
+		botan-sys-0.11.1 \
+		bstr-1.11.3 \
+		buffered-reader-1.4.0 \
+		bumpalo-3.17.0 \
 		byteorder-1.5.0 \
-		bytes-1.6.0 \
-		bzip2-0.4.4 \
-		bzip2-sys-0.1.11+1.0.8 \
+		bytes-1.10.0 \
+		bzip2-0.5.2 \
+		bzip2-sys-0.1.13+1.0.8 \
 		camellia-0.1.0 \
-		capnp-0.19.5 \
-		capnp-futures-0.19.0 \
-		capnp-rpc-0.19.1 \
+		capnp-0.19.8 \
+		capnp-futures-0.19.1 \
+		capnp-rpc-0.19.5 \
 		capnpc-0.19.0 \
 		cast5-0.11.1 \
-		cc-1.0.98 \
+		cc-1.2.16 \
 		cexpr-0.6.0 \
 		cfb-mode-0.8.2 \
 		cfg-if-1.0.0 \
-		chrono-0.4.38 \
+		cfg_aliases-0.2.1 \
+		chrono-0.4.40 \
 		cipher-0.4.4 \
-		clang-sys-1.7.0 \
-		clap-4.4.18 \
-		clap_builder-4.4.18 \
-		clap_complete-4.4.10 \
-		clap_derive-4.4.7 \
-		clap_lex-0.6.0 \
+		clang-sys-1.8.1 \
+		clap-4.5.31 \
+		clap_builder-4.5.31 \
+		clap_complete-4.5.46 \
+		clap_derive-4.5.28 \
+		clap_lex-0.7.4 \
 		cmac-0.7.2 \
-		colorchoice-1.0.1 \
-		console-0.15.8 \
+		colorchoice-1.0.3 \
+		console-0.15.11 \
 		const-oid-0.9.6 \
 		core-foundation-0.9.4 \
-		core-foundation-sys-0.8.6 \
-		cpufeatures-0.2.12 \
+		core-foundation-sys-0.8.7 \
+		cpufeatures-0.2.17 \
 		crc32fast-1.4.2 \
 		crossbeam-0.8.4 \
-		crossbeam-channel-0.5.13 \
-		crossbeam-deque-0.8.5 \
+		crossbeam-channel-0.5.14 \
+		crossbeam-deque-0.8.6 \
 		crossbeam-epoch-0.9.18 \
-		crossbeam-queue-0.3.11 \
-		crossbeam-utils-0.8.20 \
-		crunchy-0.2.2 \
+		crossbeam-queue-0.3.12 \
+		crossbeam-utils-0.8.21 \
+		crunchy-0.2.3 \
 		crypto-bigint-0.5.5 \
 		crypto-common-0.1.6 \
-		ctor-0.2.8 \
+		ctor-0.2.9 \
 		ctr-0.9.2 \
-		curve25519-dalek-4.1.2 \
+		culpa-1.0.2 \
+		culpa-macros-1.0.2 \
+		curve25519-dalek-4.1.3 \
 		curve25519-dalek-derive-0.1.1 \
 		cvt-0.1.2 \
-		data-encoding-2.6.0 \
+		data-encoding-2.8.0 \
 		dbl-0.3.2 \
 		der-0.7.9 \
 		deranged-0.3.11 \
 		des-0.8.1 \
+		descape-2.0.3 \
 		deunicode-1.6.0 \
 		difflib-0.4.0 \
 		digest-0.10.7 \
-		dircpy-0.3.16 \
 		directories-5.0.1 \
 		dirs-5.0.1 \
+		dirs-6.0.0 \
 		dirs-next-2.0.0 \
 		dirs-sys-0.4.1 \
+		dirs-sys-0.5.0 \
 		dirs-sys-next-0.1.2 \
+		displaydoc-0.2.5 \
 		doc-comment-0.3.3 \
-		dot-writer-0.1.3 \
 		dsa-0.6.3 \
-		dyn-clone-1.0.17 \
+		dyn-clone-1.0.18 \
 		eax-0.5.0 \
 		ecb-0.1.2 \
 		ecdsa-0.16.9 \
 		ed25519-2.2.3 \
 		ed25519-dalek-2.1.1 \
-		either-1.12.0 \
+		either-1.14.0 \
 		elliptic-curve-0.13.8 \
 		embedded-io-0.6.1 \
 		ena-0.14.3 \
-		encode_unicode-0.3.6 \
-		encoding_rs-0.8.34 \
+		encode_unicode-1.0.0 \
+		encoding_rs-0.8.35 \
 		endian-type-0.1.2 \
-		enum-as-inner-0.6.0 \
-		enumber-0.3.1 \
-		env_logger-0.10.2 \
-		equivalent-1.0.1 \
-		errno-0.3.9 \
+		enum-as-inner-0.6.1 \
+		env_filter-0.1.3 \
+		env_logger-0.11.6 \
+		equivalent-1.0.2 \
+		errno-0.3.10 \
 		fallible-iterator-0.3.0 \
 		fallible-streaming-iterator-0.1.9 \
-		fastrand-2.1.0 \
+		fastrand-2.3.0 \
 		fd-lock-4.0.2 \
-		fehler-1.0.0 \
-		fehler-macros-1.0.0 \
 		ff-0.13.0 \
 		fiat-crypto-0.2.9 \
-		file_diff-1.0.0 \
-		filetime-0.2.23 \
+		filetime-0.2.25 \
 		fixedbitset-0.4.2 \
-		flate2-1.0.30 \
-		float-cmp-0.9.0 \
+		fixedbitset-0.5.7 \
+		flate2-1.1.0 \
+		float-cmp-0.10.0 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.2.1 \
 		fs2-0.4.3 \
-		fs_at-0.1.10 \
-		futures-0.3.30 \
-		futures-channel-0.3.30 \
-		futures-core-0.3.30 \
-		futures-executor-0.3.30 \
-		futures-io-0.3.30 \
-		futures-macro-0.3.30 \
-		futures-sink-0.3.30 \
-		futures-task-0.3.30 \
-		futures-util-0.3.30 \
+		fs_at-0.2.1 \
+		fs_extra-1.3.0 \
+		futures-0.3.31 \
+		futures-channel-0.3.31 \
+		futures-core-0.3.31 \
+		futures-executor-0.3.31 \
+		futures-io-0.3.31 \
+		futures-macro-0.3.31 \
+		futures-sink-0.3.31 \
+		futures-task-0.3.31 \
+		futures-util-0.3.31 \
 		generator-0.7.5 \
 		generic-array-0.14.7 \
-		gethostname-0.4.3 \
+		gethostname-0.5.0 \
 		getopts-0.2.21 \
 		getrandom-0.2.15 \
+		getrandom-0.3.1 \
 		ghash-0.5.1 \
-		gimli-0.28.1 \
-		git-testament-0.2.5 \
-		git-testament-derive-0.2.0 \
-		glob-0.3.1 \
-		globset-0.4.14 \
-		globwalk-0.8.1 \
+		gimli-0.31.1 \
+		glob-0.3.2 \
+		globset-0.4.16 \
+		globwalk-0.9.1 \
 		group-0.13.0 \
-		h2-0.3.26 \
-		hashbrown-0.12.3 \
+		h2-0.4.8 \
 		hashbrown-0.14.5 \
+		hashbrown-0.15.2 \
 		hashlink-0.9.1 \
-		heck-0.4.1 \
+		heck-0.5.0 \
 		hermit-abi-0.3.9 \
-		hickory-client-0.24.1 \
-		hickory-proto-0.24.1 \
-		hickory-resolver-0.24.1 \
+		hickory-client-0.24.4 \
+		hickory-proto-0.24.4 \
+		hickory-resolver-0.24.4 \
 		hkdf-0.12.4 \
 		hmac-0.12.1 \
+		home-0.5.9 \
 		hostname-0.3.1 \
 		html-escape-0.2.13 \
-		http-0.2.12 \
-		http-body-0.4.6 \
-		httparse-1.8.0 \
-		httpdate-1.0.3 \
+		http-1.2.0 \
+		http-body-1.0.1 \
+		http-body-util-0.1.2 \
+		httparse-1.10.0 \
 		humansize-2.1.3 \
 		humantime-2.1.0 \
-		hyper-0.14.28 \
-		hyper-tls-0.5.0 \
-		iana-time-zone-0.1.60 \
+		hyper-1.6.0 \
+		hyper-rustls-0.27.5 \
+		hyper-tls-0.6.0 \
+		hyper-util-0.1.10 \
+		iana-time-zone-0.1.61 \
 		iana-time-zone-haiku-0.1.2 \
+		icu_collections-1.5.0 \
+		icu_locid-1.5.0 \
+		icu_locid_transform-1.5.0 \
+		icu_locid_transform_data-1.5.0 \
+		icu_normalizer-1.5.0 \
+		icu_normalizer_data-1.5.0 \
+		icu_properties-1.5.1 \
+		icu_properties_data-1.5.0 \
+		icu_provider-1.5.0 \
+		icu_provider_macros-1.5.0 \
 		idea-0.5.1 \
-		idna-0.4.0 \
-		idna-0.5.0 \
-		ignore-0.4.22 \
-		indexmap-1.9.3 \
-		indexmap-2.2.6 \
-		indicatif-0.17.8 \
-		inout-0.1.3 \
-		instant-0.1.13 \
+		idna-1.0.3 \
+		idna_adapter-1.2.0 \
+		ignore-0.4.23 \
+		indexmap-2.7.1 \
+		indicatif-0.17.11 \
+		inout-0.1.4 \
 		ipconfig-0.3.2 \
-		ipnet-2.9.0 \
-		is-terminal-0.4.12 \
-		is_terminal_polyfill-1.70.0 \
+		ipnet-2.11.0 \
+		is_terminal_polyfill-1.70.1 \
 		itertools-0.11.0 \
-		itoa-1.0.11 \
-		js-sys-0.3.69 \
-		jwalk-0.8.1 \
+		itertools-0.13.0 \
+		itertools-0.14.0 \
+		itoa-1.0.14 \
+		js-sys-0.3.77 \
+		keccak-0.1.5 \
 		lalrpop-0.20.2 \
+		lalrpop-0.22.1 \
 		lalrpop-util-0.20.2 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		libc-0.2.155 \
-		libloading-0.8.3 \
-		libm-0.2.8 \
+		lalrpop-util-0.22.1 \
+		lazy_static-1.5.0 \
+		libc-0.2.170 \
+		libloading-0.8.6 \
+		libm-0.2.11 \
 		libredox-0.1.3 \
 		libsqlite3-sys-0.28.0 \
 		line-col-0.2.1 \
 		linked-hash-map-0.5.6 \
-		linux-raw-sys-0.4.14 \
+		linux-raw-sys-0.4.15 \
+		litemap-0.7.3 \
 		lock_api-0.4.12 \
-		log-0.4.21 \
+		log-0.4.26 \
 		loom-0.5.6 \
 		lru-cache-0.1.2 \
+		marked-yaml-0.7.2 \
 		match_cfg-0.1.0 \
 		matchers-0.1.0 \
 		md-5-0.10.6 \
-		memchr-2.7.2 \
-		memsec-0.6.3 \
+		memchr-2.7.4 \
+		memsec-0.7.0 \
 		mime-0.3.17 \
 		minimal-lexical-0.2.1 \
-		miniz_oxide-0.7.3 \
-		mio-0.8.11 \
-		native-tls-0.2.11 \
+		miniz_oxide-0.8.5 \
+		mio-1.0.3 \
+		native-tls-0.2.13 \
 		nettle-7.4.0 \
-		nettle-sys-2.3.0 \
+		nettle-sys-2.3.1 \
 		new_debug_unreachable-1.0.6 \
 		nibble_vec-0.1.0 \
-		nix-0.26.4 \
+		nix-0.29.0 \
 		nom-7.1.3 \
 		normalize-line-endings-0.3.0 \
-		normpath-1.1.1 \
+		normpath-1.3.0 \
 		nu-ansi-term-0.46.0 \
 		num-bigint-dig-0.8.4 \
 		num-conv-0.1.0 \
@@ -239,245 +263,270 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		num-traits-0.2.19 \
 		num_cpus-1.16.0 \
 		number_prefix-0.4.0 \
-		object-0.32.2 \
-		once_cell-1.19.0 \
+		object-0.36.7 \
+		ocb3-0.1.0 \
+		once_cell-1.20.3 \
 		opaque-debug-0.3.1 \
-		openpgp-cert-d-0.3.2 \
-		openssl-0.10.67 \
+		openpgp-cert-d-0.3.4 \
+		openssl-0.10.72 \
 		openssl-macros-0.1.1 \
-		openssl-probe-0.1.5 \
-		openssl-sys-0.9.104 \
+		openssl-probe-0.1.6 \
+		openssl-sys-0.9.108 \
 		option-ext-0.2.0 \
 		overload-0.1.1 \
 		p256-0.13.2 \
-		parking_lot-0.12.2 \
+		p384-0.13.1 \
+		p521-0.13.3 \
+		parking_lot-0.12.3 \
 		parking_lot_core-0.9.10 \
+		password-hash-0.5.0 \
 		paste-1.0.15 \
-		peeking_take_while-0.1.2 \
 		pem-rfc7468-0.7.0 \
 		percent-encoding-2.3.1 \
-		pest-2.7.10 \
-		pest_derive-2.7.10 \
-		pest_generator-2.7.10 \
-		pest_meta-2.7.10 \
+		pest-2.7.15 \
+		pest_derive-2.7.15 \
+		pest_generator-2.7.15 \
+		pest_meta-2.7.15 \
 		petgraph-0.6.5 \
-		phf_shared-0.10.0 \
-		pikchr-0.1.3 \
-		pin-project-lite-0.2.14 \
+		petgraph-0.7.1 \
+		phf_shared-0.11.3 \
+		pikchr-0.1.4 \
+		pin-project-lite-0.2.16 \
 		pin-utils-0.1.0 \
 		pkcs1-0.7.5 \
 		pkcs8-0.10.2 \
-		pkg-config-0.3.30 \
-		platforms-3.4.0 \
+		pkg-config-0.3.32 \
 		polyval-0.6.2 \
-		portable-atomic-1.6.0 \
+		portable-atomic-1.11.0 \
 		powerfmt-0.2.0 \
-		ppv-lite86-0.2.17 \
+		ppv-lite86-0.2.20 \
 		precomputed-hash-0.1.1 \
-		predicates-3.1.0 \
-		predicates-core-1.0.6 \
-		predicates-tree-1.0.9 \
+		predicates-3.1.3 \
+		predicates-core-1.0.9 \
+		predicates-tree-1.0.12 \
 		primeorder-0.13.6 \
-		proc-macro2-1.0.83 \
-		pulldown-cmark-0.9.6 \
+		proc-macro2-1.0.94 \
+		pulldown-cmark-0.12.2 \
+		pulldown-cmark-escape-0.11.0 \
 		quick-error-1.2.3 \
-		quote-1.0.36 \
+		quote-1.0.39 \
 		radix_trie-0.2.1 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
 		rayon-1.10.0 \
 		rayon-core-1.12.1 \
-		redox_syscall-0.4.1 \
-		redox_syscall-0.5.1 \
-		redox_users-0.4.5 \
-		regex-1.10.4 \
+		redox_syscall-0.5.9 \
+		redox_users-0.4.6 \
+		redox_users-0.5.0 \
+		regex-1.11.1 \
 		regex-automata-0.1.10 \
-		regex-automata-0.4.6 \
+		regex-automata-0.4.9 \
 		regex-syntax-0.6.29 \
-		regex-syntax-0.8.3 \
-		remove_dir_all-0.8.2 \
-		reqwest-0.11.27 \
+		regex-syntax-0.8.5 \
+		remove_dir_all-1.0.0 \
+		reqwest-0.12.12 \
 		resolv-conf-0.7.0 \
 		rfc6979-0.4.0 \
+		ring-0.17.11 \
 		ripemd-0.1.3 \
-		roadmap-0.5.0 \
-		roff-0.2.1 \
+		roadmap-0.7.0 \
+		roff-0.2.2 \
 		rpassword-7.3.1 \
-		rsa-0.9.6 \
+		rsa-0.9.7 \
 		rtoolbox-0.0.2 \
 		rusqlite-0.31.0 \
 		rustc-demangle-0.1.24 \
 		rustc-hash-1.1.0 \
-		rustc_version-0.4.0 \
-		rustix-0.38.34 \
-		rustls-pemfile-1.0.4 \
-		rustversion-1.0.17 \
-		ryu-1.0.18 \
+		rustc_version-0.4.1 \
+		rustix-0.38.44 \
+		rustls-0.23.23 \
+		rustls-pemfile-2.2.0 \
+		rustls-pki-types-1.11.0 \
+		rustls-webpki-0.102.8 \
+		rustversion-1.0.19 \
+		ryu-1.0.19 \
 		same-file-1.0.6 \
-		schannel-0.1.23 \
+		schannel-0.1.27 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.2.0 \
 		sec1-0.7.3 \
-		security-framework-2.11.0 \
-		security-framework-sys-2.11.0 \
-		semver-1.0.23 \
-		sequoia-autocrypt-0.25.1 \
-		sequoia-cert-store-0.5.3 \
+		security-framework-2.11.1 \
+		security-framework-sys-2.14.0 \
+		semver-1.0.25 \
+		sequoia-autocrypt-0.26.0 \
+		sequoia-cert-store-0.7.0 \
 		sequoia-directories-0.1.0 \
-		sequoia-gpg-agent-0.4.0 \
-		sequoia-ipc-0.35.0 \
-		sequoia-keystore-0.4.1 \
-		sequoia-keystore-backend-0.4.0 \
-		sequoia-keystore-gpg-agent-0.2.0 \
-		sequoia-keystore-softkeys-0.4.1 \
-		sequoia-net-0.28.0 \
-		sequoia-openpgp-1.20.0 \
-		sequoia-policy-config-0.6.0 \
-		sequoia-wot-0.11.0 \
-		serde-1.0.202 \
-		serde-aux-4.5.0 \
-		serde_derive-1.0.202 \
-		serde_json-1.0.117 \
+		sequoia-gpg-agent-0.6.0 \
+		sequoia-ipc-0.36.0 \
+		sequoia-keystore-0.7.0 \
+		sequoia-keystore-backend-0.7.0 \
+		sequoia-keystore-gpg-agent-0.5.0 \
+		sequoia-keystore-softkeys-0.7.0 \
+		sequoia-man-0.3.1 \
+		sequoia-net-0.30.0 \
+		sequoia-openpgp-2.0.0 \
+		sequoia-policy-config-0.8.0 \
+		sequoia-wot-0.14.0 \
+		serde-1.0.218 \
+		serde_derive-1.0.218 \
+		serde_json-1.0.140 \
+		serde_path_to_error-0.1.17 \
 		serde_urlencoded-0.7.1 \
-		serde_yaml-0.8.26 \
-		serde_yaml-0.9.34+deprecated \
 		sha1collisiondetection-0.3.4 \
 		sha2-0.10.8 \
+		sha3-0.10.8 \
 		sharded-slab-0.1.7 \
 		shell-words-1.1.0 \
 		shlex-1.3.0 \
 		signature-2.2.0 \
-		siphasher-0.3.11 \
+		siphasher-1.0.1 \
 		slab-0.4.9 \
-		slug-0.1.5 \
-		smallvec-1.13.2 \
+		slug-0.1.6 \
+		smallvec-1.14.0 \
 		smawk-0.3.2 \
-		socket2-0.5.7 \
-		spin-0.5.2 \
+		socket2-0.5.8 \
+		spin-0.9.8 \
 		spki-0.7.3 \
 		stable_deref_trait-1.2.0 \
-		state-0.5.3 \
+		state-0.6.0 \
 		stfu8-0.2.7 \
-		string_cache-0.8.7 \
-		strsim-0.10.0 \
-		subplot-0.9.0 \
-		subplot-build-0.9.0 \
-		subplotlib-0.9.0 \
-		subplotlib-derive-0.9.0 \
-		subtle-2.5.0 \
-		syn-1.0.109 \
-		syn-2.0.65 \
-		sync_wrapper-0.1.2 \
-		system-configuration-0.5.1 \
-		system-configuration-sys-0.5.0 \
-		tempfile-3.10.1 \
-		tempfile-fast-0.3.4 \
-		tera-1.19.1 \
+		string_cache-0.8.8 \
+		strsim-0.11.1 \
+		subplot-0.12.0 \
+		subplot-build-0.12.0 \
+		subplotlib-0.12.0 \
+		subplotlib-derive-0.12.0 \
+		subtle-2.6.1 \
+		syn-2.0.99 \
+		sync_wrapper-1.0.2 \
+		synstructure-0.13.1 \
+		system-configuration-0.6.1 \
+		system-configuration-sys-0.6.0 \
+		tempfile-3.17.1 \
+		tera-1.20.0 \
 		term-0.7.0 \
+		term-1.0.1 \
 		termcolor-1.4.1 \
-		terminal_size-0.3.0 \
-		termtree-0.4.1 \
-		textwrap-0.15.2 \
-		thiserror-1.0.61 \
-		thiserror-impl-1.0.61 \
+		terminal_size-0.4.1 \
+		termtree-0.5.1 \
+		textwrap-0.16.1 \
+		thiserror-1.0.69 \
+		thiserror-2.0.12 \
+		thiserror-impl-1.0.69 \
+		thiserror-impl-2.0.12 \
 		thread_local-1.1.8 \
-		time-0.3.36 \
+		time-0.3.37 \
 		time-core-0.1.2 \
-		time-macros-0.2.18 \
+		time-macros-0.2.19 \
 		tiny-keccak-2.0.2 \
-		tinyvec-1.6.0 \
+		tinystr-0.7.6 \
+		tinyvec-1.9.0 \
 		tinyvec_macros-0.1.1 \
-		tokio-1.37.0 \
-		tokio-macros-2.2.0 \
+		tokio-1.43.0 \
+		tokio-macros-2.5.0 \
 		tokio-native-tls-0.3.1 \
-		tokio-util-0.7.11 \
+		tokio-rustls-0.26.2 \
+		tokio-util-0.7.13 \
 		toml-0.5.11 \
-		tower-service-0.3.2 \
-		tracing-0.1.40 \
-		tracing-attributes-0.1.27 \
-		tracing-core-0.1.32 \
+		toml_datetime-0.6.8 \
+		toml_edit-0.22.24 \
+		tower-0.5.2 \
+		tower-layer-0.3.3 \
+		tower-service-0.3.3 \
+		tracing-0.1.41 \
+		tracing-attributes-0.1.28 \
+		tracing-core-0.1.33 \
 		tracing-log-0.2.0 \
-		tracing-subscriber-0.3.18 \
+		tracing-subscriber-0.3.19 \
 		try-lock-0.2.5 \
 		twofish-0.7.1 \
-		typenum-1.17.0 \
-		ucd-trie-0.1.6 \
-		unescape-0.1.0 \
+		typenum-1.18.0 \
+		ucd-trie-0.1.7 \
 		unic-char-property-0.9.0 \
 		unic-char-range-0.9.0 \
 		unic-common-0.9.0 \
 		unic-segment-0.9.0 \
 		unic-ucd-segment-0.9.0 \
 		unic-ucd-version-0.9.0 \
-		unicase-2.7.0 \
-		unicode-bidi-0.3.15 \
-		unicode-ident-1.0.12 \
+		unicase-2.8.1 \
+		unicode-ident-1.0.17 \
 		unicode-linebreak-0.1.5 \
-		unicode-normalization-0.1.23 \
-		unicode-width-0.1.12 \
-		unicode-xid-0.2.4 \
+		unicode-width-0.1.14 \
+		unicode-width-0.2.0 \
+		unicode-xid-0.2.6 \
 		universal-hash-0.5.1 \
-		unsafe-libyaml-0.2.11 \
-		url-2.5.0 \
+		untrusted-0.9.0 \
+		url-2.5.4 \
+		utf16_iter-1.0.5 \
 		utf8-width-0.1.7 \
-		utf8parse-0.2.1 \
-		valuable-0.1.0 \
+		utf8_iter-1.0.4 \
+		utf8parse-0.2.2 \
+		valuable-0.1.1 \
 		vcpkg-0.2.15 \
-		version_check-0.9.4 \
-		wait-timeout-0.2.0 \
+		version_check-0.9.5 \
+		wait-timeout-0.2.1 \
 		walkdir-2.5.0 \
 		want-0.3.1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.92 \
-		wasm-bindgen-backend-0.2.92 \
-		wasm-bindgen-futures-0.4.42 \
-		wasm-bindgen-macro-0.2.92 \
-		wasm-bindgen-macro-support-0.2.92 \
-		wasm-bindgen-shared-0.2.92 \
-		web-sys-0.3.69 \
+		wasi-0.13.3+wasi-0.2.2 \
+		wasm-bindgen-0.2.100 \
+		wasm-bindgen-backend-0.2.100 \
+		wasm-bindgen-futures-0.4.50 \
+		wasm-bindgen-macro-0.2.100 \
+		wasm-bindgen-macro-support-0.2.100 \
+		wasm-bindgen-shared-0.2.100 \
+		wasm-streams-0.4.2 \
+		web-sys-0.3.77 \
+		web-time-1.1.0 \
 		widestring-1.1.0 \
 		win-crypto-ng-0.5.1 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.8 \
+		winapi-util-0.1.9 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-0.48.0 \
 		windows-core-0.52.0 \
-		windows-sys-0.45.0 \
+		windows-link-0.1.0 \
+		windows-registry-0.2.0 \
+		windows-result-0.2.0 \
+		windows-strings-0.1.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
-		windows-targets-0.42.2 \
+		windows-sys-0.59.0 \
 		windows-targets-0.48.5 \
-		windows-targets-0.52.5 \
-		windows_aarch64_gnullvm-0.42.2 \
+		windows-targets-0.52.6 \
 		windows_aarch64_gnullvm-0.48.5 \
-		windows_aarch64_gnullvm-0.52.5 \
-		windows_aarch64_msvc-0.42.2 \
+		windows_aarch64_gnullvm-0.52.6 \
 		windows_aarch64_msvc-0.48.5 \
-		windows_aarch64_msvc-0.52.5 \
-		windows_i686_gnu-0.42.2 \
+		windows_aarch64_msvc-0.52.6 \
 		windows_i686_gnu-0.48.5 \
-		windows_i686_gnu-0.52.5 \
-		windows_i686_gnullvm-0.52.5 \
-		windows_i686_msvc-0.42.2 \
+		windows_i686_gnu-0.52.6 \
+		windows_i686_gnullvm-0.52.6 \
 		windows_i686_msvc-0.48.5 \
-		windows_i686_msvc-0.52.5 \
-		windows_x86_64_gnu-0.42.2 \
+		windows_i686_msvc-0.52.6 \
 		windows_x86_64_gnu-0.48.5 \
-		windows_x86_64_gnu-0.52.5 \
-		windows_x86_64_gnullvm-0.42.2 \
+		windows_x86_64_gnu-0.52.6 \
 		windows_x86_64_gnullvm-0.48.5 \
-		windows_x86_64_gnullvm-0.52.5 \
-		windows_x86_64_msvc-0.42.2 \
+		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_msvc-0.48.5 \
-		windows_x86_64_msvc-0.52.5 \
+		windows_x86_64_msvc-0.52.6 \
+		winnow-0.7.3 \
 		winreg-0.50.0 \
+		wit-bindgen-rt-0.33.0 \
+		write16-1.0.0 \
+		writeable-0.5.5 \
 		x25519-dalek-2.0.1 \
-		xxhash-rust-0.8.10 \
-		yaml-rust-0.4.5 \
+		xxhash-rust-0.8.15 \
+		yaml-rust2-0.9.0 \
+		yoke-0.7.5 \
+		yoke-derive-0.7.5 \
 		z-base-32-0.1.4 \
-		zerocopy-0.7.34 \
-		zerocopy-derive-0.7.34 \
-		zeroize-1.7.0 \
-		zeroize_derive-1.4.2
+		zerocopy-0.7.35 \
+		zerocopy-derive-0.7.35 \
+		zerofrom-0.1.4 \
+		zerofrom-derive-0.1.6 \
+		zeroize-1.8.1 \
+		zeroize_derive-1.4.2 \
+		zerovec-0.10.4 \
+		zerovec-derive-0.10.3
diff --git a/security/sequoia-sq/distinfo b/security/sequoia-sq/distinfo
index c478c3cc7f18..e61f47d57d32 100644
--- a/security/sequoia-sq/distinfo
+++ b/security/sequoia-sq/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1729089540
-SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
-SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
-SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
-SIZE (rust/crates/adler-1.0.2.crate) = 12778
+TIMESTAMP = 1746324651
+SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
+SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
+SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
+SIZE (rust/crates/adler2-2.0.0.crate) = 13529
 SHA256 (rust/crates/aead-0.5.2.crate) = d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0
 SIZE (rust/crates/aead-0.5.2.crate) = 15509
 SHA256 (rust/crates/aes-0.8.4.crate) = b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0
@@ -19,154 +19,172 @@ SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e
 SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
-SHA256 (rust/crates/anstream-0.6.14.crate) = 418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b
-SIZE (rust/crates/anstream-0.6.14.crate) = 29160
-SHA256 (rust/crates/anstyle-1.0.7.crate) = 038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b
-SIZE (rust/crates/anstyle-1.0.7.crate) = 15709
-SHA256 (rust/crates/anstyle-parse-0.2.4.crate) = c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4
-SIZE (rust/crates/anstyle-parse-0.2.4.crate) = 23069
-SHA256 (rust/crates/anstyle-query-1.0.3.crate) = a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5
-SIZE (rust/crates/anstyle-query-1.0.3.crate) = 9742
-SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19
-SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179
-SHA256 (rust/crates/anyhow-1.0.76.crate) = 59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355
-SIZE (rust/crates/anyhow-1.0.76.crate) = 44259
+SHA256 (rust/crates/anstream-0.6.18.crate) = 8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b
+SIZE (rust/crates/anstream-0.6.18.crate) = 29681
+SHA256 (rust/crates/anstyle-1.0.10.crate) = 55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9
+SIZE (rust/crates/anstyle-1.0.10.crate) = 15725
+SHA256 (rust/crates/anstyle-parse-0.2.6.crate) = 3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9
+SIZE (rust/crates/anstyle-parse-0.2.6.crate) = 22343
+SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c
+SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
+SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e
+SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400
+SHA256 (rust/crates/anyhow-1.0.97.crate) = dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f
+SIZE (rust/crates/anyhow-1.0.97.crate) = 52221
+SHA256 (rust/crates/argon2-0.5.3.crate) = 3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072
+SIZE (rust/crates/argon2-0.5.3.crate) = 28795
+SHA256 (rust/crates/arraydeque-0.5.1.crate) = 7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236
+SIZE (rust/crates/arraydeque-0.5.1.crate) = 17671
 SHA256 (rust/crates/as-slice-0.2.1.crate) = 516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516
 SIZE (rust/crates/as-slice-0.2.1.crate) = 6942
 SHA256 (rust/crates/ascii-canvas-3.0.0.crate) = 8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6
 SIZE (rust/crates/ascii-canvas-3.0.0.crate) = 10575
-SHA256 (rust/crates/assert_cmd-2.0.13.crate) = 00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467
-SIZE (rust/crates/assert_cmd-2.0.13.crate) = 23917
-SHA256 (rust/crates/async-trait-0.1.80.crate) = c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca
-SIZE (rust/crates/async-trait-0.1.80.crate) = 28775
-SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
-SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
-SHA256 (rust/crates/backtrace-0.3.71.crate) = 26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d
-SIZE (rust/crates/backtrace-0.3.71.crate) = 86553
+SHA256 (rust/crates/ascii-canvas-4.0.0.crate) = ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891
+SIZE (rust/crates/ascii-canvas-4.0.0.crate) = 10940
+SHA256 (rust/crates/assert_cmd-2.0.16.crate) = dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d
+SIZE (rust/crates/assert_cmd-2.0.16.crate) = 26554
+SHA256 (rust/crates/async-generic-1.1.2.crate) = ddf3728566eefa873833159754f5732fb0951d3649e6e5b891cc70d56dd41673
+SIZE (rust/crates/async-generic-1.1.2.crate) = 7441
+SHA256 (rust/crates/async-trait-0.1.87.crate) = d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97
+SIZE (rust/crates/async-trait-0.1.87.crate) = 32014
+SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0
+SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
+SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
+SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
+SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
+SIZE (rust/crates/backtrace-0.3.74.crate) = 88516
 SHA256 (rust/crates/base16ct-0.2.0.crate) = 4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf
 SIZE (rust/crates/base16ct-0.2.0.crate) = 10240
-SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
-SIZE (rust/crates/base64-0.21.7.crate) = 82576
 SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
 SIZE (rust/crates/base64-0.22.1.crate) = 81597
 SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
 SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
-SHA256 (rust/crates/bindgen-0.68.1.crate) = 726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078
-SIZE (rust/crates/bindgen-0.68.1.crate) = 218997
+SHA256 (rust/crates/bindgen-0.70.1.crate) = f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f
+SIZE (rust/crates/bindgen-0.70.1.crate) = 226363
 SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
 SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
+SHA256 (rust/crates/bit-set-0.8.0.crate) = 08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3
+SIZE (rust/crates/bit-set-0.8.0.crate) = 16289
 SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
 SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
-SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
-SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.5.0.crate) = cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1
-SIZE (rust/crates/bitflags-2.5.0.crate) = 43821
+SHA256 (rust/crates/bit-vec-0.8.0.crate) = 5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7
+SIZE (rust/crates/bit-vec-0.8.0.crate) = 24132
+SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd
+SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
+SHA256 (rust/crates/blake2-0.10.6.crate) = 46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe
+SIZE (rust/crates/blake2-0.10.6.crate) = 47234
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
 SHA256 (rust/crates/block-padding-0.3.3.crate) = a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93
 SIZE (rust/crates/block-padding-0.3.3.crate) = 8504
 SHA256 (rust/crates/blowfish-0.9.1.crate) = e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7
 SIZE (rust/crates/blowfish-0.9.1.crate) = 16734
-SHA256 (rust/crates/botan-0.10.7.crate) = 350081af1a3c6883f8a1f863ac553bfe6922589aad60008a70947765ed57c53e
-SIZE (rust/crates/botan-0.10.7.crate) = 40376
-SHA256 (rust/crates/botan-sys-0.10.5.crate) = 9f49dde1b8ebd2996cc41c55c39f6ef8b54e38148d8973aeba0792b87b1621ca
-SIZE (rust/crates/botan-sys-0.10.5.crate) = 8245
-SHA256 (rust/crates/bstr-1.9.1.crate) = 05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706
-SIZE (rust/crates/bstr-1.9.1.crate) = 380305
-SHA256 (rust/crates/buffered-reader-1.3.1.crate) = cd098763fdb64579407a8c83cf0d751e6d4a7e161d0114c89cc181a2ca760ec8
-SIZE (rust/crates/buffered-reader-1.3.1.crate) = 63723
-SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
-SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/botan-0.11.1.crate) = 24d4c7647d67c53194fa0740404c6c508880aef2bfe99a9868dbb4b86f090377
+SIZE (rust/crates/botan-0.11.1.crate) = 41477
+SHA256 (rust/crates/botan-sys-0.11.1.crate) = 04285fa0c094cc9961fe435b1b279183db9394844ad82ce483aa6196c0e6da38
+SIZE (rust/crates/botan-sys-0.11.1.crate) = 8441
+SHA256 (rust/crates/bstr-1.11.3.crate) = 531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0
+SIZE (rust/crates/bstr-1.11.3.crate) = 351536
+SHA256 (rust/crates/buffered-reader-1.4.0.crate) = db26bf1f092fd5e05b5ab3be2f290915aeb6f3f20c4e9f86ce0f07f336c2412f
+SIZE (rust/crates/buffered-reader-1.4.0.crate) = 64475
+SHA256 (rust/crates/bumpalo-3.17.0.crate) = 1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf
+SIZE (rust/crates/bumpalo-3.17.0.crate) = 91975
 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
-SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9
-SIZE (rust/crates/bytes-1.6.0.crate) = 60605
-SHA256 (rust/crates/bzip2-0.4.4.crate) = bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8
-SIZE (rust/crates/bzip2-0.4.4.crate) = 34197
-SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc
-SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
+SHA256 (rust/crates/bytes-1.10.0.crate) = f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9
+SIZE (rust/crates/bytes-1.10.0.crate) = 76656
+SHA256 (rust/crates/bzip2-0.5.2.crate) = 49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47
+SIZE (rust/crates/bzip2-0.5.2.crate) = 38314
+SHA256 (rust/crates/bzip2-sys-0.1.13+1.0.8.crate) = 225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14
+SIZE (rust/crates/bzip2-sys-0.1.13+1.0.8.crate) = 633818
 SHA256 (rust/crates/camellia-0.1.0.crate) = 3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30
 SIZE (rust/crates/camellia-0.1.0.crate) = 89085
-SHA256 (rust/crates/capnp-0.19.5.crate) = 3aed85272154b3c0bfda873c40395f13adcfbc89696bf639a512291077f8cd17
-SIZE (rust/crates/capnp-0.19.5.crate) = 143141
-SHA256 (rust/crates/capnp-futures-0.19.0.crate) = 5fac483cb34e3bc0be251dba7ce318f465143dd18f948c7bd7ad035f6fecfb1b
-SIZE (rust/crates/capnp-futures-0.19.0.crate) = 12275
-SHA256 (rust/crates/capnp-rpc-0.19.1.crate) = 287cfab678fbdc6b382e86bfe8e2a9f8aeb3771b04c622ccbd700742c680f6e2
-SIZE (rust/crates/capnp-rpc-0.19.1.crate) = 92536
+SHA256 (rust/crates/capnp-0.19.8.crate) = 4e985a566bdaae9a428a957d12b10c318d41b2afddb54cfbb764878059df636e
+SIZE (rust/crates/capnp-0.19.8.crate) = 143635
+SHA256 (rust/crates/capnp-futures-0.19.1.crate) = f8f3ee810b3890498e51028448ac732cdd5009223897124dd2fac6b085b5d867
+SIZE (rust/crates/capnp-futures-0.19.1.crate) = 12493
+SHA256 (rust/crates/capnp-rpc-0.19.5.crate) = fe57ab22a5e121e6fddaf36e837514aab9ae888bcff2baa6fda5630820dfc501
+SIZE (rust/crates/capnp-rpc-0.19.5.crate) = 94361
 SHA256 (rust/crates/capnpc-0.19.0.crate) = c75ba30e0f08582d53c2f3710cf4bb65ff562614b1ba86906d7391adffe189ec
 SIZE (rust/crates/capnpc-0.19.0.crate) = 33806
 SHA256 (rust/crates/cast5-0.11.1.crate) = 26b07d673db1ccf000e90f54b819db9e75a8348d6eb056e9b8ab53231b7a9911
 SIZE (rust/crates/cast5-0.11.1.crate) = 37018
-SHA256 (rust/crates/cc-1.0.98.crate) = 41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f
-SIZE (rust/crates/cc-1.0.98.crate) = 76780
+SHA256 (rust/crates/cc-1.2.16.crate) = be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c
+SIZE (rust/crates/cc-1.2.16.crate) = 103847
 SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
 SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
 SHA256 (rust/crates/cfb-mode-0.8.2.crate) = 738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330
 SIZE (rust/crates/cfb-mode-0.8.2.crate) = 25334
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/chrono-0.4.38.crate) = a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401
-SIZE (rust/crates/chrono-0.4.38.crate) = 220559
+SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
+SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
+SHA256 (rust/crates/chrono-0.4.40.crate) = 1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c
+SIZE (rust/crates/chrono-0.4.40.crate) = 229824
 SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad
 SIZE (rust/crates/cipher-0.4.4.crate) = 19073
-SHA256 (rust/crates/clang-sys-1.7.0.crate) = 67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1
-SIZE (rust/crates/clang-sys-1.7.0.crate) = 42088
-SHA256 (rust/crates/clap-4.4.18.crate) = 1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c
-SIZE (rust/crates/clap-4.4.18.crate) = 55269
-SHA256 (rust/crates/clap_builder-4.4.18.crate) = 4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7
-SIZE (rust/crates/clap_builder-4.4.18.crate) = 163538
-SHA256 (rust/crates/clap_complete-4.4.10.crate) = abb745187d7f4d76267b37485a65e0149edd0e91a4cfcdd3f27524ad86cee9f3
-SIZE (rust/crates/clap_complete-4.4.10.crate) = 37761
-SHA256 (rust/crates/clap_derive-4.4.7.crate) = cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442
-SIZE (rust/crates/clap_derive-4.4.7.crate) = 29046
-SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1
-SIZE (rust/crates/clap_lex-0.6.0.crate) = 12272
+SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4
+SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009
+SHA256 (rust/crates/clap-4.5.31.crate) = 027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767
+SIZE (rust/crates/clap-4.5.31.crate) = 56084
+SHA256 (rust/crates/clap_builder-4.5.31.crate) = 5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863
+SIZE (rust/crates/clap_builder-4.5.31.crate) = 168303
+SHA256 (rust/crates/clap_complete-4.5.46.crate) = f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98
+SIZE (rust/crates/clap_complete-4.5.46.crate) = 48021
+SHA256 (rust/crates/clap_derive-4.5.28.crate) = bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed
+SIZE (rust/crates/clap_derive-4.5.28.crate) = 33428
+SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6
+SIZE (rust/crates/clap_lex-0.7.4.crate) = 12858
 SHA256 (rust/crates/cmac-0.7.2.crate) = 8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa
 SIZE (rust/crates/cmac-0.7.2.crate) = 44847
-SHA256 (rust/crates/colorchoice-1.0.1.crate) = 0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422
-SIZE (rust/crates/colorchoice-1.0.1.crate) = 7895
-SHA256 (rust/crates/console-0.15.8.crate) = 0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb
-SIZE (rust/crates/console-0.15.8.crate) = 36364
+SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990
+SIZE (rust/crates/colorchoice-1.0.3.crate) = 7923
+SHA256 (rust/crates/console-0.15.11.crate) = 054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8
+SIZE (rust/crates/console-0.15.11.crate) = 37822
 SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8
 SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
 SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f
 SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
-SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
-SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
-SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
-SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
+SHA256 (rust/crates/core-foundation-sys-0.8.7.crate) = 773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b
+SIZE (rust/crates/core-foundation-sys-0.8.7.crate) = 37712
+SHA256 (rust/crates/cpufeatures-0.2.17.crate) = 59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280
+SIZE (rust/crates/cpufeatures-0.2.17.crate) = 13466
 SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
 SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
 SHA256 (rust/crates/crossbeam-0.8.4.crate) = 1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8
 SIZE (rust/crates/crossbeam-0.8.4.crate) = 10500
-SHA256 (rust/crates/crossbeam-channel-0.5.13.crate) = 33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2
-SIZE (rust/crates/crossbeam-channel-0.5.13.crate) = 91174
-SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
-SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726
+SHA256 (rust/crates/crossbeam-channel-0.5.14.crate) = 06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471
+SIZE (rust/crates/crossbeam-channel-0.5.14.crate) = 92728
+SHA256 (rust/crates/crossbeam-deque-0.8.6.crate) = 9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51
+SIZE (rust/crates/crossbeam-deque-0.8.6.crate) = 22471
 SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
 SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875
-SHA256 (rust/crates/crossbeam-queue-0.3.11.crate) = df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35
-SIZE (rust/crates/crossbeam-queue-0.3.11.crate) = 15581
-SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
-SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
-SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7
-SIZE (rust/crates/crunchy-0.2.2.crate) = 2995
+SHA256 (rust/crates/crossbeam-queue-0.3.12.crate) = 0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115
+SIZE (rust/crates/crossbeam-queue-0.3.12.crate) = 16270
+SHA256 (rust/crates/crossbeam-utils-0.8.21.crate) = d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28
+SIZE (rust/crates/crossbeam-utils-0.8.21.crate) = 42691
+SHA256 (rust/crates/crunchy-0.2.3.crate) = 43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929
+SIZE (rust/crates/crunchy-0.2.3.crate) = 3775
 SHA256 (rust/crates/crypto-bigint-0.5.5.crate) = 0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76
 SIZE (rust/crates/crypto-bigint-0.5.5.crate) = 83384
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
-SHA256 (rust/crates/ctor-0.2.8.crate) = edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f
-SIZE (rust/crates/ctor-0.2.8.crate) = 11053
+SHA256 (rust/crates/ctor-0.2.9.crate) = 32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501
+SIZE (rust/crates/ctor-0.2.9.crate) = 11032
 SHA256 (rust/crates/ctr-0.9.2.crate) = 0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835
 SIZE (rust/crates/ctr-0.9.2.crate) = 18344
-SHA256 (rust/crates/curve25519-dalek-4.1.2.crate) = 0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348
-SIZE (rust/crates/curve25519-dalek-4.1.2.crate) = 305477
+SHA256 (rust/crates/culpa-1.0.2.crate) = 5ae0bfe9317b1cb4ff5a56d766ee4b157b3e1f47f11979253570e88d10fd1fd3
+SIZE (rust/crates/culpa-1.0.2.crate) = 10733
+SHA256 (rust/crates/culpa-macros-1.0.2.crate) = 1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279
+SIZE (rust/crates/culpa-macros-1.0.2.crate) = 3325
+SHA256 (rust/crates/curve25519-dalek-4.1.3.crate) = 97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be
+SIZE (rust/crates/curve25519-dalek-4.1.3.crate) = 306017
 SHA256 (rust/crates/curve25519-dalek-derive-0.1.1.crate) = f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3
 SIZE (rust/crates/curve25519-dalek-derive-0.1.1.crate) = 11723
 SHA256 (rust/crates/cvt-0.1.2.crate) = d2ae9bf77fbf2d39ef573205d554d87e86c12f1994e9ea335b0651b9b278bcf1
 SIZE (rust/crates/cvt-0.1.2.crate) = 6214
-SHA256 (rust/crates/data-encoding-2.6.0.crate) = e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2
-SIZE (rust/crates/data-encoding-2.6.0.crate) = 20769
+SHA256 (rust/crates/data-encoding-2.8.0.crate) = 575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010
+SIZE (rust/crates/data-encoding-2.8.0.crate) = 21394
 SHA256 (rust/crates/dbl-0.3.2.crate) = bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9
 SIZE (rust/crates/dbl-0.3.2.crate) = 6336
 SHA256 (rust/crates/der-0.7.9.crate) = f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0
@@ -175,32 +193,36 @@ SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585
 SIZE (rust/crates/deranged-0.3.11.crate) = 18043
 SHA256 (rust/crates/des-0.8.1.crate) = ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e
 SIZE (rust/crates/des-0.8.1.crate) = 38783
+SHA256 (rust/crates/descape-2.0.3.crate) = 7c1113b908df80c963b107424498e37fba986b424b605729d1492dfbe4b2a630
+SIZE (rust/crates/descape-2.0.3.crate) = 12266
 SHA256 (rust/crates/deunicode-1.6.0.crate) = 339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00
 SIZE (rust/crates/deunicode-1.6.0.crate) = 170864
 SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
 SIZE (rust/crates/difflib-0.4.0.crate) = 7638
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
-SHA256 (rust/crates/dircpy-0.3.16.crate) = 29259db751c34980bfc44100875890c507f585323453b91936960ab1104272ca
-SIZE (rust/crates/dircpy-0.3.16.crate) = 6756
 SHA256 (rust/crates/directories-5.0.1.crate) = 9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35
 SIZE (rust/crates/directories-5.0.1.crate) = 15833
 SHA256 (rust/crates/dirs-5.0.1.crate) = 44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225
 SIZE (rust/crates/dirs-5.0.1.crate) = 12255
+SHA256 (rust/crates/dirs-6.0.0.crate) = c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e
+SIZE (rust/crates/dirs-6.0.0.crate) = 14190
 SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
 SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
 SHA256 (rust/crates/dirs-sys-0.4.1.crate) = 520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c
 SIZE (rust/crates/dirs-sys-0.4.1.crate) = 10719
+SHA256 (rust/crates/dirs-sys-0.5.0.crate) = e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab
+SIZE (rust/crates/dirs-sys-0.5.0.crate) = 10157
 SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
 SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
+SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
+SIZE (rust/crates/displaydoc-0.2.5.crate) = 24219
 SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
 SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
-SHA256 (rust/crates/dot-writer-0.1.3.crate) = 3d1b11bd5e7e98406c6ff39fbc94d6e910a489b978ce7f17c19fce91a1195b7a
-SIZE (rust/crates/dot-writer-0.1.3.crate) = 10327
 SHA256 (rust/crates/dsa-0.6.3.crate) = 48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689
 SIZE (rust/crates/dsa-0.6.3.crate) = 25991
-SHA256 (rust/crates/dyn-clone-1.0.17.crate) = 0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125
-SIZE (rust/crates/dyn-clone-1.0.17.crate) = 11848
+SHA256 (rust/crates/dyn-clone-1.0.18.crate) = feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35
+SIZE (rust/crates/dyn-clone-1.0.18.crate) = 12871
 SHA256 (rust/crates/eax-0.5.0.crate) = 9954fabd903b82b9d7a68f65f97dc96dd9ad368e40ccc907a7c19d53e6bfac28
 SIZE (rust/crates/eax-0.5.0.crate) = 14882
 SHA256 (rust/crates/ecb-0.1.2.crate) = 1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7
@@ -211,56 +233,52 @@ SHA256 (rust/crates/ed25519-2.2.3.crate) = 115531babc129696a58c64a4fef0a8bf9e969
 SIZE (rust/crates/ed25519-2.2.3.crate) = 17802
 SHA256 (rust/crates/ed25519-dalek-2.1.1.crate) = 4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871
 SIZE (rust/crates/ed25519-dalek-2.1.1.crate) = 85736
-SHA256 (rust/crates/either-1.12.0.crate) = 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b
-SIZE (rust/crates/either-1.12.0.crate) = 18974
+SHA256 (rust/crates/either-1.14.0.crate) = b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d
+SIZE (rust/crates/either-1.14.0.crate) = 19890
 SHA256 (rust/crates/elliptic-curve-0.13.8.crate) = b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47
 SIZE (rust/crates/elliptic-curve-0.13.8.crate) = 63198
 SHA256 (rust/crates/embedded-io-0.6.1.crate) = edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d
 SIZE (rust/crates/embedded-io-0.6.1.crate) = 13133
 SHA256 (rust/crates/ena-0.14.3.crate) = 3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5
 SIZE (rust/crates/ena-0.14.3.crate) = 22986
-SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
-SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
-SHA256 (rust/crates/encoding_rs-0.8.34.crate) = b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59
-SIZE (rust/crates/encoding_rs-0.8.34.crate) = 1378166
+SHA256 (rust/crates/encode_unicode-1.0.0.crate) = 34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0
+SIZE (rust/crates/encode_unicode-1.0.0.crate) = 56986
+SHA256 (rust/crates/encoding_rs-0.8.35.crate) = 75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3
+SIZE (rust/crates/encoding_rs-0.8.35.crate) = 1381050
 SHA256 (rust/crates/endian-type-0.1.2.crate) = c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d
 SIZE (rust/crates/endian-type-0.1.2.crate) = 2340
-SHA256 (rust/crates/enum-as-inner-0.6.0.crate) = 5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a
-SIZE (rust/crates/enum-as-inner-0.6.0.crate) = 12079
-SHA256 (rust/crates/enumber-0.3.1.crate) = 0e94171909dd76d846c1ee9d14704de157cf77d01560c883f74ddd1f74c5bdbf
-SIZE (rust/crates/enumber-0.3.1.crate) = 10171
-SHA256 (rust/crates/env_logger-0.10.2.crate) = 4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580
-SIZE (rust/crates/env_logger-0.10.2.crate) = 36402
-SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
-SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.9.crate) = 534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba
-SIZE (rust/crates/errno-0.3.9.crate) = 10690
+SHA256 (rust/crates/enum-as-inner-0.6.1.crate) = a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc
+SIZE (rust/crates/enum-as-inner-0.6.1.crate) = 12190
+SHA256 (rust/crates/env_filter-0.1.3.crate) = 186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0
+SIZE (rust/crates/env_filter-0.1.3.crate) = 15191
+SHA256 (rust/crates/env_logger-0.11.6.crate) = dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0
+SIZE (rust/crates/env_logger-0.11.6.crate) = 31105
+SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
+SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
+SHA256 (rust/crates/errno-0.3.10.crate) = 33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d
+SIZE (rust/crates/errno-0.3.10.crate) = 11824
 SHA256 (rust/crates/fallible-iterator-0.3.0.crate) = 2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649
 SIZE (rust/crates/fallible-iterator-0.3.0.crate) = 19639
 SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a
 SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
-SHA256 (rust/crates/fastrand-2.1.0.crate) = 9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a
-SIZE (rust/crates/fastrand-2.1.0.crate) = 14907
+SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be
+SIZE (rust/crates/fastrand-2.3.0.crate) = 15076
 SHA256 (rust/crates/fd-lock-4.0.2.crate) = 7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947
 SIZE (rust/crates/fd-lock-4.0.2.crate) = 13675
-SHA256 (rust/crates/fehler-1.0.0.crate) = d5729fe49ba028cd550747b6e62cd3d841beccab5390aa398538c31a2d983635
-SIZE (rust/crates/fehler-1.0.0.crate) = 9032
-SHA256 (rust/crates/fehler-macros-1.0.0.crate) = ccb5acb1045ebbfa222e2c50679e392a71dd77030b78fb0189f2d9c5974400f9
-SIZE (rust/crates/fehler-macros-1.0.0.crate) = 3271
 SHA256 (rust/crates/ff-0.13.0.crate) = ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449
 SIZE (rust/crates/ff-0.13.0.crate) = 17688
 SHA256 (rust/crates/fiat-crypto-0.2.9.crate) = 28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d
 SIZE (rust/crates/fiat-crypto-0.2.9.crate) = 495390
-SHA256 (rust/crates/file_diff-1.0.0.crate) = 31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5
-SIZE (rust/crates/file_diff-1.0.0.crate) = 282318
-SHA256 (rust/crates/filetime-0.2.23.crate) = 1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd
-SIZE (rust/crates/filetime-0.2.23.crate) = 14942
+SHA256 (rust/crates/filetime-0.2.25.crate) = 35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586
+SIZE (rust/crates/filetime-0.2.25.crate) = 14940
 SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
 SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
-SHA256 (rust/crates/flate2-1.0.30.crate) = 5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae
-SIZE (rust/crates/flate2-1.0.30.crate) = 75511
-SHA256 (rust/crates/float-cmp-0.9.0.crate) = 98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4
-SIZE (rust/crates/float-cmp-0.9.0.crate) = 10102
+SHA256 (rust/crates/fixedbitset-0.5.7.crate) = 1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99
+SIZE (rust/crates/fixedbitset-0.5.7.crate) = 26537
+SHA256 (rust/crates/flate2-1.1.0.crate) = 11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc
+SIZE (rust/crates/flate2-1.1.0.crate) = 110650
+SHA256 (rust/crates/float-cmp-0.10.0.crate) = b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8
+SIZE (rust/crates/float-cmp-0.10.0.crate) = 10702
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
@@ -271,146 +289,172 @@ SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd
 SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
 SHA256 (rust/crates/fs2-0.4.3.crate) = 9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213
 SIZE (rust/crates/fs2-0.4.3.crate) = 13138
-SHA256 (rust/crates/fs_at-0.1.10.crate) = 982f82cc75107eef84f417ad6c53ae89bf65b561937ca4a3b3b0fd04d0aa2425
-SIZE (rust/crates/fs_at-0.1.10.crate) = 36185
-SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
-SIZE (rust/crates/futures-0.3.30.crate) = 53828
-SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
-SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
-SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
-SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
-SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
-SIZE (rust/crates/futures-executor-0.3.30.crate) = 17744
-SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1
-SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
-SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
-SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
-SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
-SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
-SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
-SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
-SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
-SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
+SHA256 (rust/crates/fs_at-0.2.1.crate) = 14af6c9694ea25db25baa2a1788703b9e7c6648dcaeeebeb98f7561b5384c036
+SIZE (rust/crates/fs_at-0.2.1.crate) = 35800
+SHA256 (rust/crates/fs_extra-1.3.0.crate) = 42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c
+SIZE (rust/crates/fs_extra-1.3.0.crate) = 31298
+SHA256 (rust/crates/futures-0.3.31.crate) = 65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876
+SIZE (rust/crates/futures-0.3.31.crate) = 54953
+SHA256 (rust/crates/futures-channel-0.3.31.crate) = 2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10
+SIZE (rust/crates/futures-channel-0.3.31.crate) = 31971
+SHA256 (rust/crates/futures-core-0.3.31.crate) = 05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e
+SIZE (rust/crates/futures-core-0.3.31.crate) = 14318
+SHA256 (rust/crates/futures-executor-0.3.31.crate) = 1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f
+SIZE (rust/crates/futures-executor-0.3.31.crate) = 17965
+SHA256 (rust/crates/futures-io-0.3.31.crate) = 9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6
+SIZE (rust/crates/futures-io-0.3.31.crate) = 9047
+SHA256 (rust/crates/futures-macro-0.3.31.crate) = 162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650
+SIZE (rust/crates/futures-macro-0.3.31.crate) = 11341
+SHA256 (rust/crates/futures-sink-0.3.31.crate) = e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7
+SIZE (rust/crates/futures-sink-0.3.31.crate) = 7958
+SHA256 (rust/crates/futures-task-0.3.31.crate) = f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988
+SIZE (rust/crates/futures-task-0.3.31.crate) = 11217
+SHA256 (rust/crates/futures-util-0.3.31.crate) = 9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81
+SIZE (rust/crates/futures-util-0.3.31.crate) = 162124
 SHA256 (rust/crates/generator-0.7.5.crate) = 5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e
 SIZE (rust/crates/generator-0.7.5.crate) = 29947
 SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
 SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
-SHA256 (rust/crates/gethostname-0.4.3.crate) = 0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818
-SIZE (rust/crates/gethostname-0.4.3.crate) = 9336
+SHA256 (rust/crates/gethostname-0.5.0.crate) = dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30
+SIZE (rust/crates/gethostname-0.5.0.crate) = 8772
 SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5
 SIZE (rust/crates/getopts-0.2.21.crate) = 18457
 SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
 SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/getrandom-0.3.1.crate) = 43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8
+SIZE (rust/crates/getrandom-0.3.1.crate) = 42449
 SHA256 (rust/crates/ghash-0.5.1.crate) = f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1
 SIZE (rust/crates/ghash-0.5.1.crate) = 9482
-SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
-SIZE (rust/crates/gimli-0.28.1.crate) = 270497
-SHA256 (rust/crates/git-testament-0.2.5.crate) = 710c78d2b68e46e62f5ba63ba0a7a2986640f37f9ecc07903b9ad4e7b2dbfc8e
-SIZE (rust/crates/git-testament-0.2.5.crate) = 9312
-SHA256 (rust/crates/git-testament-derive-0.2.0.crate) = 9b31494efbbe1a6730f6943759c21b92c8dc431cb4df177e6f2a6429c3c96842
-SIZE (rust/crates/git-testament-derive-0.2.0.crate) = 5795
-SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
-SIZE (rust/crates/glob-0.3.1.crate) = 18880
-SHA256 (rust/crates/globset-0.4.14.crate) = 57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1
-SIZE (rust/crates/globset-0.4.14.crate) = 25090
-SHA256 (rust/crates/globwalk-0.8.1.crate) = 93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc
-SIZE (rust/crates/globwalk-0.8.1.crate) = 13705
+SHA256 (rust/crates/gimli-0.31.1.crate) = 07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f
+SIZE (rust/crates/gimli-0.31.1.crate) = 279515
+SHA256 (rust/crates/glob-0.3.2.crate) = a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2
+SIZE (rust/crates/glob-0.3.2.crate) = 22359
+SHA256 (rust/crates/globset-0.4.16.crate) = 54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5
+SIZE (rust/crates/globset-0.4.16.crate) = 26533
+SHA256 (rust/crates/globwalk-0.9.1.crate) = 0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757
+SIZE (rust/crates/globwalk-0.9.1.crate) = 12572
 SHA256 (rust/crates/group-0.13.0.crate) = f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63
 SIZE (rust/crates/group-0.13.0.crate) = 16526
-SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
-SIZE (rust/crates/h2-0.3.26.crate) = 168315
-SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
-SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/h2-0.4.8.crate) = 5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2
+SIZE (rust/crates/h2-0.4.8.crate) = 174535
 SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
 SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
+SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
+SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
 SHA256 (rust/crates/hashlink-0.9.1.crate) = 6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af
 SIZE (rust/crates/hashlink-0.9.1.crate) = 28928
-SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
-SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
+SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
 SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
-SHA256 (rust/crates/hickory-client-0.24.1.crate) = bab9683b08d8f8957a857b0236455d80e1886eaa8c6178af556aa7871fb61b55
-SIZE (rust/crates/hickory-client-0.24.1.crate) = 37830
-SHA256 (rust/crates/hickory-proto-0.24.1.crate) = 07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512
-SIZE (rust/crates/hickory-proto-0.24.1.crate) = 374410
-SHA256 (rust/crates/hickory-resolver-0.24.1.crate) = 28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243
-SIZE (rust/crates/hickory-resolver-0.24.1.crate) = 91134
+SHA256 (rust/crates/hickory-client-0.24.4.crate) = 156579a5cd8d1fc6f0df87cc21b6ee870db978a163a1ba484acd98a4eff5a6de
+SIZE (rust/crates/hickory-client-0.24.4.crate) = 49394
+SHA256 (rust/crates/hickory-proto-0.24.4.crate) = 92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248
+SIZE (rust/crates/hickory-proto-0.24.4.crate) = 383461
+SHA256 (rust/crates/hickory-resolver-0.24.4.crate) = cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e
+SIZE (rust/crates/hickory-resolver-0.24.4.crate) = 89596
 SHA256 (rust/crates/hkdf-0.12.4.crate) = 7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7
 SIZE (rust/crates/hkdf-0.12.4.crate) = 171163
 SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
 SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
+SIZE (rust/crates/home-0.5.9.crate) = 8760
 SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
 SIZE (rust/crates/hostname-0.3.1.crate) = 9272
 SHA256 (rust/crates/html-escape-0.2.13.crate) = 6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476
 SIZE (rust/crates/html-escape-0.2.13.crate) = 23345
-SHA256 (rust/crates/http-0.2.12.crate) = 601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1
-SIZE (rust/crates/http-0.2.12.crate) = 101964
-SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
-SIZE (rust/crates/http-body-0.4.6.crate) = 10773
-SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
-SIZE (rust/crates/httparse-1.8.0.crate) = 29954
-SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
-SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
+SHA256 (rust/crates/http-1.2.0.crate) = f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea
+SIZE (rust/crates/http-1.2.0.crate) = 105932
+SHA256 (rust/crates/http-body-1.0.1.crate) = 1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184
+SIZE (rust/crates/http-body-1.0.1.crate) = 6125
+SHA256 (rust/crates/http-body-util-0.1.2.crate) = 793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f
+SIZE (rust/crates/http-body-util-0.1.2.crate) = 12821
+SHA256 (rust/crates/httparse-1.10.0.crate) = f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a
+SIZE (rust/crates/httparse-1.10.0.crate) = 44882
 SHA256 (rust/crates/humansize-2.1.3.crate) = 6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7
 SIZE (rust/crates/humansize-2.1.3.crate) = 11953
 SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
 SIZE (rust/crates/humantime-2.1.0.crate) = 16749
-SHA256 (rust/crates/hyper-0.14.28.crate) = bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80
-SIZE (rust/crates/hyper-0.14.28.crate) = 197204
-SHA256 (rust/crates/hyper-tls-0.5.0.crate) = d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905
-SIZE (rust/crates/hyper-tls-0.5.0.crate) = 13257
-SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141
-SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
+SHA256 (rust/crates/hyper-1.6.0.crate) = cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80
+SIZE (rust/crates/hyper-1.6.0.crate) = 153923
+SHA256 (rust/crates/hyper-rustls-0.27.5.crate) = 2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2
+SIZE (rust/crates/hyper-rustls-0.27.5.crate) = 34660
+SHA256 (rust/crates/hyper-tls-0.6.0.crate) = 70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0
+SIZE (rust/crates/hyper-tls-0.6.0.crate) = 15052
+SHA256 (rust/crates/hyper-util-0.1.10.crate) = df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4
+SIZE (rust/crates/hyper-util-0.1.10.crate) = 72887
+SHA256 (rust/crates/iana-time-zone-0.1.61.crate) = 235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220
+SIZE (rust/crates/iana-time-zone-0.1.61.crate) = 27685
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/icu_collections-1.5.0.crate) = db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526
+SIZE (rust/crates/icu_collections-1.5.0.crate) = 82762
+SHA256 (rust/crates/icu_locid-1.5.0.crate) = 13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637
+SIZE (rust/crates/icu_locid-1.5.0.crate) = 55131
+SHA256 (rust/crates/icu_locid_transform-1.5.0.crate) = 01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e
+SIZE (rust/crates/icu_locid_transform-1.5.0.crate) = 29094
+SHA256 (rust/crates/icu_locid_transform_data-1.5.0.crate) = fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e
+SIZE (rust/crates/icu_locid_transform_data-1.5.0.crate) = 44727
+SHA256 (rust/crates/icu_normalizer-1.5.0.crate) = 19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f
+SIZE (rust/crates/icu_normalizer-1.5.0.crate) = 53113
+SHA256 (rust/crates/icu_normalizer_data-1.5.0.crate) = f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516
+SIZE (rust/crates/icu_normalizer_data-1.5.0.crate) = 50561
+SHA256 (rust/crates/icu_properties-1.5.1.crate) = 93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5
+SIZE (rust/crates/icu_properties-1.5.1.crate) = 64479
+SHA256 (rust/crates/icu_properties_data-1.5.0.crate) = 67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569
+SIZE (rust/crates/icu_properties_data-1.5.0.crate) = 227993
+SHA256 (rust/crates/icu_provider-1.5.0.crate) = 6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9
+SIZE (rust/crates/icu_provider-1.5.0.crate) = 52722
+SHA256 (rust/crates/icu_provider_macros-1.5.0.crate) = 1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6
+SIZE (rust/crates/icu_provider_macros-1.5.0.crate) = 6436
 SHA256 (rust/crates/idea-0.5.1.crate) = 075557004419d7f2031b8bb7f44bb43e55a83ca7b63076a8fb8fe75753836477
 SIZE (rust/crates/idea-0.5.1.crate) = 23243
-SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c
-SIZE (rust/crates/idna-0.4.0.crate) = 271429
-SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
-SIZE (rust/crates/idna-0.5.0.crate) = 271940
-SHA256 (rust/crates/ignore-0.4.22.crate) = b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1
-SIZE (rust/crates/ignore-0.4.22.crate) = 55462
-SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
-SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
-SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
-SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
-SHA256 (rust/crates/indicatif-0.17.8.crate) = 763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3
-SIZE (rust/crates/indicatif-0.17.8.crate) = 64869
-SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5
-SIZE (rust/crates/inout-0.1.3.crate) = 10743
-SHA256 (rust/crates/instant-0.1.13.crate) = e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222
-SIZE (rust/crates/instant-0.1.13.crate) = 6305
+SHA256 (rust/crates/idna-1.0.3.crate) = 686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e
+SIZE (rust/crates/idna-1.0.3.crate) = 142515
+SHA256 (rust/crates/idna_adapter-1.2.0.crate) = daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71
+SIZE (rust/crates/idna_adapter-1.2.0.crate) = 8206
+SHA256 (rust/crates/ignore-0.4.23.crate) = 6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b
+SIZE (rust/crates/ignore-0.4.23.crate) = 55901
+SHA256 (rust/crates/indexmap-2.7.1.crate) = 8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652
+SIZE (rust/crates/indexmap-2.7.1.crate) = 88644
+SHA256 (rust/crates/indicatif-0.17.11.crate) = 183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235
+SIZE (rust/crates/indicatif-0.17.11.crate) = 66577
+SHA256 (rust/crates/inout-0.1.4.crate) = 879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01
+SIZE (rust/crates/inout-0.1.4.crate) = 11280
 SHA256 (rust/crates/ipconfig-0.3.2.crate) = b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f
 SIZE (rust/crates/ipconfig-0.3.2.crate) = 24468
-SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3
-SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
-SHA256 (rust/crates/is-terminal-0.4.12.crate) = f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b
-SIZE (rust/crates/is-terminal-0.4.12.crate) = 7470
-SHA256 (rust/crates/is_terminal_polyfill-1.70.0.crate) = f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800
-SIZE (rust/crates/is_terminal_polyfill-1.70.0.crate) = 7451
+SHA256 (rust/crates/ipnet-2.11.0.crate) = 469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130
+SIZE (rust/crates/ipnet-2.11.0.crate) = 29718
+SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
+SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
 SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
 SIZE (rust/crates/itertools-0.11.0.crate) = 125074
-SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
-SIZE (rust/crates/itoa-1.0.11.crate) = 10563
-SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
-SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
-SHA256 (rust/crates/jwalk-0.8.1.crate) = 2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56
-SIZE (rust/crates/jwalk-0.8.1.crate) = 39882
+SHA256 (rust/crates/itertools-0.13.0.crate) = 413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186
+SIZE (rust/crates/itertools-0.13.0.crate) = 146261
+SHA256 (rust/crates/itertools-0.14.0.crate) = 2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285
+SIZE (rust/crates/itertools-0.14.0.crate) = 152715
+SHA256 (rust/crates/itoa-1.0.14.crate) = d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674
+SIZE (rust/crates/itoa-1.0.14.crate) = 11210
+SHA256 (rust/crates/js-sys-0.3.77.crate) = 1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f
+SIZE (rust/crates/js-sys-0.3.77.crate) = 55538
+SHA256 (rust/crates/keccak-0.1.5.crate) = ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654
+SIZE (rust/crates/keccak-0.1.5.crate) = 13120
 SHA256 (rust/crates/lalrpop-0.20.2.crate) = 55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca
 SIZE (rust/crates/lalrpop-0.20.2.crate) = 240370
+SHA256 (rust/crates/lalrpop-0.22.1.crate) = 7047a26de42016abf8f181b46b398aef0b77ad46711df41847f6ed869a2a1d5b
+SIZE (rust/crates/lalrpop-0.22.1.crate) = 245351
 SHA256 (rust/crates/lalrpop-util-0.20.2.crate) = 507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553
 SIZE (rust/crates/lalrpop-util-0.20.2.crate) = 15064
-SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
-SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
-SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
-SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
-SHA256 (rust/crates/libc-0.2.155.crate) = 97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c
-SIZE (rust/crates/libc-0.2.155.crate) = 743539
-SHA256 (rust/crates/libloading-0.8.3.crate) = 0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19
-SIZE (rust/crates/libloading-0.8.3.crate) = 28480
-SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
-SIZE (rust/crates/libm-0.2.8.crate) = 113450
+SHA256 (rust/crates/lalrpop-util-0.22.1.crate) = e8d05b3fe34b8bd562c338db725dfa9beb9451a48f65f129ccb9538b48d2c93b
+SIZE (rust/crates/lalrpop-util-0.22.1.crate) = 18141
+SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
+SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
+SHA256 (rust/crates/libc-0.2.170.crate) = 875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828
+SIZE (rust/crates/libc-0.2.170.crate) = 760076
+SHA256 (rust/crates/libloading-0.8.6.crate) = fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34
+SIZE (rust/crates/libloading-0.8.6.crate) = 28922
+SHA256 (rust/crates/libm-0.2.11.crate) = 8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa
+SIZE (rust/crates/libm-0.2.11.crate) = 111477
 SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
 SIZE (rust/crates/libredox-0.1.3.crate) = 6068
 SHA256 (rust/crates/libsqlite3-sys-0.28.0.crate) = 0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f
@@ -419,52 +463,56 @@ SHA256 (rust/crates/line-col-0.2.1.crate) = 9e69cdf6b85b5c8dce514f694089a2cf8b1a
 SIZE (rust/crates/line-col-0.2.1.crate) = 3915
 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
-SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
-SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
+SHA256 (rust/crates/linux-raw-sys-0.4.15.crate) = d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab
+SIZE (rust/crates/linux-raw-sys-0.4.15.crate) = 2150898
+SHA256 (rust/crates/litemap-0.7.3.crate) = 643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704
+SIZE (rust/crates/litemap-0.7.3.crate) = 28728
 SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
 SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
-SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
-SIZE (rust/crates/log-0.4.21.crate) = 43442
+SHA256 (rust/crates/log-0.4.26.crate) = 30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e
+SIZE (rust/crates/log-0.4.26.crate) = 47022
 SHA256 (rust/crates/loom-0.5.6.crate) = ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5
 SIZE (rust/crates/loom-0.5.6.crate) = 72186
 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
 SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
+SHA256 (rust/crates/marked-yaml-0.7.2.crate) = f2eb25a7ab146f4058d67a74dfea52e25c133c575f08ce5851da97d224e3ad8d
+SIZE (rust/crates/marked-yaml-0.7.2.crate) = 24771
 SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4
 SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153
 SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
 SIZE (rust/crates/matchers-0.1.0.crate) = 6948
 SHA256 (rust/crates/md-5-0.10.6.crate) = d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf
 SIZE (rust/crates/md-5-0.10.6.crate) = 16161
-SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d
-SIZE (rust/crates/memchr-2.7.2.crate) = 96220
-SHA256 (rust/crates/memsec-0.6.3.crate) = 0fa0916b001582d253822171bd23f4a0229d32b9507fae236f5da8cad515ba7c
-SIZE (rust/crates/memsec-0.6.3.crate) = 5512
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
+SHA256 (rust/crates/memsec-0.7.0.crate) = c797b9d6bb23aab2fc369c65f871be49214f5c759af65bde26ffaaa2b646b492
+SIZE (rust/crates/memsec-0.7.0.crate) = 6532
 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
 SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/miniz_oxide-0.7.3.crate) = 87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae
-SIZE (rust/crates/miniz_oxide-0.7.3.crate) = 55774
-SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
-SIZE (rust/crates/mio-0.8.11.crate) = 102983
-SHA256 (rust/crates/native-tls-0.2.11.crate) = 07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e
-SIZE (rust/crates/native-tls-0.2.11.crate) = 29008
+SHA256 (rust/crates/miniz_oxide-0.8.5.crate) = 8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5
+SIZE (rust/crates/miniz_oxide-0.8.5.crate) = 62237
+SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
+SIZE (rust/crates/mio-1.0.3.crate) = 103703
+SHA256 (rust/crates/native-tls-0.2.13.crate) = 0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c
+SIZE (rust/crates/native-tls-0.2.13.crate) = 29133
 SHA256 (rust/crates/nettle-7.4.0.crate) = 44e6ff4a94e5d34a1fd5abbd39418074646e2fa51b257198701330f22fcd6936
 SIZE (rust/crates/nettle-7.4.0.crate) = 583944
-SHA256 (rust/crates/nettle-sys-2.3.0.crate) = b495053a10a19a80e3a26bf1212e92e29350797b5f5bdc58268c3f3f818e66ec
-SIZE (rust/crates/nettle-sys-2.3.0.crate) = 28576
+SHA256 (rust/crates/nettle-sys-2.3.1.crate) = 61a3f5406064d310d59b1a219d3c5c9a49caf4047b6496032e3f930876488c34
+SIZE (rust/crates/nettle-sys-2.3.1.crate) = 81980
 SHA256 (rust/crates/new_debug_unreachable-1.0.6.crate) = 650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086
 SIZE (rust/crates/new_debug_unreachable-1.0.6.crate) = 2582
 SHA256 (rust/crates/nibble_vec-0.1.0.crate) = 77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43
 SIZE (rust/crates/nibble_vec-0.1.0.crate) = 11796
-SHA256 (rust/crates/nix-0.26.4.crate) = 598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b
-SIZE (rust/crates/nix-0.26.4.crate) = 279099
+SHA256 (rust/crates/nix-0.29.0.crate) = 71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46
+SIZE (rust/crates/nix-0.29.0.crate) = 318248
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
 SHA256 (rust/crates/normalize-line-endings-0.3.0.crate) = 61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be
 SIZE (rust/crates/normalize-line-endings-0.3.0.crate) = 5737
-SHA256 (rust/crates/normpath-1.1.1.crate) = ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5
-SIZE (rust/crates/normpath-1.1.1.crate) = 19786
+SHA256 (rust/crates/normpath-1.3.0.crate) = c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed
+SIZE (rust/crates/normpath-1.3.0.crate) = 20719
 SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
 SHA256 (rust/crates/num-bigint-dig-0.8.4.crate) = dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151
@@ -481,92 +529,100 @@ SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a
 SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
 SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
 SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
-SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
-SIZE (rust/crates/object-0.32.2.crate) = 286994
-SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
-SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/object-0.36.7.crate) = 62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87
+SIZE (rust/crates/object-0.36.7.crate) = 329938
+SHA256 (rust/crates/ocb3-0.1.0.crate) = c196e0276c471c843dd5777e7543a36a298a4be942a2a688d8111cd43390dedb
+SIZE (rust/crates/ocb3-0.1.0.crate) = 14025
+SHA256 (rust/crates/once_cell-1.20.3.crate) = 945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e
+SIZE (rust/crates/once_cell-1.20.3.crate) = 33456
 SHA256 (rust/crates/opaque-debug-0.3.1.crate) = c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381
 SIZE (rust/crates/opaque-debug-0.3.1.crate) = 7066
-SHA256 (rust/crates/openpgp-cert-d-0.3.2.crate) = c94a97687feb8838a6b2b47dbad623f269788f27f3fab90b1dc4a575295def1e
-SIZE (rust/crates/openpgp-cert-d-0.3.2.crate) = 31488
-SHA256 (rust/crates/openssl-0.10.67.crate) = 7b8cefcf97f41316955f9294cd61f639bdcfa9f2f230faac6cb896aa8ab64704
-SIZE (rust/crates/openssl-0.10.67.crate) = 276540
+SHA256 (rust/crates/openpgp-cert-d-0.3.4.crate) = d3dd47b0b6df1022ca8a9a06791261c3153028abef191fe53aa326b7f443f2d6
+SIZE (rust/crates/openpgp-cert-d-0.3.4.crate) = 32033
+SHA256 (rust/crates/openssl-0.10.72.crate) = fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da
+SIZE (rust/crates/openssl-0.10.72.crate) = 283852
 SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c
 SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601
-SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
-SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
-SHA256 (rust/crates/openssl-sys-0.9.104.crate) = 45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741
-SIZE (rust/crates/openssl-sys-0.9.104.crate) = 72287
+SHA256 (rust/crates/openssl-probe-0.1.6.crate) = d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e
+SIZE (rust/crates/openssl-probe-0.1.6.crate) = 8128
+SHA256 (rust/crates/openssl-sys-0.9.108.crate) = e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847
+SIZE (rust/crates/openssl-sys-0.9.108.crate) = 78190
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
 SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
 SHA256 (rust/crates/p256-0.13.2.crate) = c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b
 SIZE (rust/crates/p256-0.13.2.crate) = 63434
-SHA256 (rust/crates/parking_lot-0.12.2.crate) = 7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb
-SIZE (rust/crates/parking_lot-0.12.2.crate) = 41723
+SHA256 (rust/crates/p384-0.13.1.crate) = fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6
+SIZE (rust/crates/p384-0.13.1.crate) = 193022
+SHA256 (rust/crates/p521-0.13.3.crate) = 0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2
+SIZE (rust/crates/p521-0.13.3.crate) = 138499
+SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
+SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
 SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
 SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
+SHA256 (rust/crates/password-hash-0.5.0.crate) = 346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166
+SIZE (rust/crates/password-hash-0.5.0.crate) = 26884
 SHA256 (rust/crates/paste-1.0.15.crate) = 57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a
 SIZE (rust/crates/paste-1.0.15.crate) = 18374
-SHA256 (rust/crates/peeking_take_while-0.1.2.crate) = 19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099
-SIZE (rust/crates/peeking_take_while-0.1.2.crate) = 6697
 SHA256 (rust/crates/pem-rfc7468-0.7.0.crate) = 88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412
 SIZE (rust/crates/pem-rfc7468-0.7.0.crate) = 24159
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
-SHA256 (rust/crates/pest-2.7.10.crate) = 560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8
-SIZE (rust/crates/pest-2.7.10.crate) = 123707
-SHA256 (rust/crates/pest_derive-2.7.10.crate) = 26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459
-SIZE (rust/crates/pest_derive-2.7.10.crate) = 36221
-SHA256 (rust/crates/pest_generator-2.7.10.crate) = 3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687
-SIZE (rust/crates/pest_generator-2.7.10.crate) = 18411
-SHA256 (rust/crates/pest_meta-2.7.10.crate) = d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd
-SIZE (rust/crates/pest_meta-2.7.10.crate) = 41550
+SHA256 (rust/crates/pest-2.7.15.crate) = 8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc
+SIZE (rust/crates/pest-2.7.15.crate) = 127895
+SHA256 (rust/crates/pest_derive-2.7.15.crate) = 816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e
+SIZE (rust/crates/pest_derive-2.7.15.crate) = 40745
+SHA256 (rust/crates/pest_generator-2.7.15.crate) = 7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b
+SIZE (rust/crates/pest_generator-2.7.15.crate) = 18417
+SHA256 (rust/crates/pest_meta-2.7.15.crate) = e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea
+SIZE (rust/crates/pest_meta-2.7.15.crate) = 42121
 SHA256 (rust/crates/petgraph-0.6.5.crate) = b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db
 SIZE (rust/crates/petgraph-0.6.5.crate) = 710970
-SHA256 (rust/crates/phf_shared-0.10.0.crate) = b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096
-SIZE (rust/crates/phf_shared-0.10.0.crate) = 4095
-SHA256 (rust/crates/pikchr-0.1.3.crate) = b430b470a0dfac4e22cd248210e3ef005346acd1ada670d74d6bdcdbab0dc96e
-SIZE (rust/crates/pikchr-0.1.3.crate) = 77527
-SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
-SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
+SHA256 (rust/crates/petgraph-0.7.1.crate) = 3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772
+SIZE (rust/crates/petgraph-0.7.1.crate) = 736025
+SHA256 (rust/crates/phf_shared-0.11.3.crate) = 67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5
+SIZE (rust/crates/phf_shared-0.11.3.crate) = 15199
+SHA256 (rust/crates/pikchr-0.1.4.crate) = 13680336a9060974d823f15053decc0ae5380eebf6f82abf17608523a7d71826
+SIZE (rust/crates/pikchr-0.1.4.crate) = 78654
+SHA256 (rust/crates/pin-project-lite-0.2.16.crate) = 3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b
+SIZE (rust/crates/pin-project-lite-0.2.16.crate) = 30504
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
 SHA256 (rust/crates/pkcs1-0.7.5.crate) = c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f
 SIZE (rust/crates/pkcs1-0.7.5.crate) = 35790
 SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7
 SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360
-SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec
-SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
-SHA256 (rust/crates/platforms-3.4.0.crate) = db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7
-SIZE (rust/crates/platforms-3.4.0.crate) = 29298
+SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c
+SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370
 SHA256 (rust/crates/polyval-0.6.2.crate) = 9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25
 SIZE (rust/crates/polyval-0.6.2.crate) = 18425
-SHA256 (rust/crates/portable-atomic-1.6.0.crate) = 7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0
-SIZE (rust/crates/portable-atomic-1.6.0.crate) = 140689
+SHA256 (rust/crates/portable-atomic-1.11.0.crate) = 350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e
+SIZE (rust/crates/portable-atomic-1.11.0.crate) = 181258
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
-SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
-SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/ppv-lite86-0.2.20.crate) = 77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04
+SIZE (rust/crates/ppv-lite86-0.2.20.crate) = 22478
 SHA256 (rust/crates/precomputed-hash-0.1.1.crate) = 925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c
 SIZE (rust/crates/precomputed-hash-0.1.1.crate) = 1640
-SHA256 (rust/crates/predicates-3.1.0.crate) = 68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8
-SIZE (rust/crates/predicates-3.1.0.crate) = 23090
-SHA256 (rust/crates/predicates-core-1.0.6.crate) = b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174
-SIZE (rust/crates/predicates-core-1.0.6.crate) = 8084
-SHA256 (rust/crates/predicates-tree-1.0.9.crate) = 368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf
-SIZE (rust/crates/predicates-tree-1.0.9.crate) = 7960
+SHA256 (rust/crates/predicates-3.1.3.crate) = a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573
+SIZE (rust/crates/predicates-3.1.3.crate) = 24063
+SHA256 (rust/crates/predicates-core-1.0.9.crate) = 727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa
+SIZE (rust/crates/predicates-core-1.0.9.crate) = 8618
+SHA256 (rust/crates/predicates-tree-1.0.12.crate) = 72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c
+SIZE (rust/crates/predicates-tree-1.0.12.crate) = 8392
 SHA256 (rust/crates/primeorder-0.13.6.crate) = 353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6
 SIZE (rust/crates/primeorder-0.13.6.crate) = 21296
-SHA256 (rust/crates/proc-macro2-1.0.83.crate) = 0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43
-SIZE (rust/crates/proc-macro2-1.0.83.crate) = 48661
-SHA256 (rust/crates/pulldown-cmark-0.9.6.crate) = 57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b
-SIZE (rust/crates/pulldown-cmark-0.9.6.crate) = 117378
+SHA256 (rust/crates/proc-macro2-1.0.94.crate) = a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84
+SIZE (rust/crates/proc-macro2-1.0.94.crate) = 52391
+SHA256 (rust/crates/pulldown-cmark-0.12.2.crate) = f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14
+SIZE (rust/crates/pulldown-cmark-0.12.2.crate) = 149070
+SHA256 (rust/crates/pulldown-cmark-escape-0.11.0.crate) = 007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae
+SIZE (rust/crates/pulldown-cmark-escape-0.11.0.crate) = 6719
 SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
 SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
-SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
-SIZE (rust/crates/quote-1.0.36.crate) = 28507
+SHA256 (rust/crates/quote-1.0.39.crate) = c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801
+SIZE (rust/crates/quote-1.0.39.crate) = 31206
 SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd
 SIZE (rust/crates/radix_trie-0.2.1.crate) = 251366
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
@@ -579,40 +635,42 @@ SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4
 SIZE (rust/crates/rayon-1.10.0.crate) = 180155
 SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
 SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
-SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
-SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
-SHA256 (rust/crates/redox_syscall-0.5.1.crate) = 469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e
-SIZE (rust/crates/redox_syscall-0.5.1.crate) = 22536
-SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891
-SIZE (rust/crates/redox_users-0.4.5.crate) = 15514
-SHA256 (rust/crates/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
-SIZE (rust/crates/regex-1.10.4.crate) = 253191
+SHA256 (rust/crates/redox_syscall-0.5.9.crate) = 82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f
+SIZE (rust/crates/redox_syscall-0.5.9.crate) = 30080
+SHA256 (rust/crates/redox_users-0.4.6.crate) = ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43
+SIZE (rust/crates/redox_users-0.4.6.crate) = 15585
+SHA256 (rust/crates/redox_users-0.5.0.crate) = dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b
+SIZE (rust/crates/redox_users-0.5.0.crate) = 15586
+SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191
+SIZE (rust/crates/regex-1.11.1.crate) = 254170
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
-SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
-SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
+SHA256 (rust/crates/regex-automata-0.4.9.crate) = 809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908
+SIZE (rust/crates/regex-automata-0.4.9.crate) = 618525
 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
-SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
-SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
-SHA256 (rust/crates/remove_dir_all-0.8.2.crate) = 23895cfadc1917fed9c6ed76a8c2903615fa3704f7493ff82b364c6540acc02b
-SIZE (rust/crates/remove_dir_all-0.8.2.crate) = 19074
-SHA256 (rust/crates/reqwest-0.11.27.crate) = dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62
-SIZE (rust/crates/reqwest-0.11.27.crate) = 163155
+SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c
+SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
+SHA256 (rust/crates/remove_dir_all-1.0.0.crate) = 808cc0b475acf76adf36f08ca49429b12aad9f678cb56143d5b3cb49b9a1dd08
+SIZE (rust/crates/remove_dir_all-1.0.0.crate) = 20461
+SHA256 (rust/crates/reqwest-0.12.12.crate) = 43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da
+SIZE (rust/crates/reqwest-0.12.12.crate) = 193321
 SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
 SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352
 SHA256 (rust/crates/rfc6979-0.4.0.crate) = f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2
 SIZE (rust/crates/rfc6979-0.4.0.crate) = 9140
+SHA256 (rust/crates/ring-0.17.11.crate) = da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73
+SIZE (rust/crates/ring-0.17.11.crate) = 1477583
 SHA256 (rust/crates/ripemd-0.1.3.crate) = bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f
 SIZE (rust/crates/ripemd-0.1.3.crate) = 16601
-SHA256 (rust/crates/roadmap-0.5.0.crate) = a129e44a647b309ed394a092e21eabcb58537802c6912920ef4ea76239421234
-SIZE (rust/crates/roadmap-0.5.0.crate) = 9231
-SHA256 (rust/crates/roff-0.2.1.crate) = b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316
-SIZE (rust/crates/roff-0.2.1.crate) = 10605
+SHA256 (rust/crates/roadmap-0.7.0.crate) = ec49775c5134c7e4befdedecaf112bb72964baa9b24bedfc79b54c3ca0ee9f77
+SIZE (rust/crates/roadmap-0.7.0.crate) = 12738
+SHA256 (rust/crates/roff-0.2.2.crate) = 88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3
+SIZE (rust/crates/roff-0.2.2.crate) = 11648
 SHA256 (rust/crates/rpassword-7.3.1.crate) = 80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f
 SIZE (rust/crates/rpassword-7.3.1.crate) = 8164
-SHA256 (rust/crates/rsa-0.9.6.crate) = 5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc
-SIZE (rust/crates/rsa-0.9.6.crate) = 80048
+SHA256 (rust/crates/rsa-0.9.7.crate) = 47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519
+SIZE (rust/crates/rsa-0.9.7.crate) = 80231
 SHA256 (rust/crates/rtoolbox-0.0.2.crate) = c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e
 SIZE (rust/crates/rtoolbox-0.0.2.crate) = 9179
 SHA256 (rust/crates/rusqlite-0.31.0.crate) = b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae
@@ -621,76 +679,82 @@ SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
-SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
-SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
-SHA256 (rust/crates/rustix-0.38.34.crate) = 70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f
-SIZE (rust/crates/rustix-0.38.34.crate) = 365160
-SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
-SIZE (rust/crates/rustls-pemfile-1.0.4.crate) = 22092
-SHA256 (rust/crates/rustversion-1.0.17.crate) = 955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6
-SIZE (rust/crates/rustversion-1.0.17.crate) = 17621
-SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
-SIZE (rust/crates/ryu-1.0.18.crate) = 47713
+SHA256 (rust/crates/rustc_version-0.4.1.crate) = cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92
+SIZE (rust/crates/rustc_version-0.4.1.crate) = 12245
+SHA256 (rust/crates/rustix-0.38.44.crate) = fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154
+SIZE (rust/crates/rustix-0.38.44.crate) = 379347
+SHA256 (rust/crates/rustls-0.23.23.crate) = 47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395
+SIZE (rust/crates/rustls-0.23.23.crate) = 342561
+SHA256 (rust/crates/rustls-pemfile-2.2.0.crate) = dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50
+SIZE (rust/crates/rustls-pemfile-2.2.0.crate) = 25849
+SHA256 (rust/crates/rustls-pki-types-1.11.0.crate) = 917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c
+SIZE (rust/crates/rustls-pki-types-1.11.0.crate) = 63933
+SHA256 (rust/crates/rustls-webpki-0.102.8.crate) = 64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9
+SIZE (rust/crates/rustls-webpki-0.102.8.crate) = 204327
+SHA256 (rust/crates/rustversion-1.0.19.crate) = f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4
+SIZE (rust/crates/rustversion-1.0.19.crate) = 20616
+SHA256 (rust/crates/ryu-1.0.19.crate) = 6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd
+SIZE (rust/crates/ryu-1.0.19.crate) = 48770
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
-SHA256 (rust/crates/schannel-0.1.23.crate) = fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534
-SIZE (rust/crates/schannel-0.1.23.crate) = 41667
+SHA256 (rust/crates/schannel-0.1.27.crate) = 1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d
+SIZE (rust/crates/schannel-0.1.27.crate) = 42772
 SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
 SHA256 (rust/crates/sec1-0.7.3.crate) = d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc
 SIZE (rust/crates/sec1-0.7.3.crate) = 17979
-SHA256 (rust/crates/security-framework-2.11.0.crate) = c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0
-SIZE (rust/crates/security-framework-2.11.0.crate) = 80191
-SHA256 (rust/crates/security-framework-sys-2.11.0.crate) = 317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7
-SIZE (rust/crates/security-framework-sys-2.11.0.crate) = 18718
-SHA256 (rust/crates/semver-1.0.23.crate) = 61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b
-SIZE (rust/crates/semver-1.0.23.crate) = 30622
-SHA256 (rust/crates/sequoia-autocrypt-0.25.1.crate) = e24fc0ec87c156a35f24fc153ab694e0f37cd6fa87c1cf5005c9f4fa5e10415b
-SIZE (rust/crates/sequoia-autocrypt-0.25.1.crate) = 41241
-SHA256 (rust/crates/sequoia-cert-store-0.5.3.crate) = 83bd0304e4a7dc7af3aebb827ec3bf980b5e85d5a04c0c3bd9032e29d677e526
-SIZE (rust/crates/sequoia-cert-store-0.5.3.crate) = 181761
+SHA256 (rust/crates/security-framework-2.11.1.crate) = 897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02
+SIZE (rust/crates/security-framework-2.11.1.crate) = 80188
+SHA256 (rust/crates/security-framework-sys-2.14.0.crate) = 49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32
+SIZE (rust/crates/security-framework-sys-2.14.0.crate) = 20537
+SHA256 (rust/crates/semver-1.0.25.crate) = f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03
+SIZE (rust/crates/semver-1.0.25.crate) = 31291
+SHA256 (rust/crates/sequoia-autocrypt-0.26.0.crate) = 11d65ff1c8589a3e505d36c8e1919483bf4a2d8d6eb65f84c3922fbdcae6928b
+SIZE (rust/crates/sequoia-autocrypt-0.26.0.crate) = 54682
+SHA256 (rust/crates/sequoia-cert-store-0.7.0.crate) = cc8987ed37e9931aee509c7ebc10e93b2ee5862849546c8a0c4588f3ed670b74
+SIZE (rust/crates/sequoia-cert-store-0.7.0.crate) = 285314
 SHA256 (rust/crates/sequoia-directories-0.1.0.crate) = b01dd48960c5cf8617ab77e5c9f8ebeb55a1d694e3eabf830fa70453ffa637d5
 SIZE (rust/crates/sequoia-directories-0.1.0.crate) = 21519
-SHA256 (rust/crates/sequoia-gpg-agent-0.4.0.crate) = 5c929d572dee98c48d286cef43e2ade4201962f3454c015f52bf43b5a8e40d42
-SIZE (rust/crates/sequoia-gpg-agent-0.4.0.crate) = 142453
-SHA256 (rust/crates/sequoia-ipc-0.35.0.crate) = b4a7e644ec9e1055fde8dcdaa65c58fa4636c615b5e955a9b1942444145e308a
-SIZE (rust/crates/sequoia-ipc-0.35.0.crate) = 4484979
-SHA256 (rust/crates/sequoia-keystore-0.4.1.crate) = aa77ac702f6be1489580eb092aa5acae36050db04fa5ae445238a84591e1ad7a
-SIZE (rust/crates/sequoia-keystore-0.4.1.crate) = 85919
-SHA256 (rust/crates/sequoia-keystore-backend-0.4.0.crate) = 5ab69a90e3455e15aa0ff47d676e84bf1a085716691b72156badc50d0a01dab1
-SIZE (rust/crates/sequoia-keystore-backend-0.4.0.crate) = 57362
-SHA256 (rust/crates/sequoia-keystore-gpg-agent-0.2.0.crate) = 454e8d580617e07d595b8df718d7fa3e26cdc58f35d1ad89f9fecc78ef0d55a7
-SIZE (rust/crates/sequoia-keystore-gpg-agent-0.2.0.crate) = 17991
-SHA256 (rust/crates/sequoia-keystore-softkeys-0.4.1.crate) = 6f9707371cae085b6e1cac9e17bf94a19efcdc04da4dba5cbda1cb8f8c0a655a
-SIZE (rust/crates/sequoia-keystore-softkeys-0.4.1.crate) = 17646
-SHA256 (rust/crates/sequoia-net-0.28.0.crate) = 6abf810ba698339f332b946b485cc815c13a0f750189009bc10514c71fba814b
-SIZE (rust/crates/sequoia-net-0.28.0.crate) = 49672
-SHA256 (rust/crates/sequoia-openpgp-1.20.0.crate) = 06f82708c8568218b8544b4abbba1f6483067dca0a946a54991c1d3f424dcade
-SIZE (rust/crates/sequoia-openpgp-1.20.0.crate) = 3002022
-SHA256 (rust/crates/sequoia-policy-config-0.6.0.crate) = 757d45d308f2bd9c0d6fdd640f320998ad24856bdf2890ddd28d3c3b85808274
-SIZE (rust/crates/sequoia-policy-config-0.6.0.crate) = 42529
-SHA256 (rust/crates/sequoia-wot-0.11.0.crate) = d16930db37050e74cfdae18654108e8f78eeeb3d659336223b657ccc9a3a6141
-SIZE (rust/crates/sequoia-wot-0.11.0.crate) = 1080482
-SHA256 (rust/crates/serde-1.0.202.crate) = 226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395
-SIZE (rust/crates/serde-1.0.202.crate) = 77722
-SHA256 (rust/crates/serde-aux-4.5.0.crate) = 0d2e8bfba469d06512e11e3311d4d051a4a387a5b42d010404fecf3200321c95
-SIZE (rust/crates/serde-aux-4.5.0.crate) = 12448
-SHA256 (rust/crates/serde_derive-1.0.202.crate) = 6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838
-SIZE (rust/crates/serde_derive-1.0.202.crate) = 55867
-SHA256 (rust/crates/serde_json-1.0.117.crate) = 455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3
-SIZE (rust/crates/serde_json-1.0.117.crate) = 146921
+SHA256 (rust/crates/sequoia-gpg-agent-0.6.0.crate) = c7f01803c82bdada34baa0f049e523c77b446ee347035df239a1f890c5d70c48
+SIZE (rust/crates/sequoia-gpg-agent-0.6.0.crate) = 139699
+SHA256 (rust/crates/sequoia-ipc-0.36.0.crate) = c92579bbd37f62bbcc41e4dce7771fea395037bebaf9b8e10c20b765be8280ab
+SIZE (rust/crates/sequoia-ipc-0.36.0.crate) = 4520359
+SHA256 (rust/crates/sequoia-keystore-0.7.0.crate) = b510811048c0767a0d3196b3bb0719d999eb52a836580d794e97a2586b546347
+SIZE (rust/crates/sequoia-keystore-0.7.0.crate) = 111374
+SHA256 (rust/crates/sequoia-keystore-backend-0.7.0.crate) = c55b047f9b6412c34dc7a26a42f278205cbf1e29516feab1228edccca215f500
+SIZE (rust/crates/sequoia-keystore-backend-0.7.0.crate) = 105957
+SHA256 (rust/crates/sequoia-keystore-gpg-agent-0.5.0.crate) = 7ad901f1f1d88b38f5f5738d5bf2b80136ec44e94a40716193be0bbf3314df2b
+SIZE (rust/crates/sequoia-keystore-gpg-agent-0.5.0.crate) = 35352
+SHA256 (rust/crates/sequoia-keystore-softkeys-0.7.0.crate) = 713736e9a5277f8ff829a1efaf99c0f6c07718fe0c199f435406883313ee8742
+SIZE (rust/crates/sequoia-keystore-softkeys-0.7.0.crate) = 36232
+SHA256 (rust/crates/sequoia-man-0.3.1.crate) = e0a9d99c0d8879eb0acc2f21908ea328b3370e429079d21a8a187b42161bc674
+SIZE (rust/crates/sequoia-man-0.3.1.crate) = 92703
+SHA256 (rust/crates/sequoia-net-0.30.0.crate) = 956ef5d37e41f53259cd3c6caac5f135351ee92f76f3ac6ee9cf771ee6e33925
+SIZE (rust/crates/sequoia-net-0.30.0.crate) = 49377
+SHA256 (rust/crates/sequoia-openpgp-2.0.0.crate) = 015e5fc3d023418b9db98ca9a7f3e90b305872eeafe5ca45c5c32b5eb335c1e8
+SIZE (rust/crates/sequoia-openpgp-2.0.0.crate) = 3049067
+SHA256 (rust/crates/sequoia-policy-config-0.8.0.crate) = 8e016b708d64857b6a97e1a331d9471b73e30ed450d247628e1a0ce236b1e597
+SIZE (rust/crates/sequoia-policy-config-0.8.0.crate) = 102267
+SHA256 (rust/crates/sequoia-wot-0.14.0.crate) = 7725fa3249ea6f786362408e7fc9ebd86e9250633991d97a2bd64d1197dce490
+SIZE (rust/crates/sequoia-wot-0.14.0.crate) = 1042167
+SHA256 (rust/crates/serde-1.0.218.crate) = e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60
+SIZE (rust/crates/serde-1.0.218.crate) = 78968
+SHA256 (rust/crates/serde_derive-1.0.218.crate) = f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b
+SIZE (rust/crates/serde_derive-1.0.218.crate) = 57782
+SHA256 (rust/crates/serde_json-1.0.140.crate) = 20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373
+SIZE (rust/crates/serde_json-1.0.140.crate) = 154852
+SHA256 (rust/crates/serde_path_to_error-0.1.17.crate) = 59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a
+SIZE (rust/crates/serde_path_to_error-0.1.17.crate) = 17662
 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
 SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
-SHA256 (rust/crates/serde_yaml-0.8.26.crate) = 578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b
-SIZE (rust/crates/serde_yaml-0.8.26.crate) = 40670
-SHA256 (rust/crates/serde_yaml-0.9.34+deprecated.crate) = 6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47
-SIZE (rust/crates/serde_yaml-0.9.34+deprecated.crate) = 65290
 SHA256 (rust/crates/sha1collisiondetection-0.3.4.crate) = 1f606421e4a6012877e893c399822a4ed4b089164c5969424e1b9d1e66e6964b
 SIZE (rust/crates/sha1collisiondetection-0.3.4.crate) = 799321
 SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
 SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sha3-0.10.8.crate) = 75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60
+SIZE (rust/crates/sha3-0.10.8.crate) = 858216
 SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
 SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
 SHA256 (rust/crates/shell-words-1.1.0.crate) = 24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde
@@ -699,118 +763,132 @@ SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce35
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
 SHA256 (rust/crates/signature-2.2.0.crate) = 77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de
 SIZE (rust/crates/signature-2.2.0.crate) = 15531
-SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
-SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
+SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
+SIZE (rust/crates/siphasher-1.0.1.crate) = 10351
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
-SHA256 (rust/crates/slug-0.1.5.crate) = 3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4
-SIZE (rust/crates/slug-0.1.5.crate) = 6833
-SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
-SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
+SHA256 (rust/crates/slug-0.1.6.crate) = 882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724
+SIZE (rust/crates/slug-0.1.6.crate) = 6787
+SHA256 (rust/crates/smallvec-1.14.0.crate) = 7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd
+SIZE (rust/crates/smallvec-1.14.0.crate) = 35561
 SHA256 (rust/crates/smawk-0.3.2.crate) = b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c
 SIZE (rust/crates/smawk-0.3.2.crate) = 13831
-SHA256 (rust/crates/socket2-0.5.7.crate) = ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c
-SIZE (rust/crates/socket2-0.5.7.crate) = 55758
-SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
-SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/socket2-0.5.8.crate) = c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8
+SIZE (rust/crates/socket2-0.5.8.crate) = 56309
+SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
+SIZE (rust/crates/spin-0.9.8.crate) = 38958
 SHA256 (rust/crates/spki-0.7.3.crate) = d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d
 SIZE (rust/crates/spki-0.7.3.crate) = 16409
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
-SHA256 (rust/crates/state-0.5.3.crate) = dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b
-SIZE (rust/crates/state-0.5.3.crate) = 30385
+SHA256 (rust/crates/state-0.6.0.crate) = 2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8
+SIZE (rust/crates/state-0.6.0.crate) = 30182
 SHA256 (rust/crates/stfu8-0.2.7.crate) = e51f1e89f093f99e7432c491c382b88a6860a5adbe6bf02574bf0a08efff1978
 SIZE (rust/crates/stfu8-0.2.7.crate) = 42753
-SHA256 (rust/crates/string_cache-0.8.7.crate) = f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b
-SIZE (rust/crates/string_cache-0.8.7.crate) = 16655
-SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
-SIZE (rust/crates/strsim-0.10.0.crate) = 11355
-SHA256 (rust/crates/subplot-0.9.0.crate) = a2c5723f41235a3deefab3cfd6164a5b780802f596fa97eb40dfcf3c39c36b21
-SIZE (rust/crates/subplot-0.9.0.crate) = 130930
-SHA256 (rust/crates/subplot-build-0.9.0.crate) = cd58ff7123e83e5a5ed5bcdcd9f6f23226eea5b08bc310e129cad5d24b18fabe
-SIZE (rust/crates/subplot-build-0.9.0.crate) = 2213
-SHA256 (rust/crates/subplotlib-0.9.0.crate) = 4fc3c17998cc92ec00493a7d1c0d0256f8977c7baed553777ba347dd6d1c3ccf
-SIZE (rust/crates/subplotlib-0.9.0.crate) = 22509
-SHA256 (rust/crates/subplotlib-derive-0.9.0.crate) = 0234a041a912954e3cc81230b9f64f6a471c4297e65053e6ad733bb3e473bc60
-SIZE (rust/crates/subplotlib-derive-0.9.0.crate) = 4490
-SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
-SIZE (rust/crates/subtle-2.5.0.crate) = 13909
-SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
-SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.65.crate) = d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106
-SIZE (rust/crates/syn-2.0.65.crate) = 264863
-SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
-SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
-SHA256 (rust/crates/system-configuration-0.5.1.crate) = ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7
-SIZE (rust/crates/system-configuration-0.5.1.crate) = 12618
-SHA256 (rust/crates/system-configuration-sys-0.5.0.crate) = a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9
-SIZE (rust/crates/system-configuration-sys-0.5.0.crate) = 6730
-SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
-SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
-SHA256 (rust/crates/tempfile-fast-0.3.4.crate) = a74be8531b1a9d607004a32b8f50dd8093b09ec6b0a6af004e33051068e87af6
-SIZE (rust/crates/tempfile-fast-0.3.4.crate) = 8991
-SHA256 (rust/crates/tera-1.19.1.crate) = 970dff17c11e884a4a09bc76e3a17ef71e01bb13447a11e85226e254fe6d10b8
-SIZE (rust/crates/tera-1.19.1.crate) = 104237
+SHA256 (rust/crates/string_cache-0.8.8.crate) = 938d512196766101d333398efde81bc1f37b00cb42c2f8350e5df639f040bbbe
+SIZE (rust/crates/string_cache-0.8.8.crate) = 17181
+SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
+SIZE (rust/crates/strsim-0.11.1.crate) = 14266
+SHA256 (rust/crates/subplot-0.12.0.crate) = 5eb998cc5b2599ac493bd0fd2972013c3f3c11ef37800f6d2d2f4067d78a0c01
+SIZE (rust/crates/subplot-0.12.0.crate) = 133795
+SHA256 (rust/crates/subplot-build-0.12.0.crate) = 008b31a93442526100369310bf717117df546b8259b7043aebcfdffa84af35bf
+SIZE (rust/crates/subplot-build-0.12.0.crate) = 2441
+SHA256 (rust/crates/subplotlib-0.12.0.crate) = 6ddf898c1d4ef62f77028b546f7baf9c1e661c927587249da0b0fa5ec5906422
+SIZE (rust/crates/subplotlib-0.12.0.crate) = 22285
+SHA256 (rust/crates/subplotlib-derive-0.12.0.crate) = f37c9bc08dcdd72eb2a5f0d2f405c5384466c7c199921b00d4ab9d8f60972efb
+SIZE (rust/crates/subplotlib-derive-0.12.0.crate) = 6078
+SHA256 (rust/crates/subtle-2.6.1.crate) = 13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292
+SIZE (rust/crates/subtle-2.6.1.crate) = 14562
+SHA256 (rust/crates/syn-2.0.99.crate) = e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2
+SIZE (rust/crates/syn-2.0.99.crate) = 297762
+SHA256 (rust/crates/sync_wrapper-1.0.2.crate) = 0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263
+SIZE (rust/crates/sync_wrapper-1.0.2.crate) = 6958
+SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
+SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
+SHA256 (rust/crates/system-configuration-0.6.1.crate) = 3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b
+SIZE (rust/crates/system-configuration-0.6.1.crate) = 17935
+SHA256 (rust/crates/system-configuration-sys-0.6.0.crate) = 8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4
+SIZE (rust/crates/system-configuration-sys-0.6.0.crate) = 11090
+SHA256 (rust/crates/tempfile-3.17.1.crate) = 22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230
+SIZE (rust/crates/tempfile-3.17.1.crate) = 39240
+SHA256 (rust/crates/tera-1.20.0.crate) = ab9d851b45e865f178319da0abdbfe6acbc4328759ff18dafc3a41c16b4cd2ee
+SIZE (rust/crates/tera-1.20.0.crate) = 104452
 SHA256 (rust/crates/term-0.7.0.crate) = c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f
 SIZE (rust/crates/term-0.7.0.crate) = 37082
+SHA256 (rust/crates/term-1.0.1.crate) = a3bb6001afcea98122260987f8b7b5da969ecad46dbf0b5453702f776b491a41
+SIZE (rust/crates/term-1.0.1.crate) = 36846
 SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
 SIZE (rust/crates/termcolor-1.4.1.crate) = 18773
-SHA256 (rust/crates/terminal_size-0.3.0.crate) = 21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7
-SIZE (rust/crates/terminal_size-0.3.0.crate) = 10096
-SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76
-SIZE (rust/crates/termtree-0.4.1.crate) = 4557
-SHA256 (rust/crates/textwrap-0.15.2.crate) = b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d
-SIZE (rust/crates/textwrap-0.15.2.crate) = 53191
-SHA256 (rust/crates/thiserror-1.0.61.crate) = c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709
-SIZE (rust/crates/thiserror-1.0.61.crate) = 21264
-SHA256 (rust/crates/thiserror-impl-1.0.61.crate) = 46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533
-SIZE (rust/crates/thiserror-impl-1.0.61.crate) = 15786
+SHA256 (rust/crates/terminal_size-0.4.1.crate) = 5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9
+SIZE (rust/crates/terminal_size-0.4.1.crate) = 10037
+SHA256 (rust/crates/termtree-0.5.1.crate) = 8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683
+SIZE (rust/crates/termtree-0.5.1.crate) = 8498
+SHA256 (rust/crates/textwrap-0.16.1.crate) = 23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9
+SIZE (rust/crates/textwrap-0.16.1.crate) = 56012
+SHA256 (rust/crates/thiserror-1.0.69.crate) = b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52
+SIZE (rust/crates/thiserror-1.0.69.crate) = 22198
+SHA256 (rust/crates/thiserror-2.0.12.crate) = 567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708
+SIZE (rust/crates/thiserror-2.0.12.crate) = 28693
+SHA256 (rust/crates/thiserror-impl-1.0.69.crate) = 4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1
+SIZE (rust/crates/thiserror-impl-1.0.69.crate) = 18365
+SHA256 (rust/crates/thiserror-impl-2.0.12.crate) = 7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d
+SIZE (rust/crates/thiserror-impl-2.0.12.crate) = 21141
 SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
 SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
-SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
-SIZE (rust/crates/time-0.3.36.crate) = 119805
+SHA256 (rust/crates/time-0.3.37.crate) = 35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21
+SIZE (rust/crates/time-0.3.37.crate) = 123257
 SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
 SIZE (rust/crates/time-core-0.1.2.crate) = 7191
-SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf
-SIZE (rust/crates/time-macros-0.2.18.crate) = 24361
+SHA256 (rust/crates/time-macros-0.2.19.crate) = 2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de
+SIZE (rust/crates/time-macros-0.2.19.crate) = 24268
 SHA256 (rust/crates/tiny-keccak-2.0.2.crate) = 2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237
 SIZE (rust/crates/tiny-keccak-2.0.2.crate) = 20129
-SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
-SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f
+SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
+SHA256 (rust/crates/tinyvec-1.9.0.crate) = 09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71
+SIZE (rust/crates/tinyvec-1.9.0.crate) = 54137
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.37.0.crate) = 1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787
-SIZE (rust/crates/tokio-1.37.0.crate) = 764297
-SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
-SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
+SHA256 (rust/crates/tokio-1.43.0.crate) = 3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e
+SIZE (rust/crates/tokio-1.43.0.crate) = 817422
+SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
+SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
 SHA256 (rust/crates/tokio-native-tls-0.3.1.crate) = bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2
 SIZE (rust/crates/tokio-native-tls-0.3.1.crate) = 20676
-SHA256 (rust/crates/tokio-util-0.7.11.crate) = 9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1
-SIZE (rust/crates/tokio-util-0.7.11.crate) = 113421
+SHA256 (rust/crates/tokio-rustls-0.26.2.crate) = 8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b
+SIZE (rust/crates/tokio-rustls-0.26.2.crate) = 31655
+SHA256 (rust/crates/tokio-util-0.7.13.crate) = d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078
+SIZE (rust/crates/tokio-util-0.7.13.crate) = 115191
 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
 SIZE (rust/crates/toml-0.5.11.crate) = 54910
-SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
-SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
-SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
-SIZE (rust/crates/tracing-0.1.40.crate) = 79459
-SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
-SIZE (rust/crates/tracing-attributes-0.1.27.crate) = 32241
-SHA256 (rust/crates/tracing-core-0.1.32.crate) = c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54
-SIZE (rust/crates/tracing-core-0.1.32.crate) = 61221
+SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
+SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
+SHA256 (rust/crates/toml_edit-0.22.24.crate) = 17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474
+SIZE (rust/crates/toml_edit-0.22.24.crate) = 106399
+SHA256 (rust/crates/tower-0.5.2.crate) = d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9
+SIZE (rust/crates/tower-0.5.2.crate) = 109417
+SHA256 (rust/crates/tower-layer-0.3.3.crate) = 121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e
+SIZE (rust/crates/tower-layer-0.3.3.crate) = 6180
+SHA256 (rust/crates/tower-service-0.3.3.crate) = 8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3
+SIZE (rust/crates/tower-service-0.3.3.crate) = 6950
+SHA256 (rust/crates/tracing-0.1.41.crate) = 784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0
+SIZE (rust/crates/tracing-0.1.41.crate) = 82448
+SHA256 (rust/crates/tracing-attributes-0.1.28.crate) = 395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d
+SIZE (rust/crates/tracing-attributes-0.1.28.crate) = 33280
+SHA256 (rust/crates/tracing-core-0.1.33.crate) = e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c
+SIZE (rust/crates/tracing-core-0.1.33.crate) = 63434
 SHA256 (rust/crates/tracing-log-0.2.0.crate) = ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3
 SIZE (rust/crates/tracing-log-0.2.0.crate) = 17561
-SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b
-SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
+SHA256 (rust/crates/tracing-subscriber-0.3.19.crate) = e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008
+SIZE (rust/crates/tracing-subscriber-0.3.19.crate) = 198345
 SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
 SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
 SHA256 (rust/crates/twofish-0.7.1.crate) = a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013
 SIZE (rust/crates/twofish-0.7.1.crate) = 12156
-SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
-SIZE (rust/crates/typenum-1.17.0.crate) = 42849
-SHA256 (rust/crates/ucd-trie-0.1.6.crate) = ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9
-SIZE (rust/crates/ucd-trie-0.1.6.crate) = 45790
-SHA256 (rust/crates/unescape-0.1.0.crate) = ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e
-SIZE (rust/crates/unescape-0.1.0.crate) = 2412
+SHA256 (rust/crates/typenum-1.18.0.crate) = 1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f
+SIZE (rust/crates/typenum-1.18.0.crate) = 74871
+SHA256 (rust/crates/ucd-trie-0.1.7.crate) = 2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971
+SIZE (rust/crates/ucd-trie-0.1.7.crate) = 46795
 SHA256 (rust/crates/unic-char-property-0.9.0.crate) = a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221
 SIZE (rust/crates/unic-char-property-0.9.0.crate) = 6809
 SHA256 (rust/crates/unic-char-range-0.9.0.crate) = 0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc
@@ -823,58 +901,66 @@ SHA256 (rust/crates/unic-ucd-segment-0.9.0.crate) = 2079c122a62205b421f499da10f3
 SIZE (rust/crates/unic-ucd-segment-0.9.0.crate) = 39262
 SHA256 (rust/crates/unic-ucd-version-0.9.0.crate) = 96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4
 SIZE (rust/crates/unic-ucd-version-0.9.0.crate) = 2246
-SHA256 (rust/crates/unicase-2.7.0.crate) = f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89
-SIZE (rust/crates/unicase-2.7.0.crate) = 23783
-SHA256 (rust/crates/unicode-bidi-0.3.15.crate) = 08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75
-SIZE (rust/crates/unicode-bidi-0.3.15.crate) = 56811
-SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
-SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/unicase-2.8.1.crate) = 75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539
+SIZE (rust/crates/unicase-2.8.1.crate) = 24088
+SHA256 (rust/crates/unicode-ident-1.0.17.crate) = 00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe
+SIZE (rust/crates/unicode-ident-1.0.17.crate) = 47704
 SHA256 (rust/crates/unicode-linebreak-0.1.5.crate) = 3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f
 SIZE (rust/crates/unicode-linebreak-0.1.5.crate) = 15324
-SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5
-SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
-SHA256 (rust/crates/unicode-width-0.1.12.crate) = 68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6
-SIZE (rust/crates/unicode-width-0.1.12.crate) = 24062
-SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
-SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
+SHA256 (rust/crates/unicode-width-0.1.14.crate) = 7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af
+SIZE (rust/crates/unicode-width-0.1.14.crate) = 271615
+SHA256 (rust/crates/unicode-width-0.2.0.crate) = 1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd
+SIZE (rust/crates/unicode-width-0.2.0.crate) = 271509
+SHA256 (rust/crates/unicode-xid-0.2.6.crate) = ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853
+SIZE (rust/crates/unicode-xid-0.2.6.crate) = 15744
 SHA256 (rust/crates/universal-hash-0.5.1.crate) = fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea
 SIZE (rust/crates/universal-hash-0.5.1.crate) = 9146
-SHA256 (rust/crates/unsafe-libyaml-0.2.11.crate) = 673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861
-SIZE (rust/crates/unsafe-libyaml-0.2.11.crate) = 62101
-SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
-SIZE (rust/crates/url-2.5.0.crate) = 78605
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
+SHA256 (rust/crates/url-2.5.4.crate) = 32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60
+SIZE (rust/crates/url-2.5.4.crate) = 81097
+SHA256 (rust/crates/utf16_iter-1.0.5.crate) = c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246
+SIZE (rust/crates/utf16_iter-1.0.5.crate) = 9736
 SHA256 (rust/crates/utf8-width-0.1.7.crate) = 86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3
 SIZE (rust/crates/utf8-width-0.1.7.crate) = 2977
-SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
-SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
-SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
-SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/utf8_iter-1.0.4.crate) = b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be
+SIZE (rust/crates/utf8_iter-1.0.4.crate) = 10437
+SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
+SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
+SHA256 (rust/crates/valuable-0.1.1.crate) = ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65
+SIZE (rust/crates/valuable-0.1.1.crate) = 28679
 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
 SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
-SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
-SIZE (rust/crates/version_check-0.9.4.crate) = 14895
-SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
-SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
+SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
+SIZE (rust/crates/version_check-0.9.5.crate) = 15554
+SHA256 (rust/crates/wait-timeout-0.2.1.crate) = 09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11
+SIZE (rust/crates/wait-timeout-0.2.1.crate) = 11435
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
 SIZE (rust/crates/want-0.3.1.crate) = 6398
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
-SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
-SIZE (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 28348
-SHA256 (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0
-SIZE (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 15380
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.92.crate) = a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726
-SIZE (rust/crates/wasm-bindgen-macro-0.2.92.crate) = 13835
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
-SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
-SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
-SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
+SHA256 (rust/crates/wasi-0.13.3+wasi-0.2.2.crate) = 26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2
+SIZE (rust/crates/wasi-0.13.3+wasi-0.2.2.crate) = 136754
+SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
+SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
+SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.50.crate) = 555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61
+SIZE (rust/crates/wasm-bindgen-futures-0.4.50.crate) = 16181
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
+SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
+SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
+SHA256 (rust/crates/wasm-streams-0.4.2.crate) = 15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65
+SIZE (rust/crates/wasm-streams-0.4.2.crate) = 36773
+SHA256 (rust/crates/web-sys-0.3.77.crate) = 33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2
+SIZE (rust/crates/web-sys-0.3.77.crate) = 638246
+SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
+SIZE (rust/crates/web-time-1.1.0.crate) = 18026
 SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311
 SIZE (rust/crates/widestring-1.1.0.crate) = 85046
 SHA256 (rust/crates/win-crypto-ng-0.5.1.crate) = 99abfb435a71e54ab2971d8d8c32f1a7e006cdbf527f71743b1d45b93517bb92
@@ -883,87 +969,99 @@ SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe9399
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.8.crate) = 4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b
-SIZE (rust/crates/winapi-util-0.1.8.crate) = 12416
+SHA256 (rust/crates/winapi-util-0.1.9.crate) = cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb
+SIZE (rust/crates/winapi-util-0.1.9.crate) = 12464
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
 SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
 SIZE (rust/crates/windows-0.48.0.crate) = 11864177
 SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
 SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
-SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
-SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
+SHA256 (rust/crates/windows-link-0.1.0.crate) = 6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3
+SIZE (rust/crates/windows-link-0.1.0.crate) = 6153
+SHA256 (rust/crates/windows-registry-0.2.0.crate) = e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0
+SIZE (rust/crates/windows-registry-0.2.0.crate) = 10470
+SHA256 (rust/crates/windows-result-0.2.0.crate) = 1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e
+SIZE (rust/crates/windows-result-0.2.0.crate) = 12756
+SHA256 (rust/crates/windows-strings-0.1.0.crate) = 4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10
+SIZE (rust/crates/windows-strings-0.1.0.crate) = 13832
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
 SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
 SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
 SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
-SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071
-SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492
+SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
+SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323
 SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
 SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
-SHA256 (rust/crates/windows-targets-0.52.5.crate) = 6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb
-SIZE (rust/crates/windows-targets-0.52.5.crate) = 6376
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
-SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
+SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
+SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263
-SIZE (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 433266
-SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
-SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
 SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
 SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
-SHA256 (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6
-SIZE (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 827944
-SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
-SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
+SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
 SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
 SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
-SHA256 (rust/crates/windows_i686_gnu-0.52.5.crate) = 88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670
-SIZE (rust/crates/windows_i686_gnu-0.52.5.crate) = 875699
-SHA256 (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9
-SIZE (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 473064
-SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
-SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
+SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
+SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
+SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
 SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
 SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
-SHA256 (rust/crates/windows_i686_msvc-0.52.5.crate) = db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf
-SIZE (rust/crates/windows_i686_msvc-0.52.5.crate) = 895404
-SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
-SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
+SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
+SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
 SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
 SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
-SHA256 (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9
-SIZE (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 831539
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
-SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
+SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596
-SIZE (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 433246
-SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
-SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
 SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
 SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
-SHA256 (rust/crates/windows_x86_64_msvc-0.52.5.crate) = bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0
-SIZE (rust/crates/windows_x86_64_msvc-0.52.5.crate) = 827905
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
+SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
+SHA256 (rust/crates/winnow-0.7.3.crate) = 0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1
+SIZE (rust/crates/winnow-0.7.3.crate) = 171602
 SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
 SIZE (rust/crates/winreg-0.50.0.crate) = 29703
+SHA256 (rust/crates/wit-bindgen-rt-0.33.0.crate) = 3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c
+SIZE (rust/crates/wit-bindgen-rt-0.33.0.crate) = 3357
+SHA256 (rust/crates/write16-1.0.0.crate) = d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936
+SIZE (rust/crates/write16-1.0.0.crate) = 7218
+SHA256 (rust/crates/writeable-0.5.5.crate) = 1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51
+SIZE (rust/crates/writeable-0.5.5.crate) = 22354
 SHA256 (rust/crates/x25519-dalek-2.0.1.crate) = c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277
 SIZE (rust/crates/x25519-dalek-2.0.1.crate) = 87820
-SHA256 (rust/crates/xxhash-rust-0.8.10.crate) = 927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03
-SIZE (rust/crates/xxhash-rust-0.8.10.crate) = 20066
-SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
-SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
+SHA256 (rust/crates/xxhash-rust-0.8.15.crate) = fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3
+SIZE (rust/crates/xxhash-rust-0.8.15.crate) = 21515
+SHA256 (rust/crates/yaml-rust2-0.9.0.crate) = 2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d
+SIZE (rust/crates/yaml-rust2-0.9.0.crate) = 136382
+SHA256 (rust/crates/yoke-0.7.5.crate) = 120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40
+SIZE (rust/crates/yoke-0.7.5.crate) = 29673
+SHA256 (rust/crates/yoke-derive-0.7.5.crate) = 2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154
+SIZE (rust/crates/yoke-derive-0.7.5.crate) = 7525
 SHA256 (rust/crates/z-base-32-0.1.4.crate) = 21bf7b4a78668416e1e8a332334e26fb2f377afe707f0c6feaf6ed5f9100133b
 SIZE (rust/crates/z-base-32-0.1.4.crate) = 14008
-SHA256 (rust/crates/zerocopy-0.7.34.crate) = ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087
-SIZE (rust/crates/zerocopy-0.7.34.crate) = 151177
-SHA256 (rust/crates/zerocopy-derive-0.7.34.crate) = 15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b
-SIZE (rust/crates/zerocopy-derive-0.7.34.crate) = 37907
-SHA256 (rust/crates/zeroize-1.7.0.crate) = 525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d
-SIZE (rust/crates/zeroize-1.7.0.crate) = 19039
+SHA256 (rust/crates/zerocopy-0.7.35.crate) = 1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0
+SIZE (rust/crates/zerocopy-0.7.35.crate) = 152645
+SHA256 (rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e
+SIZE (rust/crates/zerocopy-derive-0.7.35.crate) = 37829
+SHA256 (rust/crates/zerofrom-0.1.4.crate) = 91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55
+SIZE (rust/crates/zerofrom-0.1.4.crate) = 5044
+SHA256 (rust/crates/zerofrom-derive-0.1.6.crate) = d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502
+SIZE (rust/crates/zerofrom-derive-0.1.6.crate) = 8305
+SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
+SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
 SHA256 (rust/crates/zeroize_derive-1.4.2.crate) = ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69
 SIZE (rust/crates/zeroize_derive-1.4.2.crate) = 11141
-SHA256 (sequoia-sq-v0.36.0.tar.bz2) = 0b8f6440ffd1156d6a27330c269db17c6b0f9c4679e8d3a240a48969e77f1d28
-SIZE (sequoia-sq-v0.36.0.tar.bz2) = 474304
+SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079
+SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
+SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
+SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
+SHA256 (sequoia-sq-v1.3.1.tar.bz2) = ca4a6ef07ab9ca492c8166d6d6ed0354eb81f418bf819cf095c1ee856c461365
+SIZE (sequoia-sq-v1.3.1.tar.bz2) = 675650
diff --git a/security/sequoia-sq/pkg-plist b/security/sequoia-sq/pkg-plist
index d6f951db7efe..df22dd8ba949 100644
--- a/security/sequoia-sq/pkg-plist
+++ b/security/sequoia-sq/pkg-plist
@@ -2,19 +2,26 @@ bin/sq
 %%BASH%%share/bash-completion/completions/sq
 %%ELVISH%%share/elvish/lib/sq.elv
 %%FISH%%share/fish/completions/sq.fish
-%%MANPAGES%%share/man/man1/sq-autocrypt-decode.1.gz
-%%MANPAGES%%share/man/man1/sq-autocrypt-encode-sender.1.gz
-%%MANPAGES%%share/man/man1/sq-autocrypt-import.1.gz
-%%MANPAGES%%share/man/man1/sq-autocrypt.1.gz
 %%MANPAGES%%share/man/man1/sq-cert-export.1.gz
 %%MANPAGES%%share/man/man1/sq-cert-import.1.gz
 %%MANPAGES%%share/man/man1/sq-cert-lint.1.gz
+%%MANPAGES%%share/man/man1/sq-cert-list.1.gz
 %%MANPAGES%%share/man/man1/sq-cert.1.gz
+%%MANPAGES%%share/man/man1/sq-config-get.1.gz
+%%MANPAGES%%share/man/man1/sq-config-inspect-network.1.gz
+%%MANPAGES%%share/man/man1/sq-config-inspect-paths.1.gz
+%%MANPAGES%%share/man/man1/sq-config-inspect-policy.1.gz
+%%MANPAGES%%share/man/man1/sq-config-inspect.1.gz
+%%MANPAGES%%share/man/man1/sq-config-template.1.gz
+%%MANPAGES%%share/man/man1/sq-config.1.gz
 %%MANPAGES%%share/man/man1/sq-decrypt.1.gz
+%%MANPAGES%%share/man/man1/sq-download.1.gz
 %%MANPAGES%%share/man/man1/sq-encrypt.1.gz
 %%MANPAGES%%share/man/man1/sq-inspect.1.gz
-%%MANPAGES%%share/man/man1/sq-key-adopt.1.gz
-%%MANPAGES%%share/man/man1/sq-key-attest-certifications.1.gz
+%%MANPAGES%%share/man/man1/sq-key-approvals-list.1.gz
+%%MANPAGES%%share/man/man1/sq-key-approvals-update.1.gz
+%%MANPAGES%%share/man/man1/sq-key-approvals.1.gz
+%%MANPAGES%%share/man/man1/sq-key-delete.1.gz
 %%MANPAGES%%share/man/man1/sq-key-expire.1.gz
 %%MANPAGES%%share/man/man1/sq-key-export.1.gz
 %%MANPAGES%%share/man/man1/sq-key-generate.1.gz
@@ -22,53 +29,58 @@ bin/sq
 %%MANPAGES%%share/man/man1/sq-key-list.1.gz
 %%MANPAGES%%share/man/man1/sq-key-password.1.gz
 %%MANPAGES%%share/man/man1/sq-key-revoke.1.gz
+%%MANPAGES%%share/man/man1/sq-key-rotate.1.gz
 %%MANPAGES%%share/man/man1/sq-key-subkey-add.1.gz
+%%MANPAGES%%share/man/man1/sq-key-subkey-bind.1.gz
+%%MANPAGES%%share/man/man1/sq-key-subkey-delete.1.gz
+%%MANPAGES%%share/man/man1/sq-key-subkey-expire.1.gz
+%%MANPAGES%%share/man/man1/sq-key-subkey-export.1.gz
+%%MANPAGES%%share/man/man1/sq-key-subkey-password.1.gz
 %%MANPAGES%%share/man/man1/sq-key-subkey-revoke.1.gz
 %%MANPAGES%%share/man/man1/sq-key-subkey.1.gz
 %%MANPAGES%%share/man/man1/sq-key-userid-add.1.gz
 %%MANPAGES%%share/man/man1/sq-key-userid-revoke.1.gz
-%%MANPAGES%%share/man/man1/sq-key-userid-strip.1.gz
 %%MANPAGES%%share/man/man1/sq-key-userid.1.gz
 %%MANPAGES%%share/man/man1/sq-key.1.gz
-%%MANPAGES%%share/man/man1/sq-network-dane-fetch.1.gz
+%%MANPAGES%%share/man/man1/sq-keyring-filter.1.gz
+%%MANPAGES%%share/man/man1/sq-keyring-list.1.gz
+%%MANPAGES%%share/man/man1/sq-keyring-merge.1.gz
+%%MANPAGES%%share/man/man1/sq-keyring-split.1.gz
+%%MANPAGES%%share/man/man1/sq-keyring.1.gz
 %%MANPAGES%%share/man/man1/sq-network-dane-generate.1.gz
+%%MANPAGES%%share/man/man1/sq-network-dane-search.1.gz
 %%MANPAGES%%share/man/man1/sq-network-dane.1.gz
-%%MANPAGES%%share/man/man1/sq-network-fetch.1.gz
-%%MANPAGES%%share/man/man1/sq-network-keyserver-fetch.1.gz
 %%MANPAGES%%share/man/man1/sq-network-keyserver-publish.1.gz
+%%MANPAGES%%share/man/man1/sq-network-keyserver-search.1.gz
 %%MANPAGES%%share/man/man1/sq-network-keyserver.1.gz
-%%MANPAGES%%share/man/man1/sq-network-wkd-direct-url.1.gz
-%%MANPAGES%%share/man/man1/sq-network-wkd-fetch.1.gz
-%%MANPAGES%%share/man/man1/sq-network-wkd-generate.1.gz
-%%MANPAGES%%share/man/man1/sq-network-wkd-url.1.gz
+%%MANPAGES%%share/man/man1/sq-network-search.1.gz
+%%MANPAGES%%share/man/man1/sq-network-wkd-publish.1.gz
+%%MANPAGES%%share/man/man1/sq-network-wkd-search.1.gz
 %%MANPAGES%%share/man/man1/sq-network-wkd.1.gz
 %%MANPAGES%%share/man/man1/sq-network.1.gz
+%%MANPAGES%%share/man/man1/sq-packet-armor.1.gz
+%%MANPAGES%%share/man/man1/sq-packet-dearmor.1.gz
+%%MANPAGES%%share/man/man1/sq-packet-decrypt.1.gz
+%%MANPAGES%%share/man/man1/sq-packet-dump.1.gz
+%%MANPAGES%%share/man/man1/sq-packet-join.1.gz
+%%MANPAGES%%share/man/man1/sq-packet-split.1.gz
+%%MANPAGES%%share/man/man1/sq-packet.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-authenticate.1.gz
-%%MANPAGES%%share/man/man1/sq-pki-certify.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-identify.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-link-add.1.gz
+%%MANPAGES%%share/man/man1/sq-pki-link-authorize.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-link-list.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-link-retract.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-link.1.gz
-%%MANPAGES%%share/man/man1/sq-pki-list.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-lookup.1.gz
 %%MANPAGES%%share/man/man1/sq-pki-path.1.gz
+%%MANPAGES%%share/man/man1/sq-pki-vouch-add.1.gz
+%%MANPAGES%%share/man/man1/sq-pki-vouch-authorize.1.gz
+%%MANPAGES%%share/man/man1/sq-pki-vouch-list.1.gz
+%%MANPAGES%%share/man/man1/sq-pki-vouch-replay.1.gz
+%%MANPAGES%%share/man/man1/sq-pki-vouch.1.gz
 %%MANPAGES%%share/man/man1/sq-pki.1.gz
 %%MANPAGES%%share/man/man1/sq-sign.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-armor.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-dearmor.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-extract-cert.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-keyring-filter.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-keyring-list.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-keyring-merge.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-keyring-split.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-keyring.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-packet-decrypt.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-packet-dump.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-packet-join.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-packet-split.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox-packet.1.gz
-%%MANPAGES%%share/man/man1/sq-toolbox.1.gz
 %%MANPAGES%%share/man/man1/sq-verify.1.gz
 %%MANPAGES%%share/man/man1/sq-version.1.gz
 %%MANPAGES%%share/man/man1/sq.1.gz
diff --git a/security/sequoia/Makefile b/security/sequoia/Makefile
index 2a94f6982613..7f55386a5cf8 100644
--- a/security/sequoia/Makefile
+++ b/security/sequoia/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	sequoia
-DISTVERSION=	1.18.0
+DISTVERSION=	2.0.0
 CATEGORIES=	security
 
 MAINTAINER=	vishwin@FreeBSD.org
diff --git a/security/snowflake-tor/Makefile b/security/snowflake-tor/Makefile
index 96a53e4fb684..57ff0543eb68 100644
--- a/security/snowflake-tor/Makefile
+++ b/security/snowflake-tor/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		snowflake
 DISTVERSIONPREFIX=	v
 PORTVERSION=		2.5.1
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=		security net
 PKGNAMESUFFIX=		-tor
 
diff --git a/security/snowflake-tor/files/snowflake-broker.in b/security/snowflake-tor/files/snowflake-broker.in
index 3113d655db55..66291a653ad7 100644
--- a/security/snowflake-tor/files/snowflake-broker.in
+++ b/security/snowflake-tor/files/snowflake-broker.in
@@ -11,7 +11,7 @@
 
 . /etc/rc.subr
 
-name="snowflake-broker"
+name="snowflake_broker"
 rcvar="snowflake_broker_enable"
 pidfile="/var/run/${name}.pid"
 logfile="/var/log/${name}.log"
diff --git a/security/timestamp-authority/Makefile b/security/timestamp-authority/Makefile
new file mode 100644
index 000000000000..b2282b914160
--- /dev/null
+++ b/security/timestamp-authority/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	timestamp-authority
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.2.6
+CATEGORIES=	security
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Service for issuing RFC 3161 timestamps
+WWW=		https://sigstore.dev/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:1.24,modules
+USE_RC_SUBR=	${PORTNAME}
+
+GO_MODULE=	github.com/sigstore/timestamp-authority
+GO_TARGET=	./cmd/fetch-tsa-certs \
+		./cmd/timestamp-cli \
+		./cmd/timestamp-server
+
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/security/timestamp-authority/distinfo b/security/timestamp-authority/distinfo
new file mode 100644
index 000000000000..c3840e7d5dd9
--- /dev/null
+++ b/security/timestamp-authority/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746365906
+SHA256 (go/security_timestamp-authority/timestamp-authority-v1.2.6/v1.2.6.mod) = c4aefce5738d70dd5cc0ee2a3556d3642d63b23ff348295668aec953dc417cb1
+SIZE (go/security_timestamp-authority/timestamp-authority-v1.2.6/v1.2.6.mod) = 7778
+SHA256 (go/security_timestamp-authority/timestamp-authority-v1.2.6/v1.2.6.zip) = a9fad76a867bc16dbd893a08d286c24eff93b49b00c64e8a051da58df5c154dc
+SIZE (go/security_timestamp-authority/timestamp-authority-v1.2.6/v1.2.6.zip) = 196254
diff --git a/security/timestamp-authority/files/timestamp-authority.in b/security/timestamp-authority/files/timestamp-authority.in
new file mode 100644
index 000000000000..dc39614451c1
--- /dev/null
+++ b/security/timestamp-authority/files/timestamp-authority.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# PROVIDE: timestamp-server
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# timestamp-server_enable (bool):	Set it to YES to enable timestamp-server.
+#			Default is "NO".
+# timestamp-server_user (user):	Set user to run timestamp-server.
+#			Default is "timestamp-server".
+# timestamp-server_group (group):	Set group to run timestamp-server.
+#			Default is "timestamp-server".
+# timestamp-server_config (file):	Set timestamp-server config file.
+#			Default is "%%PREFIX%%/etc/timestamp-server/timestamp-server.yaml".
+
+. /etc/rc.subr
+
+name=timestamp-server
+rcvar=timestamp-server_enable
+
+load_rc_config $name
+
+: ${timestamp-server_enable:="NO"}
+: ${timestamp-server_user:="timestamp-authority"}
+: ${timestamp-server_group:="timestamp-authority"}
+: ${timestamp-server_config:="%%PREFIX%%/etc/timestamp-authority/timestamp-server.yaml"}
+
+pidfile=/var/run/timestamp-server.pid
+procname="%%PREFIX%%/bin/timestamp-server"
+command="/usr/sbin/daemon"
+command_args="-f -t ${name} -p ${pidfile} ${procname} serve -config=${timestamp-server_config}"
+
+start_precmd=timestamp-server_startprecmd
+required_files="$timestamp-server_config"
+
+timestamp-server_startprecmd()
+{
+        if [ ! -e ${pidfile} ]; then
+                install -o ${timestamp-server_user} -g ${timestamp-server_group} /dev/null ${pidfile};
+        fi
+}
+
+run_rc_command "$1"
diff --git a/security/timestamp-authority/pkg-descr b/security/timestamp-authority/pkg-descr
new file mode 100644
index 000000000000..7160e019b0ea
--- /dev/null
+++ b/security/timestamp-authority/pkg-descr
@@ -0,0 +1,10 @@
+Trusted timestamping is a process that has been around for some time. It
+provides a timestamp record of when a document was created or modified.
+
+A timestamp authority creates signed timestamps using public key
+infrastructure. The operator of the timestamp authority must secure the
+signing key material to prevent unauthorized timestamp signing.
+
+A timestamp authority should also verify its own clock. We provide a
+configuration to periodically check the current time against well-known
+NTP sources.
diff --git a/security/timestamp-authority/pkg-plist b/security/timestamp-authority/pkg-plist
new file mode 100644
index 000000000000..7462fe7c3956
--- /dev/null
+++ b/security/timestamp-authority/pkg-plist
@@ -0,0 +1,3 @@
+bin/fetch-tsa-certs
+bin/timestamp-cli
+bin/timestamp-server
diff --git a/security/trillian/Makefile b/security/trillian/Makefile
new file mode 100644
index 000000000000..030fb4024a2e
--- /dev/null
+++ b/security/trillian/Makefile
@@ -0,0 +1,33 @@
+PORTNAME=	trillian
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.7.2
+CATEGORIES=	security
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	General transparency
+WWW=		https://github.com/google/trillian
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:1.24,modules
+USE_RC_SUBR=	trillian_log_server trillian_log_signer
+
+GO_MODULE=	github.com/google/trillian
+GO_TARGET=	./cmd/createtree \
+		./cmd/deletetree \
+		./cmd/trillian_log_server \
+		./cmd/trillian_log_signer \
+		./cmd/updatetree
+
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+
+post-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${FILESDIR}/trillian_log_server.conf \
+		${STAGEDIR}${ETCDIR}/trillian_log_server.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/trillian_log_signer.conf \
+		${STAGEDIR}${ETCDIR}/trillian_log_signer.conf.sample
+
+.include <bsd.port.mk>
diff --git a/security/trillian/distinfo b/security/trillian/distinfo
new file mode 100644
index 000000000000..7c7c0402bfdb
--- /dev/null
+++ b/security/trillian/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746297835
+SHA256 (go/security_trillian/trillian-v1.7.2/v1.7.2.mod) = d22d6349374cf164ac10240d5075da9cf5d896a3393c4e8705f9a184a0835687
+SIZE (go/security_trillian/trillian-v1.7.2/v1.7.2.mod) = 10012
+SHA256 (go/security_trillian/trillian-v1.7.2/v1.7.2.zip) = ed6db0f457762c8b8068fbc7ee697510a270c93ce5ca11dc2d73597e082b6336
+SIZE (go/security_trillian/trillian-v1.7.2/v1.7.2.zip) = 2592461
diff --git a/security/trillian/files/trillian_log_server.conf b/security/trillian/files/trillian_log_server.conf
new file mode 100644
index 000000000000..223f0afeca24
--- /dev/null
+++ b/security/trillian/files/trillian_log_server.conf
@@ -0,0 +1,141 @@
+# NOTE: Comments are NOT allowed. Please remove ALL comments (including this
+# one) and add each command line argument desired. See
+# https://github.com/google/trillian/issues/2724 for details.
+
+# log to standard error as well as files
+#--alsologtostderr
+
+# Fraction of merkle keyspace to dequeue from, set to zero to disable. (default 0.75)
+#--cloudspanner_dequeue_bucket_fraction float
+
+# Interval betweek pinging sessions.
+#--cloudspanner_healthcheck_interval duration
+
+# Max concurrent create session requests.
+#--cloudspanner_max_burst_sessions uint
+
+# Max idle sessions.
+#--cloudspanner_max_idle_sessions uint
+
+# Max open sessions.
+#--cloudspanner_max_open_sessions uint
+
+# Min open sessions.
+#--cloudspanner_min_open_sessions uint
+
+# Number of gRPC channels to use to talk to CloudSpanner.
+#--cloudspanner_num_channels int
+
+# Number of health check workers for Spanner session pool.
+#--cloudspanner_num_healthcheckers int
+
+# How far in the past to perform readonly operations. Within limits, raising this should help to increase performance/reduce latency. (default 1m0s)
+#--cloudspanner_readonly_staleness duration
+
+# determines whether the session pool will keep track of the stacktrace of the goroutines that take sessions from the pool.
+#--cloudspanner_track_session_handles
+
+# Connection URI for CloudSpanner database
+#--cloudspanner_uri string
+
+# Fraction of write capable sessions to maintain.
+#--cloudspanner_write_sessions float
+
+# Config file containing flags, file contents can be overridden by command line flags
+#--config string
+
+# If set, write CPU profile to this file
+#--cpuprofile string
+
+# Service name to announce our HTTP endpoint under (default "trillian-logserver-http")
+#--etcd_http_service string
+
+# A comma-separated list of etcd servers; no etcd registration if empty
+#--etcd_servers string
+
+# Service name to announce ourselves under (default "trillian-logserver")
+#--etcd_service string
+
+# Timeout used during healthz checks (default 5s)
+#--healthz_timeout duration
+
+# Endpoint for HTTP metrics (host:port, empty means disabled) (default "localhost:8091")
+#--http_endpoint string
+
+# when logging hits line file:N, emit a stack trace
+#--log_backtrace_at value
+
+# If non-empty, write log files in this directory
+#--log_dir string
+
+# log to standard error instead of files
+#--logtostderr
+
+# Max number of unsequenced rows before rate limiting kicks in. Only effective for quota_system=mysql. (default 500000)
+#--max_unsequenced_rows int
+
+# If set, write memory profile to this file
+#--memprofile string
+
+# Maximum connections to the database
+#--mysql_max_conns int
+
+# Maximum idle database connections in the connection pool (default -1)
+#--mysql_max_idle_conns int
+
+# Connection URI for MySQL database (default "test:zaphod@tcp(127.0.0.1:3306)/test")
+#--mysql_uri string
+
+# Max number of concurrent workers concurrently populating subtrees (default 256)
+#--populate_subtree_concurrency int
+
+# If true no requests are blocked due to lack of tokens
+#--quota_dry_run
+
+# Max number of quota specs in the quota cache. Zero or lower means batching is disabled. Applicable for etcd quotas. (default 1000)
+#--quota_max_cache_entries int
+
+# Minimum number of tokens to request from the quota system. Zero or lower means batching is disabled. Applicable for etcd quotas. (default 100)
+#--quota_min_batch_size int
+
+# Quota system to use. One of: [noop etcd mysql] (default "mysql")
+#--quota_system string
+
+# Endpoint for RPC requests (host:port) (default "localhost:8090")
+#--rpc_endpoint string
+
+# logs at or above this threshold go to stderr
+#--stderrthreshold value
+
+# Storage system to use. One of: [mysql cloud_spanner] (default "mysql")
+#--storage_system string
+
+# Path to the TLS server certificate. If unset, the server will use unsecured connections.
+#--tls_cert_file string
+
+# Path to the TLS server key. If unset, the server will use unsecured connections.
+#--tls_key_file string
+
+# If true opencensus Stackdriver tracing will be enabled. See https://opencensus.io/.
+#--tracing
+
+# Percent of requests to be traced. Zero is a special case to use the DefaultSampler
+#--tracing_percent int
+
+# project ID to pass to stackdriver. Can be empty for GCP, consult docs for other platforms.
+#--tracing_project_id string
+
+# Minimum interval between tree garbage collection sweeps. Actual runs happen randomly between [minInterval,2*minInterval). (default 4h0m0s)
+#--tree_delete_min_run_interval duration
+
+# Minimum period a tree has to remain deleted before being hard-deleted (default 168h0m0s)
+#--tree_delete_threshold duration
+
+# If true, tree garbage collection (hard-deletion) is periodically performed (default true)
+#--tree_gc
+
+# log level for V logs
+#--v value
+
+# comma-separated list of pattern=N settings for file-filtered logging
+#--vmodule value
diff --git a/security/trillian/files/trillian_log_server.in b/security/trillian/files/trillian_log_server.in
new file mode 100644
index 000000000000..c53fdc75cdd6
--- /dev/null
+++ b/security/trillian/files/trillian_log_server.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# PROVIDE: trillian_log_server
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# trillian_log_server_enable (bool):	Set it to YES to enable trillian_log_server.
+#			Default is "NO".
+# trillian_log_server_user (user):	Set user to run trillian_log_server.
+#			Default is "trillian".
+# trillian_log_server_group (group):	Set group to run trillian_log_server.
+#			Default is "trillian".
+# trillian_log_server_config (file):	Set trillian_log_server config file.
+#			Default is "%%PREFIX%%/etc/trillian/trillian_log_server.conf".
+
+. /etc/rc.subr
+
+name=trillian_log_server
+rcvar=trillian_log_server_enable
+
+load_rc_config $name
+
+: ${trillian_log_server_enable:="NO"}
+: ${trillian_log_server_user:="trillian"}
+: ${trillian_log_server_group:="trillian"}
+: ${trillian_log_server_config:="%%PREFIX%%/etc/trillian/trillian_log_server.conf"}
+
+pidfile=/var/run/trillian_log_server.pid
+procname="%%PREFIX%%/bin/trillian_log_server"
+command="/usr/sbin/daemon"
+command_args="-f -t ${name} -p ${pidfile} ${procname} server -config=${trillian_log_server_config}"
+
+start_precmd=trillian_log_server_startprecmd
+required_files="$trillian_log_server_config"
+
+trillian_log_server_startprecmd()
+{
+        if [ ! -e ${pidfile} ]; then
+                install -o ${trillian_log_server_user} -g ${trillian_log_server_group} /dev/null ${pidfile};
+        fi
+}
+
+run_rc_command "$1"
diff --git a/security/trillian/files/trillian_log_signer.conf b/security/trillian/files/trillian_log_signer.conf
new file mode 100644
index 000000000000..c5f400b336a4
--- /dev/null
+++ b/security/trillian/files/trillian_log_signer.conf
@@ -0,0 +1,147 @@
+# NOTE: Comments are NOT allowed. Please remove ALL comments (including this
+# one) and add each command line argument desired. See
+# https://github.com/google/trillian/issues/2724 for details.
+
+# log to standard error as well as files
+#--alsologtostderr
+
+# Max number of leaves to process per batch (default 1000)
+#--batch_size int
+
+# Fraction of merkle keyspace to dequeue from, set to zero to disable. (default 0.75)
+#--cloudspanner_dequeue_bucket_fraction float
+
+# Interval betweek pinging sessions.
+#--cloudspanner_healthcheck_interval duration
+
+# Max concurrent create session requests.
+#--cloudspanner_max_burst_sessions uint
+
+# Max idle sessions.
+#--cloudspanner_max_idle_sessions uint
+
+# Max open sessions.
+#--cloudspanner_max_open_sessions uint
+
+# Min open sessions.
+#--cloudspanner_min_open_sessions uint
+
+# Number of gRPC channels to use to talk to CloudSpanner.
+#--cloudspanner_num_channels int
+
+# Number of health check workers for Spanner session pool.
+#--cloudspanner_num_healthcheckers int
+
+# How far in the past to perform readonly operations. Within limits, raising this should help to increase performance/reduce latency. (default 1m0s)
+#--cloudspanner_readonly_staleness duration
+
+# determines whether the session pool will keep track of the stacktrace of the goroutines that take sessions from the pool.
+#--cloudspanner_track_session_handles
+
+# Connection URI for CloudSpanner database
+#--cloudspanner_uri string
+
+# Fraction of write capable sessions to maintain.
+#--cloudspanner_write_sessions float
+
+# Config file containing flags, file contents can be overridden by command line flags
+#--config string
+
+# If set, write CPU profile to this file
+#--cpuprofile string
+
+# Service name to announce our HTTP endpoint under (default "trillian-logsigner-http")
+#--etcd_http_service string
+
+# A comma-separated list of etcd servers; no etcd registration if empty
+#--etcd_servers string
+
+# If true, assume master for all logs
+#--force_master
+
+# Timeout used during healthz checks (default 5s)
+#--healthz_timeout duration
+
+# Endpoint for HTTP (host:port, empty means disabled) (default "localhost:8091")
+#--http_endpoint string
+
+# etcd lock file directory path (default "/test/multimaster")
+#--lock_file_path string
+
+# when logging hits line file:N, emit a stack trace
+#--log_backtrace_at value
+
+# If non-empty, write log files in this directory
+#--log_dir string
+
+# log to standard error instead of files
+#--logtostderr
+
+# Minimum interval to hold mastership for (default 1m0s)
+#--master_hold_interval duration
+
+# Maximal random addition to --master_hold_interval (default 2m0s)
+#--master_hold_jitter duration
+
+# Max number of unsequenced rows before rate limiting kicks in. Only effective for quota_system=mysql. (default 500000)
+#--max_unsequenced_rows int
+
+# If set, write memory profile to this file
+#--memprofile string
+
+# Maximum connections to the database
+#--mysql_max_conns int
+
+# Maximum idle database connections in the connection pool (default -1)
+#--mysql_max_idle_conns int
+
+# Connection URI for MySQL database (default "test:zaphod@tcp(127.0.0.1:3306)/test")
+#--mysql_uri string
+
+# Number of sequencer workers to run in parallel (default 10)
+#--num_sequencers int
+
+# Max number of concurrent workers concurrently populating subtrees (default 256)
+#--populate_subtree_concurrency int
+
+# Maximum time to wait before starting elections (default 1s)
+#--pre_election_pause duration
+
+# Increase factor for tokens replenished by sequencing-based quotas (1 means a 1:1 relationship between sequenced leaves and replenished tokens).Only effective for --quota_system=etcd. (default 1.1)
+#--quota_increase_factor float
+
+# Max number of quota specs in the quota cache. Zero or lower means batching is disabled. Applicable for etcd quotas. (default 1000)
+#--quota_max_cache_entries int
+
+# Minimum number of tokens to request from the quota system. Zero or lower means batching is disabled. Applicable for etcd quotas. (default 100)
+#--quota_min_batch_size int
+
+# Quota system to use. One of: [noop etcd mysql] (default "mysql")
+#--quota_system string
+
+# Endpoint for RPC requests (host:port) (default "localhost:8090")
+#--rpc_endpoint string
+
+# If set, the time elapsed before submitted leaves are eligible for sequencing
+#--sequencer_guard_window duration
+
+# Time between each sequencing pass through all logs (default 100ms)
+#--sequencer_interval duration
+
+# logs at or above this threshold go to stderr
+#--stderrthreshold value
+
+# Storage system to use. One of: [cloud_spanner mysql] (default "mysql")
+#--storage_system string
+
+# Path to the TLS server certificate. If unset, the server will use unsecured connections.
+#--tls_cert_file string
+
+# Path to the TLS server key. If unset, the server will use unsecured connections.
+#--tls_key_file string
+
+# log level for V logs
+#--v value
+
+# comma-separated list of pattern=N settings for file-filtered logging
+#--vmodule value
diff --git a/security/trillian/files/trillian_log_signer.in b/security/trillian/files/trillian_log_signer.in
new file mode 100644
index 000000000000..065f35e6badb
--- /dev/null
+++ b/security/trillian/files/trillian_log_signer.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# PROVIDE: trillian_log_signer
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# trillian_log_signer_enable (bool):	Set it to YES to enable trillian_log_signer.
+#			Default is "NO".
+# trillian_log_signer_user (user):	Set user to run trillian_log_signer.
+#			Default is "trillian".
+# trillian_log_signer_group (group):	Set group to run trillian_log_signer.
+#			Default is "trillian".
+# trillian_log_signer_config (file):	Set trillian_log_signer config file.
+#			Default is "%%PREFIX%%/etc/trillian/trillian_log_signer.conf".
+
+. /etc/rc.subr
+
+name=trillian_log_signer
+rcvar=trillian_log_signer_enable
+
+load_rc_config $name
+
+: ${trillian_log_signer_enable:="NO"}
+: ${trillian_log_signer_user:="trillian"}
+: ${trillian_log_signer_group:="trillian"}
+: ${trillian_log_signer_config:="%%PREFIX%%/etc/trillian/trillian_log_signer.conf"}
+
+pidfile=/var/run/trillian_log_signer.pid
+procname="%%PREFIX%%/bin/trillian_log_signer"
+command="/usr/sbin/daemon"
+command_args="-f -t ${name} -p ${pidfile} ${procname} signer -config=${trillian_log_signer_config}"
+
+start_precmd=trillian_log_signer_startprecmd
+required_files="$trillian_log_signer_config"
+
+trillian_log_signer_startprecmd()
+{
+        if [ ! -e ${pidfile} ]; then
+                install -o ${trillian_log_signer_user} -g ${trillian_log_signer_group} /dev/null ${pidfile};
+        fi
+}
+
+run_rc_command "$1"
diff --git a/security/trillian/pkg-descr b/security/trillian/pkg-descr
new file mode 100644
index 000000000000..05f0d33c4dea
--- /dev/null
+++ b/security/trillian/pkg-descr
@@ -0,0 +1,14 @@
+Trillian is an implementation of the concepts described in the
+Verifiable Data Structures white paper, which in turn is an extension
+and generalisation of the ideas which underpin Certificate Transparency.
+
+Trillian implements a Merkle tree whose contents are served from a data
+storage layer, to allow scalability to extremely large trees. On top of
+this Merkle tree, Trillian provides the following:
+
+- An append-only Log mode, analogous to the original Certificate
+  Transparency logs. In this mode, the Merkle tree is effectively filled
+  up from the left, giving a dense Merkle tree.
+
+Note that Trillian requires particular applications to provide their own
+personalities on top of the core transparent data store functionality.
diff --git a/security/trillian/pkg-plist b/security/trillian/pkg-plist
new file mode 100644
index 000000000000..6eaaeea5dead
--- /dev/null
+++ b/security/trillian/pkg-plist
@@ -0,0 +1,7 @@
+bin/createtree
+bin/deletetree
+bin/trillian_log_server
+bin/trillian_log_signer
+bin/updatetree
+@sample %%ETCDIR%%/trillian_log_server.conf.sample
+@sample %%ETCDIR%%/trillian_log_signer.conf.sample
diff --git a/security/trivy/Makefile b/security/trivy/Makefile
index 227970b9aa61..ad36ebf70235 100644
--- a/security/trivy/Makefile
+++ b/security/trivy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	trivy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.62.0
+DISTVERSION=	0.62.1
 CATEGORIES=	security
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/security/trivy/distinfo b/security/trivy/distinfo
index ddd8bdb337b3..82103f007cc0 100644
--- a/security/trivy/distinfo
+++ b/security/trivy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746162898
-SHA256 (go/security_trivy/trivy-v0.62.0/v0.62.0.mod) = 3e90959b59232687e7d13d65b30bb33be2298cd9e828177ff7937c2382b8a573
-SIZE (go/security_trivy/trivy-v0.62.0/v0.62.0.mod) = 23442
-SHA256 (go/security_trivy/trivy-v0.62.0/v0.62.0.zip) = 7d7d727aaddf26856a71a3f47576984a272fdc8bc95ef8198e97a515541a9565
-SIZE (go/security_trivy/trivy-v0.62.0/v0.62.0.zip) = 58731204
+TIMESTAMP = 1746598325
+SHA256 (go/security_trivy/trivy-v0.62.1/v0.62.1.mod) = a74c2bd0c648c42d60b33daf66218efe3b5c31d4a73f2764b9c24c0bab28c4b6
+SIZE (go/security_trivy/trivy-v0.62.1/v0.62.1.mod) = 23443
+SHA256 (go/security_trivy/trivy-v0.62.1/v0.62.1.zip) = 26ae4d7f825e69d82ad825ced3a1ed4d87da8a4f927d5ffd1c5ca9b9e10fb480
+SIZE (go/security_trivy/trivy-v0.62.1/v0.62.1.zip) = 58731883
diff --git a/security/vault/Makefile b/security/vault/Makefile
index aa8e4738b5fe..f9d7fbdb0097 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vault
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.19.2
+DISTVERSION=	1.19.3
 CATEGORIES=	security
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/vault/${DISTVERSIONFULL}/ \
 		LOCAL/bofh/security/${PORTNAME}/:web_ui
@@ -27,7 +27,7 @@ EXTRACT_DEPENDS=npm-node20>0:www/npm-node20 \
 		yarn-node20>0:www/yarn-node20
 .endif
 
-USES=		cpe go:1.23,modules
+USES=		cpe go:1.24,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
@@ -46,7 +46,7 @@ GROUPS=		vault
 
 PLIST_FILES=	bin/${PORTNAME}
 
-GITID=	2ee4ea013b31a770a2fc421bb1e4bc74a9669185
+GITID=	a2de3bb7bcf4a073cbb8724863a5a88d3c2f83da
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/vault/distinfo b/security/vault/distinfo
index 447a370f207c..c0042fa7080b 100644
--- a/security/vault/distinfo
+++ b/security/vault/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1745485739
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/go.mod) = e8e9ca206af8f4da1ab8ae7b5fc4c05654d972c7bac463813a0e879a23e430d4
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/go.mod) = 29858
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/go.mod) = 0d652a7ef05e4031f5cc927151101672f29851c4a227e6082263a8aa32918667
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/go.mod) = 1678
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/auth/approle/go.mod) = 58a8a86c96adddbe7d63ca3aa6be8b4972048639084ed8191522f60610cdb811
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/auth/approle/go.mod) = 1084
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/auth/kubernetes/go.mod) = 877dd47a4ba1d2e0b4be63bb30178433e7be72e3bf7454619be502af4d05332f
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/auth/kubernetes/go.mod) = 1087
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/auth/userpass/go.mod) = 380860700e965d112bbb40ed96a0da01a9ff9e16a5127fc7c6496ae3aaa14538
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/api/auth/userpass/go.mod) = 1085
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/sdk/go.mod) = de34bb96ea593e1017d3dc20061d19de6f4b02d42c2eff22ebda3adf8961a35d
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/sdk/go.mod) = 6583
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/vault-web_ui-1.19.2.tar.gz) = 6381591dbd3c0bc7a5ec0d9e0901d4f28dd9a7f17cef9ce7ebb2eefb9c2e8d7f
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/vault-web_ui-1.19.2.tar.gz) = 3389373
-SHA256 (go/security_vault/hashicorp-vault-v1.19.2_GH0/hashicorp-vault-v1.19.2_GH0.tar.gz) = 81c6e63137f6b2d4f302109607569a2ecd94b5dc94846dadd8d56885dcd087b2
-SIZE (go/security_vault/hashicorp-vault-v1.19.2_GH0/hashicorp-vault-v1.19.2_GH0.tar.gz) = 37535210
+TIMESTAMP = 1746273215
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/go.mod) = 95f945454a3cc8a181cd3ba5bf6b35c17a0c3396ddc4537d51e12aed8b37c73e
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/go.mod) = 29858
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/go.mod) = 0d652a7ef05e4031f5cc927151101672f29851c4a227e6082263a8aa32918667
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/go.mod) = 1678
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/auth/approle/go.mod) = 58a8a86c96adddbe7d63ca3aa6be8b4972048639084ed8191522f60610cdb811
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/auth/approle/go.mod) = 1084
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/auth/kubernetes/go.mod) = 877dd47a4ba1d2e0b4be63bb30178433e7be72e3bf7454619be502af4d05332f
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/auth/kubernetes/go.mod) = 1087
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/auth/userpass/go.mod) = 380860700e965d112bbb40ed96a0da01a9ff9e16a5127fc7c6496ae3aaa14538
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/api/auth/userpass/go.mod) = 1085
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/sdk/go.mod) = de34bb96ea593e1017d3dc20061d19de6f4b02d42c2eff22ebda3adf8961a35d
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/sdk/go.mod) = 6583
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/vault-web_ui-1.19.3.tar.gz) = 87d591f4d4c18960ab602b2a7d59db30aec42e8284e44af97cdb303ef75936ae
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/vault-web_ui-1.19.3.tar.gz) = 3392232
+SHA256 (go/security_vault/hashicorp-vault-v1.19.3_GH0/hashicorp-vault-v1.19.3_GH0.tar.gz) = 41f1c09f12aa2e6559c192630fcd201378815516c952ed23579ef08c4506104a
+SIZE (go/security_vault/hashicorp-vault-v1.19.3_GH0/hashicorp-vault-v1.19.3_GH0.tar.gz) = 37549912
diff --git a/security/vuxml/vuln/2023.xml b/security/vuxml/vuln/2023.xml
index 74e0306ae776..9d6a9444af0b 100644
--- a/security/vuxml/vuln/2023.xml
+++ b/security/vuxml/vuln/2023.xml
@@ -2538,7 +2538,7 @@ Reported by Niccolo Belli and WIPocket (Github #400, #417).
     <affects>
       <package>
 	<name>libspf2</name>
-	<range><le>1.2.11</le></range>
+	<range><lt>1.2.11_1</lt></range>
       </package>
     </affects>
     <description>
@@ -2562,6 +2562,7 @@ Reported by Niccolo Belli and WIPocket (Github #400, #417).
     <dates>
       <discovery>2022-06-06</discovery>
       <entry>2023-10-04</entry>
+      <modified>2025-05-04</modified>
     </dates>
   </vuln>
 
diff --git a/security/vuxml/vuln/2025.xml b/security/vuxml/vuln/2025.xml
index b0fe7584fe75..4d0ad1044db5 100644
--- a/security/vuxml/vuln/2025.xml
+++ b/security/vuxml/vuln/2025.xml
@@ -1,3 +1,140 @@
+  <vuln vid="db221414-2b0d-11f0-8cb5-a8a1599412c6">
+    <topic>chromium -- multiple security fixes</topic>
+    <affects>
+      <package>
+       <name>chromium</name>
+       <range><lt>136.0.7103.92</lt></range>
+      </package>
+      <package>
+       <name>ungoogled-chromium</name>
+       <range><lt>136.0.7103.92</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+       <p>Chrome Releases reports:</p>
+       <blockquote cite="https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop.html">
+	 <p>This update includes 2 security fixes:</p>
+	 <ul>
+	    <li>[412057896] Medium CVE-2025-4372: Use after free in WebAudio. Reported by Huang Xilin of Ant Group Light-Year Security Lab on 2025-04-20</li>
+	 </ul>
+       </blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2025-4372</cvename>
+      <url>https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop.html</url>
+    </references>
+    <dates>
+      <discovery>2025-05-06</discovery>
+      <entry>2025-05-07</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="e195e915-2a43-11f0-8cb5-a8a1599412c6">
+    <topic>chromium -- multiple security fixes</topic>
+    <affects>
+      <package>
+       <name>chromium</name>
+       <range><lt>136.0.7103.59</lt></range>
+      </package>
+      <package>
+       <name>ungoogled-chromium</name>
+       <range><lt>136.0.7103.59</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+       <p>Chrome Releases reports:</p>
+       <blockquote cite="https://chromereleases.googleblog.com/2025/04/stable-channel-update-for-desktop_29.html">
+	 <p>This update includes 8 security fixes:</p>
+	 <ul>
+	    <li>[409911705] High CVE-2025-4096: Heap buffer overflow in HTML. Reported by Anonymous on 2025-04-11</li>
+	    <li>[409342999] Medium CVE-2025-4050: Out of bounds memory access in DevTools. Reported by Anonymous on 2025-04-09</li>
+	    <li>[404000989] Medium CVE-2025-4051: Insufficient data validation in DevTools. Reported by Daniel Fröjdendahl on 2025-03-16</li>
+	    <li>[401927528] Low CVE-2025-4052: Inappropriate implementation in DevTools. Reported by vanillawebdev on 2025-03-10</li>
+	 </ul>
+       </blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2025-4096</cvename>
+      <cvename>CVE-2025-4050</cvename>
+      <cvename>CVE-2025-4051</cvename>
+      <cvename>CVE-2025-4052</cvename>
+      <url>https://chromereleases.googleblog.com/2025/04/stable-channel-update-for-desktop_29.html</url>
+    </references>
+    <dates>
+      <discovery>2025-04-29</discovery>
+      <entry>2025-05-06</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="5f868a5f-2943-11f0-bb22-f02f7432cf97">
+    <topic>fcgi -- Heap-based buffer overflow via crafted nameLen/valueLen in ReadParams</topic>
+    <affects>
+      <package>
+	<name>fcgi</name>
+	<range><lt>2.4.5</lt></range>
+      </package>
+    </affects>
+    <description>
+	<body xmlns="http://www.w3.org/1999/xhtml">
+	<p>cve@mitre.org reports:</p>
+	<blockquote cite="https://github.com/FastCGI-Archives/fcgi2/issues/67">
+	<p>FastCGI fcgi2 (aka fcgi) 2.x through 2.4.4 has an integer
+	overflow (and resultant heap-based buffer overflow) via
+	crafted nameLen or valueLen values in data to the IPC socket.
+	This occurs in ReadParams in fcgiapp.c.</p>
+	</blockquote>
+	</body>
+    </description>
+    <references>
+      <cvename>CVE-2025-23016</cvename>
+      <url>https://nvd.nist.gov/vuln/detail/CVE-2025-23016</url>
+      <url>https://github.com/FastCGI-Archives/fcgi2/issues/67</url>
+    </references>
+    <dates>
+      <discovery>2025-01-10</discovery>
+      <entry>2025-05-04</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="7e7a32e7-2901-11f0-ab20-b42e991fc52e">
+    <topic>dnsdist -- Denial of service via crafted DoH exchange</topic>
+    <affects>
+      <package>
+	<name>null</name>
+	<range><lt>null</lt></range>
+      </package>
+    </affects>
+    <description>
+	<body xmlns="http://www.w3.org/1999/xhtml">
+	<p>security@open-xchange.com reports:</p>
+	<blockquote cite="https://dnsdist.org/security-advisories/powerdns-advisory-for-dnsdist-2025-02.html">
+	<p>
+	When DNSdist is configured to provide DoH via the
+	nghttp2provider, an attacker can cause a denial of service by
+	crafting a DoH exchange that triggers an illegal memory
+	access (double-free) and crash of DNSdist, causing a denial
+	of service. The remedy is: upgrade to the patched 1.9.9
+	version. A workaround is to temporarily switch to the h2o
+	provider until DNSdist has been upgraded to a fixed version.
+	We would like to thank Charles Howes for bringing this issue
+	to our attention.</p>
+	</blockquote>
+	</body>
+    </description>
+    <references>
+      <cvename>CVE-2025-30194</cvename>
+      <url>https://nvd.nist.gov/vuln/detail/CVE-2025-30194</url>
+    </references>
+    <dates>
+      <discovery>2025-04-29</discovery>
+      <entry>2025-05-04</entry>
+    </dates>
+  </vuln>
+
   <vuln vid="d70d5e0a-1f5e-11f0-9c67-6805ca2fa271">
     <topic>powerdns-recursor -- denial of service</topic>
     <affects>
diff --git a/shells/carapace/Makefile b/shells/carapace/Makefile
index 69348a4aec5e..0cbd25c42c53 100644
--- a/shells/carapace/Makefile
+++ b/shells/carapace/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	carapace
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.0
+DISTVERSION=	1.3.1
 CATEGORIES=	shells
 
 MAINTAINER=	tagattie@FreeBSD.org
diff --git a/shells/carapace/distinfo b/shells/carapace/distinfo
index da4ba7b9a5f2..226ce0cfb58d 100644
--- a/shells/carapace/distinfo
+++ b/shells/carapace/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745149219
-SHA256 (go/shells_carapace/carapace-v1.3.0/v1.3.0.mod) = df8eba8b641ca39c467bf2f8aa831b0f88b6f42179bd1c3ddd787e791c102d86
-SIZE (go/shells_carapace/carapace-v1.3.0/v1.3.0.mod) = 690
-SHA256 (go/shells_carapace/carapace-v1.3.0/v1.3.0.zip) = 42d442042848fa012ee89c371f94d4a76155e22b8b7bde2a2c31046347a452a7
-SIZE (go/shells_carapace/carapace-v1.3.0/v1.3.0.zip) = 20581338
+TIMESTAMP = 1746533369
+SHA256 (go/shells_carapace/carapace-v1.3.1/v1.3.1.mod) = 21ad8cfa8d8727b09cd4cdda470af51e1008bc8f0bdf8fa5b0b03642306300a1
+SIZE (go/shells_carapace/carapace-v1.3.1/v1.3.1.mod) = 690
+SHA256 (go/shells_carapace/carapace-v1.3.1/v1.3.1.zip) = 84f2993719d70fbfffd92d82077e5dfdde1586d762f801e954c4a3311938a193
+SIZE (go/shells_carapace/carapace-v1.3.1/v1.3.1.zip) = 20703507
diff --git a/shells/ion/Makefile b/shells/ion/Makefile
index cf211369eff4..a110132267d2 100644
--- a/shells/ion/Makefile
+++ b/shells/ion/Makefile
@@ -5,7 +5,7 @@ PORTREVISION=	8
 CATEGORIES=	shells
 PKGNAMESUFFIX=	-shell
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Modern system shell written in Rust
 WWW=		https://gitlab.redox-os.org/redox-os/ion
 
diff --git a/shells/powershell/Makefile b/shells/powershell/Makefile
index 2b1286fc04d1..85914b0d8905 100644
--- a/shells/powershell/Makefile
+++ b/shells/powershell/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	powershell
 DISTVERSIONPREFIX=v
-DISTVERSION=	7.5.0
-PORTREVISION=	1
+DISTVERSION=	7.5.1
 CATEGORIES=	shells
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -11,7 +10,7 @@ WWW=		https://microsoft.com/PowerShell
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	dotnet>=9.0.1:lang/dotnet
+BUILD_DEPENDS=	dotnet>=9.0.4:lang/dotnet
 LIB_DEPENDS=	libbrotlienc.so:archivers/brotli \
 		libinotify.so:devel/libinotify \
 		libunwind.so:devel/libunwind
@@ -41,98 +40,98 @@ NUGET_NUPKGS=	DotNetAnalyzers.DocumentationAnalyzers:1.0.0-beta.59 \
 		Microsoft.CodeAnalysis.Analyzers:3.11.0 \
 		Microsoft.CodeAnalysis.Common:4.11.0 \
 		Microsoft.CodeAnalysis.CSharp:4.11.0 \
-		Microsoft.Extensions.ObjectPool:8.0.12 \
+		Microsoft.Extensions.ObjectPool:8.0.15 \
 		Microsoft.Management.Infrastructure:3.0.0 \
 		Microsoft.Management.Infrastructure.Runtime.Unix:3.0.0 \
 		Microsoft.Management.Infrastructure.Runtime.Win:3.0.0 \
 		Microsoft.NETCore.Platforms:7.0.4 \
 		Microsoft.PowerShell.MarkdownRender:7.2.1 \
 		Microsoft.PowerShell.Native:7.4.0 \
-		Microsoft.Security.Extensions:1.3.0 \
+		Microsoft.Security.Extensions:1.4.0 \
 		Microsoft.Win32.Registry:5.0.0 \
-		Microsoft.Win32.Registry.AccessControl:9.0.1 \
-		Microsoft.Win32.SystemEvents:9.0.1 \
-		Microsoft.Windows.Compatibility:9.0.1 \
+		Microsoft.Win32.Registry.AccessControl:9.0.4 \
+		Microsoft.Win32.SystemEvents:9.0.4 \
+		Microsoft.Windows.Compatibility:9.0.4 \
 		NETStandard.Library:2.0.3 \
 		Newtonsoft.Json:13.0.3 \
-		runtime.linux-arm.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.linux-arm64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.linux-x64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.android-arm.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.android-arm64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.android-x64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.android-x86.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.linux-bionic-arm64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.linux-bionic-x64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.linux-musl-arm.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.linux-musl-arm64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.linux-musl-x64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.maccatalyst-arm64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.maccatalyst-x64.runtime.native.System.IO.Ports:9.0.1 \
+		runtime.linux-arm.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.linux-arm64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.linux-x64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.android-arm.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.android-arm64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.android-x64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.android-x86.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.linux-bionic-arm64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.linux-bionic-x64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.linux-musl-arm.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.linux-musl-arm64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.linux-musl-x64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.maccatalyst-arm64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.maccatalyst-x64.runtime.native.System.IO.Ports:9.0.4 \
 		runtime.native.System.Data.SqlClient.sni:4.7.0 \
-		runtime.native.System.IO.Ports:9.0.1 \
-		runtime.osx-arm64.runtime.native.System.IO.Ports:9.0.1 \
-		runtime.osx-x64.runtime.native.System.IO.Ports:9.0.1 \
+		runtime.native.System.IO.Ports:9.0.4 \
+		runtime.osx-arm64.runtime.native.System.IO.Ports:9.0.4 \
+		runtime.osx-x64.runtime.native.System.IO.Ports:9.0.4 \
 		runtime.win-arm64.runtime.native.System.Data.SqlClient.sni:4.4.0 \
 		runtime.win-x64.runtime.native.System.Data.SqlClient.sni:4.4.0 \
 		runtime.win-x86.runtime.native.System.Data.SqlClient.sni:4.4.0 \
 		StyleCop.Analyzers:1.2.0-beta.556 \
 		StyleCop.Analyzers.Unstable:1.2.0.556 \
 		System.Buffers:4.5.1 \
-		System.CodeDom:9.0.1 \
-		System.Collections.Immutable:9.0.1 \
+		System.CodeDom:9.0.4 \
+		System.Collections.Immutable:9.0.4 \
 		System.Collections.Immutable:8.0.0 \
-		System.ComponentModel.Composition:9.0.1 \
-		System.ComponentModel.Composition.Registration:9.0.1 \
-		System.Configuration.ConfigurationManager:9.0.1 \
-		System.Data.Odbc:9.0.1 \
-		System.Data.OleDb:9.0.1 \
+		System.ComponentModel.Composition:9.0.4 \
+		System.ComponentModel.Composition.Registration:9.0.4 \
+		System.Configuration.ConfigurationManager:9.0.4 \
+		System.Data.Odbc:9.0.4 \
+		System.Data.OleDb:9.0.4 \
 		System.Data.SqlClient:4.8.6 \
-		System.Diagnostics.DiagnosticSource:9.0.1 \
-		System.Diagnostics.EventLog:9.0.1 \
-		System.Diagnostics.PerformanceCounter:9.0.1 \
-		System.DirectoryServices:9.0.1 \
-		System.DirectoryServices.AccountManagement:9.0.1 \
-		System.DirectoryServices.Protocols:9.0.1 \
-		System.Drawing.Common:9.0.1 \
+		System.Diagnostics.DiagnosticSource:9.0.4 \
+		System.Diagnostics.EventLog:9.0.4 \
+		System.Diagnostics.PerformanceCounter:9.0.4 \
+		System.DirectoryServices:9.0.4 \
+		System.DirectoryServices.AccountManagement:9.0.4 \
+		System.DirectoryServices.Protocols:9.0.4 \
+		System.Drawing.Common:9.0.4 \
 		System.Formats.Asn1:6.0.0 \
-		System.IO.Packaging:9.0.1 \
-		System.IO.Ports:9.0.1 \
-		System.Management:9.0.1 \
+		System.IO.Packaging:9.0.4 \
+		System.IO.Ports:9.0.4 \
+		System.Management:9.0.4 \
 		System.Memory:4.5.5 \
-		System.Net.Http.WinHttpHandler:9.0.1 \
+		System.Net.Http.WinHttpHandler:9.0.4 \
 		System.Numerics.Vectors:4.4.0 \
 		System.Numerics.Vectors:4.5.0 \
 		System.Private.ServiceModel:4.10.3 \
-		System.Reflection.Context:9.0.1 \
+		System.Reflection.Context:9.0.4 \
 		System.Reflection.DispatchProxy:4.7.1 \
 		System.Reflection.Metadata:8.0.1 \
-		System.Runtime.Caching:9.0.1 \
+		System.Runtime.Caching:9.0.4 \
 		System.Runtime.CompilerServices.Unsafe:6.0.0 \
 		System.Security.AccessControl:6.0.1 \
-		System.Security.Cryptography.Pkcs:9.0.1 \
-		System.Security.Cryptography.ProtectedData:9.0.1 \
-		System.Security.Cryptography.Xml:9.0.1 \
-		System.Security.Permissions:9.0.1 \
+		System.Security.Cryptography.Pkcs:9.0.4 \
+		System.Security.Cryptography.ProtectedData:9.0.4 \
+		System.Security.Cryptography.Xml:9.0.4 \
+		System.Security.Permissions:9.0.4 \
 		System.Security.Principal.Windows:5.0.0 \
 		System.ServiceModel.Duplex:4.10.3 \
 		System.ServiceModel.Http:4.10.3 \
 		System.ServiceModel.NetTcp:4.10.3 \
 		System.ServiceModel.Primitives:4.10.3 \
 		System.ServiceModel.Security:4.10.3 \
-		System.ServiceModel.Syndication:9.0.1 \
-		System.ServiceProcess.ServiceController:9.0.1 \
-		System.Speech:9.0.1 \
+		System.ServiceModel.Syndication:9.0.4 \
+		System.ServiceProcess.ServiceController:9.0.4 \
+		System.Speech:9.0.4 \
 		System.Text.Encoding.CodePages:7.0.0 \
 		System.Text.Encoding.CodePages:8.0.0 \
-		System.Text.Encoding.CodePages:9.0.1 \
+		System.Text.Encoding.CodePages:9.0.4 \
 		System.Text.Encodings.Web:6.0.0 \
-		System.Text.Encodings.Web:9.0.1 \
+		System.Text.Encodings.Web:9.0.4 \
 		System.Text.Json:6.0.9 \
-		System.Threading.AccessControl:9.0.1 \
+		System.Threading.AccessControl:9.0.4 \
 		System.Threading.Tasks.Extensions:4.5.4 \
 		System.Web.Services.Description:8.0.0 \
-		System.Windows.Extensions:9.0.1 \
+		System.Windows.Extensions:9.0.4 \
 		Humanizer.Core:2.14.1
 PWSH_NUPKGS=	Microsoft.PowerShell.PSResourceGet:1.0.3 \
 		PSReadLine:2.3.4 \
@@ -155,6 +154,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%NUGET_DISTDIR%%|${DISTDIR}/${NUGET_DISTSUBDIR}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/nuget.config
+	${REINPLACE_CMD} -e 's|9.0.203|9.0.105|' ${WRKSRC}/global.json
 
 do-build:
 	cd ${WRKSRC}/src/ResGen && \
diff --git a/shells/powershell/distinfo b/shells/powershell/distinfo
index 127be7374801..ae98d14b15ea 100644
--- a/shells/powershell/distinfo
+++ b/shells/powershell/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1740155453
+TIMESTAMP = 1746284371
 SHA256 (nuget/dotnetanalyzers.documentationanalyzers.unstable.1.0.0.59.nupkg) = ae589831a3338b8b7efc889cbfc65f64724460ca63e4af97a8da03bff2c02191
 SIZE (nuget/dotnetanalyzers.documentationanalyzers.unstable.1.0.0.59.nupkg) = 148293
 SHA256 (nuget/dotnetanalyzers.documentationanalyzers.1.0.0-beta.59.nupkg) = 923a54cd5b0fdb74cc6cc49a01b9027785ef4fd142b9b0802a588ae242a6740e
@@ -25,8 +25,8 @@ SHA256 (nuget/microsoft.codeanalysis.csharp.4.11.0.nupkg) = 13d8c43a3a7d83f08579
 SIZE (nuget/microsoft.codeanalysis.csharp.4.11.0.nupkg) = 16919271
 SHA256 (nuget/microsoft.codeanalysis.common.4.11.0.nupkg) = 717ff180cd15992f81b2eeb7299936a1f8c538ecb59b323e08254463a908f909
 SIZE (nuget/microsoft.codeanalysis.common.4.11.0.nupkg) = 7082945
-SHA256 (nuget/microsoft.extensions.objectpool.8.0.12.nupkg) = 21cbd2aa5c19a45e497643071b6a349cde841269c1e4308dacc0a4ce3c36d637
-SIZE (nuget/microsoft.extensions.objectpool.8.0.12.nupkg) = 92165
+SHA256 (nuget/microsoft.extensions.objectpool.8.0.15.nupkg) = 6e92690bc864831f5f46873ae66c90fb2810dad83462d3119d33a490e0173777
+SIZE (nuget/microsoft.extensions.objectpool.8.0.15.nupkg) = 92154
 SHA256 (nuget/microsoft.management.infrastructure.runtime.unix.3.0.0.nupkg) = b4f959bad08df9a6e680c33200f5cefe7c1b8222a26eb134d338de0b565425ab
 SIZE (nuget/microsoft.management.infrastructure.runtime.unix.3.0.0.nupkg) = 122301
 SHA256 (nuget/microsoft.management.infrastructure.runtime.win.3.0.0.nupkg) = 7206e8f30c824066fb34a97795ba88e4733a6958e9e08fba746e035ef6075f34
@@ -39,16 +39,16 @@ SHA256 (nuget/microsoft.powershell.markdownrender.7.2.1.nupkg) = 4a28a353be54c2d
 SIZE (nuget/microsoft.powershell.markdownrender.7.2.1.nupkg) = 49815
 SHA256 (nuget/microsoft.powershell.native.7.4.0.nupkg) = 5ce903457b6ac0a8565e13916d9bbcffd49d31fc02dd19fbb868f17e5e62e249
 SIZE (nuget/microsoft.powershell.native.7.4.0.nupkg) = 590282
-SHA256 (nuget/microsoft.security.extensions.1.3.0.nupkg) = b492358c44055abb99f890693abea10af77d1e475c76ba9391daa77b56a1110b
-SIZE (nuget/microsoft.security.extensions.1.3.0.nupkg) = 128821
-SHA256 (nuget/microsoft.win32.registry.accesscontrol.9.0.1.nupkg) = 070b5ec5f9617741fd13b336d76e7ec83e6efe8b8ca994fe6ab5bbbe9d32496a
-SIZE (nuget/microsoft.win32.registry.accesscontrol.9.0.1.nupkg) = 124846
+SHA256 (nuget/microsoft.security.extensions.1.4.0.nupkg) = 633343fdc9624fcf2d250f7869c4bb590bf4c52b9b7cc14e613cc59562661ab2
+SIZE (nuget/microsoft.security.extensions.1.4.0.nupkg) = 131310
+SHA256 (nuget/microsoft.win32.registry.accesscontrol.9.0.4.nupkg) = 94272dc4d9d7068c622b00db5eb05cf44cc989349fc83d8da72b025f29baeff2
+SIZE (nuget/microsoft.win32.registry.accesscontrol.9.0.4.nupkg) = 124917
 SHA256 (nuget/microsoft.win32.registry.5.0.0.nupkg) = f64ca53c67ca65ce7cc85a8d29aefbb2da2672836731e1115e8cd62730dc5080
 SIZE (nuget/microsoft.win32.registry.5.0.0.nupkg) = 354731
-SHA256 (nuget/microsoft.win32.systemevents.9.0.1.nupkg) = 35c4541f1e8ae8a27f0ea7d9cdb942701c9e505ac65f2adb27f7b7d4697cd29b
-SIZE (nuget/microsoft.win32.systemevents.9.0.1.nupkg) = 184464
-SHA256 (nuget/microsoft.windows.compatibility.9.0.1.nupkg) = 59d999aeefcbf582431a251d5f95549ec9fe1a79cb576d66eff012d0838bf689
-SIZE (nuget/microsoft.windows.compatibility.9.0.1.nupkg) = 31484
+SHA256 (nuget/microsoft.win32.systemevents.9.0.4.nupkg) = bd639b86ff5efe73d568c90461be254e53265ffbf87e5b955ae1c0b7162b5084
+SIZE (nuget/microsoft.win32.systemevents.9.0.4.nupkg) = 184474
+SHA256 (nuget/microsoft.windows.compatibility.9.0.4.nupkg) = 5dcc4bfe6663dc8fb3dbee16d8c3984b72d83029d5ae9a292ab8cb68d58c3e13
+SIZE (nuget/microsoft.windows.compatibility.9.0.4.nupkg) = 31483
 SHA256 (nuget/netstandard.library.2.0.3.nupkg) = 3eb87644f79bcffb3c0331dbdac3c7837265f2cdf58a7bfd93e431776f77c9ba
 SIZE (nuget/netstandard.library.2.0.3.nupkg) = 3146139
 SHA256 (nuget/newtonsoft.json.13.0.3.nupkg) = 872fc189e638ab1056555b03aaa38f68bcb54286e221aa646eb1129babf63c77
@@ -59,76 +59,76 @@ SHA256 (nuget/stylecop.analyzers.1.2.0-beta.556.nupkg) = f7b61841caf9bd9c53be2df
 SIZE (nuget/stylecop.analyzers.1.2.0-beta.556.nupkg) = 15876
 SHA256 (nuget/system.buffers.4.5.1.nupkg) = c30b3dd2c7e2f4cee4b823d692fd42118309b42ab1f5007f923d329a5b0d6b12
 SIZE (nuget/system.buffers.4.5.1.nupkg) = 93737
-SHA256 (nuget/system.codedom.9.0.1.nupkg) = 021a0b6f3ed620fe6d57b744c6763146014697836049703747b8764b3696d167
-SIZE (nuget/system.codedom.9.0.1.nupkg) = 405169
+SHA256 (nuget/system.codedom.9.0.4.nupkg) = 5fc2031f0fecb29d2f80f4a7c8cfed9834dbde9a07e862defa0678311f6a7e1a
+SIZE (nuget/system.codedom.9.0.4.nupkg) = 405180
 SHA256 (nuget/system.collections.immutable.8.0.0.nupkg) = 17b3958ca370a6a6d487c95389d6ea256622e3bea7b2af67fba934f90551a37c
 SIZE (nuget/system.collections.immutable.8.0.0.nupkg) = 787241
-SHA256 (nuget/system.collections.immutable.9.0.1.nupkg) = db7a1df773fb40747394be4db4a3540ee8e2606797464930ee55e4c8de333866
-SIZE (nuget/system.collections.immutable.9.0.1.nupkg) = 651033
-SHA256 (nuget/system.componentmodel.composition.registration.9.0.1.nupkg) = fb436b08a6c21f0bf980bb584179e1e710706dc67c4cebdfcd85a961e5ab5e9d
-SIZE (nuget/system.componentmodel.composition.registration.9.0.1.nupkg) = 124509
-SHA256 (nuget/system.componentmodel.composition.9.0.1.nupkg) = d11cde63824d9e0266789bc53174c258e63eb29dafc286f3cb1f4b4d1175f612
-SIZE (nuget/system.componentmodel.composition.9.0.1.nupkg) = 388000
-SHA256 (nuget/system.configuration.configurationmanager.9.0.1.nupkg) = 8ec6b11010df478fcdeafd254b874e08b86eebff8872a62d58bd18f2409ad74b
-SIZE (nuget/system.configuration.configurationmanager.9.0.1.nupkg) = 766374
-SHA256 (nuget/system.data.odbc.9.0.1.nupkg) = 0efd25af1f1a37194c135dac89158579c03a64f2ad7456b77be892ae3c638c5d
-SIZE (nuget/system.data.odbc.9.0.1.nupkg) = 716045
-SHA256 (nuget/system.data.oledb.9.0.1.nupkg) = 16be6957d612ad4b1549989084f0d6da519eac48b424d42011767f6179606ece
-SIZE (nuget/system.data.oledb.9.0.1.nupkg) = 580830
+SHA256 (nuget/system.collections.immutable.9.0.4.nupkg) = d00ea008f8e1c7420802586c90fb164bc7235a9a012461184e75b57e47691538
+SIZE (nuget/system.collections.immutable.9.0.4.nupkg) = 651053
+SHA256 (nuget/system.componentmodel.composition.registration.9.0.4.nupkg) = 971145cdf5601955b7e1666549e9509ed70ffe6a7ead3e13aef1ea2d06695809
+SIZE (nuget/system.componentmodel.composition.registration.9.0.4.nupkg) = 124550
+SHA256 (nuget/system.componentmodel.composition.9.0.4.nupkg) = 6b1ce642f3881a33b03f1f58ae71186cf7e287d43b0f6b2a02e0b8ae87722e86
+SIZE (nuget/system.componentmodel.composition.9.0.4.nupkg) = 388003
+SHA256 (nuget/system.configuration.configurationmanager.9.0.4.nupkg) = 84875ef00d842be46951200c671ff14d531155e656c9aaae56e48a9966f1ae0c
+SIZE (nuget/system.configuration.configurationmanager.9.0.4.nupkg) = 766369
+SHA256 (nuget/system.data.odbc.9.0.4.nupkg) = cc964ba79984348a6cc58dec5f2d0e38689bd4f0fbbff44462eee09054fa4a32
+SIZE (nuget/system.data.odbc.9.0.4.nupkg) = 716067
+SHA256 (nuget/system.data.oledb.9.0.4.nupkg) = 2c8a73d5d61cdadac3540e024484ad50ba5d9343e20bb57b5762a16dda469d9f
+SIZE (nuget/system.data.oledb.9.0.4.nupkg) = 580861
 SHA256 (nuget/system.data.sqlclient.4.8.6.nupkg) = 41cff2728dded3eea33fc522300d044657d210a74836fd019878b187d67c7c94
 SIZE (nuget/system.data.sqlclient.4.8.6.nupkg) = 4928218
-SHA256 (nuget/system.diagnostics.diagnosticsource.9.0.1.nupkg) = 9c822f54afb9bb23a102e536b0444d0032b837f03fc743229411ff100af580e0
-SIZE (nuget/system.diagnostics.diagnosticsource.9.0.1.nupkg) = 455323
-SHA256 (nuget/system.diagnostics.eventlog.9.0.1.nupkg) = a6aa99c849bff46b29d734f95897955f8ed2d8cbe88861a01b54b651dfda22aa
-SIZE (nuget/system.diagnostics.eventlog.9.0.1.nupkg) = 400687
-SHA256 (nuget/system.diagnostics.performancecounter.9.0.1.nupkg) = 771627742d11c59ff60215e9d6a5ba983ee9d26646ad84a82479ca362da2973f
-SIZE (nuget/system.diagnostics.performancecounter.9.0.1.nupkg) = 329755
-SHA256 (nuget/system.directoryservices.accountmanagement.9.0.1.nupkg) = 6768d611ca924261c87a349c60b9fe39a384eab8640675e158aaa088eac0d488
-SIZE (nuget/system.directoryservices.accountmanagement.9.0.1.nupkg) = 427296
-SHA256 (nuget/system.directoryservices.protocols.9.0.1.nupkg) = 1fd4cb2d31df5aee0246246dad237b07cc19993d4fc7ccfb9abfc7e6dbc6c69b
-SIZE (nuget/system.directoryservices.protocols.9.0.1.nupkg) = 682520
-SHA256 (nuget/system.directoryservices.9.0.1.nupkg) = 0f126c66d4babdc0de0ecea24f00129efd9b0adba06b5643e49c3f7418d599ba
-SIZE (nuget/system.directoryservices.9.0.1.nupkg) = 723220
-SHA256 (nuget/system.drawing.common.9.0.1.nupkg) = 217dab36223e9b0beb7df5e67de1c6b365ccff793db8b111ddff199f6a9cae41
-SIZE (nuget/system.drawing.common.9.0.1.nupkg) = 2049702
+SHA256 (nuget/system.diagnostics.diagnosticsource.9.0.4.nupkg) = b15f817c8a5254f0d7bdac65851747632bb87f0a52150978885f5d4a2ac0af4e
+SIZE (nuget/system.diagnostics.diagnosticsource.9.0.4.nupkg) = 453306
+SHA256 (nuget/system.diagnostics.eventlog.9.0.4.nupkg) = 69f17bdb2c09a3fbdf257b765e223c2dfdb329cbe7d05fe9dbcd0fd70dc59a4e
+SIZE (nuget/system.diagnostics.eventlog.9.0.4.nupkg) = 400695
+SHA256 (nuget/system.diagnostics.performancecounter.9.0.4.nupkg) = d38275c56ba4a56269b844ea65c4be9605e1c867b6e4bc1b6b88f300c3ba9fb6
+SIZE (nuget/system.diagnostics.performancecounter.9.0.4.nupkg) = 329803
+SHA256 (nuget/system.directoryservices.accountmanagement.9.0.4.nupkg) = 1a68b4459eebb61c9b61585559f9d15e194ed9da3a9e4f4d925c30fe993f48c1
+SIZE (nuget/system.directoryservices.accountmanagement.9.0.4.nupkg) = 427327
+SHA256 (nuget/system.directoryservices.protocols.9.0.4.nupkg) = 0508dee4f58795d05bc67d5c76280d8fcc001b2b7edd1805921970437fb0d413
+SIZE (nuget/system.directoryservices.protocols.9.0.4.nupkg) = 686419
+SHA256 (nuget/system.directoryservices.9.0.4.nupkg) = f6eaf90148e5fab9b1e2059fad2fbe00204d5587619a83a19ede02e63152df70
+SIZE (nuget/system.directoryservices.9.0.4.nupkg) = 723235
+SHA256 (nuget/system.drawing.common.9.0.4.nupkg) = b5ab9d839c9579a36b82f0fd2cc12e981c8a1341b4df68e9f6cf4019f29823d0
+SIZE (nuget/system.drawing.common.9.0.4.nupkg) = 2049822
 SHA256 (nuget/system.formats.asn1.6.0.0.nupkg) = 29a30780844117b35fdd5c0ea3e8094b50dc0fee357090cf58587e4c343c79ef
 SIZE (nuget/system.formats.asn1.6.0.0.nupkg) = 182980
-SHA256 (nuget/system.io.packaging.9.0.1.nupkg) = cc4e9d3f51858d7e66f6a09cb89c0a5c8b24ebcd36e69b9676a73f5c41fe569e
-SIZE (nuget/system.io.packaging.9.0.1.nupkg) = 298747
-SHA256 (nuget/system.io.ports.9.0.1.nupkg) = aa368109ddd5c44cd5678e987382914a9ff3b658a16920a3b36561a236609ceb
-SIZE (nuget/system.io.ports.9.0.1.nupkg) = 311165
-SHA256 (nuget/system.management.9.0.1.nupkg) = 7474811a2239396c4d405ffb66b7150d1c9b63074338cc8850d0d21a1d06a73d
-SIZE (nuget/system.management.9.0.1.nupkg) = 565571
+SHA256 (nuget/system.io.packaging.9.0.4.nupkg) = 8e816f2260aefd4f68471eca1aa05902f6e3b1aef7cb83d060a4aca769f493b8
+SIZE (nuget/system.io.packaging.9.0.4.nupkg) = 298785
+SHA256 (nuget/system.io.ports.9.0.4.nupkg) = f2e80d661048e36b8e4e1239b8551553bb0aaf56fc7f10c2a75cc82164d57e63
+SIZE (nuget/system.io.ports.9.0.4.nupkg) = 311196
+SHA256 (nuget/system.management.9.0.4.nupkg) = fac5bf35010b6811a351fce775a34b3c728a415748d7238931aa85e2d5764956
+SIZE (nuget/system.management.9.0.4.nupkg) = 565659
 SHA256 (nuget/system.memory.4.5.5.nupkg) = 10f43da352a29fb2b3188e4edd4dcf5100194c8b526e4f61fe2e2b5623775a22
 SIZE (nuget/system.memory.4.5.5.nupkg) = 208978
-SHA256 (nuget/system.net.http.winhttphandler.9.0.1.nupkg) = 279e86aa4e1e9a1e7e954b9632b68d2dda7d1ddb24bc093ffd2bcdc000dfb679
-SIZE (nuget/system.net.http.winhttphandler.9.0.1.nupkg) = 321214
+SHA256 (nuget/system.net.http.winhttphandler.9.0.4.nupkg) = 5b17fb0c4bb7b8d8afbd3bb3cdc35ea3b2a1e9a723fbf6167d57f576b9076981
+SIZE (nuget/system.net.http.winhttphandler.9.0.4.nupkg) = 321216
 SHA256 (nuget/system.numerics.vectors.4.4.0.nupkg) = 6ae5d02b67e52ff2699c1feb11c01c526e2f60c09830432258e0809486aabb65
 SIZE (nuget/system.numerics.vectors.4.4.0.nupkg) = 337043
 SHA256 (nuget/system.numerics.vectors.4.5.0.nupkg) = a9d49320581fda1b4f4be6212c68c01a22cdf228026099c20a8eabefcf90f9cf
 SIZE (nuget/system.numerics.vectors.4.5.0.nupkg) = 382792
 SHA256 (nuget/system.private.servicemodel.4.10.3.nupkg) = 1786507c1ee2ecae6361e5766465b38b71ad9d3406fbbb9c213a1fd3a4c8437c
 SIZE (nuget/system.private.servicemodel.4.10.3.nupkg) = 2204805
-SHA256 (nuget/system.reflection.context.9.0.1.nupkg) = 3365ec063844643f8a0b32b46c01f12a20bdd5c00f49c8c7261300e855e2433b
-SIZE (nuget/system.reflection.context.9.0.1.nupkg) = 179858
+SHA256 (nuget/system.reflection.context.9.0.4.nupkg) = 5d44753899c17184f80c8448e6816fd68e617f4ed8150bda46a451ceb8d34b38
+SIZE (nuget/system.reflection.context.9.0.4.nupkg) = 179901
 SHA256 (nuget/system.reflection.dispatchproxy.4.7.1.nupkg) = 3a2fa5df6a7bdd9c70701e86ad24b69b6e4171c7e9bb06d8e1ec8513051ed083
 SIZE (nuget/system.reflection.dispatchproxy.4.7.1.nupkg) = 197900
 SHA256 (nuget/system.reflection.metadata.8.0.1.nupkg) = 4b08a9d57b93b3faf69b844ab86e415d7c5c68d19187e8db3278c544d74bf3b5
 SIZE (nuget/system.reflection.metadata.8.0.1.nupkg) = 1308880
-SHA256 (nuget/system.runtime.caching.9.0.1.nupkg) = dbf9895296393d6908110dad4a106903a047dc38d32921aeb4826bded111e388
-SIZE (nuget/system.runtime.caching.9.0.1.nupkg) = 291324
+SHA256 (nuget/system.runtime.caching.9.0.4.nupkg) = dfc1d5b61206da672c6574f74046e6023ed353cc279d6cd3b6e9ee3d52200914
+SIZE (nuget/system.runtime.caching.9.0.4.nupkg) = 291386
 SHA256 (nuget/system.runtime.compilerservices.unsafe.6.0.0.nupkg) = 6c41b53e70e9eee298cff3a02ce5acdd15b04125589be0273f0566026720a762
 SIZE (nuget/system.runtime.compilerservices.unsafe.6.0.0.nupkg) = 84343
 SHA256 (nuget/system.security.accesscontrol.6.0.1.nupkg) = 462e26f796417e8a4350655a85bbd4233b94cbd0f7150c1c5e9acfd88e885141
 SIZE (nuget/system.security.accesscontrol.6.0.1.nupkg) = 235270
-SHA256 (nuget/system.security.cryptography.pkcs.9.0.1.nupkg) = f23ddc6588b503dafdb2c3fe999fef9a8573897c507dd5669af569cda72bb58a
-SIZE (nuget/system.security.cryptography.pkcs.9.0.1.nupkg) = 821048
-SHA256 (nuget/system.security.cryptography.protecteddata.9.0.1.nupkg) = 53673cababc3f8ee36ccd4c645201bb1d8feaf7fa75de8280d8741fd09b89ef5
-SIZE (nuget/system.security.cryptography.protecteddata.9.0.1.nupkg) = 127160
-SHA256 (nuget/system.security.cryptography.xml.9.0.1.nupkg) = ee4c6cd292c660ae4ea941ec5c26878046ee1c5c3a3e759a819c1e0a1c621819
-SIZE (nuget/system.security.cryptography.xml.9.0.1.nupkg) = 370086
-SHA256 (nuget/system.security.permissions.9.0.1.nupkg) = 6d86eb16b73d59c13287ca38ac3d5cc83b281d572ac210f79a228fcdc55a035c
-SIZE (nuget/system.security.permissions.9.0.1.nupkg) = 431915
+SHA256 (nuget/system.security.cryptography.pkcs.9.0.4.nupkg) = 75f3afb026014766c61afc26eadb61581f2474d4ba6f1a0c4d2fe5c4be2dd600
+SIZE (nuget/system.security.cryptography.pkcs.9.0.4.nupkg) = 821081
+SHA256 (nuget/system.security.cryptography.protecteddata.9.0.4.nupkg) = 55297068a8b9594e89d0b61587f8457d9b929021b857df4c1f688bc2ca53ad80
+SIZE (nuget/system.security.cryptography.protecteddata.9.0.4.nupkg) = 127173
+SHA256 (nuget/system.security.cryptography.xml.9.0.4.nupkg) = 65e4e9999dc92ca19a5db94626d8fe9cf869a4b2241a3cc9b545298d9841d297
+SIZE (nuget/system.security.cryptography.xml.9.0.4.nupkg) = 370093
+SHA256 (nuget/system.security.permissions.9.0.4.nupkg) = abe2adf8d8fb3cb49bf405b362eeb5fb3129a825a5aded11eb862def7bcc610c
+SIZE (nuget/system.security.permissions.9.0.4.nupkg) = 431930
 SHA256 (nuget/system.security.principal.windows.5.0.0.nupkg) = 081390c25f6f78592b28ada853c24514488a221fe9f9a24efaaf5373643ff3d6
 SIZE (nuget/system.security.principal.windows.5.0.0.nupkg) = 535022
 SHA256 (nuget/system.servicemodel.duplex.4.10.3.nupkg) = 6888497fd53965e39b4d3db2094c325712669377ff864ac784d306ef32fd8672
@@ -141,68 +141,68 @@ SHA256 (nuget/system.servicemodel.primitives.4.10.3.nupkg) = 3620a006732eab633e4
 SIZE (nuget/system.servicemodel.primitives.4.10.3.nupkg) = 419873
 SHA256 (nuget/system.servicemodel.security.4.10.3.nupkg) = 2f515a9dccd0ebcd006077b79d89e88a4c1cff74b470b661bdc044454f1a7d79
 SIZE (nuget/system.servicemodel.security.4.10.3.nupkg) = 189764
-SHA256 (nuget/system.servicemodel.syndication.9.0.1.nupkg) = ef69470a5ce254f3c68c2686a2bd305ad8a7d9852f31d0be1995473e836420df
-SIZE (nuget/system.servicemodel.syndication.9.0.1.nupkg) = 281044
-SHA256 (nuget/system.serviceprocess.servicecontroller.9.0.1.nupkg) = e8442038b3b267577cfc3d4022b946cbf7615e8cf0645213c5892f3e0c743d78
-SIZE (nuget/system.serviceprocess.servicecontroller.9.0.1.nupkg) = 228405
-SHA256 (nuget/system.speech.9.0.1.nupkg) = 98fa3333e4913eccf84abe74b1f16104a309b41d711163429797f5a4ceedb27b
-SIZE (nuget/system.speech.9.0.1.nupkg) = 875733
+SHA256 (nuget/system.servicemodel.syndication.9.0.4.nupkg) = 20770def34141b5e950ef853a8766b19894ecd66cf7279952db1849ecb1b2723
+SIZE (nuget/system.servicemodel.syndication.9.0.4.nupkg) = 281073
+SHA256 (nuget/system.serviceprocess.servicecontroller.9.0.4.nupkg) = a68a6764b038ffa1e89f3838d1c92a6ce9ffe313164f4c2c6b2fed8e769a616a
+SIZE (nuget/system.serviceprocess.servicecontroller.9.0.4.nupkg) = 228477
+SHA256 (nuget/system.speech.9.0.4.nupkg) = a4aea9ae86adc9ac52e571a6849c43cd4de8b9d1e6eab15b67a01ace247584da
+SIZE (nuget/system.speech.9.0.4.nupkg) = 875713
 SHA256 (nuget/system.text.encoding.codepages.7.0.0.nupkg) = 782293570ba60f4e7564472825c0d54469c8180b04bcaa5f1f7c9d2a5b87c66a
 SIZE (nuget/system.text.encoding.codepages.7.0.0.nupkg) = 3198933
 SHA256 (nuget/system.text.encoding.codepages.8.0.0.nupkg) = 7e308b41cd4f456d08c7921995d8345cabfe2750ea3d27eef698ccc8d069edd1
 SIZE (nuget/system.text.encoding.codepages.8.0.0.nupkg) = 4260927
-SHA256 (nuget/system.text.encoding.codepages.9.0.1.nupkg) = f5942f0bb33cecd27b745464047137d325977ed29d72615b49391d6b39b1c76c
-SIZE (nuget/system.text.encoding.codepages.9.0.1.nupkg) = 3219458
+SHA256 (nuget/system.text.encoding.codepages.9.0.4.nupkg) = 816de71b0dc49580984c4b98c593a4d68c87b23df005e9ebeaec0918ad2ef884
+SIZE (nuget/system.text.encoding.codepages.9.0.4.nupkg) = 3219510
 SHA256 (nuget/system.text.encodings.web.6.0.0.nupkg) = 51e9831c61684081bb39b430465ba155fe8082d42291f1c4a0f2c2ea06c5c91a
 SIZE (nuget/system.text.encodings.web.6.0.0.nupkg) = 235525
-SHA256 (nuget/system.text.encodings.web.9.0.1.nupkg) = 8ae0157138a26502c26630df0ea74b2cf1ea65d66abc569bc0b14789561d449a
-SIZE (nuget/system.text.encodings.web.9.0.1.nupkg) = 293375
+SHA256 (nuget/system.text.encodings.web.9.0.4.nupkg) = 34ec67b941ed2d54fe69369384b4b0f1416017756210bff4653962338d8b9e54
+SIZE (nuget/system.text.encodings.web.9.0.4.nupkg) = 293405
 SHA256 (nuget/system.text.json.6.0.9.nupkg) = e638efc55f2e6c662393274384bb0665707a9a5dceffb0866ae41cbb58a478bb
 SIZE (nuget/system.text.json.6.0.9.nupkg) = 1396928
-SHA256 (nuget/system.threading.accesscontrol.9.0.1.nupkg) = 837a4d6edbd4a9fdd769733bcf12e246bddd725082dc4810d1be029982738f2f
-SIZE (nuget/system.threading.accesscontrol.9.0.1.nupkg) = 194592
+SHA256 (nuget/system.threading.accesscontrol.9.0.4.nupkg) = 01681b7c34f4fcbe5a173bd40746ce138f0f950439aaf0ac5c280d610ec39e37
+SIZE (nuget/system.threading.accesscontrol.9.0.4.nupkg) = 194621
 SHA256 (nuget/system.threading.tasks.extensions.4.5.4.nupkg) = a304a963cc0796c5179f9c6b7d8022bbce3b2fa7c029eb6196f631f7b462d678
 SIZE (nuget/system.threading.tasks.extensions.4.5.4.nupkg) = 89582
 SHA256 (nuget/system.web.services.description.8.0.0.nupkg) = ad752d7a6cc846029c599a7e7426b4c7ab651708cff7d8d119e761166efa74b0
 SIZE (nuget/system.web.services.description.8.0.0.nupkg) = 282138
-SHA256 (nuget/system.windows.extensions.9.0.1.nupkg) = dbaf9acb49555a85709d11927c8bffda92acbafc1f8df165d0998c4f03674b28
-SIZE (nuget/system.windows.extensions.9.0.1.nupkg) = 152240
-SHA256 (nuget/runtime.android-arm.runtime.native.system.io.ports.9.0.1.nupkg) = 1ee541adef5f83a7fe77e8b7190cf8b711f53d2c16e9d9e4be1081dce39f04d6
-SIZE (nuget/runtime.android-arm.runtime.native.system.io.ports.9.0.1.nupkg) = 51227
-SHA256 (nuget/runtime.android-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 9a62995205695cba3d683f30066a73e5a34c23ff85d4bc3a7a9d9eaa08ea2882
-SIZE (nuget/runtime.android-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 52218
-SHA256 (nuget/runtime.android-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 0175e803180e1aaea20b08927b3a0d4e83ba09c630804d192253eff155643bcf
-SIZE (nuget/runtime.android-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 52483
-SHA256 (nuget/runtime.android-x86.runtime.native.system.io.ports.9.0.1.nupkg) = 4cc1b0a3211bc38bc059e18ca1c1390c3e4d366efd06d65876eef80e2d4a42a8
-SIZE (nuget/runtime.android-x86.runtime.native.system.io.ports.9.0.1.nupkg) = 52430
-SHA256 (nuget/runtime.linux-arm.runtime.native.system.io.ports.9.0.1.nupkg) = 5d9df633f4696c279fb307ebd5aa443070156fd7020452bdf95cb6eeee87241e
-SIZE (nuget/runtime.linux-arm.runtime.native.system.io.ports.9.0.1.nupkg) = 51261
-SHA256 (nuget/runtime.linux-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 8512602c156ce132860491bd860c2de20e13925a3c03eec6fb2e2e0b019364c2
-SIZE (nuget/runtime.linux-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 52491
-SHA256 (nuget/runtime.linux-bionic-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 30932a8aa22e0ada44b1c02b83f546b701d953b78c897b4d318f54fb59534503
-SIZE (nuget/runtime.linux-bionic-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 52237
-SHA256 (nuget/runtime.linux-bionic-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 0242294506b60eb12ef3d03c9a565cbdaa5a36a9b7104f7eeb499b980b416669
-SIZE (nuget/runtime.linux-bionic-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 52505
-SHA256 (nuget/runtime.linux-musl-arm.runtime.native.system.io.ports.9.0.1.nupkg) = b7278d60de1122647992a9272957ac39b184ff5a41592ecd351da686991c48b5
-SIZE (nuget/runtime.linux-musl-arm.runtime.native.system.io.ports.9.0.1.nupkg) = 51203
-SHA256 (nuget/runtime.linux-musl-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 7c7125b2f5dd16b2e1ec412a03514d2a936d86b1dd8a907130efda52458c604d
-SIZE (nuget/runtime.linux-musl-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 52451
-SHA256 (nuget/runtime.linux-musl-x64.runtime.native.system.io.ports.9.0.1.nupkg) = c4f2196181761e08e053018717e30bf774c5c62c538acd5a7353b47dbcd3771a
-SIZE (nuget/runtime.linux-musl-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 52597
-SHA256 (nuget/runtime.linux-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 0227d84ba48288f7ab10449f4b2562feaabc9a3865234b93ee77b530544bebf7
-SIZE (nuget/runtime.linux-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 52605
-SHA256 (nuget/runtime.maccatalyst-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 33ada08417c8f30d5756b4a9a1841b3128f5380ac9fb1ef854040f44d16883b3
-SIZE (nuget/runtime.maccatalyst-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 51846
-SHA256 (nuget/runtime.maccatalyst-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 842f107573aec44a42278d476e1329f14866676ada290843a0f526224d3792a8
-SIZE (nuget/runtime.maccatalyst-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 51379
+SHA256 (nuget/system.windows.extensions.9.0.4.nupkg) = 72df1279fd9a44f0b39078da7b0adc9142eef1583a3fc20c9e1f485869363d52
+SIZE (nuget/system.windows.extensions.9.0.4.nupkg) = 152209
+SHA256 (nuget/runtime.android-arm.runtime.native.system.io.ports.9.0.4.nupkg) = c885bcf440b44e68c1446c8c921a21302dcf9d82c4df8b573ebe4c5de61c4cd0
+SIZE (nuget/runtime.android-arm.runtime.native.system.io.ports.9.0.4.nupkg) = 51236
+SHA256 (nuget/runtime.android-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 74343e6dbc52fd96359378b4b9877460d9256e2e5ca46539d0540d6bf50310d3
+SIZE (nuget/runtime.android-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 52354
+SHA256 (nuget/runtime.android-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 00ced8792815417e40c55376626701c58d9f57613aa2e4c631e628933862f3f0
+SIZE (nuget/runtime.android-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 52530
+SHA256 (nuget/runtime.android-x86.runtime.native.system.io.ports.9.0.4.nupkg) = dcc489fd3e0d34af6a70cc63117e8b1f2c5a651c553c6725e3ae40f67fd70c90
+SIZE (nuget/runtime.android-x86.runtime.native.system.io.ports.9.0.4.nupkg) = 52528
+SHA256 (nuget/runtime.linux-arm.runtime.native.system.io.ports.9.0.4.nupkg) = b32d36f6409d0db569d8fb465f616aea98789262de5614602959b1ce55f4dd5d
+SIZE (nuget/runtime.linux-arm.runtime.native.system.io.ports.9.0.4.nupkg) = 51258
+SHA256 (nuget/runtime.linux-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 0e7e213473d7eb9befeccd29ec07c46e725c570a1595834264de14b7eec73e60
+SIZE (nuget/runtime.linux-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 52490
+SHA256 (nuget/runtime.linux-bionic-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = acd54c20e708bf2b07ac3fdcf80f204caf84133169ffbd6c6d0078a6fd08aa40
+SIZE (nuget/runtime.linux-bionic-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 52373
+SHA256 (nuget/runtime.linux-bionic-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 6ef9b0642646ec89acaae7e20228ec386b7ca3527be1c180e3e3f6ae7b0d7196
+SIZE (nuget/runtime.linux-bionic-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 52552
+SHA256 (nuget/runtime.linux-musl-arm.runtime.native.system.io.ports.9.0.4.nupkg) = a77bf9dac67c1aa1df19f8964da46ee18c0b2f88024d8e8f2a9fba6b28da7e0c
+SIZE (nuget/runtime.linux-musl-arm.runtime.native.system.io.ports.9.0.4.nupkg) = 51204
+SHA256 (nuget/runtime.linux-musl-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = af67283ea5d038397afda1843d62e86d0090aa4c59a2710b77f1f333354ce8a2
+SIZE (nuget/runtime.linux-musl-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 52450
+SHA256 (nuget/runtime.linux-musl-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 9c0d7a03bc29e7186e20d9f74a39d043672b6909c70892964f7fc0694062bc51
+SIZE (nuget/runtime.linux-musl-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 52594
+SHA256 (nuget/runtime.linux-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 1e1acb5e39fefe5e92912ed2b3cabca0f7ecc66a318d38ddb761edec61390b0c
+SIZE (nuget/runtime.linux-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 52600
+SHA256 (nuget/runtime.maccatalyst-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 05d7476439a83f61284e17991271196b92c427794a2b75ce90f1d15e6143b88e
+SIZE (nuget/runtime.maccatalyst-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 51835
+SHA256 (nuget/runtime.maccatalyst-x64.runtime.native.system.io.ports.9.0.4.nupkg) = e1bec8c7fd901d5e3b2f90ef01ff9ce3dd64b4572425ca3fa7c0069aadf89030
+SIZE (nuget/runtime.maccatalyst-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 51380
 SHA256 (nuget/runtime.native.system.data.sqlclient.sni.4.7.0.nupkg) = 723d3e0699a889bc0e5a3db0357c0e3497931a8b26170843df8f733e335a04ad
 SIZE (nuget/runtime.native.system.data.sqlclient.sni.4.7.0.nupkg) = 26713
-SHA256 (nuget/runtime.native.system.io.ports.9.0.1.nupkg) = 625103edf2c038e6e11282fdb996708eab6d27c6c1292ab633ebfd4285653b62
-SIZE (nuget/runtime.native.system.io.ports.9.0.1.nupkg) = 44231
-SHA256 (nuget/runtime.osx-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = c00b4ff0e99d0e68a4d410c16ec8782915ccc704109f7d253043d002598395d6
-SIZE (nuget/runtime.osx-arm64.runtime.native.system.io.ports.9.0.1.nupkg) = 51847
-SHA256 (nuget/runtime.osx-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 82b86f5e018465a1a2f2867d46a5555afc15673cf14c500c79daba3e144ceab7
-SIZE (nuget/runtime.osx-x64.runtime.native.system.io.ports.9.0.1.nupkg) = 51745
+SHA256 (nuget/runtime.native.system.io.ports.9.0.4.nupkg) = 14ab7ab0ff26bf975551294d2484f1a0ab381a544001628bdeb88c9db7b5a43a
+SIZE (nuget/runtime.native.system.io.ports.9.0.4.nupkg) = 44230
+SHA256 (nuget/runtime.osx-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = d1ecd292b576b52ac23a6fe199026aa4477db9ae8d22c4958ace586f04ba8d34
+SIZE (nuget/runtime.osx-arm64.runtime.native.system.io.ports.9.0.4.nupkg) = 51843
+SHA256 (nuget/runtime.osx-x64.runtime.native.system.io.ports.9.0.4.nupkg) = a3cdd5c1629fe7201d93fbb2835b8d3d7202239f3027efacf1d21edddd156f76
+SIZE (nuget/runtime.osx-x64.runtime.native.system.io.ports.9.0.4.nupkg) = 51741
 SHA256 (nuget/runtime.win-arm64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg) = f311a2aa4e60e2433bf7ffd28aba33983b43a6ac155c7dc29af22cec63707e1d
 SIZE (nuget/runtime.win-arm64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg) = 97899
 SHA256 (nuget/runtime.win-x64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg) = 1e85ca18192e7b44494f5499c409625664f9adb7d4df10fc987f217c2bd1c704
@@ -215,5 +215,5 @@ SHA256 (nuget/psreadline.2.3.4.nupkg) = 906569c65c52775c41df985c53fca07f1d19d846
 SIZE (nuget/psreadline.2.3.4.nupkg) = 257204
 SHA256 (nuget/powershellget.3.0.23-beta23.nupkg) = b25688d2758aabbff04b4cd39a93aaa253be272080e7f92329273920e95c2707
 SIZE (nuget/powershellget.3.0.23-beta23.nupkg) = 28433
-SHA256 (PowerShell-PowerShell-v7.5.0_GH0.tar.gz) = 6cdf35d3227db2c7caacdc1a730c4f025aff80483c3b58120717f30f397ce934
-SIZE (PowerShell-PowerShell-v7.5.0_GH0.tar.gz) = 10853954
+SHA256 (PowerShell-PowerShell-v7.5.1_GH0.tar.gz) = c61559b1370ab6c4471b06b2edaf609e08638d39233df1a83b3cc8079aee8182
+SIZE (PowerShell-PowerShell-v7.5.1_GH0.tar.gz) = 10809080
diff --git a/sysutils/chaoskube/Makefile b/sysutils/chaoskube/Makefile
index 19ee3cbdc721..d3987b7eea38 100644
--- a/sysutils/chaoskube/Makefile
+++ b/sysutils/chaoskube/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	chaoskube
-PORTVERSION=	0.34.1
+PORTVERSION=	0.35.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
@@ -11,7 +10,7 @@ WWW=		https://github.com/linki/chaoskube
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:1.23,modules
+USES=		go:1.24,modules
 GO_MODULE=	github.com/linki/chaoskube
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/sysutils/chaoskube/distinfo b/sysutils/chaoskube/distinfo
index d1cd01615ff0..fa2e78915786 100644
--- a/sysutils/chaoskube/distinfo
+++ b/sysutils/chaoskube/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1742838506
-SHA256 (go/sysutils_chaoskube/chaoskube-v0.34.1/v0.34.1.mod) = eed640b1d7fad2ad4ce88e9d49c217cbc43f1b06d6ffb5b046c980575dd778f6
-SIZE (go/sysutils_chaoskube/chaoskube-v0.34.1/v0.34.1.mod) = 2959
-SHA256 (go/sysutils_chaoskube/chaoskube-v0.34.1/v0.34.1.zip) = cde2e541e3f3b79d2e6c2a2d81cff30f9fec29669ed2bafbb3c4b45f64fec652
-SIZE (go/sysutils_chaoskube/chaoskube-v0.34.1/v0.34.1.zip) = 206103
+TIMESTAMP = 1746632534
+SHA256 (go/sysutils_chaoskube/chaoskube-v0.35.0/v0.35.0.mod) = 7a301deaeab6f90d22c21673eec7827fbecc49dcb721368b4f4e56dfe1dac001
+SIZE (go/sysutils_chaoskube/chaoskube-v0.35.0/v0.35.0.mod) = 2749
+SHA256 (go/sysutils_chaoskube/chaoskube-v0.35.0/v0.35.0.zip) = cb8f7459e7e64bb1ad232375871b66df3c44fb6748d3584467d06614afb686b4
+SIZE (go/sysutils_chaoskube/chaoskube-v0.35.0/v0.35.0.zip) = 205878
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index b6378dda4aab..1b95485dd445 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	consul
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.20.6
+DISTVERSION=	1.21.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
@@ -17,7 +17,7 @@ WWW=		https://www.consul.io/
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe go:1.23,modules
+USES=		cpe go:1.24,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
@@ -43,7 +43,7 @@ CONSUL_USER?=	consul
 CONSUL_GROUP?=	consul
 CONSUL_DBDIR?=	/var/db/${PORTNAME}
 
-GITID=		a343c51
+GITID=		4e96098
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 .include <bsd.port.pre.mk>
diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo
index 153b855011c2..3eb680e47a79 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1746176572
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/go.mod) = 058db3ddc1245a8195aebd26c81ec89d5636a64cfd9e89db5d574229f5112490
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/go.mod) = 13795
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/api/go.mod) = c8f80921ac94f31f1b338436a88870f347948afd8e1c4207b285fa72a09d437a
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/api/go.mod) = 1869
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/envoyextensions/go.mod) = 1fd77d2d2690739038026daab6c6eb607601c1c14350d6530dfce0db716254be
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/envoyextensions/go.mod) = 2071
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/proto-public/go.mod) = c0bf39ba829f5a06b8b0f26ea18392b4ac58a00ef561728815b1a2620ebaba6a
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/proto-public/go.mod) = 390
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/sdk/go.mod) = 5241149e898962ff666a6d83140ea5bb8f8e11b10f52253745c8508303566211
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/sdk/go.mod) = 822
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/troubleshoot/go.mod) = 619874fc3590081ba9e838fb43170a72078be9b08a7453a23882cb7392797df5
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/troubleshoot/go.mod) = 2847
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/hashicorp-consul-v1.20.6_GH0.tar.gz) = 1868ba920c241350f82bccb24aceae1e8210b5a32ea19fbd20ac4bf254476952
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.6_GH0/hashicorp-consul-v1.20.6_GH0.tar.gz) = 39229939
+TIMESTAMP = 1746604383
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/go.mod) = 1a32a7a606f584853f9f767e40e4bf640af329c4fe93ce65f82a26d24879f4b3
+SIZE (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/go.mod) = 15151
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/api/go.mod) = c8f80921ac94f31f1b338436a88870f347948afd8e1c4207b285fa72a09d437a
+SIZE (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/api/go.mod) = 1869
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/envoyextensions/go.mod) = 1fd77d2d2690739038026daab6c6eb607601c1c14350d6530dfce0db716254be
+SIZE (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/envoyextensions/go.mod) = 2071
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/proto-public/go.mod) = c0bf39ba829f5a06b8b0f26ea18392b4ac58a00ef561728815b1a2620ebaba6a
+SIZE (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/proto-public/go.mod) = 390
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/sdk/go.mod) = 5241149e898962ff666a6d83140ea5bb8f8e11b10f52253745c8508303566211
+SIZE (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/sdk/go.mod) = 822
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/troubleshoot/go.mod) = 619874fc3590081ba9e838fb43170a72078be9b08a7453a23882cb7392797df5
+SIZE (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/troubleshoot/go.mod) = 2847
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/hashicorp-consul-v1.21.0_GH0.tar.gz) = aad1a57899c54e7f37d8c681c124f9fe2c8cf5829c73d122ba5e3dfebd95ec89
+SIZE (go/sysutils_consul/hashicorp-consul-v1.21.0_GH0/hashicorp-consul-v1.21.0_GH0.tar.gz) = 47398255
diff --git a/sysutils/deskflow/Makefile b/sysutils/deskflow/Makefile
index c3e1d36e2b2f..6f69cf8cea9d 100644
--- a/sysutils/deskflow/Makefile
+++ b/sysutils/deskflow/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	deskflow
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.21.1
+DISTVERSION=	1.21.2
 CATEGORIES=	sysutils
 
 PATCH_SITES=	https://github.com/deskflow/deskflow/commit/
-PATCHFILES+=	12bcc1a4d6c7ae5edec8a43892a0a2e5f59ad11f.patch:-p1 # Fix build with Qt >= 6.9.0
 
 MAINTAINER=	ykasap@gmail.com
 COMMENT=	Mouse and keyboard sharing utility
@@ -16,7 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_FreeBSD_13=	requires OpenSSL 3.0
 
 BUILD_DEPENDS=	${LOCALBASE}/include/CLI/Version.hpp:devel/cli11 \
-		googletest>0:devel/googletest
+		googletest>0:devel/googletest \
+		help2man:misc/help2man
 LIB_DEPENDS=	libei.so:x11/libei \
 		libportal.so:deskutils/libportal \
 		libtomlplusplus.so:devel/tomlplusplus \
diff --git a/sysutils/deskflow/distinfo b/sysutils/deskflow/distinfo
index c742167dcab5..44bf535e79b3 100644
--- a/sysutils/deskflow/distinfo
+++ b/sysutils/deskflow/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1745409053
-SHA256 (deskflow-deskflow-v1.21.1_GH0.tar.gz) = e284b0c90e4bcb08b93e3df85e8d062d51be60d6a23622629aafd5e92b86aa4b
-SIZE (deskflow-deskflow-v1.21.1_GH0.tar.gz) = 1884253
-SHA256 (12bcc1a4d6c7ae5edec8a43892a0a2e5f59ad11f.patch) = a2a9d6cebb901cb161f9c6dd07bba0eae64215d1c33122a0981efa5cb86e5f79
-SIZE (12bcc1a4d6c7ae5edec8a43892a0a2e5f59ad11f.patch) = 1522
+TIMESTAMP = 1746181665
+SHA256 (deskflow-deskflow-v1.21.2_GH0.tar.gz) = 1a79c0c54fa4c5a9eea46b4675fed4518fd71ea8f4905127356db032ce5c697b
+SIZE (deskflow-deskflow-v1.21.2_GH0.tar.gz) = 1884045
diff --git a/sysutils/deskflow/files/patch-src_apps_CMakeLists.txt b/sysutils/deskflow/files/patch-src_apps_CMakeLists.txt
new file mode 100644
index 000000000000..a335de39d915
--- /dev/null
+++ b/sysutils/deskflow/files/patch-src_apps_CMakeLists.txt
@@ -0,0 +1,12 @@
+--- src/apps/CMakeLists.txt.orig	2025-04-07 12:24:27 UTC
++++ src/apps/CMakeLists.txt
+@@ -19,6 +19,9 @@ function(generate_app_man TARGET)
+           --no-info
+           $<TARGET_FILE:${target}>
+           -o $<TARGET_FILE_DIR:${target}>/${target}.1
++        COMMAND sed -i.bak -e \'s|$<TARGET_FILE_DIR:${target}>/||\' 
++	  -e \'s|$ENV{HOME}|$$HOME|\'
++          $<TARGET_FILE_DIR:${target}>/${target}.1
+     )
+     install(
+       FILES $<TARGET_FILE_DIR:${target}>/${target}.1
diff --git a/sysutils/deskflow/pkg-plist b/sysutils/deskflow/pkg-plist
index b88225737f79..f4ddfb7643dd 100644
--- a/sysutils/deskflow/pkg-plist
+++ b/sysutils/deskflow/pkg-plist
@@ -5,6 +5,9 @@ share/applications/org.deskflow.deskflow.desktop
 share/icons/hicolor/512x512/apps/org.deskflow.deskflow.png
 share/licenses/deskflow/LICENSE
 share/licenses/deskflow/LICENSE_EXCEPTION
+share/man/man1/deskflow-client.1.gz
+share/man/man1/deskflow-server.1.gz
+share/man/man1/deskflow.1.gz
 share/metainfo/org.deskflow.deskflow.metainfo.xml
 %%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
 %%PORTDOCS%%%%DOCSDIR%%/html/bc_sd.png
diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile
index d91b316d7f1e..b169eb06b342 100644
--- a/sysutils/exa/Makefile
+++ b/sysutils/exa/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	exa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.1
-PORTREVISION=	42
+PORTREVISION=	43
 CATEGORIES=	sysutils
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modern replacement for ls
 WWW=		https://the.exa.website/
 
diff --git a/sysutils/eza/Makefile b/sysutils/eza/Makefile
index f8e9c7219fbf..fb3f0dde2dd6 100644
--- a/sysutils/eza/Makefile
+++ b/sysutils/eza/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	eza
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.21.2
+DISTVERSION=	0.21.3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/eza-community/${PORTNAME}/releases/download/v${DISTVERSION}/man-${DISTVERSION}.tar.gz?dummy=/:man
 DISTFILES=	${PORTNAME}-man-${DISTVERSION}.tar.gz:man
diff --git a/sysutils/eza/Makefile.crates b/sysutils/eza/Makefile.crates
index 00f1ed64dbe7..3aeb0fe262cb 100644
--- a/sysutils/eza/Makefile.crates
+++ b/sysutils/eza/Makefile.crates
@@ -20,9 +20,9 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		by_address-1.2.1 \
 		byteorder-1.5.0 \
 		cast-0.3.0 \
-		cc-1.2.19 \
+		cc-1.2.20 \
 		cfg-if-1.0.0 \
-		chrono-0.4.40 \
+		chrono-0.4.41 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
 		ciborium-ll-0.2.2 \
@@ -51,13 +51,13 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		fastrand-2.3.0 \
 		filetime-0.2.25 \
 		form_urlencoded-1.2.1 \
-		getrandom-0.2.15 \
+		getrandom-0.2.16 \
 		getrandom-0.3.2 \
 		gimli-0.31.1 \
 		git2-0.20.1 \
 		glob-0.3.2 \
 		half-2.6.0 \
-		hashbrown-0.15.2 \
+		hashbrown-0.15.3 \
 		hermit-abi-0.5.0 \
 		humantime-2.2.0 \
 		humantime-serde-1.1.1 \
@@ -101,7 +101,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		object-0.36.7 \
 		once_cell-1.21.3 \
 		oorandom-11.1.5 \
-		openssl-sys-0.9.107 \
+		openssl-sys-0.9.108 \
 		option-ext-0.2.0 \
 		os_pipe-1.2.1 \
 		palette-0.7.6 \
@@ -135,7 +135,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		regex-automata-0.4.9 \
 		regex-syntax-0.8.5 \
 		rustc-demangle-0.1.24 \
-		rustix-1.0.5 \
+		rustix-1.0.7 \
 		rustversion-1.0.20 \
 		ryu-1.0.20 \
 		same-file-1.0.6 \
@@ -151,8 +151,8 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		snapbox-0.6.21 \
 		snapbox-macros-0.3.10 \
 		stable_deref_trait-1.2.0 \
-		syn-2.0.100 \
-		synstructure-0.13.1 \
+		syn-2.0.101 \
+		synstructure-0.13.2 \
 		tempfile-3.19.1 \
 		terminal_size-0.4.2 \
 		thiserror-1.0.69 \
@@ -165,8 +165,9 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		timeago-0.4.2 \
 		tinystr-0.7.6 \
 		tinytemplate-1.2.1 \
-		toml_datetime-0.6.8 \
-		toml_edit-0.22.24 \
+		toml_datetime-0.6.9 \
+		toml_edit-0.22.26 \
+		toml_write-0.1.1 \
 		trycmd-0.15.9 \
 		unicode-ident-1.0.18 \
 		unicode-width-0.1.14 \
@@ -210,7 +211,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		windows_x86_64_gnu-0.52.6 \
 		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_msvc-0.52.6 \
-		winnow-0.7.6 \
+		winnow-0.7.8 \
 		wit-bindgen-rt-0.39.0 \
 		write16-1.0.0 \
 		writeable-0.5.5 \
diff --git a/sysutils/eza/distinfo b/sysutils/eza/distinfo
index 83f27f881ecd..a06d44469028 100644
--- a/sysutils/eza/distinfo
+++ b/sysutils/eza/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1745570599
-SHA256 (eza-man-0.21.2.tar.gz) = 75e979a609eadc74f4d0d4c9c800a8cb42776f09a71cde877dcf44b6f52e4ede
-SIZE (eza-man-0.21.2.tar.gz) = 9557
+TIMESTAMP = 1746222245
+SHA256 (eza-man-0.21.3.tar.gz) = f9175dab708b65eef4d8a9bba0296efa0c63d1031e56d78daaa5e21544d42c50
+SIZE (eza-man-0.21.3.tar.gz) = 9535
 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
@@ -45,12 +45,12 @@ SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
 SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
 SIZE (rust/crates/cast-0.3.0.crate) = 11452
-SHA256 (rust/crates/cc-1.2.19.crate) = 8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362
-SIZE (rust/crates/cc-1.2.19.crate) = 105910
+SHA256 (rust/crates/cc-1.2.20.crate) = 04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a
+SIZE (rust/crates/cc-1.2.20.crate) = 105986
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/chrono-0.4.40.crate) = 1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c
-SIZE (rust/crates/chrono-0.4.40.crate) = 229824
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
 SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
 SIZE (rust/crates/ciborium-0.2.2.crate) = 35611
 SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757
@@ -107,8 +107,8 @@ SHA256 (rust/crates/filetime-0.2.25.crate) = 35c0522e981e68cbfa8c3f978441a5f34b3
 SIZE (rust/crates/filetime-0.2.25.crate) = 14940
 SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
 SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
-SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
-SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592
+SIZE (rust/crates/getrandom-0.2.16.crate) = 40163
 SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0
 SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
 SHA256 (rust/crates/gimli-0.31.1.crate) = 07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f
@@ -119,8 +119,8 @@ SHA256 (rust/crates/glob-0.3.2.crate) = a8d1add55171497b4705a648c6b583acafb01d58
 SIZE (rust/crates/glob-0.3.2.crate) = 22359
 SHA256 (rust/crates/half-2.6.0.crate) = 459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9
 SIZE (rust/crates/half-2.6.0.crate) = 59507
-SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
-SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
+SHA256 (rust/crates/hashbrown-0.15.3.crate) = 84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3
+SIZE (rust/crates/hashbrown-0.15.3.crate) = 140413
 SHA256 (rust/crates/hermit-abi-0.5.0.crate) = fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e
 SIZE (rust/crates/hermit-abi-0.5.0.crate) = 17480
 SHA256 (rust/crates/humantime-2.2.0.crate) = 9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f
@@ -207,8 +207,8 @@ SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a71648
 SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
 SHA256 (rust/crates/oorandom-11.1.5.crate) = d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e
 SIZE (rust/crates/oorandom-11.1.5.crate) = 23750
-SHA256 (rust/crates/openssl-sys-0.9.107.crate) = 8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07
-SIZE (rust/crates/openssl-sys-0.9.107.crate) = 78156
+SHA256 (rust/crates/openssl-sys-0.9.108.crate) = e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847
+SIZE (rust/crates/openssl-sys-0.9.108.crate) = 78190
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
 SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
 SHA256 (rust/crates/os_pipe-1.2.1.crate) = 5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982
@@ -275,8 +275,8 @@ SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303af
 SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
 SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
-SHA256 (rust/crates/rustix-1.0.5.crate) = d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf
-SIZE (rust/crates/rustix-1.0.5.crate) = 414160
+SHA256 (rust/crates/rustix-1.0.7.crate) = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+SIZE (rust/crates/rustix-1.0.7.crate) = 414500
 SHA256 (rust/crates/rustversion-1.0.20.crate) = eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2
 SIZE (rust/crates/rustversion-1.0.20.crate) = 20666
 SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f
@@ -307,10 +307,10 @@ SHA256 (rust/crates/snapbox-macros-0.3.10.crate) = 16569f53ca23a41bb6f62e0a5084a
 SIZE (rust/crates/snapbox-macros-0.3.10.crate) = 7129
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
-SHA256 (rust/crates/syn-2.0.100.crate) = b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0
-SIZE (rust/crates/syn-2.0.100.crate) = 297947
-SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
-SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
+SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf
+SIZE (rust/crates/syn-2.0.101.crate) = 299250
+SHA256 (rust/crates/synstructure-0.13.2.crate) = 728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2
+SIZE (rust/crates/synstructure-0.13.2.crate) = 18950
 SHA256 (rust/crates/tempfile-3.19.1.crate) = 7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf
 SIZE (rust/crates/tempfile-3.19.1.crate) = 39634
 SHA256 (rust/crates/terminal_size-0.4.2.crate) = 45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed
@@ -335,10 +335,12 @@ SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1
 SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
 SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
 SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
-SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
-SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
-SHA256 (rust/crates/toml_edit-0.22.24.crate) = 17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474
-SIZE (rust/crates/toml_edit-0.22.24.crate) = 106399
+SHA256 (rust/crates/toml_datetime-0.6.9.crate) = 3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3
+SIZE (rust/crates/toml_datetime-0.6.9.crate) = 12622
+SHA256 (rust/crates/toml_edit-0.22.26.crate) = 310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e
+SIZE (rust/crates/toml_edit-0.22.26.crate) = 121714
+SHA256 (rust/crates/toml_write-0.1.1.crate) = bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076
+SIZE (rust/crates/toml_write-0.1.1.crate) = 17467
 SHA256 (rust/crates/trycmd-0.15.9.crate) = a8b5cf29388862aac065d6597ac9c8e842d1cc827cb50f7c32f11d29442eaae4
 SIZE (rust/crates/trycmd-0.15.9.crate) = 33881
 SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
@@ -425,8 +427,8 @@ SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681
 SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
-SHA256 (rust/crates/winnow-0.7.6.crate) = 63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10
-SIZE (rust/crates/winnow-0.7.6.crate) = 174072
+SHA256 (rust/crates/winnow-0.7.8.crate) = 9e27d6ad3dac991091e4d35de9ba2d2d00647c5d0fc26c5496dee55984ae111b
+SIZE (rust/crates/winnow-0.7.8.crate) = 174444
 SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
 SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241
 SHA256 (rust/crates/write16-1.0.0.crate) = d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936
@@ -447,5 +449,5 @@ SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc
 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
 SHA256 (rust/crates/zoneinfo_compiled-0.5.1.crate) = 64fbebe65e899530f43bd760b23fda8f141118f4db49952b02998cbd0907a5de
 SIZE (rust/crates/zoneinfo_compiled-0.5.1.crate) = 8837
-SHA256 (eza-community-eza-v0.21.2_GH0.tar.gz) = 8ddaa84c655eba97c7287422bcd475defdaf1b7c28a609400ebf69da16d80b53
-SIZE (eza-community-eza-v0.21.2_GH0.tar.gz) = 1423685
+SHA256 (eza-community-eza-v0.21.3_GH0.tar.gz) = f0827d39406f0799e6676ab87e349193e88b6220af1670e98b988e8ee0c2b7c0
+SIZE (eza-community-eza-v0.21.3_GH0.tar.gz) = 1423834
diff --git a/sysutils/eza/files/patch-Cargo.lock b/sysutils/eza/files/patch-Cargo.lock
index 02d7e6f460fa..1ec3b1206fdb 100644
--- a/sysutils/eza/files/patch-Cargo.lock
+++ b/sysutils/eza/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig	2025-04-19 06:16:56 UTC
+--- Cargo.lock.orig	2025-05-02 06:07:17 UTC
 +++ Cargo.lock
-@@ -963,15 +963,6 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68
+@@ -962,15 +962,6 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68
  checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
  
  [[package]]
@@ -14,9 +14,9 @@
 -
 -[[package]]
  name = "openssl-sys"
- version = "0.9.107"
+ version = "0.9.108"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -979,7 +970,6 @@ dependencies = [
+@@ -978,7 +969,6 @@ dependencies = [
  dependencies = [
   "cc",
   "libc",
diff --git a/sysutils/eza/files/patch-Cargo.toml b/sysutils/eza/files/patch-Cargo.toml
index 06a861a9ae0c..f2747353dbae 100644
--- a/sysutils/eza/files/patch-Cargo.toml
+++ b/sysutils/eza/files/patch-Cargo.toml
@@ -1,6 +1,6 @@
---- Cargo.toml.orig	2025-01-09 04:24:20 UTC
+--- Cargo.toml.orig	2025-05-02 06:07:17 UTC
 +++ Cargo.toml
-@@ -140,7 +140,6 @@ git = ["git2"]
+@@ -139,7 +139,6 @@ git = ["git2"]
  [features]
  default = ["git"]
  git = ["git2"]
diff --git a/sysutils/eza/files/patch-cargo-crates_openssl-sys-0.9.107_Cargo.toml b/sysutils/eza/files/patch-cargo-crates_openssl-sys-0.9.108_Cargo.toml
index e839352d8945..590822d62fae 100644
--- a/sysutils/eza/files/patch-cargo-crates_openssl-sys-0.9.107_Cargo.toml
+++ b/sysutils/eza/files/patch-cargo-crates_openssl-sys-0.9.108_Cargo.toml
@@ -1,5 +1,5 @@
---- cargo-crates/openssl-sys-0.9.107/Cargo.toml.orig	1970-01-01 00:00:01 UTC
-+++ cargo-crates/openssl-sys-0.9.107/Cargo.toml
+--- cargo-crates/openssl-sys-0.9.108/Cargo.toml.orig	1970-01-01 00:00:01 UTC
++++ cargo-crates/openssl-sys-0.9.108/Cargo.toml
 @@ -40,7 +40,6 @@ unstable_boringssl = ["bssl-sys"]
  [features]
  aws-lc = ["dep:aws-lc-sys"]
diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile
index 056892ba42f2..2c609ba8e86e 100644
--- a/sysutils/fd/Makefile
+++ b/sysutils/fd/Makefile
@@ -5,7 +5,7 @@ PORTREVISION=	6
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-find
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Simple, fast and user-friendly alternative to find
 WWW=		https://github.com/sharkdp/fd
 
diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile
index 87d8c5d718aa..a6799cb6eda9 100644
--- a/sysutils/flowgger/Makefile
+++ b/sysutils/flowgger/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	CRATESIO
 DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast data collector
 WWW=		https://github.com/awslabs/flowgger
 
diff --git a/sysutils/framework-system/Makefile b/sysutils/framework-system/Makefile
index 58d57b52268a..b7874e98db1b 100644
--- a/sysutils/framework-system/Makefile
+++ b/sysutils/framework-system/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	framework-system
 DISTVERSIONPREFIX=v
-DISTVERSION=	0.2.1
-PORTREVISION=	1
+DISTVERSION=	0.4.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	dhs@frame.work
diff --git a/sysutils/framework-system/Makefile.crates b/sysutils/framework-system/Makefile.crates
index ceb3935c0da4..ba47b0b4a0e1 100644
--- a/sysutils/framework-system/Makefile.crates
+++ b/sysutils/framework-system/Makefile.crates
@@ -18,6 +18,7 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		cfg_aliases-0.2.1 \
 		chrono-0.4.24 \
 		clap-4.5.13 \
+		clap-num-1.2.0 \
 		clap-verbosity-flag-2.2.1 \
 		clap_builder-4.5.13 \
 		clap_derive-4.5.13 \
@@ -52,7 +53,7 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		getopts-0.2.21 \
 		git2-0.15.0 \
 		heck-0.5.0 \
-		hidapi-2.6.1 \
+		hidapi-2.6.3 \
 		humantime-2.1.0 \
 		iana-time-zone-0.1.56 \
 		iana-time-zone-haiku-0.1.1 \
@@ -90,13 +91,13 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.26 \
 		plain-0.2.3 \
-		proc-macro2-1.0.86 \
+		proc-macro2-1.0.93 \
 		ptr_meta-0.2.0 \
 		ptr_meta_derive-0.2.0 \
-		quote-1.0.26 \
-		regex-1.10.6 \
-		regex-automata-0.4.6 \
-		regex-syntax-0.8.3 \
+		quote-1.0.38 \
+		regex-1.11.1 \
+		regex-automata-0.4.9 \
+		regex-syntax-0.8.5 \
 		rusb-0.9.4 \
 		rustc_version-0.4.0 \
 		ryu-1.0.12 \
@@ -113,10 +114,10 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		static_vcruntime-2.0.0 \
 		strsim-0.11.1 \
 		syn-1.0.107 \
-		syn-2.0.13 \
+		syn-2.0.98 \
 		termcolor-1.1.3 \
-		thiserror-1.0.40 \
-		thiserror-impl-1.0.40 \
+		thiserror-2.0.11 \
+		thiserror-impl-2.0.11 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
 		toml-0.5.11 \
@@ -141,13 +142,9 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-0.48.0 \
-		windows-0.52.0 \
 		windows-0.59.0 \
-		windows-core-0.52.0 \
 		windows-core-0.59.0 \
-		windows-implement-0.52.0 \
 		windows-implement-0.59.0 \
-		windows-interface-0.52.0 \
 		windows-interface-0.59.0 \
 		windows-result-0.3.0 \
 		windows-strings-0.3.0 \
@@ -179,7 +176,7 @@ CARGO_CRATES=	aho-corasick-1.1.3 \
 		windows_x86_64_msvc-0.48.0 \
 		windows_x86_64_msvc-0.52.6 \
 		windows_x86_64_msvc-0.53.0 \
-		wmi-0.13.3 \
+		wmi-0.15.0 \
 		uefi,uefi-services@git+https://github.com/FrameworkComputer/uefi-rs?branch=merged\#76130a0f1c1585012e598b8c514526bac09c68e0 \
 		redox_hwio@git+https://github.com/FrameworkComputer/rust-hwio?branch=freebsd\#9bcff4277d8f3d7dce2b12c6ad81d092ae35c4ba \
 		smbios-lib@git+https://github.com/FrameworkComputer/smbios-lib.git?branch=no-std\#b3e2fff8a6f4b8c2d729467cbbf0c8c41974cd1c
diff --git a/sysutils/framework-system/distinfo b/sysutils/framework-system/distinfo
index 714b4aef8819..b8e54b0ba1c5 100644
--- a/sysutils/framework-system/distinfo
+++ b/sysutils/framework-system/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1741617059
+TIMESTAMP = 1746526783
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
@@ -39,6 +39,8 @@ SHA256 (rust/crates/chrono-0.4.24.crate) = 4e3c5919066adf22df73762e50cffcde3a758
 SIZE (rust/crates/chrono-0.4.24.crate) = 191330
 SHA256 (rust/crates/clap-4.5.13.crate) = 0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc
 SIZE (rust/crates/clap-4.5.13.crate) = 56267
+SHA256 (rust/crates/clap-num-1.2.0.crate) = 822c4000301ac390e65995c62207501e3ef800a1fc441df913a5e8e4dc374816
+SIZE (rust/crates/clap-num-1.2.0.crate) = 10476
 SHA256 (rust/crates/clap-verbosity-flag-2.2.1.crate) = 63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53
 SIZE (rust/crates/clap-verbosity-flag-2.2.1.crate) = 12620
 SHA256 (rust/crates/clap_builder-4.5.13.crate) = 64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99
@@ -107,8 +109,8 @@ SHA256 (rust/crates/git2-0.15.0.crate) = 2994bee4a3a6a51eb90c218523be382fd7ea09b
 SIZE (rust/crates/git2-0.15.0.crate) = 198983
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
-SHA256 (rust/crates/hidapi-2.6.1.crate) = 9e58251020fe88fe0dae5ebcc1be92b4995214af84725b375d08354d0311c23c
-SIZE (rust/crates/hidapi-2.6.1.crate) = 128006
+SHA256 (rust/crates/hidapi-2.6.3.crate) = 03b876ecf37e86b359573c16c8366bc3eba52b689884a0fc42ba3f67203d2a8b
+SIZE (rust/crates/hidapi-2.6.3.crate) = 128080
 SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
 SIZE (rust/crates/humantime-2.1.0.crate) = 16749
 SHA256 (rust/crates/iana-time-zone-0.1.56.crate) = 0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c
@@ -183,20 +185,20 @@ SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809
 SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662
 SHA256 (rust/crates/plain-0.2.3.crate) = b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6
 SIZE (rust/crates/plain-0.2.3.crate) = 10664
-SHA256 (rust/crates/proc-macro2-1.0.86.crate) = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
-SIZE (rust/crates/proc-macro2-1.0.86.crate) = 48958
+SHA256 (rust/crates/proc-macro2-1.0.93.crate) = 60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99
+SIZE (rust/crates/proc-macro2-1.0.93.crate) = 52388
 SHA256 (rust/crates/ptr_meta-0.2.0.crate) = bcada80daa06c42ed5f48c9a043865edea5dc44cbf9ac009fda3b89526e28607
 SIZE (rust/crates/ptr_meta-0.2.0.crate) = 6141
 SHA256 (rust/crates/ptr_meta_derive-0.2.0.crate) = bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2
 SIZE (rust/crates/ptr_meta_derive-0.2.0.crate) = 2353
-SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc
-SIZE (rust/crates/quote-1.0.26.crate) = 28397
-SHA256 (rust/crates/regex-1.10.6.crate) = 4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619
-SIZE (rust/crates/regex-1.10.6.crate) = 253894
-SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
-SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
-SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
-SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
+SHA256 (rust/crates/quote-1.0.38.crate) = 0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc
+SIZE (rust/crates/quote-1.0.38.crate) = 31252
+SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191
+SIZE (rust/crates/regex-1.11.1.crate) = 254170
+SHA256 (rust/crates/regex-automata-0.4.9.crate) = 809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908
+SIZE (rust/crates/regex-automata-0.4.9.crate) = 618525
+SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c
+SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
 SHA256 (rust/crates/rusb-0.9.4.crate) = ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4
 SIZE (rust/crates/rusb-0.9.4.crate) = 44539
 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
@@ -229,14 +231,14 @@ SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3
 SIZE (rust/crates/strsim-0.11.1.crate) = 14266
 SHA256 (rust/crates/syn-1.0.107.crate) = 1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5
 SIZE (rust/crates/syn-1.0.107.crate) = 237539
-SHA256 (rust/crates/syn-2.0.13.crate) = 4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec
-SIZE (rust/crates/syn-2.0.13.crate) = 240619
+SHA256 (rust/crates/syn-2.0.98.crate) = 36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1
+SIZE (rust/crates/syn-2.0.98.crate) = 297807
 SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
 SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
-SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac
-SIZE (rust/crates/thiserror-1.0.40.crate) = 18709
-SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f
-SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138
+SHA256 (rust/crates/thiserror-2.0.11.crate) = d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc
+SIZE (rust/crates/thiserror-2.0.11.crate) = 28648
+SHA256 (rust/crates/thiserror-impl-2.0.11.crate) = 26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2
+SIZE (rust/crates/thiserror-impl-2.0.11.crate) = 21067
 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
@@ -285,20 +287,12 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
 SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
 SIZE (rust/crates/windows-0.48.0.crate) = 11864177
-SHA256 (rust/crates/windows-0.52.0.crate) = e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be
-SIZE (rust/crates/windows-0.52.0.crate) = 11843715
 SHA256 (rust/crates/windows-0.59.0.crate) = 7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1
 SIZE (rust/crates/windows-0.59.0.crate) = 9429988
-SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
-SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
 SHA256 (rust/crates/windows-core-0.59.0.crate) = 810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce
 SIZE (rust/crates/windows-core-0.59.0.crate) = 37073
-SHA256 (rust/crates/windows-implement-0.52.0.crate) = 12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946
-SIZE (rust/crates/windows-implement-0.52.0.crate) = 8705
 SHA256 (rust/crates/windows-implement-0.59.0.crate) = 83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1
 SIZE (rust/crates/windows-implement-0.59.0.crate) = 11373
-SHA256 (rust/crates/windows-interface-0.52.0.crate) = 9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1
-SIZE (rust/crates/windows-interface-0.52.0.crate) = 9685
 SHA256 (rust/crates/windows-interface-0.59.0.crate) = cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01
 SIZE (rust/crates/windows-interface-0.59.0.crate) = 11751
 SHA256 (rust/crates/windows-result-0.3.0.crate) = d08106ce80268c4067c0571ca55a9b4e9516518eaa1a1fe9b37ca403ae1d1a34
@@ -361,13 +355,13 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
 SHA256 (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486
 SIZE (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 834400
-SHA256 (rust/crates/wmi-0.13.3.crate) = fc2f0a4062ca522aad4705a2948fd4061b3857537990202a8ddd5af21607f79a
-SIZE (rust/crates/wmi-0.13.3.crate) = 53050
+SHA256 (rust/crates/wmi-0.15.0.crate) = 58078b4e28f04064dae68f6e11a6b93133c83b88dfd5ae16738ded4942db6544
+SIZE (rust/crates/wmi-0.15.0.crate) = 59983
 SHA256 (FrameworkComputer-uefi-rs-76130a0f1c1585012e598b8c514526bac09c68e0_GH0.tar.gz) = 42719b6055f38712115b4698bf8961c3b18f21c7e511c43ea3e1ac14edac0b82
 SIZE (FrameworkComputer-uefi-rs-76130a0f1c1585012e598b8c514526bac09c68e0_GH0.tar.gz) = 320730
 SHA256 (FrameworkComputer-rust-hwio-9bcff4277d8f3d7dce2b12c6ad81d092ae35c4ba_GH0.tar.gz) = 128cc19b5824d0228b6f9fc5a55d65d2afe91ffe3712e95c0289592387a5d0e8
 SIZE (FrameworkComputer-rust-hwio-9bcff4277d8f3d7dce2b12c6ad81d092ae35c4ba_GH0.tar.gz) = 3502
 SHA256 (FrameworkComputer-smbios-lib-b3e2fff8a6f4b8c2d729467cbbf0c8c41974cd1c_GH0.tar.gz) = e5649380b465b478a45a0d5eeb5ed68a7fffd15205bdcc179292f8bca5c54347
 SIZE (FrameworkComputer-smbios-lib-b3e2fff8a6f4b8c2d729467cbbf0c8c41974cd1c_GH0.tar.gz) = 139972
-SHA256 (FrameworkComputer-framework-system-v0.2.1_GH0.tar.gz) = 5d23e0ae3e226fb5b8e1085b832db4e6bfb9665f97270fa91b83b6fdee335f20
-SIZE (FrameworkComputer-framework-system-v0.2.1_GH0.tar.gz) = 1169623
+SHA256 (FrameworkComputer-framework-system-v0.4.0_GH0.tar.gz) = 4ff47cbfb91799a4b5d9e4f2fd63ddd92121d64683aa933b3ac9a866718b9ed2
+SIZE (FrameworkComputer-framework-system-v0.4.0_GH0.tar.gz) = 1189123
diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile
index bf8ef28d1d0f..1cc391cb5026 100644
--- a/sysutils/froxlor/Makefile
+++ b/sysutils/froxlor/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	froxlor
-DISTVERSION=	2.2.5
+DISTVERSION=	2.2.7
+PORTREVISION=	2
 CATEGORIES=	sysutils www
 MASTER_SITES=	https://files.froxlor.org/releases/
 
diff --git a/sysutils/froxlor/distinfo b/sysutils/froxlor/distinfo
index 4e7a4a2a15ef..514fd92677e1 100644
--- a/sysutils/froxlor/distinfo
+++ b/sysutils/froxlor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731688250
-SHA256 (froxlor-2.2.5.tar.gz) = b8ebcba5a9e2752b4f8efcbf9a5a5207254fa2d056d367e9ed9c40d7a427b033
-SIZE (froxlor-2.2.5.tar.gz) = 3788019
+TIMESTAMP = 1746486315
+SHA256 (froxlor-2.2.7.tar.gz) = f8767224b62cdaabe450540ad336c45ec700bdf1602e102db1ef8cbac6dc7ac8
+SIZE (froxlor-2.2.7.tar.gz) = 3903448
diff --git a/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php
new file mode 100644
index 000000000000..16c063a76a12
--- /dev/null
+++ b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php
@@ -0,0 +1,11 @@
+--- froxlor/lib/Froxlor/Cli/MasterCron.php.orig	2025-05-07 03:26:39 UTC
++++ froxlor/lib/Froxlor/Cli/MasterCron.php
+@@ -211,7 +211,7 @@ final class MasterCron extends CliCommand
+ 	private function lockJob(string $job, OutputInterface $output): bool
+ 	{
+ 
+-		$this->lockFile = '/run/lock/froxlor_' . $job . '.lock';
++		$this->lockFile = '/var/run/froxlor_' . $job . '.lock';
+ 
+ 		if (file_exists($this->lockFile)) {
+ 			$jobinfo = json_decode(file_get_contents($this->lockFile), true);
diff --git a/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php
new file mode 100644
index 000000000000..56bc0ee1600e
--- /dev/null
+++ b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php
@@ -0,0 +1,11 @@
+--- froxlor/lib/Froxlor/Cron/Traffic/TrafficCron.php.orig	2025-05-07 03:27:51 UTC
++++ froxlor/lib/Froxlor/Cron/Traffic/TrafficCron.php
+@@ -861,7 +861,7 @@ class TrafficCron extends FroxlorCron
+ 			// the default selection is 'current',
+ 			// so link the latest dir to it
+ 			$new_current = FileDir::makeCorrectFile($outputdir . '/current');
+-			FileDir::safe_exec('ln -fTs ' . escapeshellarg($staticOutputdir) . ' ' . escapeshellarg($new_current));
++			FileDir::safe_exec('ln -fFs ' . escapeshellarg($staticOutputdir) . ' ' . escapeshellarg($new_current));
+ 
+ 			// statistics file looks like: 'awstats[month][year].[domain].txt'
+ 			$file = FileDir::makeCorrectFile($outputdir . '/awstats' . date('mY', time()) . '.' . $domain . '.txt');
diff --git a/sysutils/froxlor/pkg-plist b/sysutils/froxlor/pkg-plist
index a17324832ed5..1f61b033da55 100644
--- a/sysutils/froxlor/pkg-plist
+++ b/sysutils/froxlor/pkg-plist
@@ -383,6 +383,7 @@
 %%WWWDIR%%/lng/en.lng.php
 %%WWWDIR%%/lng/es.lng.php
 %%WWWDIR%%/lng/fr.lng.php
+%%WWWDIR%%/lng/hu.lng.php
 %%WWWDIR%%/lng/index.html
 %%WWWDIR%%/lng/it.lng.php
 %%WWWDIR%%/lng/nl.lng.php
@@ -432,16 +433,16 @@
 %%WWWDIR%%/templates/Froxlor/assets/scss/components/index.html
 %%WWWDIR%%/templates/Froxlor/assets/scss/index.html
 %%WWWDIR%%/templates/Froxlor/base.html.twig
-%%WWWDIR%%/templates/Froxlor/build/assets/app-65a6b342.js
-%%WWWDIR%%/templates/Froxlor/build/assets/app-8baf2336.css
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-003f1154.ttf
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-faae6fc0.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-7d81a1a7.ttf
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-9169d8be.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-886c8611.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-cea79b34.ttf
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-335fd7d9.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-455e8e72.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/app-BNFip9fw.js
+%%WWWDIR%%/templates/Froxlor/build/assets/app-Cj1XHuKC.css
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-D1LuMI3I.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-D_cYUPeE.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-BjRzuEpd.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-DZaxPHgR.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-CTAAxXor.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-D0aA9rwL.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-C9RhG_FT.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-CCth-dXg.ttf
 %%WWWDIR%%/templates/Froxlor/build/assets/index.html
 %%WWWDIR%%/templates/Froxlor/build/index.html
 %%WWWDIR%%/templates/Froxlor/build/manifest.json
@@ -611,10 +612,12 @@
 %%WWWDIR%%/vendor/league/commonmark/composer.json
 %%WWWDIR%%/vendor/league/commonmark/src/CommonMarkConverter.php
 %%WWWDIR%%/vendor/league/commonmark/src/ConverterInterface.php
+%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Bracket.php
 %%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Delimiter.php
 %%WWWDIR%%/vendor/league/commonmark/src/Delimiter/DelimiterInterface.php
 %%WWWDIR%%/vendor/league/commonmark/src/Delimiter/DelimiterParser.php
 %%WWWDIR%%/vendor/league/commonmark/src/Delimiter/DelimiterStack.php
+%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/CacheableDelimiterProcessorInterface.php
 %%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/DelimiterProcessorCollection.php
 %%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/DelimiterProcessorCollectionInterface.php
 %%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/DelimiterProcessorInterface.php
@@ -868,6 +871,7 @@
 %%WWWDIR%%/vendor/league/commonmark/src/Parser/MarkdownParserState.php
 %%WWWDIR%%/vendor/league/commonmark/src/Parser/MarkdownParserStateInterface.php
 %%WWWDIR%%/vendor/league/commonmark/src/Parser/ParserLogicException.php
+%%WWWDIR%%/vendor/league/commonmark/src/Reference/MemoryLimitedReferenceMap.php
 %%WWWDIR%%/vendor/league/commonmark/src/Reference/Reference.php
 %%WWWDIR%%/vendor/league/commonmark/src/Reference/ReferenceInterface.php
 %%WWWDIR%%/vendor/league/commonmark/src/Reference/ReferenceMap.php
@@ -1159,11 +1163,11 @@
 %%WWWDIR%%/vendor/pear/net_dns2/tests/Tests_Net_DNS2_DNSSECTest.php
 %%WWWDIR%%/vendor/pear/net_dns2/tests/Tests_Net_DNS2_ParserTest.php
 %%WWWDIR%%/vendor/pear/net_dns2/tests/Tests_Net_DNS2_ResolverTest.php
-%%WWWDIR%%/vendor/phpmailer/phpmailer/.editorconfig
 %%WWWDIR%%/vendor/phpmailer/phpmailer/COMMITMENT
 %%WWWDIR%%/vendor/phpmailer/phpmailer/LICENSE
 %%WWWDIR%%/vendor/phpmailer/phpmailer/README.md
 %%WWWDIR%%/vendor/phpmailer/phpmailer/SECURITY.md
+%%WWWDIR%%/vendor/phpmailer/phpmailer/SMTPUTF8.md
 %%WWWDIR%%/vendor/phpmailer/phpmailer/VERSION
 %%WWWDIR%%/vendor/phpmailer/phpmailer/composer.json
 %%WWWDIR%%/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -1198,6 +1202,7 @@
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
+%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
@@ -1219,6 +1224,7 @@
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
+%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
 %%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
@@ -1532,11 +1538,6 @@
 %%WWWDIR%%/vendor/symfony/polyfill-mbstring/bootstrap.php
 %%WWWDIR%%/vendor/symfony/polyfill-mbstring/bootstrap80.php
 %%WWWDIR%%/vendor/symfony/polyfill-mbstring/composer.json
-%%WWWDIR%%/vendor/symfony/polyfill-php72/LICENSE
-%%WWWDIR%%/vendor/symfony/polyfill-php72/Php72.php
-%%WWWDIR%%/vendor/symfony/polyfill-php72/README.md
-%%WWWDIR%%/vendor/symfony/polyfill-php72/bootstrap.php
-%%WWWDIR%%/vendor/symfony/polyfill-php72/composer.json
 %%WWWDIR%%/vendor/symfony/polyfill-php73/LICENSE
 %%WWWDIR%%/vendor/symfony/polyfill-php73/Php73.php
 %%WWWDIR%%/vendor/symfony/polyfill-php73/README.md
@@ -1554,6 +1555,13 @@
 %%WWWDIR%%/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
 %%WWWDIR%%/vendor/symfony/polyfill-php80/bootstrap.php
 %%WWWDIR%%/vendor/symfony/polyfill-php80/composer.json
+%%WWWDIR%%/vendor/symfony/polyfill-php81/LICENSE
+%%WWWDIR%%/vendor/symfony/polyfill-php81/Php81.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/README.md
+%%WWWDIR%%/vendor/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/bootstrap.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/composer.json
 %%WWWDIR%%/vendor/symfony/service-contracts/Attribute/Required.php
 %%WWWDIR%%/vendor/symfony/service-contracts/Attribute/SubscribedService.php
 %%WWWDIR%%/vendor/symfony/service-contracts/CHANGELOG.md
@@ -1594,8 +1602,10 @@
 %%WWWDIR%%/vendor/twig/twig/composer.json
 %%WWWDIR%%/vendor/twig/twig/src/Attribute/YieldReady.php
 %%WWWDIR%%/vendor/twig/twig/src/Cache/CacheInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Cache/ChainCache.php
 %%WWWDIR%%/vendor/twig/twig/src/Cache/FilesystemCache.php
 %%WWWDIR%%/vendor/twig/twig/src/Cache/NullCache.php
+%%WWWDIR%%/vendor/twig/twig/src/Cache/ReadOnlyFilesystemCache.php
 %%WWWDIR%%/vendor/twig/twig/src/Compiler.php
 %%WWWDIR%%/vendor/twig/twig/src/Environment.php
 %%WWWDIR%%/vendor/twig/twig/src/Error/Error.php
@@ -1673,6 +1683,7 @@
 %%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ConstantExpression.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Filter/RawFilter.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FilterExpression.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FunctionExpression.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php
@@ -1703,6 +1714,7 @@
 %%WWWDIR%%/vendor/twig/twig/src/Node/IncludeNode.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/MacroNode.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/ModuleNode.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/NameDeprecation.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/Node.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/NodeCaptureInterface.php
 %%WWWDIR%%/vendor/twig/twig/src/Node/NodeOutputInterface.php
@@ -1777,6 +1789,7 @@
 %%WWWDIR%%/vendor/twig/twig/src/TwigFunction.php
 %%WWWDIR%%/vendor/twig/twig/src/TwigTest.php
 %%WWWDIR%%/vendor/twig/twig/src/Util/DeprecationCollector.php
+%%WWWDIR%%/vendor/twig/twig/src/Util/ReflectionCallable.php
 %%WWWDIR%%/vendor/twig/twig/src/Util/TemplateDirIterator.php
 %%WWWDIR%%/vendor/voku/anti-xss/CHANGELOG.md
 %%WWWDIR%%/vendor/voku/anti-xss/LICENSE
@@ -1784,6 +1797,7 @@
 %%WWWDIR%%/vendor/voku/anti-xss/composer.json
 %%WWWDIR%%/vendor/voku/anti-xss/src/voku/helper/AntiXSS.php
 %%WWWDIR%%/vendor/voku/anti-xss/src/voku/helper/data/entities_fallback.php
+%%WWWDIR%%/vendor/voku/portable-ascii/.deepsource.toml
 %%WWWDIR%%/vendor/voku/portable-ascii/CHANGELOG.md
 %%WWWDIR%%/vendor/voku/portable-ascii/LICENSE.txt
 %%WWWDIR%%/vendor/voku/portable-ascii/README.md
@@ -1983,7 +1997,7 @@
 %%WWWDIR%%/vendor/voku/portable-ascii/src/voku/helper/data/x1d7.php
 %%WWWDIR%%/vendor/voku/portable-ascii/src/voku/helper/data/x1f1.php
 %%WWWDIR%%/vendor/voku/portable-utf8/CHANGELOG.md
-%%WWWDIR%%/vendor/voku/portable-utf8/LICENSE%%AP_MOD_EN%%PACHE
+%%WWWDIR%%/vendor/voku/portable-utf8/LICENSE-APACHE
 %%WWWDIR%%/vendor/voku/portable-utf8/LICENSE-GPL
 %%WWWDIR%%/vendor/voku/portable-utf8/README.md
 %%WWWDIR%%/vendor/voku/portable-utf8/SECURITY.md
diff --git a/sysutils/hexyl/Makefile b/sysutils/hexyl/Makefile
index 02f67482ccbc..ed7d25b8037d 100644
--- a/sysutils/hexyl/Makefile
+++ b/sysutils/hexyl/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.16.0
 PORTREVISION=	3
 CATEGORIES=	sysutils
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Command-line hex viewer
 WWW=		https://github.com/sharkdp/hexyl
 
diff --git a/sysutils/httm/Makefile b/sysutils/httm/Makefile
index d8245be9e88b..ce18d00723ef 100644
--- a/sysutils/httm/Makefile
+++ b/sysutils/httm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	httm
-DISTVERSION=	0.46.10
+DISTVERSION=	0.47.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/sysutils/httm/Makefile.crates b/sysutils/httm/Makefile.crates
index 9a458e10e464..e47e254aa53b 100644
--- a/sysutils/httm/Makefile.crates
+++ b/sysutils/httm/Makefile.crates
@@ -1,3 +1,9 @@
+===>  License MPL20 accepted by the user
+===>   httm-0.47.0 depends on file: /usr/local/sbin/pkg - found
+===> Fetching all distfiles required by httm-0.47.0 for building
+===>  Extracting for httm-0.47.0
+=> SHA256 Checksum OK for kimono-koans-httm-0.47.0_GH0.tar.gz.
+===>  Moving crates to /usr/ports/sysutils/httm/work/httm-0.47.0/cargo-crates
 CARGO_CRATES=	ahash-0.3.8 \
 		aho-corasick-1.1.3 \
 		ansi_term-0.12.1 \
@@ -50,7 +56,7 @@ CARGO_CRATES=	ahash-0.3.8 \
 		getrandom-0.2.9 \
 		hashbrown-0.8.2 \
 		hashbrown-0.14.5 \
-		hashbrown-0.15.2 \
+		hashbrown-0.15.3 \
 		hermit-abi-0.1.19 \
 		humantime-1.3.0 \
 		ident_case-1.0.1 \
@@ -70,7 +76,7 @@ CARGO_CRATES=	ahash-0.3.8 \
 		memchr-2.7.4 \
 		memoffset-0.8.0 \
 		nix-0.24.3 \
-		nix-0.29.0 \
+		nix-0.30.0 \
 		nu-ansi-term-0.50.1 \
 		num-conv-0.1.0 \
 		num_threads-0.1.6 \
diff --git a/sysutils/httm/distinfo b/sysutils/httm/distinfo
index 82d3e1db7c4d..7c0effed99a4 100644
--- a/sysutils/httm/distinfo
+++ b/sysutils/httm/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745486711
+TIMESTAMP = 1746269811
 SHA256 (rust/crates/ahash-0.3.8.crate) = e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217
 SIZE (rust/crates/ahash-0.3.8.crate) = 28650
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
@@ -103,8 +103,8 @@ SHA256 (rust/crates/hashbrown-0.8.2.crate) = e91b62f79061a0bc2e046024cb7ba44b084
 SIZE (rust/crates/hashbrown-0.8.2.crate) = 75830
 SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
 SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
-SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
-SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
+SHA256 (rust/crates/hashbrown-0.15.3.crate) = 84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3
+SIZE (rust/crates/hashbrown-0.15.3.crate) = 140413
 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
 SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
 SHA256 (rust/crates/humantime-1.3.0.crate) = df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f
@@ -143,8 +143,8 @@ SHA256 (rust/crates/memoffset-0.8.0.crate) = d61c719bcfbcf5d62b3a09efa6088de8c54
 SIZE (rust/crates/memoffset-0.8.0.crate) = 8912
 SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069
 SIZE (rust/crates/nix-0.24.3.crate) = 266843
-SHA256 (rust/crates/nix-0.29.0.crate) = 71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46
-SIZE (rust/crates/nix-0.29.0.crate) = 318248
+SHA256 (rust/crates/nix-0.30.0.crate) = 537bc3c4a347b87fd52ac6c03a02ab1302962cfd93373c5d7a112cdc337854cc
+SIZE (rust/crates/nix-0.30.0.crate) = 342229
 SHA256 (rust/crates/nu-ansi-term-0.50.1.crate) = d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399
 SIZE (rust/crates/nu-ansi-term-0.50.1.crate) = 28536
 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
@@ -325,5 +325,5 @@ SHA256 (rust/crates/xattr-1.5.0.crate) = 0d65cbf2f12c15564212d48f4e3dfb87923d25d
 SIZE (rust/crates/xattr-1.5.0.crate) = 14694
 SHA256 (rust/crates/yaml-rust-0.3.5.crate) = e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992
 SIZE (rust/crates/yaml-rust-0.3.5.crate) = 42087
-SHA256 (kimono-koans-httm-0.46.10_GH0.tar.gz) = 219342f84f5ce392fb3294ef0a9a009c80afc34c1287090c36e04eb594f47c15
-SIZE (kimono-koans-httm-0.46.10_GH0.tar.gz) = 135976
+SHA256 (kimono-koans-httm-0.47.0_GH0.tar.gz) = bf0d12b822d13838bdad289b59dfa4bcc5436b1d6621abb8e400cd1f52e12f5d
+SIZE (kimono-koans-httm-0.47.0_GH0.tar.gz) = 136271
diff --git a/sysutils/linux-miniconda-installer/Makefile b/sysutils/linux-miniconda-installer/Makefile
index e9362b51de3f..30c22e5aace5 100644
--- a/sysutils/linux-miniconda-installer/Makefile
+++ b/sysutils/linux-miniconda-installer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	miniconda-installer
-DISTVERSION=	0.1.0
-PORTREVISION=	2
+DISTVERSION=	0.1.0-6
+DISTVERSIONSUFFIX=	-g0f300a8
 CATEGORIES=	sysutils linux
 PKGNAMEPREFIX=	linux-
 
diff --git a/sysutils/linux-miniconda-installer/distinfo b/sysutils/linux-miniconda-installer/distinfo
index 60cd2eebe966..0ef11d217f9c 100644
--- a/sysutils/linux-miniconda-installer/distinfo
+++ b/sysutils/linux-miniconda-installer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697893560
-SHA256 (outpaddling-miniconda-installer-0.1.0_GH0.tar.gz) = 60d99e614aa9a89ec538ae21d08f09fc055284254d771a18bc271df5df259a85
-SIZE (outpaddling-miniconda-installer-0.1.0_GH0.tar.gz) = 2434
+TIMESTAMP = 1746362044
+SHA256 (outpaddling-miniconda-installer-0.1.0-6-g0f300a8_GH0.tar.gz) = eb12c9cd7a9f74c7ec69f63ca37d163881867a2949bbe1c78324cc1236de9ebf
+SIZE (outpaddling-miniconda-installer-0.1.0-6-g0f300a8_GH0.tar.gz) = 2800
diff --git a/sysutils/mise/Makefile b/sysutils/mise/Makefile
index a945e0f795d1..e873537873ab 100644
--- a/sysutils/mise/Makefile
+++ b/sysutils/mise/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mise
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.4.12
+DISTVERSION=	2025.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -24,8 +25,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jdx
 
 CARGO_BUILDDEP=	no
-CARGO_CRATES=	addr2line-0.21.0 \
-		adler-1.0.2 \
+CARGO_CRATES=	addr2line-0.24.2 \
 		adler2-2.0.0 \
 		aead-0.5.2 \
 		aes-0.8.4 \
@@ -53,7 +53,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		async-trait-0.1.88 \
 		atomic-waker-1.1.2 \
 		autocfg-1.4.0 \
-		backtrace-0.3.71 \
+		backtrace-0.3.74 \
 		base64-0.21.7 \
 		base64-0.22.1 \
 		base64ct-1.7.3 \
@@ -76,12 +76,12 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		bzip2-sys-0.1.13+1.0.8 \
 		calm_io-0.1.1 \
 		calmio_filters-0.1.0 \
-		cc-1.2.20 \
+		cc-1.2.21 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.2.1 \
 		chacha20-0.9.1 \
 		chacha20poly1305-0.10.1 \
-		chrono-0.4.40 \
+		chrono-0.4.41 \
 		chrono-tz-0.9.0 \
 		chrono-tz-build-0.3.0 \
 		ci_info-0.14.14 \
@@ -92,10 +92,10 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		clap_lex-0.7.4 \
 		clap_mangen-0.2.26 \
 		clru-0.6.2 \
-		color-eyre-0.6.3 \
+		color-eyre-0.6.4 \
 		color-print-0.3.7 \
 		color-print-proc-macro-0.3.7 \
-		color-spantrace-0.2.1 \
+		color-spantrace-0.2.2 \
 		colorchoice-1.0.3 \
 		colored-3.0.0 \
 		comfy-table-7.1.4 \
@@ -104,7 +104,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		console-0.15.11 \
 		const-oid-0.9.6 \
 		constant_time_eq-0.3.1 \
-		contracts-0.6.3 \
+		contracts-0.6.5 \
 		convert_case-0.4.0 \
 		cookie-factory-0.3.3 \
 		core-foundation-0.9.4 \
@@ -133,7 +133,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		dashmap-5.5.3 \
 		dashmap-6.1.0 \
 		deflate64-0.1.9 \
-		demand-1.6.5 \
+		demand-1.7.0 \
 		der-0.7.10 \
 		deranged-0.4.0 \
 		derive_arbitrary-1.4.1 \
@@ -200,7 +200,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		getrandom-0.2.16 \
 		getrandom-0.3.2 \
 		ghash-0.5.1 \
-		gimli-0.28.1 \
+		gimli-0.31.1 \
 		gix-0.72.1 \
 		gix-actor-0.35.1 \
 		gix-archive-0.21.1 \
@@ -262,7 +262,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		hash32-0.3.1 \
 		hashbrown-0.12.3 \
 		hashbrown-0.14.5 \
-		hashbrown-0.15.2 \
+		hashbrown-0.15.3 \
 		heapless-0.8.0 \
 		heck-0.5.0 \
 		hermit-abi-0.3.9 \
@@ -311,7 +311,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		indicatif-0.17.11 \
 		indoc-2.0.6 \
 		inout-0.1.4 \
-		insta-1.43.0 \
+		insta-1.43.1 \
 		intl-memoizer-0.5.2 \
 		intl_pluralrules-7.0.2 \
 		io-close-0.3.7 \
@@ -322,8 +322,8 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		itertools-0.13.0 \
 		itertools-0.14.0 \
 		itoa-1.0.15 \
-		jiff-0.2.10 \
-		jiff-static-0.2.10 \
+		jiff-0.2.12 \
+		jiff-static-0.2.12 \
 		jiff-tzdb-0.1.4 \
 		jiff-tzdb-platform-0.1.3 \
 		jobserver-0.1.33 \
@@ -361,7 +361,6 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		mime-0.3.17 \
 		minimal-lexical-0.2.1 \
 		minisign-verify-0.2.3 \
-		miniz_oxide-0.7.4 \
 		miniz_oxide-0.8.8 \
 		mio-1.0.3 \
 		mlua-0.10.3 \
@@ -384,19 +383,19 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		num-traits-0.2.19 \
 		num_cpus-1.16.0 \
 		number_prefix-0.4.0 \
-		object-0.32.2 \
+		object-0.36.7 \
 		once_cell-1.21.3 \
 		opaque-debug-0.3.1 \
 		openssl-0.10.72 \
 		openssl-macros-0.1.1 \
 		openssl-probe-0.1.6 \
-		openssl-sys-0.9.107 \
+		openssl-sys-0.9.108 \
 		option-ext-0.2.0 \
 		ordered-float-2.10.1 \
 		os-release-0.1.0 \
 		os_pipe-1.2.1 \
 		overload-0.1.1 \
-		owo-colors-3.5.0 \
+		owo-colors-4.2.0 \
 		papergrid-0.15.0 \
 		parking_lot-0.12.3 \
 		parking_lot_core-0.9.10 \
@@ -438,7 +437,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		quick-xml-0.37.5 \
 		quinn-0.11.7 \
 		quinn-proto-0.11.11 \
-		quinn-udp-0.5.11 \
+		quinn-udp-0.5.12 \
 		quote-1.0.40 \
 		r-efi-5.2.0 \
 		rand-0.8.5 \
@@ -471,7 +470,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		rustc-hash-2.1.1 \
 		rustc_version-0.4.1 \
 		rustix-0.38.44 \
-		rustix-1.0.5 \
+		rustix-1.0.7 \
 		rustls-0.23.26 \
 		rustls-native-certs-0.8.1 \
 		rustls-pemfile-2.2.0 \
@@ -511,9 +510,9 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		sevenz-rust-0.6.1 \
 		sha1-0.10.6 \
 		sha1-checked-0.10.0 \
-		sha2-0.10.8 \
+		sha2-0.10.9 \
 		sharded-slab-0.1.7 \
-		shared_child-1.0.1 \
+		shared_child-1.0.2 \
 		shell-escape-0.1.5 \
 		shell-words-1.1.0 \
 		shlex-1.3.0 \
@@ -540,7 +539,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		syn-1.0.109 \
 		syn-2.0.101 \
 		sync_wrapper-1.0.2 \
-		synstructure-0.13.1 \
+		synstructure-0.13.2 \
 		sys-info-0.9.1 \
 		system-configuration-0.6.1 \
 		system-configuration-sys-0.6.0 \
@@ -635,7 +634,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		wasm-bindgen-shared-0.2.100 \
 		web-sys-0.3.77 \
 		web-time-1.1.0 \
-		webpki-roots-0.26.9 \
+		webpki-roots-0.26.10 \
 		which-7.0.3 \
 		widestring-1.2.0 \
 		winapi-0.3.9 \
@@ -685,7 +684,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		windows_x86_64_msvc-0.52.6 \
 		windows_x86_64_msvc-0.53.0 \
 		winnow-0.6.24 \
-		winnow-0.7.7 \
+		winnow-0.7.9 \
 		winsafe-0.0.19 \
 		wit-bindgen-rt-0.39.0 \
 		write16-1.0.0 \
diff --git a/sysutils/mise/distinfo b/sysutils/mise/distinfo
index ef0b0369674a..eedfc1066530 100644
--- a/sysutils/mise/distinfo
+++ b/sysutils/mise/distinfo
@@ -1,8 +1,6 @@
-TIMESTAMP = 1745988589
-SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
-SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
-SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
-SIZE (rust/crates/adler-1.0.2.crate) = 12778
+TIMESTAMP = 1746349021
+SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
+SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
 SIZE (rust/crates/adler2-2.0.0.crate) = 13529
 SHA256 (rust/crates/aead-0.5.2.crate) = d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0
@@ -57,8 +55,8 @@ SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d
 SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
-SHA256 (rust/crates/backtrace-0.3.71.crate) = 26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d
-SIZE (rust/crates/backtrace-0.3.71.crate) = 86553
+SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
+SIZE (rust/crates/backtrace-0.3.74.crate) = 88516
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
 SIZE (rust/crates/base64-0.21.7.crate) = 82576
 SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
@@ -103,8 +101,8 @@ SHA256 (rust/crates/calm_io-0.1.1.crate) = 2ea0608700fe42d90ec17ad0f86335cf229b6
 SIZE (rust/crates/calm_io-0.1.1.crate) = 6908
 SHA256 (rust/crates/calmio_filters-0.1.0.crate) = 846501f4575cd66766a40bb7ab6d8e960adc7eb49f753c8232bd8e0e09cf6ca2
 SIZE (rust/crates/calmio_filters-0.1.0.crate) = 1930
-SHA256 (rust/crates/cc-1.2.20.crate) = 04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a
-SIZE (rust/crates/cc-1.2.20.crate) = 105986
+SHA256 (rust/crates/cc-1.2.21.crate) = 8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0
+SIZE (rust/crates/cc-1.2.21.crate) = 106117
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
@@ -113,8 +111,8 @@ SHA256 (rust/crates/chacha20-0.9.1.crate) = c3613f74bd2eac03dad61bd53dbe620703d4
 SIZE (rust/crates/chacha20-0.9.1.crate) = 23424
 SHA256 (rust/crates/chacha20poly1305-0.10.1.crate) = 10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35
 SIZE (rust/crates/chacha20poly1305-0.10.1.crate) = 68485
-SHA256 (rust/crates/chrono-0.4.40.crate) = 1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c
-SIZE (rust/crates/chrono-0.4.40.crate) = 229824
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
 SHA256 (rust/crates/chrono-tz-0.9.0.crate) = 93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb
 SIZE (rust/crates/chrono-tz-0.9.0.crate) = 361570
 SHA256 (rust/crates/chrono-tz-build-0.3.0.crate) = 0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1
@@ -135,14 +133,14 @@ SHA256 (rust/crates/clap_mangen-0.2.26.crate) = 724842fa9b144f9b89b3f3d371a89f34
 SIZE (rust/crates/clap_mangen-0.2.26.crate) = 15630
 SHA256 (rust/crates/clru-0.6.2.crate) = cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59
 SIZE (rust/crates/clru-0.6.2.crate) = 16497
-SHA256 (rust/crates/color-eyre-0.6.3.crate) = 55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5
-SIZE (rust/crates/color-eyre-0.6.3.crate) = 636041
+SHA256 (rust/crates/color-eyre-0.6.4.crate) = e6e1761c0e16f8883bbbb8ce5990867f4f06bf11a0253da6495a04ce4b6ef0ec
+SIZE (rust/crates/color-eyre-0.6.4.crate) = 636248
 SHA256 (rust/crates/color-print-0.3.7.crate) = 3aa954171903797d5623e047d9ab69d91b493657917bdfb8c2c80ecaf9cdb6f4
 SIZE (rust/crates/color-print-0.3.7.crate) = 11586
 SHA256 (rust/crates/color-print-proc-macro-0.3.7.crate) = 692186b5ebe54007e45a59aea47ece9eb4108e141326c304cdc91699a7118a22
 SIZE (rust/crates/color-print-proc-macro-0.3.7.crate) = 23082
-SHA256 (rust/crates/color-spantrace-0.2.1.crate) = cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2
-SIZE (rust/crates/color-spantrace-0.2.1.crate) = 189095
+SHA256 (rust/crates/color-spantrace-0.2.2.crate) = 2ddd8d5bfda1e11a501d0a7303f3bfed9aa632ebdb859be40d0fd70478ed70d5
+SIZE (rust/crates/color-spantrace-0.2.2.crate) = 189910
 SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990
 SIZE (rust/crates/colorchoice-1.0.3.crate) = 7923
 SHA256 (rust/crates/colored-3.0.0.crate) = fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e
@@ -159,8 +157,8 @@ SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf98497
 SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
 SHA256 (rust/crates/constant_time_eq-0.3.1.crate) = 7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6
 SIZE (rust/crates/constant_time_eq-0.3.1.crate) = 11561
-SHA256 (rust/crates/contracts-0.6.3.crate) = f1d1429e3bd78171c65aa010eabcdf8f863ba3254728dbfb0ad4b1545beac15c
-SIZE (rust/crates/contracts-0.6.3.crate) = 27850
+SHA256 (rust/crates/contracts-0.6.5.crate) = f096aae9f0af6a1f5801c5b4142c9381d0f3d5ba548fe0f7ce798299e736fd31
+SIZE (rust/crates/contracts-0.6.5.crate) = 30863
 SHA256 (rust/crates/convert_case-0.4.0.crate) = 6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e
 SIZE (rust/crates/convert_case-0.4.0.crate) = 8098
 SHA256 (rust/crates/cookie-factory-0.3.3.crate) = 9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2
@@ -217,8 +215,8 @@ SHA256 (rust/crates/dashmap-6.1.0.crate) = 5041cc499144891f3790297212f32a74fb938
 SIZE (rust/crates/dashmap-6.1.0.crate) = 24828
 SHA256 (rust/crates/deflate64-0.1.9.crate) = da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b
 SIZE (rust/crates/deflate64-0.1.9.crate) = 15104
-SHA256 (rust/crates/demand-1.6.5.crate) = 7abeb34924c8d59be6428a07f63a0bf5f9d5c15ccb6fd9ef4f4e8cd7f422abfe
-SIZE (rust/crates/demand-1.6.5.crate) = 28131
+SHA256 (rust/crates/demand-1.7.0.crate) = 081fee97d4d3dfb2baf0333ccf376b5cae24448afe5c5652861bb987853d685c
+SIZE (rust/crates/demand-1.7.0.crate) = 28958
 SHA256 (rust/crates/der-0.7.10.crate) = e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb
 SIZE (rust/crates/der-0.7.10.crate) = 90111
 SHA256 (rust/crates/deranged-0.4.0.crate) = 9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e
@@ -351,8 +349,8 @@ SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f0
 SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
 SHA256 (rust/crates/ghash-0.5.1.crate) = f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1
 SIZE (rust/crates/ghash-0.5.1.crate) = 9482
-SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
-SIZE (rust/crates/gimli-0.28.1.crate) = 270497
+SHA256 (rust/crates/gimli-0.31.1.crate) = 07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f
+SIZE (rust/crates/gimli-0.31.1.crate) = 279515
 SHA256 (rust/crates/gix-0.72.1.crate) = 01237e8d3d78581f71642be8b0c2ae8c0b2b5c251c9c5d9ebbea3c1ea280dce8
 SIZE (rust/crates/gix-0.72.1.crate) = 293929
 SHA256 (rust/crates/gix-actor-0.35.1.crate) = 6b300e6e4f31f3f6bd2de5e2b0caab192ced00dc0fcd0f7cc56e28c575c8e1ff
@@ -475,8 +473,8 @@ SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa8526
 SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
 SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
 SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
-SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
-SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
+SHA256 (rust/crates/hashbrown-0.15.3.crate) = 84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3
+SIZE (rust/crates/hashbrown-0.15.3.crate) = 140413
 SHA256 (rust/crates/heapless-0.8.0.crate) = 0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad
 SIZE (rust/crates/heapless-0.8.0.crate) = 77802
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
@@ -573,8 +571,8 @@ SHA256 (rust/crates/indoc-2.0.6.crate) = f4c7245a08504955605670dbf141fceab975f15
 SIZE (rust/crates/indoc-2.0.6.crate) = 17164
 SHA256 (rust/crates/inout-0.1.4.crate) = 879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01
 SIZE (rust/crates/inout-0.1.4.crate) = 11280
-SHA256 (rust/crates/insta-1.43.0.crate) = ab2d11b2f17a45095b8c3603928ba29d7d918d7129d0d0641a36ba73cf07daa6
-SIZE (rust/crates/insta-1.43.0.crate) = 101045
+SHA256 (rust/crates/insta-1.43.1.crate) = 154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371
+SIZE (rust/crates/insta-1.43.1.crate) = 101047
 SHA256 (rust/crates/intl-memoizer-0.5.2.crate) = fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda
 SIZE (rust/crates/intl-memoizer-0.5.2.crate) = 11708
 SHA256 (rust/crates/intl_pluralrules-7.0.2.crate) = 078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972
@@ -595,10 +593,10 @@ SHA256 (rust/crates/itertools-0.14.0.crate) = 2b192c782037fadd9cfa75548310488aab
 SIZE (rust/crates/itertools-0.14.0.crate) = 152715
 SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
 SIZE (rust/crates/itoa-1.0.15.crate) = 11231
-SHA256 (rust/crates/jiff-0.2.10.crate) = 5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6
-SIZE (rust/crates/jiff-0.2.10.crate) = 698434
-SHA256 (rust/crates/jiff-static-0.2.10.crate) = 199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254
-SIZE (rust/crates/jiff-static-0.2.10.crate) = 76123
+SHA256 (rust/crates/jiff-0.2.12.crate) = d07d8d955d798e7a4d6f9c58cd1f1916e790b42b092758a9ef6e16fef9f1b3fd
+SIZE (rust/crates/jiff-0.2.12.crate) = 706826
+SHA256 (rust/crates/jiff-static-0.2.12.crate) = f244cfe006d98d26f859c7abd1318d85327e1882dc9cef80f62daeeb0adcf300
+SIZE (rust/crates/jiff-static-0.2.12.crate) = 76130
 SHA256 (rust/crates/jiff-tzdb-0.1.4.crate) = c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524
 SIZE (rust/crates/jiff-tzdb-0.1.4.crate) = 62435
 SHA256 (rust/crates/jiff-tzdb-platform-0.1.3.crate) = 875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8
@@ -673,8 +671,6 @@ SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
 SHA256 (rust/crates/minisign-verify-0.2.3.crate) = 6367d84fb54d4242af283086402907277715b8fe46976963af5ebf173f8efba3
 SIZE (rust/crates/minisign-verify-0.2.3.crate) = 21696
-SHA256 (rust/crates/miniz_oxide-0.7.4.crate) = b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08
-SIZE (rust/crates/miniz_oxide-0.7.4.crate) = 56119
 SHA256 (rust/crates/miniz_oxide-0.8.8.crate) = 3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a
 SIZE (rust/crates/miniz_oxide-0.8.8.crate) = 67065
 SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
@@ -719,8 +715,8 @@ SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a
 SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
 SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
 SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
-SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
-SIZE (rust/crates/object-0.32.2.crate) = 286994
+SHA256 (rust/crates/object-0.36.7.crate) = 62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87
+SIZE (rust/crates/object-0.36.7.crate) = 329938
 SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
 SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
 SHA256 (rust/crates/opaque-debug-0.3.1.crate) = c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381
@@ -731,8 +727,8 @@ SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4
 SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601
 SHA256 (rust/crates/openssl-probe-0.1.6.crate) = d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e
 SIZE (rust/crates/openssl-probe-0.1.6.crate) = 8128
-SHA256 (rust/crates/openssl-sys-0.9.107.crate) = 8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07
-SIZE (rust/crates/openssl-sys-0.9.107.crate) = 78156
+SHA256 (rust/crates/openssl-sys-0.9.108.crate) = e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847
+SIZE (rust/crates/openssl-sys-0.9.108.crate) = 78190
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
 SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
 SHA256 (rust/crates/ordered-float-2.10.1.crate) = 68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c
@@ -743,8 +739,8 @@ SHA256 (rust/crates/os_pipe-1.2.1.crate) = 5ffd2b0a5634335b135d5728d84c5e0fd7269
 SIZE (rust/crates/os_pipe-1.2.1.crate) = 10691
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
-SHA256 (rust/crates/owo-colors-3.5.0.crate) = c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f
-SIZE (rust/crates/owo-colors-3.5.0.crate) = 30310
+SHA256 (rust/crates/owo-colors-4.2.0.crate) = 1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564
+SIZE (rust/crates/owo-colors-4.2.0.crate) = 37789
 SHA256 (rust/crates/papergrid-0.15.0.crate) = 30268a8d20c2c0d126b2b6610ab405f16517f6ba9f244d8c59ac2c512a8a1ce7
 SIZE (rust/crates/papergrid-0.15.0.crate) = 58592
 SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
@@ -827,8 +823,8 @@ SHA256 (rust/crates/quinn-0.11.7.crate) = c3bd15a6f2967aef83887dcb9fec0014580467
 SIZE (rust/crates/quinn-0.11.7.crate) = 79387
 SHA256 (rust/crates/quinn-proto-0.11.11.crate) = bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b
 SIZE (rust/crates/quinn-proto-0.11.11.crate) = 229381
-SHA256 (rust/crates/quinn-udp-0.5.11.crate) = 541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5
-SIZE (rust/crates/quinn-udp-0.5.11.crate) = 31854
+SHA256 (rust/crates/quinn-udp-0.5.12.crate) = ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842
+SIZE (rust/crates/quinn-udp-0.5.12.crate) = 31825
 SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
 SIZE (rust/crates/quote-1.0.40.crate) = 31063
 SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
@@ -893,8 +889,8 @@ SHA256 (rust/crates/rustc_version-0.4.1.crate) = cfcb3a22ef46e85b45de6ee7e79d063
 SIZE (rust/crates/rustc_version-0.4.1.crate) = 12245
 SHA256 (rust/crates/rustix-0.38.44.crate) = fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154
 SIZE (rust/crates/rustix-0.38.44.crate) = 379347
-SHA256 (rust/crates/rustix-1.0.5.crate) = d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf
-SIZE (rust/crates/rustix-1.0.5.crate) = 414160
+SHA256 (rust/crates/rustix-1.0.7.crate) = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+SIZE (rust/crates/rustix-1.0.7.crate) = 414500
 SHA256 (rust/crates/rustls-0.23.26.crate) = df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0
 SIZE (rust/crates/rustls-0.23.26.crate) = 347849
 SHA256 (rust/crates/rustls-native-certs-0.8.1.crate) = 7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3
@@ -973,12 +969,12 @@ SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc83
 SIZE (rust/crates/sha1-0.10.6.crate) = 13517
 SHA256 (rust/crates/sha1-checked-0.10.0.crate) = 89f599ac0c323ebb1c6082821a54962b839832b03984598375bff3975b804423
 SIZE (rust/crates/sha1-checked-0.10.0.crate) = 783840
-SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
-SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sha2-0.10.9.crate) = a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283
+SIZE (rust/crates/sha2-0.10.9.crate) = 29271
 SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
 SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
-SHA256 (rust/crates/shared_child-1.0.1.crate) = 09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c
-SIZE (rust/crates/shared_child-1.0.1.crate) = 8967
+SHA256 (rust/crates/shared_child-1.0.2.crate) = 7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc
+SIZE (rust/crates/shared_child-1.0.2.crate) = 11998
 SHA256 (rust/crates/shell-escape-0.1.5.crate) = 45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f
 SIZE (rust/crates/shell-escape-0.1.5.crate) = 6847
 SHA256 (rust/crates/shell-words-1.1.0.crate) = 24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde
@@ -1031,8 +1027,8 @@ SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e
 SIZE (rust/crates/syn-2.0.101.crate) = 299250
 SHA256 (rust/crates/sync_wrapper-1.0.2.crate) = 0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263
 SIZE (rust/crates/sync_wrapper-1.0.2.crate) = 6958
-SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
-SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
+SHA256 (rust/crates/synstructure-0.13.2.crate) = 728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2
+SIZE (rust/crates/synstructure-0.13.2.crate) = 18950
 SHA256 (rust/crates/sys-info-0.9.1.crate) = 0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c
 SIZE (rust/crates/sys-info-0.9.1.crate) = 20589
 SHA256 (rust/crates/system-configuration-0.6.1.crate) = 3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b
@@ -1221,8 +1217,8 @@ SHA256 (rust/crates/web-sys-0.3.77.crate) = 33b6dd2ef9186f1f2072e409e99cd22a9753
 SIZE (rust/crates/web-sys-0.3.77.crate) = 638246
 SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
 SIZE (rust/crates/web-time-1.1.0.crate) = 18026
-SHA256 (rust/crates/webpki-roots-0.26.9.crate) = 29aad86cec885cafd03e8305fd727c418e970a521322c91688414d5b8efba16b
-SIZE (rust/crates/webpki-roots-0.26.9.crate) = 258540
+SHA256 (rust/crates/webpki-roots-0.26.10.crate) = 37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93
+SIZE (rust/crates/webpki-roots-0.26.10.crate) = 248904
 SHA256 (rust/crates/which-7.0.3.crate) = 24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762
 SIZE (rust/crates/which-7.0.3.crate) = 18872
 SHA256 (rust/crates/widestring-1.2.0.crate) = dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d
@@ -1321,8 +1317,8 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 271414315aff87387382ec3d
 SIZE (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 834400
 SHA256 (rust/crates/winnow-0.6.24.crate) = c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a
 SIZE (rust/crates/winnow-0.6.24.crate) = 165680
-SHA256 (rust/crates/winnow-0.7.7.crate) = 6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5
-SIZE (rust/crates/winnow-0.7.7.crate) = 173993
+SHA256 (rust/crates/winnow-0.7.9.crate) = d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3
+SIZE (rust/crates/winnow-0.7.9.crate) = 174763
 SHA256 (rust/crates/winsafe-0.0.19.crate) = d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904
 SIZE (rust/crates/winsafe-0.0.19.crate) = 492820
 SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
@@ -1379,5 +1375,5 @@ SHA256 (rust/crates/zstd-safe-7.2.4.crate) = 8f49c4d5f0abb602a93fb8736af2a4f4dd9
 SIZE (rust/crates/zstd-safe-7.2.4.crate) = 29350
 SHA256 (rust/crates/zstd-sys-2.0.15+zstd.1.5.7.crate) = eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237
 SIZE (rust/crates/zstd-sys-2.0.15+zstd.1.5.7.crate) = 774847
-SHA256 (jdx-mise-v2025.4.12_GH0.tar.gz) = bd50c240355fa2d975af0069ee8b270812ebc39267c542c63f13a5877729688c
-SIZE (jdx-mise-v2025.4.12_GH0.tar.gz) = 4159060
+SHA256 (jdx-mise-v2025.5.0_GH0.tar.gz) = 9713eed8806d96ccff20fdb2571a8669ab4ac2c2e26c1aac03741b1173085e7e
+SIZE (jdx-mise-v2025.5.0_GH0.tar.gz) = 4160875
diff --git a/sysutils/nix/Makefile b/sysutils/nix/Makefile
index e7d1797f4140..01b1d42b6995 100644
--- a/sysutils/nix/Makefile
+++ b/sysutils/nix/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nix
 DISTVERSION=	2.20.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/sysutils/onefetch/Makefile b/sysutils/onefetch/Makefile
index c10de29eb05e..9157bdb0f879 100644
--- a/sysutils/onefetch/Makefile
+++ b/sysutils/onefetch/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	onefetch
 DISTVERSION=	2.22.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index 1ac37bce8b2f..33859d25bfb1 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pacman
-DISTVERSION=	6.1.0
+DISTVERSION=	7.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://gitlab.archlinux.org/${PORTNAME}/${PORTNAME}/-/releases/v${DISTVERSION}/downloads/
 
diff --git a/sysutils/pacman/distinfo b/sysutils/pacman/distinfo
index 3fa1d7f90cc5..f7f588f24d9c 100644
--- a/sysutils/pacman/distinfo
+++ b/sysutils/pacman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717093084
-SHA256 (pacman-6.1.0.tar.xz) = 5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9
-SIZE (pacman-6.1.0.tar.xz) = 895640
+TIMESTAMP = 1746376035
+SHA256 (pacman-7.0.0.tar.xz) = 61cbd445d1381b4b184bc7c4e2791f07a79f0f2807b7c600399d0d08e8cd28cf
+SIZE (pacman-7.0.0.tar.xz) = 903060
diff --git a/sysutils/pacman/files/patch-lib_libalpm_diskspace.c b/sysutils/pacman/files/patch-lib_libalpm_diskspace.c
deleted file mode 100644
index a1dceb9cc61e..000000000000
--- a/sysutils/pacman/files/patch-lib_libalpm_diskspace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libalpm/diskspace.c.orig	2020-12-03 11:37:30 UTC
-+++ lib/libalpm/diskspace.c
-@@ -71,7 +71,7 @@ static void mount_point_list_free(alpm_list_t *mount_p
- 
- static int mount_point_load_fsinfo(alpm_handle_t *handle, alpm_mountpoint_t *mountpoint)
- {
--#if defined(HAVE_GETMNTENT)
-+#if HAVE_GETMNTENT
- 	/* grab the filesystem usage */
- 	if(statvfs(mountpoint->mount_dir, &(mountpoint->fsp)) != 0) {
- 		_alpm_log(handle, ALPM_LOG_WARNING,
diff --git a/sysutils/pacman/pkg-plist b/sysutils/pacman/pkg-plist
index 55148b63ec06..bb636fed10b8 100644
--- a/sysutils/pacman/pkg-plist
+++ b/sysutils/pacman/pkg-plist
@@ -17,8 +17,8 @@ bin/vercmp
 include/alpm.h
 include/alpm_list.h
 lib/libalpm.so
-lib/libalpm.so.14
-lib/libalpm.so.14.0.0
+lib/libalpm.so.15
+lib/libalpm.so.15.0.0
 libdata/pkgconfig/libalpm.pc
 libdata/pkgconfig/libmakepkg.pc
 share/bash-completion/completions/makepkg
@@ -152,6 +152,7 @@ share/makepkg/buildenv.sh
 share/makepkg/buildenv/buildflags.sh
 share/makepkg/buildenv/compiler.sh
 share/makepkg/buildenv/debugflags.sh
+share/makepkg/buildenv/fortran.sh
 share/makepkg/buildenv/lto.sh
 share/makepkg/buildenv/makeflags.sh
 share/makepkg/buildenv/rust.sh
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index 892895c2795d..8006d0efb562 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pftop
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	sysutils net
 MASTER_SITES=	https://github.com/grembo/pftop/releases/download/${DISTVERSION}/
 
diff --git a/sysutils/pftop/distinfo b/sysutils/pftop/distinfo
index 5732a399a2a7..6a12684d8cc1 100644
--- a/sysutils/pftop/distinfo
+++ b/sysutils/pftop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741004632
-SHA256 (pftop-0.12.tar.gz) = d2a505197586249067c145d6c1b24f678215acabf50d59b97390b2845c78a1fc
-SIZE (pftop-0.12.tar.gz) = 62683
+TIMESTAMP = 1746625239
+SHA256 (pftop-0.13.tar.gz) = fa5a12553813344345040968a8b7dcd24b53f5a36145e03a6c24aae9445c6d0d
+SIZE (pftop-0.13.tar.gz) = 62669
diff --git a/sysutils/pstacku/Makefile b/sysutils/pstacku/Makefile
index ddedff369e3f..bc64cc805d71 100644
--- a/sysutils/pstacku/Makefile
+++ b/sysutils/pstacku/Makefile
@@ -1,20 +1,22 @@
 PORTNAME=	pstacku
-PORTVERSION=	0.9.2
-PORTREVISION=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	https://kib.kiev.ua/kib/${PORTNAME}/ \
-		http://kib.kiev.ua/kib/${PORTNAME}/
+PORTVERSION=	0.10.0
+CATEGORIES=	sysutils devel
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Retrieve process stack traces
-WWW=		https://www.kib.kiev.ua/git/gitweb.cgi?p=pstacku.git;a=tree
+WWW=		https://github.com/kostikbel/pstacku
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libunwind.so:devel/libunwind
 
+USES=		autoreconf
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	kostikbel
+GH_TAGNAME=	f2b80d40993f689539ae46ea0b985d7332aa317f
+
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--with-libunwind=${LOCALBASE}
 LLD_UNSAFE=	yes
 ONLY_FOR_ARCHS=	amd64 i386
diff --git a/sysutils/pstacku/distinfo b/sysutils/pstacku/distinfo
index 9bdea5472b65..8f07b948ebb9 100644
--- a/sysutils/pstacku/distinfo
+++ b/sysutils/pstacku/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pstacku-0.9.2.tar.gz) = e5b1ea4ee6e07de2988f8d03da752097c887f204c84a0faac6271420f70639e8
-SIZE (pstacku-0.9.2.tar.gz) = 303413
+TIMESTAMP = 1745223789
+SHA256 (kostikbel-pstacku-0.10.0-f2b80d40993f689539ae46ea0b985d7332aa317f_GH0.tar.gz) = 25df2875a60eaee9af6ff5454930de0650c5af1385148715af0cf5c6fa791a87
+SIZE (kostikbel-pstacku-0.10.0-f2b80d40993f689539ae46ea0b985d7332aa317f_GH0.tar.gz) = 7635
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index fe5d1acbb833..e28485f11fac 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rsyslog
-PORTVERSION=	8.2502.0
+PORTVERSION=	8.2504.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index b0933afbd160..e6940d40aa99 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740086065
-SHA256 (rsyslog-8.2502.0.tar.gz) = 02fa197d21d519f5a25a928deb9397cd387ba7382b9b449782ba31d8f3118206
-SIZE (rsyslog-8.2502.0.tar.gz) = 3470593
+TIMESTAMP = 1746644321
+SHA256 (rsyslog-8.2504.0.tar.gz) = 5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab
+SIZE (rsyslog-8.2504.0.tar.gz) = 3468108
diff --git a/sysutils/rtkit-unix/Makefile b/sysutils/rtkit-unix/Makefile
index a97c2d20ef84..a60faba182cc 100644
--- a/sysutils/rtkit-unix/Makefile
+++ b/sysutils/rtkit-unix/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rtkit-unix
-DISTVERSION=	0.20250430
+DISTVERSION=	0.20250505
 CATEGORIES=	sysutils deskutils
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -17,7 +17,7 @@ USE_QT=		base
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arrowd
-GH_TAGNAME=	85dd73460e58fb3440462ad61c8d82b377de8b1a
+GH_TAGNAME=	e4465ba18d43e13af35f075e75056e11200867c5
 
 PLIST_FILES=	libexec/rtkit-daemon \
 		share/dbus-1/system-services/org.freedesktop.RealtimeKit1.service \
diff --git a/sysutils/rtkit-unix/distinfo b/sysutils/rtkit-unix/distinfo
index 5c29085d131a..c0af2302d7c6 100644
--- a/sysutils/rtkit-unix/distinfo
+++ b/sysutils/rtkit-unix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745993036
-SHA256 (arrowd-rtkit-unix-0.20250430-85dd73460e58fb3440462ad61c8d82b377de8b1a_GH0.tar.gz) = 96c415a38a193f652fdeae365358aa6827fd29857b6cc0c1563faacccb42104b
-SIZE (arrowd-rtkit-unix-0.20250430-85dd73460e58fb3440462ad61c8d82b377de8b1a_GH0.tar.gz) = 12649
+TIMESTAMP = 1746455504
+SHA256 (arrowd-rtkit-unix-0.20250505-e4465ba18d43e13af35f075e75056e11200867c5_GH0.tar.gz) = 7b02f8d54f54274043c3bcaa5ec29e79ccb60b15dfb97560e4dad3767485dc2a
+SIZE (arrowd-rtkit-unix-0.20250505-e4465ba18d43e13af35f075e75056e11200867c5_GH0.tar.gz) = 12909
diff --git a/sysutils/stressdisk/Makefile b/sysutils/stressdisk/Makefile
index 35fe6e544f2a..7689c032b4c2 100644
--- a/sysutils/stressdisk/Makefile
+++ b/sysutils/stressdisk/Makefile
@@ -11,6 +11,8 @@ WWW=		https://github.com/ncw/stressdisk
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_FreeBSD_15=	error: SHT_STRTAB string table section [index 3] is non-null terminated, https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270962
+
 USES=		go:modules
 GO_MODULE=	github.com/ncw/stressdisk
 GO_BUILDFLAGS=	-ldflags=" \
diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
index b70a23a0fc67..228147ea1057 100644
--- a/sysutils/sysinfo/Makefile
+++ b/sysutils/sysinfo/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/danger \
 		http://danger.rulez.sk/projects/sysinfo/
 
-MAINTAINER=	danger@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility used to gather system configuration information
 WWW=		https://forums.freebsd.org/showthread.php?t=3282
 
diff --git a/sysutils/tflint/Makefile b/sysutils/tflint/Makefile
index 2de5fc84a330..900861cf56dc 100644
--- a/sysutils/tflint/Makefile
+++ b/sysutils/tflint/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tflint
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.56.0
+DISTVERSION=	0.57.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/tflint/distinfo b/sysutils/tflint/distinfo
index 42bbcff0b8fd..84b2fa5ec977 100644
--- a/sysutils/tflint/distinfo
+++ b/sysutils/tflint/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1743609027
-SHA256 (go/sysutils_tflint/tflint-v0.56.0/v0.56.0.mod) = a2cd859049557eb5ea8ca76ce5390a33385f2abc0f1eb631143e1a59320cfcda
-SIZE (go/sysutils_tflint/tflint-v0.56.0/v0.56.0.mod) = 8785
-SHA256 (go/sysutils_tflint/tflint-v0.56.0/v0.56.0.zip) = 473c4fbb27f7245861b23fcae2c4edbf793cc6245aed8d53bd686f74a299f76b
-SIZE (go/sysutils_tflint/tflint-v0.56.0/v0.56.0.zip) = 1650621
+TIMESTAMP = 1746411799
+SHA256 (go/sysutils_tflint/tflint-v0.57.0/v0.57.0.mod) = da640651a1825985a3d1e8ec6d695abf63150b9b429becdecebc53e03263b14b
+SIZE (go/sysutils_tflint/tflint-v0.57.0/v0.57.0.mod) = 8629
+SHA256 (go/sysutils_tflint/tflint-v0.57.0/v0.57.0.zip) = 35b60f07e7b8345e711f0cfd21d474d90f8782eef261282cd97e7aafe6bfe265
+SIZE (go/sysutils_tflint/tflint-v0.57.0/v0.57.0.zip) = 1650245
diff --git a/textproc/Makefile b/textproc/Makefile
index 24623b868abe..83600df918eb 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -41,11 +41,9 @@
     SUBDIR += R-cran-xtable
     SUBDIR += R-cran-yaml
     SUBDIR += UCD
-    SUBDIR += add-css-links
     SUBDIR += addts
     SUBDIR += adoc-mode.el
     SUBDIR += af-aspell
-    SUBDIR += aft
     SUBDIR += agrep
     SUBDIR += aha
     SUBDIR += aiksaurus
@@ -70,7 +68,6 @@
     SUBDIR += aspell
     SUBDIR += aspell-ispell
     SUBDIR += ast-aspell
-    SUBDIR += atom
     SUBDIR += augeas
     SUBDIR += az-aspell
     SUBDIR += bar
@@ -90,14 +87,11 @@
     SUBDIR += bn-aspell
     SUBDIR += br-aspell
     SUBDIR += bsd-spell
-    SUBDIR += bsddiff
     SUBDIR += c2html
-    SUBDIR += c2man
     SUBDIR += ca-aspell
     SUBDIR += cast2gif
     SUBDIR += castxml
     SUBDIR += catdoc
-    SUBDIR += cdif
     SUBDIR += cg3
     SUBDIR += cgrep
     SUBDIR += chkascii
@@ -116,7 +110,6 @@
     SUBDIR += codespell
     SUBDIR += colordiff
     SUBDIR += comrak
-    SUBDIR += confetti
     SUBDIR += confget
     SUBDIR += consul-template
     SUBDIR += cpp-peglib
@@ -169,12 +162,9 @@
     SUBDIR += docbook-xsl-ns
     SUBDIR += docbook2X
     SUBDIR += docbook2mdoc
-    SUBDIR += docbook2odf
     SUBDIR += docbookrx
     SUBDIR += docproj
     SUBDIR += docproj-fonts-cjk
-    SUBDIR += dom4j
-    SUBDIR += domc
     SUBDIR += dsssl-docbook-modular
     SUBDIR += dtd-catalogs
     SUBDIR += dtd2relax
@@ -183,7 +173,6 @@
     SUBDIR += dwdiff
     SUBDIR += easydiff
     SUBDIR += ebook-tools
-    SUBDIR += ekhtml
     SUBDIR += el-aspell
     SUBDIR += el-hyphen
     SUBDIR += elasticsearch-plugin-head
@@ -200,7 +189,6 @@
     SUBDIR += es-hunspell
     SUBDIR += es-hyphen
     SUBDIR += es-mythes
-    SUBDIR += estraier
     SUBDIR += et-aspell
     SUBDIR += evtx
     SUBDIR += exempi
@@ -228,7 +216,6 @@
     SUBDIR += fixrtf
     SUBDIR += fldiff
     SUBDIR += flex
-    SUBDIR += flip
     SUBDIR += fmtlatex
     SUBDIR += fo-aspell
     SUBDIR += foiltex
@@ -248,7 +235,6 @@
     SUBDIR += gitlab-elasticsearch-indexer
     SUBDIR += gl-aspell
     SUBDIR += gladtex
-    SUBDIR += gmetadom
     SUBDIR += gnugrep
     SUBDIR += go-md2man
     SUBDIR += go-transifex-client
@@ -259,6 +245,7 @@
     SUBDIR += google-ctemplate
     SUBDIR += gpp
     SUBDIR += grap
+    SUBDIR += grass
     SUBDIR += grc-aspell
     SUBDIR += greple
     SUBDIR += groff
@@ -289,7 +276,6 @@
     SUBDIR += hs-pandoc-crossref
     SUBDIR += hs-yaml
     SUBDIR += hsb-aspell
-    SUBDIR += htdig
     SUBDIR += html
     SUBDIR += html-pretty
     SUBDIR += html-xml-utils
@@ -340,8 +326,6 @@
     SUBDIR += jalingo
     SUBDIR += jaq
     SUBDIR += jarnal
-    SUBDIR += java2html
-    SUBDIR += jaxup
     SUBDIR += jdictionary
     SUBDIR += jdictionary-int-eng
     SUBDIR += jid
@@ -493,7 +477,6 @@
     SUBDIR += metauml
     SUBDIR += mgdiff
     SUBDIR += mi-aspell
-    SUBDIR += mifluz
     SUBDIR += miller
     SUBDIR += minify
     SUBDIR += minised
@@ -513,9 +496,9 @@
     SUBDIR += multimarkdown
     SUBDIR += muse
     SUBDIR += mxml
-    SUBDIR += mysqlviz
     SUBDIR += mythes
     SUBDIR += nb-aspell
+    SUBDIR += nerdlog
     SUBDIR += nds-aspell
     SUBDIR += nl-aspell
     SUBDIR += nl-hunspell
@@ -524,7 +507,6 @@
     SUBDIR += nn-aspell
     SUBDIR += nunnimcax
     SUBDIR += nuspell
-    SUBDIR += nux
     SUBDIR += ny-aspell
     SUBDIR += obsidian
     SUBDIR += ocaml-csv
@@ -813,7 +795,6 @@
     SUBDIR += p5-Search-Odeum
     SUBDIR += p5-Search-QueryParser
     SUBDIR += p5-Search-QueryParser-SQL
-    SUBDIR += p5-Search-Saryer
     SUBDIR += p5-Search-Sitemap
     SUBDIR += p5-Search-VectorSpace
     SUBDIR += p5-Senna
@@ -1312,7 +1293,6 @@
     SUBDIR += pod2mdoc
     SUBDIR += popup-stacks
     SUBDIR += ppower4
-    SUBDIR += print-n-times
     SUBDIR += pugixml
     SUBDIR += pup
     SUBDIR += py-CommonMark
@@ -1750,8 +1730,6 @@
     SUBDIR += reflex
     SUBDIR += regex2dfa
     SUBDIR += replaceit
-    SUBDIR += resume
-    SUBDIR += resume-extensions
     SUBDIR += rfcdiff
     SUBDIR += riffdiff
     SUBDIR += ripgrep
@@ -2010,10 +1988,7 @@
     SUBDIR += sad
     SUBDIR += sansi
     SUBDIR += sarep
-    SUBDIR += sary
     SUBDIR += sassc
-    SUBDIR += saxon
-    SUBDIR += saxon-devel
     SUBDIR += saxon-he
     SUBDIR += sc-aspell
     SUBDIR += scdoc
@@ -2030,7 +2005,6 @@
     SUBDIR += sd
     SUBDIR += sdcv
     SUBDIR += sdf
-    SUBDIR += sdif
     SUBDIR += sdocbook-xml
     SUBDIR += sdom
     SUBDIR += senna
@@ -2056,7 +2030,6 @@
     SUBDIR += snowballstemmer
     SUBDIR += so-hunspell
     SUBDIR += sonic
-    SUBDIR += soothsayer
     SUBDIR += source-highlight
     SUBDIR += sowing
     SUBDIR += spellutils
@@ -2076,8 +2049,6 @@
     SUBDIR += sv-mythes
     SUBDIR += svn2cl
     SUBDIR += sw-aspell
-    SUBDIR += sxml
-    SUBDIR += syck
     SUBDIR += ta-aspell
     SUBDIR += tagsoup
     SUBDIR += te-aspell
@@ -2118,7 +2089,6 @@
     SUBDIR += tttcmds
     SUBDIR += ttynt
     SUBDIR += tui-journal
-    SUBDIR += turboxsl
     SUBDIR += txt2html
     SUBDIR += txt2man
     SUBDIR += txt2tags
@@ -2140,7 +2110,6 @@
     SUBDIR += uni
     SUBDIR += uni-algo
     SUBDIR += uni2ascii
-    SUBDIR += unoconv
     SUBDIR += unroff
     SUBDIR += unrtf
     SUBDIR += up
@@ -2160,7 +2129,6 @@
     SUBDIR += weka
     SUBDIR += wiggle
     SUBDIR += wikiman
-    SUBDIR += word2x
     SUBDIR += wordnet
     SUBDIR += write-good
     SUBDIR += wv
@@ -2200,7 +2168,6 @@
     SUBDIR += xmlwrapp
     SUBDIR += xom
     SUBDIR += xorg-sgml-doctools
-    SUBDIR += xp
     SUBDIR += xslide.el
     SUBDIR += xstream
     SUBDIR += xsv-rs
diff --git a/textproc/add-css-links/Makefile b/textproc/add-css-links/Makefile
deleted file mode 100644
index 96b381fe656a..000000000000
--- a/textproc/add-css-links/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-PORTNAME=	add-css-links
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	textproc
-MASTER_SITES=	http://aaronland.info/xsl/xhtml/add-css-links/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Add one or more CSS <link> elements to an XHTML document
-WWW=		https://aaronland.info/xsl/xhtml/add-css-links
-
-DEPRECATED=	Obsolete and unmaintained in tree for years
-EXPIRATION_DATE=2025-04-30
-
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/xhtml
-
-PLIST_FILES=	share/xsl/xhtml/add-css-links.xsl
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xsl/xhtml
-	${CP} ${WRKSRC}/*.xsl ${STAGEDIR}${PREFIX}/share/xsl/xhtml/
-
-.include <bsd.port.mk>
diff --git a/textproc/add-css-links/distinfo b/textproc/add-css-links/distinfo
deleted file mode 100644
index 3ab3c02a08a1..000000000000
--- a/textproc/add-css-links/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (add-css-links-1.0.tar.gz) = 847d5b7ca3ae0cae28483cdaf02b163662bf69a9d58913bc01dd5fbd5b6bc35c
-SIZE (add-css-links-1.0.tar.gz) = 1123
diff --git a/textproc/add-css-links/pkg-descr b/textproc/add-css-links/pkg-descr
deleted file mode 100644
index 72ae69ecd6f2..000000000000
--- a/textproc/add-css-links/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Add one or more CSS <link> elements to an XHTML document.
diff --git a/textproc/aft/Makefile b/textproc/aft/Makefile
deleted file mode 100644
index 26cb56eac7a0..000000000000
--- a/textproc/aft/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-PORTNAME=	aft
-PORTVERSION=	5.098
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.maplefish.com/todd/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Document preparation system using an Almost Free Text input format
-WWW=		http://www.maplefish.com/todd/aft.html
-
-LICENSE=	CART
-LICENSE_GROUPS=	FSF GPL OSI
-LICENSE_NAME=	Clarified Artistic License
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED=	Obscure markup language and unmaintained in tree for years
-EXPIRATION_DATE=2025-04-30
-
-USES=		perl5 gmake
-GNU_CONFIGURE=	yes
-OPTIONS_DEFINE=	DOCS
-
-PORTDOCS=	*
-
-.include <bsd.port.mk>
diff --git a/textproc/aft/distinfo b/textproc/aft/distinfo
deleted file mode 100644
index aa55d2639fcf..000000000000
--- a/textproc/aft/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (aft-5.098.tar.gz) = 0c856fe1dbcef282ee39ab11041513cab966a5c6e4cce7154f374623d24c7419
-SIZE (aft-5.098.tar.gz) = 119072
diff --git a/textproc/aft/pkg-descr b/textproc/aft/pkg-descr
deleted file mode 100644
index 7bac8ae199bc..000000000000
--- a/textproc/aft/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-AFT (Almost Free Text) is a document preparation system. It is mostly
-free form meaning that there is little intrusive markup. AFT source
-documents look a lot like plain old ASCII text.
-
-AFT has a few rules for structuring your document and these rules have
-more to do with formatting your text rather than embedding commands.
-
-Right now, AFT produces pretty good (weblint-able) HTML, XHTML, LaTeX,
-lout and RTF. It can, in fact, be coerced into producing all types of
-output (e.g. roll-your-own XML). All that needs to be done is to edit
-a rule file. You can even customize your own HTML rule files for
-specialized output.
diff --git a/textproc/aft/pkg-plist b/textproc/aft/pkg-plist
deleted file mode 100644
index 60a3827b5a9d..000000000000
--- a/textproc/aft/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-bin/aft
-%%DATADIR%%/AFT.pm
-%%DATADIR%%/aft-bn-html.pm
-%%DATADIR%%/aft-dbarticle.pm
-%%DATADIR%%/aft-html.pm
-%%DATADIR%%/aft-lout.pm
-%%DATADIR%%/aft-loutbook.pm
-%%DATADIR%%/aft-loutreport.pm
-%%DATADIR%%/aft-rtf.pm
-%%DATADIR%%/aft-tex.pm
-%%DATADIR%%/aft-xhtml.pm
-%%DATADIR%%/aft.pl
-%%DATADIR%%/compile.pl
-%%DATADIR%%/launch_ie.pl
-%%DATADIR%%/postrtf.pl
diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index f713e6572a15..3885975dc398 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	poi
-PORTVERSION=	5.4.0
+PORTVERSION=	5.4.1
 CATEGORIES=	textproc devel java
 MASTER_SITES=	${MAVEN_SITE}/poi/${PORTVERSION}/:poi	\
 		${MAVEN_SITE}/poi-examples/${PORTVERSION}/:examples	\
diff --git a/textproc/apache-poi/distinfo b/textproc/apache-poi/distinfo
index 707a95f42b8e..e70f9b2a23a5 100644
--- a/textproc/apache-poi/distinfo
+++ b/textproc/apache-poi/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1743444168
-SHA256 (poi-5.4.0.jar) = ace71e79873059e273036674560b50c3d6b945b7ca168b0d4962ad7650ae1eec
-SIZE (poi-5.4.0.jar) = 2995160
-SHA256 (poi-examples-5.4.0.jar) = ee164205efc68993f80048d04dfaae7cb77d3cb1375a4ae8e3deca3753d2f63f
-SIZE (poi-examples-5.4.0.jar) = 389746
-SHA256 (poi-excelant-5.4.0.jar) = 78483b12d878bf288bb4edeb57072de96b041ea568111f28e54483a0ad89c349
-SIZE (poi-excelant-5.4.0.jar) = 28568
-SHA256 (poi-ooxml-5.4.0.jar) = 98693442ed7d44791de4a57962b6c820ae678e0eba9cf854681b62ff62c9611d
-SIZE (poi-ooxml-5.4.0.jar) = 2035159
-SHA256 (poi-ooxml-full-5.4.0.jar) = 8977fbc93981052001527ca6f951f5ba1636f152bcc6c8f6249295056602c4a8
-SIZE (poi-ooxml-full-5.4.0.jar) = 14246289
-SHA256 (poi-ooxml-lite-5.4.0.jar) = bb5a8a6c833279ced51afb6042aa15ae5d5ca312ee682e570e23917b522b079e
-SIZE (poi-ooxml-lite-5.4.0.jar) = 5995292
-SHA256 (poi-scratchpad-5.4.0.jar) = 6665792cde201f5828e38e0d214aa67d817e34de3e7a5946e6a488c4534b4561
-SIZE (poi-scratchpad-5.4.0.jar) = 1908845
+TIMESTAMP = 1746260871
+SHA256 (poi-5.4.1.jar) = da5abf42da4604c5a7bca38956af6e9d6f196d9b6d4cb7eabee4f480b580d505
+SIZE (poi-5.4.1.jar) = 2996461
+SHA256 (poi-examples-5.4.1.jar) = dafa9640080e206f646ddd8a85c931ffec29353e62436eb41666c47f9dbee783
+SIZE (poi-examples-5.4.1.jar) = 389746
+SHA256 (poi-excelant-5.4.1.jar) = 57211f58a96d6975ae21202ba4ba712218fb5babbb54fa26ac114d967632f74b
+SIZE (poi-excelant-5.4.1.jar) = 28568
+SHA256 (poi-ooxml-5.4.1.jar) = fd200c9e6f74d704160a97e9d52041995ed87439454530001edd920688f19f53
+SIZE (poi-ooxml-5.4.1.jar) = 2037787
+SHA256 (poi-ooxml-full-5.4.1.jar) = c51b051655d58d74d5eb89e7d3736c7052c2574f43c79db0c8a83ad216f6dd37
+SIZE (poi-ooxml-full-5.4.1.jar) = 14246567
+SHA256 (poi-ooxml-lite-5.4.1.jar) = dc590461efdfcd4f27e2a892737979ab5e30b4132a7adfc7c9e56447b71a45b0
+SIZE (poi-ooxml-lite-5.4.1.jar) = 5996003
+SHA256 (poi-scratchpad-5.4.1.jar) = 6497ba15c1cba7062aa71661a8d776d321b1f998bb2bfa19b57d7e35606381f1
+SIZE (poi-scratchpad-5.4.1.jar) = 1909132
diff --git a/textproc/atom/Makefile b/textproc/atom/Makefile
deleted file mode 100644
index b68517bef513..000000000000
--- a/textproc/atom/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-PORTNAME=	atom
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.bayofrum.net/dist/atom/ \
-		http://muuz.deadbbs.com/FreeBSD/atom/
-
-MAINTAINER=	crees@FreeBSD.org
-COMMENT=	Converts text files to html with special attributes
-WWW=		https://www.bayofrum.net/dist/atom/
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Upstream is gone and utility is considered obsolete
-EXPIRATION_DATE=2025-04-30
-
-GNU_CONFIGURE=	yes
-
-PLIST_FILES=	bin/atom share/man/man1/atom.1.gz
-PORTDOCS=	README TODO testFile
-
-OPTIONS_DEFINE=	DOCS
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/atom/distinfo b/textproc/atom/distinfo
deleted file mode 100644
index eedd56b1696e..000000000000
--- a/textproc/atom/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (atom-1.0.tar.gz) = 852413c1051977b613d3b1796215e40698d6545c9195c395fa6fef0113818280
-SIZE (atom-1.0.tar.gz) = 103239
diff --git a/textproc/atom/files/patch-msg.c b/textproc/atom/files/patch-msg.c
deleted file mode 100644
index b03304be69a0..000000000000
--- a/textproc/atom/files/patch-msg.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- msg.c.orig	2023-03-07 22:52:52 UTC
-+++ msg.c
-@@ -194,11 +194,7 @@ parse_preface(const char *template) {
-         fmt[p++] = *template;
-         if (state == percent) {
-             if (*template == 's')
--#if defined(_POSIX_SOURCE)
-                 p += sprintf(fmt + p - 2, "%d", msg_severity) - 2;
--#else
--                p = strchr(sprintf(fmt + p - 2, "%d", msg_severity), 0) - fmt;
--#endif
-             state = normal;
-         } else if (*template == '%')
-             state = percent;
diff --git a/textproc/atom/pkg-descr b/textproc/atom/pkg-descr
deleted file mode 100644
index 402883a0622f..000000000000
--- a/textproc/atom/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-This port takes plain text files like ASCII as input, and outputs
-mark files such as HTML or (unsupported) LaTeX.
diff --git a/textproc/bsddiff/Makefile b/textproc/bsddiff/Makefile
deleted file mode 100644
index d4a28aeecf2d..000000000000
--- a/textproc/bsddiff/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PORTNAME=	diff
-PORTVERSION=	20120705
-PORTREVISION=	3
-CATEGORIES=	textproc
-MASTER_SITES=	LOCAL/gabor
-PKGNAMEPREFIX=	bsd-
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	BSD-licensed version of diff from OpenBSD
-WWW=		https://www.freebsd.org/projects/ideas/ #p-bsdtexttools
-
-DEPRECATED=	Obsolete, newer version imported into base as 2017
-EXPIRATION_DATE=2025-04-30
-
-USES=		uidfix
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-MAKE_ENV+=	BINDIR="${PREFIX}/bin" \
-		MANDIR="${PREFIX}/share/man/man" \
-		CATDIR="${PREFIX}/share/man/man"
-
-post-install:
-	${LN} -sf ${PREFIX}/bin/bsddiff ${STAGEDIR}${PREFIX}/bin/diff
-
-.include <bsd.port.mk>
diff --git a/textproc/bsddiff/distinfo b/textproc/bsddiff/distinfo
deleted file mode 100644
index 9226fc9d5594..000000000000
--- a/textproc/bsddiff/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (diff-20120705.tar.gz) = beaffc540a3e50c15fc837f83d81fe3c409e07b62c84ed06c2541d1b96e10ffb
-SIZE (diff-20120705.tar.gz) = 30541
diff --git a/textproc/bsddiff/pkg-descr b/textproc/bsddiff/pkg-descr
deleted file mode 100644
index f87047aea06f..000000000000
--- a/textproc/bsddiff/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the BSD-licensed version of the well-known diff utility, obtained from
-OpenBSD. It lacks some features of GNU diff. It is a proposed project idea
-to replace the GNU diff with this one, but it needs to be completed first.
-Patches are highly appreciated.
diff --git a/textproc/bsddiff/pkg-plist b/textproc/bsddiff/pkg-plist
deleted file mode 100644
index a57b8b4585b3..000000000000
--- a/textproc/bsddiff/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/diff
-bin/bsddiff
-share/man/man1/bsddiff.1.gz
diff --git a/textproc/c2man/Makefile b/textproc/c2man/Makefile
deleted file mode 100644
index 34737b51ede0..000000000000
--- a/textproc/c2man/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-PORTNAME=	c2man
-PORTVERSION=	${VERSION}.${PATCHLEVEL}
-PORTREVISION=	1
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.ciselant.de/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${VERSION}@${PATCHLEVEL}
-
-MAINTAINER=	lantw44@gmail.com
-COMMENT=	Tool to generate documentation from C source code comments
-WWW=		https://www.ciselant.de/c2man/c2man.html
-
-LICENSE=	${PORTNAME}
-LICENSE_NAME=	${PORTNAME}
-LICENSE_FILE=	${WRKSRC}/README
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED=	Not recommended for use in new projects
-EXPIRATION_DATE=2025-04-30
-
-VERSION=	2.0
-PATCHLEVEL=	42
-
-NO_WRKSUBDIR=	yes
-NO_INSTALL=	yes
-
-PLIST_FILES=	bin/c2man share/man/man1/c2man.1.gz
-
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=Configure
-CONFIGURE_ARGS=	-des -Dcc="${CC}" -Dccflags="${CFLAGS}" -Dldflags="${LDFLAGS}"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
-
-.include <bsd.port.mk>
diff --git a/textproc/c2man/distinfo b/textproc/c2man/distinfo
deleted file mode 100644
index d92d1724bac8..000000000000
--- a/textproc/c2man/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1518289578
-SHA256 (c2man-2.0@42.tar.gz) = 0280ba17471da32216af2109e7e3b17ff2fda15f294d68efdc0108eca64cd577
-SIZE (c2man-2.0@42.tar.gz) = 188551
diff --git a/textproc/c2man/files/patch-grammar.y b/textproc/c2man/files/patch-grammar.y
deleted file mode 100644
index 24aa753d11f9..000000000000
--- a/textproc/c2man/files/patch-grammar.y
+++ /dev/null
@@ -1,22 +0,0 @@
---- grammar.y.orig	1998-09-30 01:29:13 UTC
-+++ grammar.y
-@@ -14,7 +14,7 @@
- %token T_INLINE
- 
- /* type specifiers */
--%token T_CHAR T_DOUBLE T_FLOAT T_INT T_VOID
-+%token T_CHAR T_DOUBLE T_FLOAT T_INT T_VOID T_VALIST
- %token T_LONG T_SHORT T_SIGNED T_UNSIGNED
- %token T_ENUM T_STRUCT T_UNION
- 
-@@ -374,6 +374,10 @@ type_specifier
- 	{
- 	    new_decl_spec(&$$, "void", DS_NONE);
- 	}
-+	| T_VALIST
-+	{
-+	    new_decl_spec(&$$, "va_list", DS_NONE);
-+	}
- 	| struct_or_union_specifier
- 	| enum_specifier
- 	| T_TYPEDEF_NAME
diff --git a/textproc/c2man/files/patch-lex.l b/textproc/c2man/files/patch-lex.l
deleted file mode 100644
index 0d4178f7d706..000000000000
--- a/textproc/c2man/files/patch-lex.l
+++ /dev/null
@@ -1,10 +0,0 @@
---- lex.l.orig	2000-02-25 01:41:11 UTC
-+++ lex.l
-@@ -167,6 +167,7 @@ QUOTED		({STRING}|\'(\\\'|[^'\n])*\'|\\.
- <INITIAL>float		return T_FLOAT;
- <INITIAL>int		return T_INT;
- <INITIAL>void		return T_VOID;
-+<INITIAL>__builtin_va_list return T_VALIST;
- <INITIAL>long		return T_LONG;
- <INITIAL>short		return T_SHORT;
- <INITIAL>signed		return T_SIGNED;
diff --git a/textproc/c2man/pkg-descr b/textproc/c2man/pkg-descr
deleted file mode 100644
index 8f7012a6331c..000000000000
--- a/textproc/c2man/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-c2man is an obsolete and unmaintained documentation tool that extracts comments
-from C source code. Do not use this tool in new projects. The only reason for it
-to exist in FreeBSD ports is to allow building GNU FriBidi from a git snapshot.
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
deleted file mode 100644
index 725468fe51ec..000000000000
--- a/textproc/cdif/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-PORTNAME=	cdif
-PORTVERSION=	2.14.20170401
-DISTVERSIONPREFIX=	v
-CATEGORIES=	textproc
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Word context visualizer of DIFF output
-WWW=		https://github.com/kaz-utashiro/cdif
-
-LICENSE=	GREPLE
-LICENSE_NAME=	GREPLE License
-LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED=	Deprecated upstream, repo archived on Jun 25, 2018.
-EXPIRATION_DATE=2025-04-30
-
-RUN_DEPENDS=	${SITE_PERL}/Getopt/EX.pm:devel/p5-Getopt-EX
-
-USES=		perl5 shebangfix
-SHEBANG_FILES=	${PORTNAME}
-USE_GITHUB=	yes
-GH_ACCOUNT=	kaz-utashiro
-GH_TAGNAME=	2f4de90
-NO_BUILD=	yes
-NO_ARCH=	yes
-PLIST_FILES=	bin/cdif
-
-post-extract:
-	cd ${WRKSRC} && \
-	    ${SED} -n "/^# COPYRIGHT/,//p" README.md > LICENSE
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/cdif
-
-.include <bsd.port.mk>
diff --git a/textproc/cdif/distinfo b/textproc/cdif/distinfo
deleted file mode 100644
index d91e7c8b80ba..000000000000
--- a/textproc/cdif/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1491036190
-SHA256 (kaz-utashiro-cdif-v2.14.20170401-2f4de90_GH0.tar.gz) = 0396528034f54ddb22ffcdfcf925355c8f2a9426a7de6ca1c149e9e5b4ec8377
-SIZE (kaz-utashiro-cdif-v2.14.20170401-2f4de90_GH0.tar.gz) = 19118
diff --git a/textproc/cdif/pkg-descr b/textproc/cdif/pkg-descr
deleted file mode 100644
index 413530f0ae03..000000000000
--- a/textproc/cdif/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-cdif is a post-processor of the Unix diff command.  It highlights
-deleted, changed and added words based on word context.  You may want
-to compare character-by-character rather than word-by-word.  Option -B
-option can be used for that purpose.  If only one file is specified,
-cdif reads that file (stdin if no file) as a output from diff command.
-Lines those don't look like diff output are simply ignored and
-printed.
-
-Note that this requires fdescfs(5) mounted.
diff --git a/textproc/confetti/Makefile b/textproc/confetti/Makefile
deleted file mode 100644
index 6ea2c9c72a22..000000000000
--- a/textproc/confetti/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-PORTNAME=	confetti
-PORTVERSION=	0.0.${DATE}
-CATEGORIES=	textproc
-MASTER_SITES=	LOCAL/vg
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Configuration file parser generator
-WWW=		https://github.com/mailru/confetti
-
-DEPRECATED=	Outdated and unmaintained in tree since 2018
-EXPIRATION_DATE=2025-04-30
-
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
-
-USES=		bison perl5 gmake tar:bzip2
-DATE=		20120801
-MAKE_ARGS+=	FLEX=${LOCALBASE}/bin/flex
-MAKE_JOBS_UNSAFE=yes
-
-OPTIONS_DEFINE=	EXAMPLES
-
-PLIST_FILES=	bin/confetti
-PORTEXAMPLES=	*
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|CC=|CC?=|' -e 's|CFLAGS=|CFLAGS?=|' \
-		${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/confetti/distinfo b/textproc/confetti/distinfo
deleted file mode 100644
index 21e647187922..000000000000
--- a/textproc/confetti/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (confetti-0.0.20120801.tar.bz2) = 7bc6a4bbfb7465adf0a9af80f03dd1bd21d96244a7b6887b2e7cfb2a9dadfd3b
-SIZE (confetti-0.0.20120801.tar.bz2) = 120800
diff --git a/textproc/confetti/pkg-descr b/textproc/confetti/pkg-descr
deleted file mode 100644
index 64e664ee7fa0..000000000000
--- a/textproc/confetti/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-confetti -- configuration file parser generator
diff --git a/textproc/docbook2odf/Makefile b/textproc/docbook2odf/Makefile
deleted file mode 100644
index a89ef3264aa3..000000000000
--- a/textproc/docbook2odf/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-PORTNAME=	docbook2odf
-PORTVERSION=	0.244
-PORTREVISION=	4
-CATEGORIES=	textproc perl5
-MASTER_SITES=	http://open.comsultia.com/docbook2odf/dwn/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Convert docbook document to Oasis Open Document
-WWW=		http://open.comsultia.com/docbook2odf/
-
-LICENSE=	GPLv2
-
-BROKEN=		Unfetchable
-DEPRECATED=	Upstream is gone and unmaintained in tree for years
-EXPIRATION_DATE=2025-04-30
-
-LIB_DEPENDS=	libsablot.so:textproc/sablotron \
-		libxslt.so:textproc/libxslt
-RUN_DEPENDS=	zip:archivers/zip \
-		p5-Archive-Zip>=0:archivers/p5-Archive-Zip
-
-USES=		desktop-file-utils magick:6,run perl5 shebangfix
-SHEBANG_FILES=	utils/maketests utils/${PORTNAME}
-USE_PERL5=	run
-NO_BUILD=	yes
-
-PORTEXAMPLES=	*
-OPTIONS_DEFINE=	EXAMPLES
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|#!/usr/bin/perl|#!${PERL}|' \
-		${WRKSRC}/tests/tests/docbook-43.001.xml
-	@${FIND} ${WRKSRC} -name "*.bak" -delete -or -name "*.cvsignore" -delete
-
-do-install:
-	${LN} -sf ${DATADIR}/utils/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "tests utils xsl" \
-		${STAGEDIR}${DATADIR})
-	${INSTALL_DATA} ${WRKSRC}/bindings/desktop/${PORTNAME}.desktop \
-		${STAGEDIR}${DESKTOPDIR}
-	${LN} -sf ${EXAMPLESDIR}/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.1 \
-		${STAGEDIR}${PREFIX}/share/man/man1/
-
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-
-.include <bsd.port.mk>
diff --git a/textproc/docbook2odf/distinfo b/textproc/docbook2odf/distinfo
deleted file mode 100644
index e9f598e97f0f..000000000000
--- a/textproc/docbook2odf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook2odf-0.244.tar.gz) = 8bbf4f1f81423ba83c0d58625b2df8bf7d234bfa1b4977c19867288cc1236482
-SIZE (docbook2odf-0.244.tar.gz) = 567200
diff --git a/textproc/docbook2odf/pkg-descr b/textproc/docbook2odf/pkg-descr
deleted file mode 100644
index cd9529b092c2..000000000000
--- a/textproc/docbook2odf/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Docbook2odf is a toolkit that automatically converts DocBook to OASIS
-OpenDocument (ODF, the ISO standardized format used for texts, spreadsheets
-and presentations). Conversion is based on a XSLT which makes it easy to
-convert DocBook->ODF, ODT, ODS and ODP as all these documents are XML based.
-
-Also goal of docbook2odf is to generate well formatted documents in
-OpenDocument, ready to be used in instant, with actually considering current
-rules of the Corporate Identity of organizations. Final results should not be
-restricted to text like documents but also many other forms could be generated,
-like presentations, charts or forms with images and multimedia.
-
-The result is provided in a one zipped ODF file (.odt/.odp/.ods) with all
-required content. There are group of utilities like docbook2odt, docbook2ods
-and docbook2odp as docbook2odf is actually universally converting to these
-respective formats.
diff --git a/textproc/docbook2odf/pkg-plist b/textproc/docbook2odf/pkg-plist
deleted file mode 100644
index 280813554d0c..000000000000
--- a/textproc/docbook2odf/pkg-plist
+++ /dev/null
@@ -1,353 +0,0 @@
-bin/docbook2odf
-share/man/man1/docbook2odf.1.gz
-share/applications/docbook2odf.desktop
-%%DATADIR%%/tests/Makefile
-%%DATADIR%%/tests/README
-%%DATADIR%%/tests/RELEASE-NOTES.xml
-%%DATADIR%%/tests/VERSION
-%%DATADIR%%/tests/fo-debug.xsl
-%%DATADIR%%/tests/graphics/U1230.gif
-%%DATADIR%%/tests/graphics/duck-co.png
-%%DATADIR%%/tests/graphics/duck-small.bmp
-%%DATADIR%%/tests/graphics/duck-small.eps
-%%DATADIR%%/tests/graphics/duck-small.gif
-%%DATADIR%%/tests/graphics/duck-small.pdf
-%%DATADIR%%/tests/graphics/duck-small.png
-%%DATADIR%%/tests/graphics/duck.png
-%%DATADIR%%/tests/graphics/stamp.png
-%%DATADIR%%/tests/graphics/stamp200x128.png
-%%DATADIR%%/tests/graphics/stamp200x256.png
-%%DATADIR%%/tests/graphics/stamp400x256.png
-%%DATADIR%%/tests/graphics/svg-001-fallback.png
-%%DATADIR%%/tests/graphics/svg-001.xml
-%%DATADIR%%/tests/i18n/Makefile
-%%DATADIR%%/tests/i18n/af.xml
-%%DATADIR%%/tests/i18n/ar.xml
-%%DATADIR%%/tests/i18n/book.xml
-%%DATADIR%%/tests/i18n/ca.xml
-%%DATADIR%%/tests/i18n/cs.xml
-%%DATADIR%%/tests/i18n/da.xml
-%%DATADIR%%/tests/i18n/de.xml
-%%DATADIR%%/tests/i18n/el.xml
-%%DATADIR%%/tests/i18n/en.xml
-%%DATADIR%%/tests/i18n/es.xml
-%%DATADIR%%/tests/i18n/et.xml
-%%DATADIR%%/tests/i18n/eu.xml
-%%DATADIR%%/tests/i18n/fi.xml
-%%DATADIR%%/tests/i18n/fr.xml
-%%DATADIR%%/tests/i18n/he.xml
-%%DATADIR%%/tests/i18n/hu.xml
-%%DATADIR%%/tests/i18n/i18n-fo.xsl
-%%DATADIR%%/tests/i18n/id.xml
-%%DATADIR%%/tests/i18n/identity.xsl
-%%DATADIR%%/tests/i18n/it.xml
-%%DATADIR%%/tests/i18n/ja.xml
-%%DATADIR%%/tests/i18n/ko.xml
-%%DATADIR%%/tests/i18n/localize.xsl
-%%DATADIR%%/tests/i18n/lt.xml
-%%DATADIR%%/tests/i18n/math_limerick.png
-%%DATADIR%%/tests/i18n/nl.xml
-%%DATADIR%%/tests/i18n/nn.xml
-%%DATADIR%%/tests/i18n/no.xml
-%%DATADIR%%/tests/i18n/pl.xml
-%%DATADIR%%/tests/i18n/pt.xml
-%%DATADIR%%/tests/i18n/pt_br.xml
-%%DATADIR%%/tests/i18n/ro.xml
-%%DATADIR%%/tests/i18n/ru.xml
-%%DATADIR%%/tests/i18n/sk.xml
-%%DATADIR%%/tests/i18n/sl.xml
-%%DATADIR%%/tests/i18n/source.xml
-%%DATADIR%%/tests/i18n/sr.xml
-%%DATADIR%%/tests/i18n/sv.xml
-%%DATADIR%%/tests/i18n/th.xml
-%%DATADIR%%/tests/i18n/titlepage-fo.xml
-%%DATADIR%%/tests/i18n/tr.xml
-%%DATADIR%%/tests/i18n/translators.xsl
-%%DATADIR%%/tests/i18n/uk.xml
-%%DATADIR%%/tests/i18n/vi.xml
-%%DATADIR%%/tests/i18n/xh.xml
-%%DATADIR%%/tests/i18n/zh_cn.xml
-%%DATADIR%%/tests/i18n/zh_tw.xml
-%%DATADIR%%/tests/imagelib/imagelib.xml
-%%DATADIR%%/tests/linking.dtd
-%%DATADIR%%/tests/template.xml
-%%DATADIR%%/tests/tests/5.0/annotation.001.xml
-%%DATADIR%%/tests/tests/5.0/mathphrase.001.xml
-%%DATADIR%%/tests/tests/5.0/sidebar.001.xml
-%%DATADIR%%/tests/tests/5.0/table.019.xml
-%%DATADIR%%/tests/tests/5.0/termdef.001.xml
-%%DATADIR%%/tests/tests/admonitions.001.xml
-%%DATADIR%%/tests/tests/article.001.xml
-%%DATADIR%%/tests/tests/article.002.xml
-%%DATADIR%%/tests/tests/article.003.xml
-%%DATADIR%%/tests/tests/article.004.xml
-%%DATADIR%%/tests/tests/article.005.xml
-%%DATADIR%%/tests/tests/article.006.xml
-%%DATADIR%%/tests/tests/author.001.xml
-%%DATADIR%%/tests/tests/author.002.xml
-%%DATADIR%%/tests/tests/bibliography.001.xml
-%%DATADIR%%/tests/tests/bibliography.002.xml
-%%DATADIR%%/tests/tests/bibliography.003.xml
-%%DATADIR%%/tests/tests/bibliography.004.xml
-%%DATADIR%%/tests/tests/bibliography.005.xml
-%%DATADIR%%/tests/tests/bibliolist.001.xml
-%%DATADIR%%/tests/tests/blockinfo.001.xml
-%%DATADIR%%/tests/tests/blockinfo.002.xml
-%%DATADIR%%/tests/tests/blockquote.001.xml
-%%DATADIR%%/tests/tests/book.001.xml
-%%DATADIR%%/tests/tests/book.002.xml
-%%DATADIR%%/tests/tests/book.003.xml
-%%DATADIR%%/tests/tests/book.004.xml
-%%DATADIR%%/tests/tests/book.005.xml
-%%DATADIR%%/tests/tests/book.006.xml
-%%DATADIR%%/tests/tests/book.007.xml
-%%DATADIR%%/tests/tests/book.008.xml
-%%DATADIR%%/tests/tests/bookinfo.001.xml
-%%DATADIR%%/tests/tests/bridgehead.001.xml
-%%DATADIR%%/tests/tests/calloutlist.001.xml
-%%DATADIR%%/tests/tests/calloutlist.002.xml
-%%DATADIR%%/tests/tests/calloutlist.003.xml
-%%DATADIR%%/tests/tests/changebars.001.xml
-%%DATADIR%%/tests/tests/chapter.001.xml
-%%DATADIR%%/tests/tests/chapter.002.xml
-%%DATADIR%%/tests/tests/classsynopsis.001.xml
-%%DATADIR%%/tests/tests/cmdsynopsis.001.xml
-%%DATADIR%%/tests/tests/cmdsynopsis.002.xml
-%%DATADIR%%/tests/tests/cmdsynopsis.003.xml
-%%DATADIR%%/tests/tests/co.001.xml
-%%DATADIR%%/tests/tests/codesample.txt
-%%DATADIR%%/tests/tests/dir.001.xml
-%%DATADIR%%/tests/tests/docbook-43.001.xml
-%%DATADIR%%/tests/tests/draft.001.xml
-%%DATADIR%%/tests/tests/ebnf/productionset.001.xml
-%%DATADIR%%/tests/tests/ebnf/productionset.002.xml
-%%DATADIR%%/tests/tests/ebnf/productionset.003.xml
-%%DATADIR%%/tests/tests/ebnf/productionset.004.xml
-%%DATADIR%%/tests/tests/ebnf/productionset.005.xml
-%%DATADIR%%/tests/tests/ebnf/productionset.006.xml
-%%DATADIR%%/tests/tests/emphasis.001.xml
-%%DATADIR%%/tests/tests/epigraph.001.xml
-%%DATADIR%%/tests/tests/equation.001.xml
-%%DATADIR%%/tests/tests/equation.002.xml
-%%DATADIR%%/tests/tests/equation.003.xml
-%%DATADIR%%/tests/tests/equation.004.xml
-%%DATADIR%%/tests/tests/example.001.xml
-%%DATADIR%%/tests/tests/extensions.001.xml
-%%DATADIR%%/tests/tests/extensions.002.xml
-%%DATADIR%%/tests/tests/extensions.003.xml
-%%DATADIR%%/tests/tests/extensions.004.xml
-%%DATADIR%%/tests/tests/figure.001.xml
-%%DATADIR%%/tests/tests/figure.002.xml
-%%DATADIR%%/tests/tests/figure.003.xml
-%%DATADIR%%/tests/tests/figure.004.xml
-%%DATADIR%%/tests/tests/figure.005.xml
-%%DATADIR%%/tests/tests/firstterm.001.xml
-%%DATADIR%%/tests/tests/footnote.001.xml
-%%DATADIR%%/tests/tests/footnote.002.xml
-%%DATADIR%%/tests/tests/footnote.003.xml
-%%DATADIR%%/tests/tests/formalpara.001.xml
-%%DATADIR%%/tests/tests/formalpara.002.xml
-%%DATADIR%%/tests/tests/formalpara.003.xml
-%%DATADIR%%/tests/tests/funcsynopsis.001.xml
-%%DATADIR%%/tests/tests/glossary.001.xml
-%%DATADIR%%/tests/tests/glossary.002.data.xml
-%%DATADIR%%/tests/tests/glossary.002.xml
-%%DATADIR%%/tests/tests/glossary.003.xml
-%%DATADIR%%/tests/tests/imagelib.001.xml
-%%DATADIR%%/tests/tests/imageobjectco.001.xml
-%%DATADIR%%/tests/tests/index.001.xml
-%%DATADIR%%/tests/tests/index.002.xml
-%%DATADIR%%/tests/tests/index.003.xml
-%%DATADIR%%/tests/tests/indexterm.001.xml
-%%DATADIR%%/tests/tests/indexterm.002.xml
-%%DATADIR%%/tests/tests/indexterm.003.xml
-%%DATADIR%%/tests/tests/indexterm.004.xml
-%%DATADIR%%/tests/tests/indexterm.005.xml
-%%DATADIR%%/tests/tests/informaltable.001.xml
-%%DATADIR%%/tests/tests/informaltable.002.xml
-%%DATADIR%%/tests/tests/informaltable.003.xml
-%%DATADIR%%/tests/tests/informaltable.004.xml
-%%DATADIR%%/tests/tests/informaltable.005.xml
-%%DATADIR%%/tests/tests/informaltable.006.xml
-%%DATADIR%%/tests/tests/informaltable.007.xml
-%%DATADIR%%/tests/tests/informaltable.008.xml
-%%DATADIR%%/tests/tests/informaltable.009.xml
-%%DATADIR%%/tests/tests/informaltable.010.xml
-%%DATADIR%%/tests/tests/informaltable.011.xml
-%%DATADIR%%/tests/tests/informaltable.012.xml
-%%DATADIR%%/tests/tests/informaltable.013.xml
-%%DATADIR%%/tests/tests/informaltable.014.xml
-%%DATADIR%%/tests/tests/informaltable.015.xml
-%%DATADIR%%/tests/tests/informaltable.016.xml
-%%DATADIR%%/tests/tests/informaltable.017.xml
-%%DATADIR%%/tests/tests/informaltable.018.xml
-%%DATADIR%%/tests/tests/inline.001.xml
-%%DATADIR%%/tests/tests/inline.002.xml
-%%DATADIR%%/tests/tests/itemizedlist.001.xml
-%%DATADIR%%/tests/tests/itemizedlist.002.xml
-%%DATADIR%%/tests/tests/itemizedlist.003.xml
-%%DATADIR%%/tests/tests/itemizedlist.004.xml
-%%DATADIR%%/tests/tests/itemizedlist.005.xml
-%%DATADIR%%/tests/tests/itemizedlist.006.xml
-%%DATADIR%%/tests/tests/legalnotice.001.xml
-%%DATADIR%%/tests/tests/lineannotation.001.xml
-%%DATADIR%%/tests/tests/link.001.xml
-%%DATADIR%%/tests/tests/literallayout.001.xml
-%%DATADIR%%/tests/tests/literallayout.002.xml
-%%DATADIR%%/tests/tests/literallayout.003.xml
-%%DATADIR%%/tests/tests/lot.001.xml
-%%DATADIR%%/tests/tests/mathml/informalequation-mml.001.xml
-%%DATADIR%%/tests/tests/mathml/mathml.001.xml
-%%DATADIR%%/tests/tests/mediaobject.001.xml
-%%DATADIR%%/tests/tests/mediaobject.002.xml
-%%DATADIR%%/tests/tests/mediaobjectco.001.xml
-%%DATADIR%%/tests/tests/mediaobjectco.002.xml
-%%DATADIR%%/tests/tests/methodsynopsis.001.xml
-%%DATADIR%%/tests/tests/note.001.xml
-%%DATADIR%%/tests/tests/olink.001.xml
-%%DATADIR%%/tests/tests/orderedlist.001.xml
-%%DATADIR%%/tests/tests/orderedlist.002.xml
-%%DATADIR%%/tests/tests/orderedlist.003.xml
-%%DATADIR%%/tests/tests/part.001.xml
-%%DATADIR%%/tests/tests/personname.001.xml
-%%DATADIR%%/tests/tests/procedure.001.xml
-%%DATADIR%%/tests/tests/procedure.002.xml
-%%DATADIR%%/tests/tests/procedure.003.xml
-%%DATADIR%%/tests/tests/profile.001.xml
-%%DATADIR%%/tests/tests/programlisting.001.xml
-%%DATADIR%%/tests/tests/programlisting.002.xml
-%%DATADIR%%/tests/tests/programlisting.003.xml
-%%DATADIR%%/tests/tests/programlisting.004.xml
-%%DATADIR%%/tests/tests/programlisting.005.xml
-%%DATADIR%%/tests/tests/programlisting.006.xml
-%%DATADIR%%/tests/tests/programlistingco.001.xml
-%%DATADIR%%/tests/tests/programlistingco.002.xml
-%%DATADIR%%/tests/tests/protocol.001.xml
-%%DATADIR%%/tests/tests/pubsnumber.xml
-%%DATADIR%%/tests/tests/qandaset.001.xml
-%%DATADIR%%/tests/tests/qandaset.002.xml
-%%DATADIR%%/tests/tests/qandaset.003.xml
-%%DATADIR%%/tests/tests/qandaset.004.xml
-%%DATADIR%%/tests/tests/qandaset.005.xml
-%%DATADIR%%/tests/tests/refentry.001.xml
-%%DATADIR%%/tests/tests/refentry.002.xml
-%%DATADIR%%/tests/tests/refentry.003.xml
-%%DATADIR%%/tests/tests/refentry.004.xml
-%%DATADIR%%/tests/tests/refentry.005.xml
-%%DATADIR%%/tests/tests/refentry.006.xml
-%%DATADIR%%/tests/tests/refentry.007.xml
-%%DATADIR%%/tests/tests/refentry.008.xml
-%%DATADIR%%/tests/tests/refentry.009.xml
-%%DATADIR%%/tests/tests/refentry.010.xml
-%%DATADIR%%/tests/tests/reference.001.xml
-%%DATADIR%%/tests/tests/reference.002.xml
-%%DATADIR%%/tests/tests/remark.001.xml
-%%DATADIR%%/tests/tests/remark.002.xml
-%%DATADIR%%/tests/tests/revhistory.001.xml
-%%DATADIR%%/tests/tests/screen.001.xml
-%%DATADIR%%/tests/tests/sect1.001.xml
-%%DATADIR%%/tests/tests/sect1.002.xml
-%%DATADIR%%/tests/tests/section.001.xml
-%%DATADIR%%/tests/tests/section.002.xml
-%%DATADIR%%/tests/tests/section.003.xml
-%%DATADIR%%/tests/tests/section.004.xml
-%%DATADIR%%/tests/tests/section.005.xml
-%%DATADIR%%/tests/tests/segmentedlist.001.xml
-%%DATADIR%%/tests/tests/segmentedlist.002.xml
-%%DATADIR%%/tests/tests/segmentedlist.003.xml
-%%DATADIR%%/tests/tests/set.001.xml
-%%DATADIR%%/tests/tests/sgmltag.xml
-%%DATADIR%%/tests/tests/sidebar.001.xml
-%%DATADIR%%/tests/tests/simplelist.001.xml
-%%DATADIR%%/tests/tests/simplesect.001.xml
-%%DATADIR%%/tests/tests/stamp.001.xml
-%%DATADIR%%/tests/tests/stamp.002.xml
-%%DATADIR%%/tests/tests/stamp.003.xml
-%%DATADIR%%/tests/tests/stamp.004.xml
-%%DATADIR%%/tests/tests/stamp.005.xml
-%%DATADIR%%/tests/tests/stamp.006.xml
-%%DATADIR%%/tests/tests/stamp.007.xml
-%%DATADIR%%/tests/tests/stamp.008.xml
-%%DATADIR%%/tests/tests/stamp.009.xml
-%%DATADIR%%/tests/tests/stamp.010.xml
-%%DATADIR%%/tests/tests/stamp.011.xml
-%%DATADIR%%/tests/tests/stamp.012.xml
-%%DATADIR%%/tests/tests/stamp.013.xml
-%%DATADIR%%/tests/tests/stepalternatives.001.xml
-%%DATADIR%%/tests/tests/subtitle.001.xml
-%%DATADIR%%/tests/tests/superscript.001.xml
-%%DATADIR%%/tests/tests/svg.002.xml
-%%DATADIR%%/tests/tests/svg/svg.001.xml
-%%DATADIR%%/tests/tests/table.001.xml
-%%DATADIR%%/tests/tests/table.002.xml
-%%DATADIR%%/tests/tests/table.003.xml
-%%DATADIR%%/tests/tests/table.004.xml
-%%DATADIR%%/tests/tests/table.005.xml
-%%DATADIR%%/tests/tests/table.006.xml
-%%DATADIR%%/tests/tests/table.007.xml
-%%DATADIR%%/tests/tests/table.008.xml
-%%DATADIR%%/tests/tests/table.009.xml
-%%DATADIR%%/tests/tests/table.010.xml
-%%DATADIR%%/tests/tests/table.011.xml
-%%DATADIR%%/tests/tests/table.012.xml
-%%DATADIR%%/tests/tests/table.013.xml
-%%DATADIR%%/tests/tests/table.014.xml
-%%DATADIR%%/tests/tests/table.015.xml
-%%DATADIR%%/tests/tests/table.016.xml
-%%DATADIR%%/tests/tests/table.017.xml
-%%DATADIR%%/tests/tests/table.018.xml
-%%DATADIR%%/tests/tests/textobject.001.xml
-%%DATADIR%%/tests/tests/textobject.002.xml
-%%DATADIR%%/tests/tests/title.001.xml
-%%DATADIR%%/tests/tests/toc.001.xml
-%%DATADIR%%/tests/tests/ulink.001.xml
-%%DATADIR%%/tests/tests/ulink.002.xml
-%%DATADIR%%/tests/tests/variablelist.001.xml
-%%DATADIR%%/tests/tests/variablelist.002.xml
-%%DATADIR%%/tests/tests/variablelist.003.xml
-%%DATADIR%%/tests/tests/variablelist.004.xml
-%%DATADIR%%/tests/tests/wordsize.001.xml
-%%DATADIR%%/tests/tests/xmlspace.001.xml
-%%DATADIR%%/tests/tests/xref.001.xml
-%%DATADIR%%/tests/tests/xref.002.xml
-%%DATADIR%%/tests/tests/xref.003.xml
-%%DATADIR%%/tests/tests/xref.004.xml
-%%DATADIR%%/tests/tests/xrefstyle.001.xml
-%%DATADIR%%/tests/xrefstyle.xsl
-%%DATADIR%%/utils/docbook2odf
-%%DATADIR%%/utils/maketests
-%%DATADIR%%/xsl/common/common.xsl
-%%DATADIR%%/xsl/docbook.xsl
-%%DATADIR%%/xsl/document-content.xsl
-%%DATADIR%%/xsl/document-content/article.xsl
-%%DATADIR%%/xsl/document-content/articleinfo.xsl
-%%DATADIR%%/xsl/document-content/automatic-styles.xsl
-%%DATADIR%%/xsl/document-content/bibliography.xsl
-%%DATADIR%%/xsl/document-content/block.xsl
-%%DATADIR%%/xsl/document-content/book.xsl
-%%DATADIR%%/xsl/document-content/chapter.xsl
-%%DATADIR%%/xsl/document-content/formal.xsl
-%%DATADIR%%/xsl/document-content/info.xsl
-%%DATADIR%%/xsl/document-content/inline.xsl
-%%DATADIR%%/xsl/document-content/lists.xsl
-%%DATADIR%%/xsl/document-content/media.xsl
-%%DATADIR%%/xsl/document-content/notes.xsl
-%%DATADIR%%/xsl/document-content/paragraph.xsl
-%%DATADIR%%/xsl/document-content/section.xsl
-%%DATADIR%%/xsl/document-content/slides.xsl
-%%DATADIR%%/xsl/document-content/synop.xsl
-%%DATADIR%%/xsl/document-content/tables.xsl
-%%DATADIR%%/xsl/document-content/verbatim.xsl
-%%DATADIR%%/xsl/document-meta.xsl
-%%DATADIR%%/xsl/document-settings.xsl
-%%DATADIR%%/xsl/document-styles.xsl
-%%DATADIR%%/xsl/document-styles/automatic-styles.xsl
-%%DATADIR%%/xsl/document-styles/font-face-decls.xsl
-%%DATADIR%%/xsl/document-styles/master-styles.xsl
-%%DATADIR%%/xsl/document-styles/office-styles.xsl
-%%DATADIR%%/xsl/document-styles/page-layout.xsl
-%%DATADIR%%/xsl/manifest.xsl
-%%DATADIR%%/xsl/odf.xsl
-%%DATADIR%%/xsl/overlay/default.xsl
-%%DATADIR%%/xsl/param.xsl
-share/pixmaps/docbook2odf.png
diff --git a/textproc/dom4j/Makefile b/textproc/dom4j/Makefile
deleted file mode 100644
index 0d4bfd5a72bb..000000000000
--- a/textproc/dom4j/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-PORTNAME=	dom4j
-PORTVERSION=	1.6.1
-PORTREVISION=	2
-CATEGORIES=	textproc java
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open Source XML framework for Java
-WWW=		https://www.dom4j.org/
-
-DEPRECATED=	Outdated and unsupported upstream
-EXPIRATION_DATE=2025-04-30
-
-USES=		cpe java
-CPE_VENDOR=	${PORTNAME}_project
-NO_BUILD=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-
-PORTDOCS=	*
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar \
-			${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-
-.include <bsd.port.mk>
diff --git a/textproc/dom4j/distinfo b/textproc/dom4j/distinfo
deleted file mode 100644
index 0a6a248f55d1..000000000000
--- a/textproc/dom4j/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (dom4j-1.6.1.tar.gz) = 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f
-SIZE (dom4j-1.6.1.tar.gz) = 9687211
diff --git a/textproc/dom4j/pkg-descr b/textproc/dom4j/pkg-descr
deleted file mode 100644
index ceae165791ce..000000000000
--- a/textproc/dom4j/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-dom4j is an easy to use, open source library for working with XML, XPath
-and XSLT on the Java platform using the Java Collections Framework and
-with full support for DOM, SAX and JAXP.
diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
deleted file mode 100644
index cfcb00f3d191..000000000000
--- a/textproc/domc/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME=	domc
-PORTVERSION=	0.8.0
-PORTREVISION=	5
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.ioplex.com/~miallen/domc/dl/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Lightweight implementation of the DOM in ANSI C
-WWW=		https://www.ioplex.com/~miallen/domc/
-
-LICENSE=	MIT
-
-DEPRECATED=	Obsolete, doesn't support HTML5, DOM Level 4 and DOM 2020-06
-EXPIRATION_DATE=2025-04-30
-
-LIB_DEPENDS=	libexpat.so:textproc/expat2 \
-		libmba.so:devel/libmba
-
-USES=		gmake
-MAKE_ENV=	prefix="${LOCALBASE}" INSTDIR="${STAGEDIR}${PREFIX}"
-MAKE_ARGS=	CC="${CC}" RPM_OPT_FLAGS="${CFLAGS}" \
-		MAJVERSION=${PORTVERSION:R:R}
-CFLAGS+=	-D__USE_XOPEN=__XSI_VISIBLE
-USE_LDCONFIG=	yes
-
-.include <bsd.port.mk>
diff --git a/textproc/domc/distinfo b/textproc/domc/distinfo
deleted file mode 100644
index 7fda586aef20..000000000000
--- a/textproc/domc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (domc-0.8.0.tar.gz) = 37ce6e14a7c705ae9b9340a05c93c8dae89a7055d09e46ca1e84c3a8d7cffcbe
-SIZE (domc-0.8.0.tar.gz) = 122571
diff --git a/textproc/domc/files/patch-Makefile b/textproc/domc/files/patch-Makefile
deleted file mode 100644
index b0fef605251f..000000000000
--- a/textproc/domc/files/patch-Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.orig	2004-09-09 22:31:42 UTC
-+++ Makefile
-@@ -1,7 +1,7 @@
--prefix     = /usr/local
-+prefix    ?= /usr/local
- includedir = $(prefix)/include
- libdir     = $(prefix)/lib
--mandir     = $(prefix)/man
-+mandir     = $(prefix)/share/man
- CC         = gcc
- LIBNAME    = domc
- MAJVERSION = 0.8
-@@ -16,10 +16,10 @@ MAN        = DOM_CharacterData.3m.gz DOM_Document.3m.g
- OBJS       = src/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o src/mbs.o
- MAN        = DOM_CharacterData.3m.gz DOM_Document.3m.gz DOM_Element.3m.gz DOM_Implementation.3m.gz DOM_NamedNodeMap.3m.gz DOM_Node.3m.gz DOM_NodeList.3m.gz DOM_Text.3m.gz
- 
--all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h
-+all: $(SONAME) src/defines.h
- 
- $(SONAME): $(OBJS)
--	$(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
-+	$(CC) $(LDFLAGS) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
- 
- .c.a:
- 	$(CC) $(CFLAGS) -c -o $*.o $<
-@@ -29,16 +29,15 @@ $(SONAME): $(OBJS)
- .c.o:
- 	$(CC) $(CFLAGS) -fpic -c -o $*.o $<
- 
-+install: prefix=$(INSTDIR)
- install: $(SONAME)
- 	install -d $(libdir)
- 	install -d $(includedir)
- 	install -d $(mandir)/man3
--	install -m 644 $(ARNAME) $(libdir)
--	install -m 755 $(SONAME) $(libdir)
-+	${BSD_INSTALL_LIB} $(SONAME) $(libdir)
- 	cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so
--	install -m 444 src/domc.h $(includedir)
--	-install -m 444 docs/man/*.3m.gz $(mandir)/man3
--	-/sbin/ldconfig $(libdir)
-+	${BSD_INSTALL_DATA} src/domc.h $(includedir)
-+	${BSD_INSTALL_DATA} docs/man/*.3m.gz $(mandir)/man3
- 
- zip:
- 	cd .. && zip -lr $(DISTRO)/.$(DISTRO).zip $(DISTRO) -x $(DISTRO)/.* $(DISTRO)/docs/man/* $(DISTRO)/tests/utf8* $(DISTRO)/domc.lib $(DISTRO)/domc.dll $(DISTRO)/domc_s.lib
diff --git a/textproc/domc/files/patch-src_defines.h b/textproc/domc/files/patch-src_defines.h
deleted file mode 100644
index 223a6be82cb3..000000000000
--- a/textproc/domc/files/patch-src_defines.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/defines.h~
-+++ src/defines.h
-@@ -1,7 +1,7 @@
- #ifndef DEFINES_H
- #define DEFINES_H
- 
--#if defined(__sparc__)
-+#if 0 //defined(__sparc__)
- 
- #define NL "\n"
- #define HAVE_ENCDEC 0
diff --git a/textproc/domc/files/patch-src_domc.h b/textproc/domc/files/patch-src_domc.h
deleted file mode 100644
index d4e2ddcb22d3..000000000000
--- a/textproc/domc/files/patch-src_domc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/domc.h.orig	Thu Sep  9 23:52:10 2004
-+++ src/domc.h	Sun Apr 10 22:14:52 2005
-@@ -33,7 +33,7 @@
- #include <errno.h>
- #include <time.h>
- 
--#if defined(__sparc__)
-+#if 0 //defined(__sparc__)
-   #include <sys/inttypes.h>
- #elif defined(_WIN32)
-   typedef unsigned __int64 uint64_t;
diff --git a/textproc/domc/pkg-descr b/textproc/domc/pkg-descr
deleted file mode 100644
index 64c059a9a60d..000000000000
--- a/textproc/domc/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-DOMC is a light weight implementation of the DOM in ANSI C as specified in
-the W3C Document Object Model Level 1, Level 2, and Level 2 Events
-recommendations.
diff --git a/textproc/domc/pkg-plist b/textproc/domc/pkg-plist
deleted file mode 100644
index cd4782f05020..000000000000
--- a/textproc/domc/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-include/domc.h
-lib/libdomc.so
-lib/libdomc.so.0
-lib/libdomc.so.0.8.0
-share/man/man3/DOM_CharacterData.3m.gz
-share/man/man3/DOM_Document.3m.gz
-share/man/man3/DOM_Element.3m.gz
-share/man/man3/DOM_Implementation.3m.gz
-share/man/man3/DOM_NamedNodeMap.3m.gz
-share/man/man3/DOM_Node.3m.gz
-share/man/man3/DOM_NodeList.3m.gz
-share/man/man3/DOM_Text.3m.gz
diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile
deleted file mode 100644
index b3b09b00b91b..000000000000
--- a/textproc/ekhtml/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-PORTNAME=	ekhtml
-PORTVERSION=	0.3.2
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	El-Kabong is a speedy, yet forgiving, SAX-style HTML parser
-WWW=		https://ekhtml.sourceforge.net/
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Abandonware and obsolete, last release in 2002
-EXPIRATION_DATE=2025-04-30
-
-GNU_CONFIGURE=	yes
-USES=		gmake libtool
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
-INSTALL_TARGET=	install-strip
-
-PLIST_FILES=	include/ekhtml.h lib/libekhtml.a \
-		lib/libekhtml.so lib/libekhtml.so.0 \
-		lib/libekhtml.so.0.0.0
-
-.include <bsd.port.mk>
diff --git a/textproc/ekhtml/distinfo b/textproc/ekhtml/distinfo
deleted file mode 100644
index 1eafb61add42..000000000000
--- a/textproc/ekhtml/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ekhtml-0.3.2.tar.gz) = 1ed1f0166cd56552253cd67abcfa51728ff6b88f39bab742dbf894b2974dc8d6
-SIZE (ekhtml-0.3.2.tar.gz) = 234917
diff --git a/textproc/ekhtml/pkg-descr b/textproc/ekhtml/pkg-descr
deleted file mode 100644
index c935f3c65c49..000000000000
--- a/textproc/ekhtml/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-El-Kabong is a high-speed, forgiving, sax-style HTML parser.
-Its aim is to provide consumers with a very fast, clean,
-lightweight library which parses HTML quickly, while forgiving
-syntactically incorrect tags.
diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile
deleted file mode 100644
index 8d9294e42c3b..000000000000
--- a/textproc/estraier/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-PORTNAME=	estraier
-PORTVERSION=	1.2.30
-PORTREVISION=	4
-CATEGORIES=	textproc
-MASTER_SITES=	https://dbmx.net/estraier/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Full-text search system for personal use
-WWW=		https://dbmx.net/estraier/
-
-DEPRECATED=	Obsolete and abandonware, last update in 2005
-EXPIRATION_DATE=2025-04-30
-
-LIB_DEPENDS=	libqdbm.so:databases/qdbm
-
-USES=		iconv
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-sysqdbm \
-		--enable-dlfilter \
-		--enable-devel
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/include
-INSTALL_TARGET=	install-strip
-
-OPTIONS_DEFINE=	CHASEN MECAB KAKASI
-OPTIONS_DEFAULT=	KAKASI
-CHASEN_DESC=	Japanese Morphological Analysis Support
-MECAB_DESC=	Part-of-Speech and Morphological Analyzer
-KAKASI_DESC=	Language processing filter/converter
-
-CHASEN_LIB_DEPENDS=	libchasen.so:japanese/chasen-base
-CHASEN_CONFIGURE_ENABLE=	chasen
-
-KAKASI_LIB_DEPENDS=	libkakasi.so:japanese/kakasi
-KAKASI_CONFIGURE_ENABLE=	kakasi
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMECAB} && ${ARCH} == "i386"
-LIB_DEPENDS+=	libmecab.so:japanese/mecab
-CONFIGURE_ARGS+=	--enable-mecab
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lc||' -e 's|-liconv|${ICONV_LIB}|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		's|$$(RELCFLAGS)|@CFLAGS@| ; \
-		 s|^LDFLAGS =|& @LDFLAGS@ | ; \
-		 s|HOME|LOCALBASE|g ; \
-		 s|:/usr/local/lib||g ; \
-		 s|-I/usr/local/include||g ; \
-		 s|-L/usr/local/lib||g' ${WRKSRC}/Makefile.in
-
-post-install:
-.for file in estindex estmbtomh estserver estsiutil estxview
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/textproc/estraier/distinfo b/textproc/estraier/distinfo
deleted file mode 100644
index 2ca26c52d939..000000000000
--- a/textproc/estraier/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (estraier-1.2.30.tar.gz) = 13cc5dc9d8c00938539cad65f910b2e74d5d81cfef5796d3794a139526937ede
-SIZE (estraier-1.2.30.tar.gz) = 501480
diff --git a/textproc/estraier/pkg-descr b/textproc/estraier/pkg-descr
deleted file mode 100644
index 13dac005610e..000000000000
--- a/textproc/estraier/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Estraier is a full-text search system for personal use. Full-text search means
-functions to search lots of documents for some documents including specified
-words. The principal purpose of Estraier is to realize a full-text search
-system of a web site. It functions similarly to Google, but for a personal
-web site or sites in an intranet.
diff --git a/textproc/estraier/pkg-plist b/textproc/estraier/pkg-plist
deleted file mode 100644
index c889aa8c8fc0..000000000000
--- a/textproc/estraier/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-bin/estautoreg
-bin/estdochtml
-bin/estfind
-bin/estgzhtml
-bin/estindex
-bin/estmanhtml
-bin/estmbtomh
-bin/estpdfhtml
-bin/estppthtml
-bin/estserver
-bin/estsiutil
-bin/estwolels
-bin/estxdthtml
-bin/estxdwhtml
-bin/estxlshtml
-bin/estxview
-libexec/estmerge.cgi
-libexec/estsearch.cgi
-libexec/estspellen
-%%DATADIR%%/COPYING
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/estmerge.conf
-%%DATADIR%%/estmerge.tmpl
-%%DATADIR%%/estmerge.top
-%%DATADIR%%/estsearch.conf
-%%DATADIR%%/estsearch.tmpl
-%%DATADIR%%/estsearch.top
-%%DATADIR%%/estxview.css
-%%DATADIR%%/estxview.dtd
-%%DATADIR%%/estxview.xsl
-%%DATADIR%%/locale/ja/estmerge.conf
-%%DATADIR%%/locale/ja/estmerge.tmpl
-%%DATADIR%%/locale/ja/estmerge.top
-%%DATADIR%%/locale/ja/estsearch.conf
-%%DATADIR%%/locale/ja/estsearch.tmpl
-%%DATADIR%%/locale/ja/estsearch.top
-%%DATADIR%%/skins/school/estmerge.tmpl
-%%DATADIR%%/skins/school/estsearch.tmpl
-%%DATADIR%%/skins/stoic/estmerge.tmpl
-%%DATADIR%%/skins/stoic/estsearch.tmpl
-%%DATADIR%%/spex-ja.html
-%%DATADIR%%/spex.html
diff --git a/textproc/flip/Makefile b/textproc/flip/Makefile
deleted file mode 100644
index d7dfc9115ad0..000000000000
--- a/textproc/flip/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-PORTNAME=	flip
-PORTVERSION=	1.19
-PORTREVISION=	1
-CATEGORIES=	textproc
-MASTER_SITES=	LOCAL/itetcu
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Convert text file line endings between Unix and DOS formats
-
-DEPRECATED=	Unmaintained and dead upstream, consider using converters/dos2unix
-EXPIRATION_DATE=2025-04-30
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-ALL_TARGET=	bsd
-PLIST_FILES=	bin/flip share/man/man1/flip.1.gz
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/flip ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/flip.1 ${STAGEDIR}${PREFIX}/share/man/man1
-
-.include <bsd.port.mk>
diff --git a/textproc/flip/distinfo b/textproc/flip/distinfo
deleted file mode 100644
index 301cb8f6a482..000000000000
--- a/textproc/flip/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (flip.1.19.tar.Z) = a2d220d5ee8743c177b4232e2bde7ba76ea0880ddba5c7c047b6b5532e1bc878
-SIZE (flip.1.19.tar.Z) = 42208
diff --git a/textproc/flip/pkg-descr b/textproc/flip/pkg-descr
deleted file mode 100644
index 4327489211aa..000000000000
--- a/textproc/flip/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This program converts line endings of text files between MS-DOS and **IX
-formats. It detects binary files in a nearly foolproof way and leaves them
-alone unless you override this. It will also leave files alone that are already
-in the right format and preserves file timestamps. User interrupts are handled
-gracefully and no garbage or corrupted files left behind. 'flip' does not
-convert files to a different character set, and it cannot handle Apple
-Macintosh line endings (CR only). For that (and more), you can use the 'recode'
-program (package 'recode').
diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile
index 8fb55472e521..6c3c0a30b384 100644
--- a/textproc/fzf/Makefile
+++ b/textproc/fzf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fzf
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.60.2
+DISTVERSION=	0.61.0
 CATEGORIES=	textproc
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 DISTFILES=	go.mod:gomod
@@ -21,7 +21,7 @@ GH_PROJECT=	fzf
 GO_MODULE=	github.com/junegunn/fzf
 GO_BUILDFLAGS=	-ldflags="-X main.version=${DISTVERSION} -X main.revision=${COMMIT_ID} -s -w"
 
-COMMIT_ID=	a24d274
+COMMIT_ID=	e15cba0
 
 PLIST_FILES=	bin/fzf share/man/man1/fzf.1.gz
 
diff --git a/textproc/fzf/distinfo b/textproc/fzf/distinfo
index e5af260f5c70..e46225e0bb75 100644
--- a/textproc/fzf/distinfo
+++ b/textproc/fzf/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746176038
-SHA256 (go/textproc_fzf/junegunn-fzf-v0.60.2_GH0/go.mod) = a06e949f8972065b83f8befa608e5cfc2e6d0cb196bdda5e5ab2a3212cdf519d
-SIZE (go/textproc_fzf/junegunn-fzf-v0.60.2_GH0/go.mod) = 526
-SHA256 (go/textproc_fzf/junegunn-fzf-v0.60.2_GH0/junegunn-fzf-v0.60.2_GH0.tar.gz) = 0df4bcba5519762ec2a51296d9b44f15543ec1f67946b027e0339a02b19a055c
-SIZE (go/textproc_fzf/junegunn-fzf-v0.60.2_GH0/junegunn-fzf-v0.60.2_GH0.tar.gz) = 328212
+TIMESTAMP = 1746448166
+SHA256 (go/textproc_fzf/junegunn-fzf-v0.61.0_GH0/go.mod) = d28136ddcb65827d87be980ad5387e4aeee3f01edcb3f0c74aa031b895ae4f55
+SIZE (go/textproc_fzf/junegunn-fzf-v0.61.0_GH0/go.mod) = 527
+SHA256 (go/textproc_fzf/junegunn-fzf-v0.61.0_GH0/junegunn-fzf-v0.61.0_GH0.tar.gz) = 5d72cdf708c6adc240b3b43dfecd218cf4703ea609422fb4d62812e9f79f0a12
+SIZE (go/textproc_fzf/junegunn-fzf-v0.61.0_GH0/junegunn-fzf-v0.61.0_GH0.tar.gz) = 330880
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
deleted file mode 100644
index bde666016866..000000000000
--- a/textproc/gmetadom/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-PORTNAME=	gmetadom
-PORTVERSION=	0.2.6
-PORTREVISION=	7
-CATEGORIES=	textproc
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Collection of DOM Implementations
-WWW=		https://gmetadom.sourceforge.net/
-
-LIB_DEPENDS=	libgdome.so:textproc/gdome2
-
-DEPRECATED=	Abandonware, last release in 2007
-EXPIRATION_DATE=2025-04-30
-
-USES=		compiler:c++11-lang gmake gnome iconv libtool localbase \
-		pathfix pkgconfig
-USE_GNOME=	glib20 libxml2
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-
-OPTIONS_DEFINE=	OCAML
-OPTIONS_SUB=	yes
-
-OCAML_DESC=	OCAML language support
-
-OCAML_BUILD_DEPENDS=	ocamlfind:devel/ocaml-findlib \
-			ocamlc:lang/ocaml
-OCAML_CONFIGURE_OFF=	HAVE_OCAMLDEP=no HAVE_OCAMLFIND=no HAVE_OCAMLOPT=no
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/-lstdc++//g' \
-		${WRKSRC}/src/gdome_cpp_smart/Makefile.in \
-		${WRKSRC}/src/gdome_cpp_smart/test/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/textproc/gmetadom/distinfo b/textproc/gmetadom/distinfo
deleted file mode 100644
index a48246434bc0..000000000000
--- a/textproc/gmetadom/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gmetadom-0.2.6.tar.gz) = 2f1e286dfceb7877f90c72de7e5e17a87d0e3f8121feff794a6f637bc1a6756a
-SIZE (gmetadom-0.2.6.tar.gz) = 509165
diff --git a/textproc/gmetadom/files/patch-src-gdome_cpp_smart-test-main.cc b/textproc/gmetadom/files/patch-src-gdome_cpp_smart-test-main.cc
deleted file mode 100644
index 96bd0210dd9b..000000000000
--- a/textproc/gmetadom/files/patch-src-gdome_cpp_smart-test-main.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gdome_cpp_smart/test/main.cc.orig	Thu Jul 17 11:35:05 2003
-+++ src/gdome_cpp_smart/test/main.cc	Thu Jul 17 11:36:16 2003
-@@ -21,6 +21,7 @@
-  * or send an email to <luca.padovani@cs.unibo.it>
-  */
- 
-+#include <assert.h>
- #include <config.h>
- 
- #include <gdome.h>
diff --git a/textproc/gmetadom/files/patch-src_gdome__cpp__smart_include_GdomeSmartDOMTraits.hh b/textproc/gmetadom/files/patch-src_gdome__cpp__smart_include_GdomeSmartDOMTraits.hh
deleted file mode 100644
index 4e051d5fed4d..000000000000
--- a/textproc/gmetadom/files/patch-src_gdome__cpp__smart_include_GdomeSmartDOMTraits.hh
+++ /dev/null
@@ -1,15 +0,0 @@
-./../include/GdomeSmartDOMTraits.hh:101:25: error: non-constant-expression cannot be narrowed from type 'std::__1::char_traits<unsigned short>::int_type' (aka 'unsigned long') to 'std::__1::char_traits<unsigned short>::char_type' (aka 'unsigned short') in initializer list [-Wc++11-narrowing]
-      char_type __r = { __c };
-                        ^~~
-
---- src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh.orig	2018-07-29 11:48:09 UTC
-+++ src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh
-@@ -98,7 +98,7 @@ namespace std {
-     static char_type 
-     to_char_type(const int_type& __c)
-     {
--      char_type __r = { __c };
-+      char_type __r = { static_cast<char_type>(__c) };
-       return __r;
-     }
- 
diff --git a/textproc/gmetadom/pkg-descr b/textproc/gmetadom/pkg-descr
deleted file mode 100644
index a3ea7d85420e..000000000000
--- a/textproc/gmetadom/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-GMetaDOM is a collection of librares, each library providing a DOM
-implementation. Currently available bindings are for C++ (smart pointers)
-and Objective Caml.
-
-The basic idea is that, given the availability of DOM implementations for
-the C programming language (like Gdome2), and given the uniformity of the
-DOM interfaces, bindings for various programming languages based on the C
-implementation can be built automatically, providing a small number of hand-
-coded classes and a set of scripts for the automatic generation of the
-remaining ones.
-
-The advantages of such approach should be evident. In particular, for
-languages like C++ where a number of different alternative DOM implementations
-are feasible, each with different characteristics like easiness of use,
-runtime flexibility, resource requirements, the approach of automatic
-generation permits to create a set of coherent implementations addressing
-such issues separately, ultimately allowing the developer to choose the
-library which fits best her needs.
diff --git a/textproc/gmetadom/pkg-plist b/textproc/gmetadom/pkg-plist
deleted file mode 100644
index dd7ac1851818..000000000000
--- a/textproc/gmetadom/pkg-plist
+++ /dev/null
@@ -1,159 +0,0 @@
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOM.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMAttr.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMBasic.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMCDATASection.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMChar.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMCharacterData.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMComment.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMCore.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMDOMException.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMDOMImplementation.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMDOMString.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMDOMTimeStamp.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMDocument.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMDocumentFragment.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMDocumentType.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMElement.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMEntity.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMEntityReference.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMEvent.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMEventListener.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMEventTarget.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMEvents.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMGdomeString.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMHelper.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMMutationEvent.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMNamedNodeMap.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMNode.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMNodeList.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMNotation.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMProcessingInstruction.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMText.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMTraits.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMUCS4String.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMUTF16String.hh
-include/gmetadom/gdome_cpp_smart/GdomeSmartDOMUTF8String.hh
-lib/libgmetadom_gdome_cpp_smart.a
-lib/libgmetadom_gdome_cpp_smart.so
-lib/libgmetadom_gdome_cpp_smart.so.0
-lib/libgmetadom_gdome_cpp_smart.so.0.2.6
-%%OCAML%%lib/ocaml/gdome2/META
-%%OCAML%%lib/ocaml/gdome2/gdome.cmi
-%%OCAML%%lib/ocaml/gdome2/gdome.mli
-%%OCAML%%lib/ocaml/gdome2/gdomeDOMExceptionT.cmi
-%%OCAML%%lib/ocaml/gdome2/gdomeDOMExceptionT.mli
-%%OCAML%%lib/ocaml/gdome2/gdomeInit.cmi
-%%OCAML%%lib/ocaml/gdome2/gdomeInit.cmo
-%%OCAML%%lib/ocaml/gdome2/gdomeInit.cmx
-%%OCAML%%lib/ocaml/gdome2/gdomeInit.ml
-%%OCAML%%lib/ocaml/gdome2/gdomeInit.mli
-%%OCAML%%lib/ocaml/gdome2/gdomeInit.o
-%%OCAML%%lib/ocaml/gdome2/gdomeNodeTypeT.cmi
-%%OCAML%%lib/ocaml/gdome2/gdomeNodeTypeT.mli
-%%OCAML%%lib/ocaml/gdome2/gdomeT.cmi
-%%OCAML%%lib/ocaml/gdome2/gdomeT.mli
-%%OCAML%%lib/ocaml/gdome2/iAttr.cmi
-%%OCAML%%lib/ocaml/gdome2/iAttr.ml
-%%OCAML%%lib/ocaml/gdome2/iCDATASection.cmi
-%%OCAML%%lib/ocaml/gdome2/iCDATASection.ml
-%%OCAML%%lib/ocaml/gdome2/iCharacterData.cmi
-%%OCAML%%lib/ocaml/gdome2/iCharacterData.ml
-%%OCAML%%lib/ocaml/gdome2/iComment.cmi
-%%OCAML%%lib/ocaml/gdome2/iComment.ml
-%%OCAML%%lib/ocaml/gdome2/iDOMImplementation.cmi
-%%OCAML%%lib/ocaml/gdome2/iDOMImplementation.ml
-%%OCAML%%lib/ocaml/gdome2/iDOMImplementation.mli
-%%OCAML%%lib/ocaml/gdome2/iDOMString.cmi
-%%OCAML%%lib/ocaml/gdome2/iDOMString.ml
-%%OCAML%%lib/ocaml/gdome2/iDocument.cmi
-%%OCAML%%lib/ocaml/gdome2/iDocument.ml
-%%OCAML%%lib/ocaml/gdome2/iDocumentFragment.cmi
-%%OCAML%%lib/ocaml/gdome2/iDocumentFragment.ml
-%%OCAML%%lib/ocaml/gdome2/iDocumentType.cmi
-%%OCAML%%lib/ocaml/gdome2/iDocumentType.ml
-%%OCAML%%lib/ocaml/gdome2/iElement.cmi
-%%OCAML%%lib/ocaml/gdome2/iElement.ml
-%%OCAML%%lib/ocaml/gdome2/iEntity.cmi
-%%OCAML%%lib/ocaml/gdome2/iEntity.ml
-%%OCAML%%lib/ocaml/gdome2/iEntityReference.cmi
-%%OCAML%%lib/ocaml/gdome2/iEntityReference.ml
-%%OCAML%%lib/ocaml/gdome2/iEvent.cmi
-%%OCAML%%lib/ocaml/gdome2/iEvent.ml
-%%OCAML%%lib/ocaml/gdome2/iEventTarget.cmi
-%%OCAML%%lib/ocaml/gdome2/iEventTarget.ml
-%%OCAML%%lib/ocaml/gdome2/iMutationEvent.cmi
-%%OCAML%%lib/ocaml/gdome2/iMutationEvent.ml
-%%OCAML%%lib/ocaml/gdome2/iNamedNodeMap.cmi
-%%OCAML%%lib/ocaml/gdome2/iNamedNodeMap.ml
-%%OCAML%%lib/ocaml/gdome2/iNode.cmi
-%%OCAML%%lib/ocaml/gdome2/iNode.ml
-%%OCAML%%lib/ocaml/gdome2/iNodeList.cmi
-%%OCAML%%lib/ocaml/gdome2/iNodeList.ml
-%%OCAML%%lib/ocaml/gdome2/iNotation.cmi
-%%OCAML%%lib/ocaml/gdome2/iNotation.ml
-%%OCAML%%lib/ocaml/gdome2/iProcessingInstruction.cmi
-%%OCAML%%lib/ocaml/gdome2/iProcessingInstruction.ml
-%%OCAML%%lib/ocaml/gdome2/iText.cmi
-%%OCAML%%lib/ocaml/gdome2/iText.ml
-%%OCAML%%lib/ocaml/gdome2/libmlgdome.a
-%%OCAML%%lib/ocaml/gdome2/mlgdome.a
-%%OCAML%%lib/ocaml/gdome2/mlgdome.cma
-%%OCAML%%lib/ocaml/gdome2/mlgdome.cmxa
-%%OCAML%%lib/ocaml/gdome2/mlgdomevalue.h
-%%OCAML%%lib/ocaml/gdome2/mlogdome.a
-%%OCAML%%lib/ocaml/gdome2/mlogdome.cma
-%%OCAML%%lib/ocaml/gdome2/mlogdome.cmxa
-%%OCAML%%lib/ocaml/gdome2/tAttr.cmi
-%%OCAML%%lib/ocaml/gdome2/tAttr.mli
-%%OCAML%%lib/ocaml/gdome2/tCDATASection.cmi
-%%OCAML%%lib/ocaml/gdome2/tCDATASection.mli
-%%OCAML%%lib/ocaml/gdome2/tCharacterData.cmi
-%%OCAML%%lib/ocaml/gdome2/tCharacterData.mli
-%%OCAML%%lib/ocaml/gdome2/tComment.cmi
-%%OCAML%%lib/ocaml/gdome2/tComment.mli
-%%OCAML%%lib/ocaml/gdome2/tDOMImplementation.cmi
-%%OCAML%%lib/ocaml/gdome2/tDOMImplementation.mli
-%%OCAML%%lib/ocaml/gdome2/tDOMString.cmi
-%%OCAML%%lib/ocaml/gdome2/tDOMString.mli
-%%OCAML%%lib/ocaml/gdome2/tDOMTimeStamp.cmi
-%%OCAML%%lib/ocaml/gdome2/tDOMTimeStamp.mli
-%%OCAML%%lib/ocaml/gdome2/tDocument.cmi
-%%OCAML%%lib/ocaml/gdome2/tDocument.mli
-%%OCAML%%lib/ocaml/gdome2/tDocumentFragment.cmi
-%%OCAML%%lib/ocaml/gdome2/tDocumentFragment.mli
-%%OCAML%%lib/ocaml/gdome2/tDocumentType.cmi
-%%OCAML%%lib/ocaml/gdome2/tDocumentType.mli
-%%OCAML%%lib/ocaml/gdome2/tElement.cmi
-%%OCAML%%lib/ocaml/gdome2/tElement.mli
-%%OCAML%%lib/ocaml/gdome2/tEntity.cmi
-%%OCAML%%lib/ocaml/gdome2/tEntity.mli
-%%OCAML%%lib/ocaml/gdome2/tEntityReference.cmi
-%%OCAML%%lib/ocaml/gdome2/tEntityReference.mli
-%%OCAML%%lib/ocaml/gdome2/tEvent.cmi
-%%OCAML%%lib/ocaml/gdome2/tEvent.mli
-%%OCAML%%lib/ocaml/gdome2/tEventListener.cmi
-%%OCAML%%lib/ocaml/gdome2/tEventListener.mli
-%%OCAML%%lib/ocaml/gdome2/tEventTarget.cmi
-%%OCAML%%lib/ocaml/gdome2/tEventTarget.mli
-%%OCAML%%lib/ocaml/gdome2/tMutationEvent.cmi
-%%OCAML%%lib/ocaml/gdome2/tMutationEvent.mli
-%%OCAML%%lib/ocaml/gdome2/tNamedNodeMap.cmi
-%%OCAML%%lib/ocaml/gdome2/tNamedNodeMap.mli
-%%OCAML%%lib/ocaml/gdome2/tNode.cmi
-%%OCAML%%lib/ocaml/gdome2/tNode.mli
-%%OCAML%%lib/ocaml/gdome2/tNodeList.cmi
-%%OCAML%%lib/ocaml/gdome2/tNodeList.mli
-%%OCAML%%lib/ocaml/gdome2/tNotation.cmi
-%%OCAML%%lib/ocaml/gdome2/tNotation.mli
-%%OCAML%%lib/ocaml/gdome2/tProcessingInstruction.cmi
-%%OCAML%%lib/ocaml/gdome2/tProcessingInstruction.mli
-%%OCAML%%lib/ocaml/gdome2/tText.cmi
-%%OCAML%%lib/ocaml/gdome2/tText.mli
-%%OCAML%%lib/ocaml/stublibs/dllmlgdome.so
-%%OCAML%%lib/ocaml/stublibs/dllmlgdome.so.owner
-libdata/pkgconfig/gdome2-cpp-smart.pc
-@comment Shim to clean-up a previous bad install - this can be removed
-@comment PORTVERSION > 0.2.6
-@exec if [ -d %D/lib/ocaml/gdome2 ] ; then /bin/rm -f %D/lib/ocaml/gdome2/* 2>/dev/null && /bin/rmdir %D/lib/ocaml/gdome2 2>/dev/null ; fi
-@exec if [ -f %D/lib/ocaml/stublibs/dllmlgdome.so ] ; then /bin/rm -f %D/lib/ocaml/stublibs/dllmlgdome.so 2>/dev/null ; fi
-@exec if [ -f %D/lib/ocaml/stublibs/dllmlgdome.so.owner ] ; then /bin/rm -f %D/lib/ocaml/stublibs/dllmlgdome.so.owner 2>/dev/null ; fi
diff --git a/textproc/grass/Makefile b/textproc/grass/Makefile
new file mode 100644
index 000000000000..f3074282e273
--- /dev/null
+++ b/textproc/grass/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	grass
+DISTVERSION=	0.13.4
+CATEGORIES=	textproc
+
+MAINTAINER=	vishwin@FreeBSD.org
+COMMENT=	A Sass compiler written purely in Rust
+WWW=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cargo
+CARGO_INSTALL_PATH=	crates/lib
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	connorskees
+GH_TUPLE=	sass:sass-spec:f726527:sass_spec/sass-spec
+
+PLIST_FILES=	bin/grass
+
+.include <bsd.port.mk>
diff --git a/textproc/grass/Makefile.crates b/textproc/grass/Makefile.crates
new file mode 100644
index 000000000000..e696871f47f5
--- /dev/null
+++ b/textproc/grass/Makefile.crates
@@ -0,0 +1,63 @@
+CARGO_CRATES=	ahash-0.8.7 \
+		anstream-0.6.11 \
+		anstyle-1.0.6 \
+		anstyle-parse-0.2.3 \
+		anstyle-query-1.0.2 \
+		anstyle-wincon-3.0.2 \
+		bitflags-2.4.2 \
+		bumpalo-3.14.0 \
+		cfg-if-1.0.0 \
+		clap-4.4.18 \
+		clap_builder-4.4.18 \
+		clap_lex-0.6.0 \
+		codemap-0.1.3 \
+		colorchoice-1.0.0 \
+		equivalent-1.0.1 \
+		errno-0.3.8 \
+		fastrand-2.0.1 \
+		getrandom-0.2.12 \
+		hashbrown-0.13.2 \
+		hashbrown-0.14.3 \
+		indexmap-2.2.2 \
+		js-sys-0.3.68 \
+		lasso-0.7.2 \
+		libc-0.2.153 \
+		linux-raw-sys-0.4.13 \
+		log-0.4.20 \
+		once_cell-1.19.0 \
+		paste-1.0.14 \
+		phf-0.11.2 \
+		phf_generator-0.11.2 \
+		phf_macros-0.11.2 \
+		phf_shared-0.11.2 \
+		ppv-lite86-0.2.17 \
+		proc-macro2-1.0.78 \
+		quote-1.0.35 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		rustix-0.38.31 \
+		siphasher-0.3.11 \
+		strsim-0.10.0 \
+		syn-2.0.48 \
+		tempfile-3.10.0 \
+		unicode-ident-1.0.12 \
+		utf8parse-0.2.1 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.91 \
+		wasm-bindgen-backend-0.2.91 \
+		wasm-bindgen-macro-0.2.91 \
+		wasm-bindgen-macro-support-0.2.91 \
+		wasm-bindgen-shared-0.2.91 \
+		windows-sys-0.52.0 \
+		windows-targets-0.52.0 \
+		windows_aarch64_gnullvm-0.52.0 \
+		windows_aarch64_msvc-0.52.0 \
+		windows_i686_gnu-0.52.0 \
+		windows_i686_msvc-0.52.0 \
+		windows_x86_64_gnu-0.52.0 \
+		windows_x86_64_gnullvm-0.52.0 \
+		windows_x86_64_msvc-0.52.0 \
+		zerocopy-0.7.32 \
+		zerocopy-derive-0.7.32
diff --git a/textproc/grass/distinfo b/textproc/grass/distinfo
new file mode 100644
index 000000000000..312650519c5a
--- /dev/null
+++ b/textproc/grass/distinfo
@@ -0,0 +1,131 @@
+TIMESTAMP = 1746303750
+SHA256 (rust/crates/ahash-0.8.7.crate) = 77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01
+SIZE (rust/crates/ahash-0.8.7.crate) = 42894
+SHA256 (rust/crates/anstream-0.6.11.crate) = 6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5
+SIZE (rust/crates/anstream-0.6.11.crate) = 30239
+SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
+SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
+SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
+SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
+SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
+SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
+SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
+SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
+SHA256 (rust/crates/bitflags-2.4.2.crate) = ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf
+SIZE (rust/crates/bitflags-2.4.2.crate) = 42602
+SHA256 (rust/crates/bumpalo-3.14.0.crate) = 7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec
+SIZE (rust/crates/bumpalo-3.14.0.crate) = 82400
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/clap-4.4.18.crate) = 1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c
+SIZE (rust/crates/clap-4.4.18.crate) = 55269
+SHA256 (rust/crates/clap_builder-4.4.18.crate) = 4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7
+SIZE (rust/crates/clap_builder-4.4.18.crate) = 163538
+SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1
+SIZE (rust/crates/clap_lex-0.6.0.crate) = 12272
+SHA256 (rust/crates/codemap-0.1.3.crate) = b9e769b5c8c8283982a987c6e948e540254f1058d5a74b8794914d4ef5fc2a24
+SIZE (rust/crates/codemap-0.1.3.crate) = 9483
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
+SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/fastrand-2.0.1.crate) = 25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5
+SIZE (rust/crates/fastrand-2.0.1.crate) = 14664
+SHA256 (rust/crates/getrandom-0.2.12.crate) = 190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5
+SIZE (rust/crates/getrandom-0.2.12.crate) = 36163
+SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e
+SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265
+SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
+SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/indexmap-2.2.2.crate) = 824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520
+SIZE (rust/crates/indexmap-2.2.2.crate) = 76160
+SHA256 (rust/crates/js-sys-0.3.68.crate) = 406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee
+SIZE (rust/crates/js-sys-0.3.68.crate) = 80764
+SHA256 (rust/crates/lasso-0.7.2.crate) = 4644821e1c3d7a560fe13d842d13f587c07348a1a05d3a797152d41c90c56df2
+SIZE (rust/crates/lasso-0.7.2.crate) = 78691
+SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
+SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
+SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
+SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
+SIZE (rust/crates/log-0.4.20.crate) = 38307
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
+SIZE (rust/crates/paste-1.0.14.crate) = 18157
+SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
+SIZE (rust/crates/phf-0.11.2.crate) = 21569
+SHA256 (rust/crates/phf_generator-0.11.2.crate) = 48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0
+SIZE (rust/crates/phf_generator-0.11.2.crate) = 14190
+SHA256 (rust/crates/phf_macros-0.11.2.crate) = 3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b
+SIZE (rust/crates/phf_macros-0.11.2.crate) = 4748
+SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
+SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/proc-macro2-1.0.78.crate) = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae
+SIZE (rust/crates/proc-macro2-1.0.78.crate) = 47158
+SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
+SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rustix-0.38.31.crate) = 6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949
+SIZE (rust/crates/rustix-0.38.31.crate) = 375443
+SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
+SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/syn-2.0.48.crate) = 0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f
+SIZE (rust/crates/syn-2.0.48.crate) = 250566
+SHA256 (rust/crates/tempfile-3.10.0.crate) = a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67
+SIZE (rust/crates/tempfile-3.10.0.crate) = 33376
+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.91.crate) = c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f
+SIZE (rust/crates/wasm-bindgen-0.2.91.crate) = 182689
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.91.crate) = c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b
+SIZE (rust/crates/wasm-bindgen-backend-0.2.91.crate) = 28345
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.91.crate) = b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed
+SIZE (rust/crates/wasm-bindgen-macro-0.2.91.crate) = 13898
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.91.crate) = 642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.91.crate) = 20091
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.91.crate) = 4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838
+SIZE (rust/crates/wasm-bindgen-shared-0.2.91.crate) = 7267
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.52.0.crate) = 8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd
+SIZE (rust/crates/windows-targets-0.52.0.crate) = 6229
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = 430182
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.0.crate) = bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef
+SIZE (rust/crates/windows_aarch64_msvc-0.52.0.crate) = 821663
+SHA256 (rust/crates/windows_i686_gnu-0.52.0.crate) = a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313
+SIZE (rust/crates/windows_i686_gnu-0.52.0.crate) = 870285
+SHA256 (rust/crates/windows_i686_msvc-0.52.0.crate) = ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a
+SIZE (rust/crates/windows_i686_msvc-0.52.0.crate) = 888693
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd
+SIZE (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 826213
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 430165
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.0.crate) = dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04
+SIZE (rust/crates/windows_x86_64_msvc-0.52.0.crate) = 821600
+SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
+SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
+SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
+SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623
+SHA256 (connorskees-grass-0.13.4_GH0.tar.gz) = 577858cce48440d161c6036d83dbfb3c173058f9df297977b13b8646f88a4906
+SIZE (connorskees-grass-0.13.4_GH0.tar.gz) = 278287
+SHA256 (sass-sass-spec-f726527_GH0.tar.gz) = 50dadd2850c17a1170ad6a4250aa44a224e758d56f2da93476c2c0f18f58415a
+SIZE (sass-sass-spec-f726527_GH0.tar.gz) = 762421
diff --git a/textproc/grass/pkg-descr b/textproc/grass/pkg-descr
new file mode 100644
index 000000000000..b9dc5f786a14
--- /dev/null
+++ b/textproc/grass/pkg-descr
@@ -0,0 +1,12 @@
+This crate aims to provide a high level interface for compiling
+Sass into plain CSS. It offers a very limited API, currently exposing
+only 2 functions.
+
+In addition to a library, this crate also includes a binary that
+is intended to act as an invisible replacement to the Sass commandline
+executable.
+
+This crate aims to achieve complete feature parity with the dart-sass
+reference implementation. A deviation from the dart-sass implementation
+can be considered a bug except for in the case of error messages
+and error spans.
diff --git a/textproc/harper/Makefile b/textproc/harper/Makefile
index 470efd7f993a..ff1e7522c6f2 100644
--- a/textproc/harper/Makefile
+++ b/textproc/harper/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	harper
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.31.0
+DISTVERSION=	0.33.0
 CATEGORIES=	textproc
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/textproc/harper/Makefile.crates b/textproc/harper/Makefile.crates
index 49c9fd6bf06f..82c00720e9b8 100644
--- a/textproc/harper/Makefile.crates
+++ b/textproc/harper/Makefile.crates
@@ -17,6 +17,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		auto_impl-1.2.1 \
 		autocfg-1.4.0 \
 		backtrace-0.3.74 \
+		base64-0.22.1 \
 		bitflags-1.3.2 \
 		bitflags-2.8.0 \
 		blanket-0.4.0 \
@@ -29,7 +30,8 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		cast-0.3.0 \
 		cc-1.0.106 \
 		cfg-if-1.0.0 \
-		chrono-0.4.40 \
+		cfg_aliases-0.2.1 \
+		chrono-0.4.41 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
 		ciborium-ll-0.2.2 \
@@ -81,7 +83,13 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		hashbrown-0.15.2 \
 		heck-0.5.0 \
 		hermit-abi-0.4.0 \
+		http-1.3.1 \
+		http-body-1.0.1 \
+		http-body-util-0.1.3 \
 		httparse-1.9.5 \
+		hyper-1.6.0 \
+		hyper-rustls-0.27.5 \
+		hyper-util-0.1.11 \
 		iana-time-zone-0.1.62 \
 		iana-time-zone-haiku-0.1.2 \
 		icu_collections-1.5.0 \
@@ -98,6 +106,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		idna-1.0.3 \
 		idna_adapter-1.2.0 \
 		indexmap-2.9.0 \
+		ipnet-2.11.0 \
 		is-docker-0.2.0 \
 		is-macro-0.3.7 \
 		is-terminal-0.4.15 \
@@ -109,7 +118,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		js-sys-0.3.77 \
 		lazy_static-1.5.0 \
 		levenshtein_automata-0.2.1 \
-		libc-0.2.169 \
+		libc-0.2.172 \
 		libredox-0.1.3 \
 		litemap-0.7.4 \
 		lock_api-0.4.12 \
@@ -117,6 +126,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		lru-0.14.0 \
 		lsp-types-0.94.1 \
 		memchr-2.7.4 \
+		mime-0.3.17 \
 		miniz_oxide-0.8.3 \
 		mio-1.0.3 \
 		nu-ansi-term-0.46.0 \
@@ -144,6 +154,9 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		pulldown-cmark-escape-0.11.0 \
 		quickcheck-1.0.3 \
 		quickcheck_macros-1.0.0 \
+		quinn-0.11.6 \
+		quinn-proto-0.11.9 \
+		quinn-udp-0.5.10 \
 		quote-1.0.38 \
 		r-efi-5.2.0 \
 		rand-0.8.5 \
@@ -157,8 +170,15 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		regex-1.11.1 \
 		regex-automata-0.4.9 \
 		regex-syntax-0.8.5 \
+		reqwest-0.12.15 \
 		resolve-path-0.1.0 \
+		ring-0.17.9 \
 		rustc-demangle-0.1.24 \
+		rustc-hash-2.1.1 \
+		rustls-0.23.26 \
+		rustls-pemfile-2.2.0 \
+		rustls-pki-types-1.11.0 \
+		rustls-webpki-0.103.1 \
 		rustversion-1.0.19 \
 		ryu-1.0.18 \
 		same-file-1.0.6 \
@@ -169,17 +189,20 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		serde_json-1.0.140 \
 		serde_repr-0.1.19 \
 		serde_spanned-0.6.8 \
+		serde_urlencoded-0.7.1 \
 		sharded-slab-0.1.7 \
 		siphasher-1.0.1 \
 		slab-0.4.9 \
 		smallvec-1.15.0 \
-		socket2-0.5.8 \
+		socket2-0.5.9 \
 		stable_deref_trait-1.2.0 \
 		strsim-0.11.1 \
 		strum-0.27.1 \
 		strum_macros-0.27.1 \
+		subtle-2.6.1 \
 		syn-1.0.109 \
 		syn-2.0.96 \
+		sync_wrapper-1.0.2 \
 		synstructure-0.13.1 \
 		thin-vec-0.2.13 \
 		thiserror-1.0.69 \
@@ -189,13 +212,17 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		thread_local-1.1.8 \
 		tinystr-0.7.6 \
 		tinytemplate-1.2.1 \
+		tinyvec-1.9.0 \
+		tinyvec_macros-0.1.1 \
 		tokio-1.44.2 \
 		tokio-macros-2.5.0 \
+		tokio-rustls-0.26.2 \
 		tokio-util-0.7.13 \
 		toml-0.8.19 \
 		toml_datetime-0.6.8 \
 		toml_edit-0.22.22 \
 		tower-0.4.13 \
+		tower-0.5.2 \
 		tower-layer-0.3.3 \
 		tower-lsp-0.20.0 \
 		tower-lsp-macros-0.9.0 \
@@ -228,6 +255,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		tree-sitter-swift-0.4.0 \
 		tree-sitter-toml-0.20.0 \
 		tree-sitter-typescript-0.20.5 \
+		try-lock-0.2.5 \
 		typst-syntax-0.13.1 \
 		typst-timing-0.13.1 \
 		typst-utils-0.13.1 \
@@ -240,6 +268,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		unicode-width-0.1.14 \
 		unicode-width-0.2.0 \
 		unscanny-0.1.0 \
+		untrusted-0.9.0 \
 		url-2.5.4 \
 		utf16_iter-1.0.5 \
 		utf8_iter-1.0.4 \
@@ -248,31 +277,47 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		valuable-0.1.1 \
 		version_check-0.9.5 \
 		walkdir-2.5.0 \
+		want-0.3.1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasi-0.14.2+wasi-0.2.4 \
 		wasm-bindgen-0.2.100 \
 		wasm-bindgen-backend-0.2.100 \
+		wasm-bindgen-futures-0.4.50 \
 		wasm-bindgen-macro-0.2.100 \
 		wasm-bindgen-macro-support-0.2.100 \
 		wasm-bindgen-shared-0.2.100 \
+		web-sys-0.3.77 \
 		web-time-1.1.0 \
+		webpki-roots-0.26.8 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.9 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-core-0.52.0 \
 		windows-link-0.1.1 \
+		windows-registry-0.4.0 \
+		windows-result-0.3.2 \
+		windows-strings-0.3.1 \
 		windows-sys-0.52.0 \
 		windows-sys-0.59.0 \
 		windows-targets-0.52.6 \
+		windows-targets-0.53.0 \
 		windows_aarch64_gnullvm-0.52.6 \
+		windows_aarch64_gnullvm-0.53.0 \
 		windows_aarch64_msvc-0.52.6 \
+		windows_aarch64_msvc-0.53.0 \
 		windows_i686_gnu-0.52.6 \
+		windows_i686_gnu-0.53.0 \
 		windows_i686_gnullvm-0.52.6 \
+		windows_i686_gnullvm-0.53.0 \
 		windows_i686_msvc-0.52.6 \
+		windows_i686_msvc-0.53.0 \
 		windows_x86_64_gnu-0.52.6 \
+		windows_x86_64_gnu-0.53.0 \
 		windows_x86_64_gnullvm-0.52.6 \
+		windows_x86_64_gnullvm-0.53.0 \
 		windows_x86_64_msvc-0.52.6 \
+		windows_x86_64_msvc-0.53.0 \
 		winnow-0.6.24 \
 		wit-bindgen-rt-0.39.0 \
 		write16-1.0.0 \
@@ -284,5 +329,6 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		zerocopy-derive-0.7.35 \
 		zerofrom-0.1.5 \
 		zerofrom-derive-0.1.5 \
+		zeroize-1.8.1 \
 		zerovec-0.10.4 \
 		zerovec-derive-0.10.3
diff --git a/textproc/harper/distinfo b/textproc/harper/distinfo
index 805cbad3bfe2..01eeff6f2bf1 100644
--- a/textproc/harper/distinfo
+++ b/textproc/harper/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745762736
+TIMESTAMP = 1746513708
 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
@@ -37,6 +37,8 @@ SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d
 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
 SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
 SIZE (rust/crates/backtrace-0.3.74.crate) = 88516
+SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
+SIZE (rust/crates/base64-0.22.1.crate) = 81597
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
 SHA256 (rust/crates/bitflags-2.8.0.crate) = 8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36
@@ -61,8 +63,10 @@ SHA256 (rust/crates/cc-1.0.106.crate) = 066fce287b1d4eafef758e89e09d724a24808a91
 SIZE (rust/crates/cc-1.0.106.crate) = 80289
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/chrono-0.4.40.crate) = 1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c
-SIZE (rust/crates/chrono-0.4.40.crate) = 229824
+SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
+SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
 SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
 SIZE (rust/crates/ciborium-0.2.2.crate) = 35611
 SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757
@@ -165,8 +169,20 @@ SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d3
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.4.0.crate) = fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc
 SIZE (rust/crates/hermit-abi-0.4.0.crate) = 16310
+SHA256 (rust/crates/http-1.3.1.crate) = f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565
+SIZE (rust/crates/http-1.3.1.crate) = 106063
+SHA256 (rust/crates/http-body-1.0.1.crate) = 1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184
+SIZE (rust/crates/http-body-1.0.1.crate) = 6125
+SHA256 (rust/crates/http-body-util-0.1.3.crate) = b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a
+SIZE (rust/crates/http-body-util-0.1.3.crate) = 16975
 SHA256 (rust/crates/httparse-1.9.5.crate) = 7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946
 SIZE (rust/crates/httparse-1.9.5.crate) = 39029
+SHA256 (rust/crates/hyper-1.6.0.crate) = cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80
+SIZE (rust/crates/hyper-1.6.0.crate) = 153923
+SHA256 (rust/crates/hyper-rustls-0.27.5.crate) = 2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2
+SIZE (rust/crates/hyper-rustls-0.27.5.crate) = 34660
+SHA256 (rust/crates/hyper-util-0.1.11.crate) = 497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2
+SIZE (rust/crates/hyper-util-0.1.11.crate) = 75973
 SHA256 (rust/crates/iana-time-zone-0.1.62.crate) = b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127
 SIZE (rust/crates/iana-time-zone-0.1.62.crate) = 35775
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
@@ -199,6 +215,8 @@ SHA256 (rust/crates/idna_adapter-1.2.0.crate) = daca1df1c957320b2cf139ac61e7bd64
 SIZE (rust/crates/idna_adapter-1.2.0.crate) = 8206
 SHA256 (rust/crates/indexmap-2.9.0.crate) = cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e
 SIZE (rust/crates/indexmap-2.9.0.crate) = 91214
+SHA256 (rust/crates/ipnet-2.11.0.crate) = 469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130
+SIZE (rust/crates/ipnet-2.11.0.crate) = 29718
 SHA256 (rust/crates/is-docker-0.2.0.crate) = 928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3
 SIZE (rust/crates/is-docker-0.2.0.crate) = 2664
 SHA256 (rust/crates/is-macro-0.3.7.crate) = 1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4
@@ -221,8 +239,8 @@ SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591
 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
 SHA256 (rust/crates/levenshtein_automata-0.2.1.crate) = 0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25
 SIZE (rust/crates/levenshtein_automata-0.2.1.crate) = 13549
-SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a
-SIZE (rust/crates/libc-0.2.169.crate) = 757901
+SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa
+SIZE (rust/crates/libc-0.2.172.crate) = 791646
 SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
 SIZE (rust/crates/libredox-0.1.3.crate) = 6068
 SHA256 (rust/crates/litemap-0.7.4.crate) = 4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104
@@ -237,6 +255,8 @@ SHA256 (rust/crates/lsp-types-0.94.1.crate) = c66bfd44a06ae10647fe3f8214762e9369
 SIZE (rust/crates/lsp-types-0.94.1.crate) = 66997
 SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
 SIZE (rust/crates/memchr-2.7.4.crate) = 96670
+SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
+SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/miniz_oxide-0.8.3.crate) = b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924
 SIZE (rust/crates/miniz_oxide-0.8.3.crate) = 61827
 SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
@@ -291,6 +311,12 @@ SHA256 (rust/crates/quickcheck-1.0.3.crate) = 588f6378e4dd99458b60ec275b4477add4
 SIZE (rust/crates/quickcheck-1.0.3.crate) = 28069
 SHA256 (rust/crates/quickcheck_macros-1.0.0.crate) = b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9
 SIZE (rust/crates/quickcheck_macros-1.0.0.crate) = 5275
+SHA256 (rust/crates/quinn-0.11.6.crate) = 62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef
+SIZE (rust/crates/quinn-0.11.6.crate) = 78222
+SHA256 (rust/crates/quinn-proto-0.11.9.crate) = a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d
+SIZE (rust/crates/quinn-proto-0.11.9.crate) = 209286
+SHA256 (rust/crates/quinn-udp-0.5.10.crate) = e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944
+SIZE (rust/crates/quinn-udp-0.5.10.crate) = 30920
 SHA256 (rust/crates/quote-1.0.38.crate) = 0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc
 SIZE (rust/crates/quote-1.0.38.crate) = 31252
 SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
@@ -317,10 +343,24 @@ SHA256 (rust/crates/regex-automata-0.4.9.crate) = 809e8dc61f6de73b46c85f4c964863
 SIZE (rust/crates/regex-automata-0.4.9.crate) = 618525
 SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c
 SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
+SHA256 (rust/crates/reqwest-0.12.15.crate) = d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb
+SIZE (rust/crates/reqwest-0.12.15.crate) = 199320
 SHA256 (rust/crates/resolve-path-0.1.0.crate) = 321e5e41b3b192dab6f1e75b9deacb6688b4b8c5e68906a78e8f43e7c2887bb5
 SIZE (rust/crates/resolve-path-0.1.0.crate) = 9129
+SHA256 (rust/crates/ring-0.17.9.crate) = e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24
+SIZE (rust/crates/ring-0.17.9.crate) = 1474639
 SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
+SHA256 (rust/crates/rustc-hash-2.1.1.crate) = 357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d
+SIZE (rust/crates/rustc-hash-2.1.1.crate) = 14154
+SHA256 (rust/crates/rustls-0.23.26.crate) = df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0
+SIZE (rust/crates/rustls-0.23.26.crate) = 347849
+SHA256 (rust/crates/rustls-pemfile-2.2.0.crate) = dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50
+SIZE (rust/crates/rustls-pemfile-2.2.0.crate) = 25849
+SHA256 (rust/crates/rustls-pki-types-1.11.0.crate) = 917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c
+SIZE (rust/crates/rustls-pki-types-1.11.0.crate) = 63933
+SHA256 (rust/crates/rustls-webpki-0.103.1.crate) = fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03
+SIZE (rust/crates/rustls-webpki-0.103.1.crate) = 820273
 SHA256 (rust/crates/rustversion-1.0.19.crate) = f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4
 SIZE (rust/crates/rustversion-1.0.19.crate) = 20616
 SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
@@ -341,6 +381,8 @@ SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c9
 SIZE (rust/crates/serde_repr-0.1.19.crate) = 9997
 SHA256 (rust/crates/serde_spanned-0.6.8.crate) = 87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1
 SIZE (rust/crates/serde_spanned-0.6.8.crate) = 9330
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
 SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
 SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
 SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
@@ -349,8 +391,8 @@ SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0b
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
 SHA256 (rust/crates/smallvec-1.15.0.crate) = 8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9
 SIZE (rust/crates/smallvec-1.15.0.crate) = 38113
-SHA256 (rust/crates/socket2-0.5.8.crate) = c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8
-SIZE (rust/crates/socket2-0.5.8.crate) = 56309
+SHA256 (rust/crates/socket2-0.5.9.crate) = 4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef
+SIZE (rust/crates/socket2-0.5.9.crate) = 57432
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
 SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
@@ -359,10 +401,14 @@ SHA256 (rust/crates/strum-0.27.1.crate) = f64def088c51c9510a8579e3c5d67c65349dcf
 SIZE (rust/crates/strum-0.27.1.crate) = 7467
 SHA256 (rust/crates/strum_macros-0.27.1.crate) = c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8
 SIZE (rust/crates/strum_macros-0.27.1.crate) = 29670
+SHA256 (rust/crates/subtle-2.6.1.crate) = 13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292
+SIZE (rust/crates/subtle-2.6.1.crate) = 14562
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
 SHA256 (rust/crates/syn-2.0.96.crate) = d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80
 SIZE (rust/crates/syn-2.0.96.crate) = 297497
+SHA256 (rust/crates/sync_wrapper-1.0.2.crate) = 0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263
+SIZE (rust/crates/sync_wrapper-1.0.2.crate) = 6958
 SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
 SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
 SHA256 (rust/crates/thin-vec-0.2.13.crate) = a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b
@@ -381,10 +427,16 @@ SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1
 SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
 SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
 SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
+SHA256 (rust/crates/tinyvec-1.9.0.crate) = 09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71
+SIZE (rust/crates/tinyvec-1.9.0.crate) = 54137
+SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
+SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
 SHA256 (rust/crates/tokio-1.44.2.crate) = e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48
 SIZE (rust/crates/tokio-1.44.2.crate) = 841618
 SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
 SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
+SHA256 (rust/crates/tokio-rustls-0.26.2.crate) = 8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b
+SIZE (rust/crates/tokio-rustls-0.26.2.crate) = 31655
 SHA256 (rust/crates/tokio-util-0.7.13.crate) = d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078
 SIZE (rust/crates/tokio-util-0.7.13.crate) = 115191
 SHA256 (rust/crates/toml-0.8.19.crate) = a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e
@@ -395,6 +447,8 @@ SHA256 (rust/crates/toml_edit-0.22.22.crate) = 4ae48d6208a266e853d946088ed816055
 SIZE (rust/crates/toml_edit-0.22.22.crate) = 106387
 SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
 SIZE (rust/crates/tower-0.4.13.crate) = 106906
+SHA256 (rust/crates/tower-0.5.2.crate) = d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9
+SIZE (rust/crates/tower-0.5.2.crate) = 109417
 SHA256 (rust/crates/tower-layer-0.3.3.crate) = 121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e
 SIZE (rust/crates/tower-layer-0.3.3.crate) = 6180
 SHA256 (rust/crates/tower-lsp-0.20.0.crate) = d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508
@@ -459,6 +513,8 @@ SHA256 (rust/crates/tree-sitter-toml-0.20.0.crate) = ca517f578a98b23d20780247cc2
 SIZE (rust/crates/tree-sitter-toml-0.20.0.crate) = 18602
 SHA256 (rust/crates/tree-sitter-typescript-0.20.5.crate) = c8bc1d2c24276a48ef097a71b56888ac9db63717e8f8d0b324668a27fd619670
 SIZE (rust/crates/tree-sitter-typescript-0.20.5.crate) = 1349236
+SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
+SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
 SHA256 (rust/crates/typst-syntax-0.13.1.crate) = 5ba949ac75a374ea6b2f61d32e6c63acb818e6179d16f78b2cba988fbb5e23a8
 SIZE (rust/crates/typst-syntax-0.13.1.crate) = 73642
 SHA256 (rust/crates/typst-timing-0.13.1.crate) = 8ba4541664e98be2023db2267d92af206190eb903063a0229c668e1ab9dca976
@@ -483,6 +539,8 @@ SHA256 (rust/crates/unicode-width-0.2.0.crate) = 1fc81956842c57dac11422a97c3b819
 SIZE (rust/crates/unicode-width-0.2.0.crate) = 271509
 SHA256 (rust/crates/unscanny-0.1.0.crate) = e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47
 SIZE (rust/crates/unscanny-0.1.0.crate) = 10338
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
 SHA256 (rust/crates/url-2.5.4.crate) = 32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60
 SIZE (rust/crates/url-2.5.4.crate) = 81097
 SHA256 (rust/crates/utf16_iter-1.0.5.crate) = c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246
@@ -499,6 +557,8 @@ SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853a
 SIZE (rust/crates/version_check-0.9.5.crate) = 15554
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
+SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
+SIZE (rust/crates/want-0.3.1.crate) = 6398
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
 SHA256 (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3
@@ -507,14 +567,20 @@ SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241
 SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
 SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
 SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.50.crate) = 555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61
+SIZE (rust/crates/wasm-bindgen-futures-0.4.50.crate) = 16181
 SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
 SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
 SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
 SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
 SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
 SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
+SHA256 (rust/crates/web-sys-0.3.77.crate) = 33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2
+SIZE (rust/crates/web-sys-0.3.77.crate) = 638246
 SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
 SIZE (rust/crates/web-time-1.1.0.crate) = 18026
+SHA256 (rust/crates/webpki-roots-0.26.8.crate) = 2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9
+SIZE (rust/crates/webpki-roots-0.26.8.crate) = 257981
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
@@ -527,28 +593,52 @@ SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838c
 SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
 SHA256 (rust/crates/windows-link-0.1.1.crate) = 76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38
 SIZE (rust/crates/windows-link-0.1.1.crate) = 6154
+SHA256 (rust/crates/windows-registry-0.4.0.crate) = 4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3
+SIZE (rust/crates/windows-registry-0.4.0.crate) = 12572
+SHA256 (rust/crates/windows-result-0.3.2.crate) = c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252
+SIZE (rust/crates/windows-result-0.3.2.crate) = 13399
+SHA256 (rust/crates/windows-strings-0.3.1.crate) = 87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319
+SIZE (rust/crates/windows-strings-0.3.1.crate) = 13922
 SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
 SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
 SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
 SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323
 SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
 SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
+SHA256 (rust/crates/windows-targets-0.53.0.crate) = b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b
+SIZE (rust/crates/windows-targets-0.53.0.crate) = 7020
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
 SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.53.0.crate) = 86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764
+SIZE (rust/crates/windows_aarch64_gnullvm-0.53.0.crate) = 782443
 SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
 SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
+SHA256 (rust/crates/windows_aarch64_msvc-0.53.0.crate) = c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c
+SIZE (rust/crates/windows_aarch64_msvc-0.53.0.crate) = 834446
 SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
 SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
+SHA256 (rust/crates/windows_i686_gnu-0.53.0.crate) = c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3
+SIZE (rust/crates/windows_i686_gnu-0.53.0.crate) = 936973
 SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
 SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
+SHA256 (rust/crates/windows_i686_gnullvm-0.53.0.crate) = 9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11
+SIZE (rust/crates/windows_i686_gnullvm-0.53.0.crate) = 854056
 SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
 SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
+SHA256 (rust/crates/windows_i686_msvc-0.53.0.crate) = 581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d
+SIZE (rust/crates/windows_i686_msvc-0.53.0.crate) = 903450
 SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
 SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
+SHA256 (rust/crates/windows_x86_64_gnu-0.53.0.crate) = 2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba
+SIZE (rust/crates/windows_x86_64_gnu-0.53.0.crate) = 902585
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
 SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.53.0.crate) = 0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57
+SIZE (rust/crates/windows_x86_64_gnullvm-0.53.0.crate) = 782434
 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
+SHA256 (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486
+SIZE (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 834400
 SHA256 (rust/crates/winnow-0.6.24.crate) = c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a
 SIZE (rust/crates/winnow-0.6.24.crate) = 165680
 SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
@@ -571,9 +661,11 @@ SHA256 (rust/crates/zerofrom-0.1.5.crate) = cff3ee08c995dee1859d998dea82f7374f28
 SIZE (rust/crates/zerofrom-0.1.5.crate) = 5091
 SHA256 (rust/crates/zerofrom-derive-0.1.5.crate) = 595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808
 SIZE (rust/crates/zerofrom-derive-0.1.5.crate) = 8285
+SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
+SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
 SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079
 SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
-SHA256 (Automattic-harper-v0.31.0_GH0.tar.gz) = 3eefcd5cf70c623aa571b9cb5457f8e317852de47dd35689a5d7eafb62cfa195
-SIZE (Automattic-harper-v0.31.0_GH0.tar.gz) = 2763968
+SHA256 (Automattic-harper-v0.33.0_GH0.tar.gz) = 6abc9d0ae180da80b1862a980ab6258cea85daa21c2ac35b5fc65e44b4d2a10e
+SIZE (Automattic-harper-v0.33.0_GH0.tar.gz) = 3663124
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
deleted file mode 100644
index 214d934a4a88..000000000000
--- a/textproc/htdig/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-PORTNAME=	htdig
-PORTVERSION=	3.2.0.b6
-PORTREVISION=	8
-CATEGORIES=	textproc www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3.2.0b6
-DISTNAME=	htdig-3.2.0b6
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	WWW indexing and searching system
-WWW=		https://sourceforge.net/projects/htdig/
-
-LICENSE=	LGPL20+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Abandonware, multiple unresolved bugs and no unicode support etc
-EXPIRATION_DATE=2025-04-30
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--with-config-dir=${PREFIX}/etc/htdig \
-		--with-default-config-file=${PREFIX}/etc/htdig/htdig.conf \
-		--with-common-dir=${PREFIX}/share/htdig/common \
-		--with-database-dir=${PREFIX}/share/htdig/database \
-		--with-cgi-bin-dir=${PREFIX}/www/cgi-bin \
-		--with-search-dir=${PREFIX}/www/data \
-		--with-image-dir=${PREFIX}/www/icons/htdig \
-		--with-image-url-prefix=/icons/htdig \
-		--with-ssl
-USES=		alias cpe libtool ssl
-CPE_VENDOR=	${PORTNAME}_project
-USE_CXXSTD=	c++98
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-LDFLAGS+=	-L${OPENSSLLIB}
-CFLAGS+=	-I${OPENSSLINC}
-
-CONFLICTS_INSTALL=	htdump mifluz # bin/htdb_dump bin/htdb_load bin/htdb_stat bin/htdump
-
-OPTIONS_DEFINE=	APACHE DOCS
-OPTIONS_DEFAULT=	APACHE
-
-APACHE_USES=	apache
-APACHE_CONFIGURE_ON=	--with-apache=${LOCALBASE}/sbin
-
-PORTDOCS=	*
-
-post-install:
-	@${MV} ${STAGEDIR}${PREFIX}/etc/htdig/htdig.conf ${STAGEDIR}${PREFIX}/etc/htdig/htdig.conf.sample
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-.for f in ChangeLog ChangeLog.0 README STATUS
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for f in *.html *.gif
-	${INSTALL_DATA} ${WRKSRC}/htdoc/${f} ${STAGEDIR}${DOCSDIR}/html
-.endfor
-
-.include <bsd.port.mk>
diff --git a/textproc/htdig/distinfo b/textproc/htdig/distinfo
deleted file mode 100644
index a8ab799c74f6..000000000000
--- a/textproc/htdig/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (htdig-3.2.0b6.tar.gz) = 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8
-SIZE (htdig-3.2.0b6.tar.gz) = 3104936
diff --git a/textproc/htdig/files/patch-config-xss b/textproc/htdig/files/patch-config-xss
deleted file mode 100644
index 32a044a7b3f1..000000000000
--- a/textproc/htdig/files/patch-config-xss
+++ /dev/null
@@ -1,24 +0,0 @@
---- htsearch/htsearch.cc.orig	Fri May 28 06:15:24 2004
-+++ htsearch/htsearch.cc	Mon Sep 12 23:16:06 2005
-@@ -211,8 +211,7 @@
- 	}
- 	if (access((char*)configFile, R_OK) < 0)
- 	{
--	    reportError(form("Unable to read configuration file '%s'",
--			     configFile.get()));
-+           reportError("Unable to read configuration file");
- 	}
- 	config->Read(configFile);
- 
---- htsearch/qtest.cc.orig	Fri May 28 06:15:25 2004
-+++ htsearch/qtest.cc	Mon Sep 12 23:19:49 2005
-@@ -132,8 +132,7 @@
- 
-     if (access((char*)configFile, R_OK) < 0)
-     {
--	reportError(form("Unable to find configuration file '%s'",
--			 configFile.get()));
-+	reportError("Unable to find configuration file");
-     }
- 	
-     config->Read(configFile);
diff --git a/textproc/htdig/files/patch-db_mut__pthread.c b/textproc/htdig/files/patch-db_mut__pthread.c
deleted file mode 100644
index 1deafc8940ba..000000000000
--- a/textproc/htdig/files/patch-db_mut__pthread.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- db/mut_pthread.c.orig	2002-02-02 18:18:05 UTC
-+++ db/mut_pthread.c
-@@ -201,7 +201,11 @@ CDB___db_pthread_mutex_lock(mutexp)
- 			 * call, and Solaris delivers the signal to the wrong
- 			 * LWP.
- 			 */
--			if (ret != 0 && ret != ETIME && ret != ETIMEDOUT)
-+			if (ret != 0 &&
-+#ifndef __FreeBSD__
-+			    ret != ETIME &&
-+#endif
-+			    ret != ETIMEDOUT)
- 				return (ret);
- 		}
- 
diff --git a/textproc/htdig/files/patch-htsearch_Collection.h b/textproc/htdig/files/patch-htsearch_Collection.h
deleted file mode 100644
index d2b25ad32897..000000000000
--- a/textproc/htdig/files/patch-htsearch_Collection.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- htsearch/Collection.h.orig	Fri May 28 06:15:24 2004
-+++ htsearch/Collection.h	Mon Dec 18 00:17:56 2006
-@@ -36,9 +36,9 @@
-                const char *docExcerpt);
-     ~Collection();
- 
--    void Collection::Open();
-+    void Open();
- 
--    void Collection::Close(); 
-+    void Close(); 
- 
-     char *getWordFile() { return wordFile.get(); }
-     DocumentRef         *getDocumentRef(int id);
diff --git a/textproc/htdig/files/patch-htsearch_Display.cc b/textproc/htdig/files/patch-htsearch_Display.cc
deleted file mode 100644
index 4ecb7c6fdd02..000000000000
--- a/textproc/htdig/files/patch-htsearch_Display.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- htsearch/Display.cc.orig	2023-04-10 13:24:24 UTC
-+++ htsearch/Display.cc
-@@ -42,7 +42,7 @@ using namespace std;
- #endif /* HAVE_STD */
- 
- #include <stdio.h>
--#include <stdlib.h> // for abs
-+#include <math.h> // for fabs
- #include <ctype.h>
- 
- #ifndef _MSC_VER /* _WIN32 */
-@@ -1541,7 +1541,7 @@ Display::buildMatchList()
- // seconds in a 365 days year). The formula gives less weight
- // as the distance between the date document and the current time
- // increases (the absolute value is for documents with future date)
--#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(abs((n) - (dd)) / 31536000)))
-+#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(fabs((n) - (dd)) / 31536000)))
- 	    date_score =  DATE_FACTOR(date_factor, now, thisRef->DocTime());
- 	    score += date_score;
-         }
diff --git a/textproc/htdig/pkg-descr b/textproc/htdig/pkg-descr
deleted file mode 100644
index fd7b60179738..000000000000
--- a/textproc/htdig/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-   The ht://Dig system is a complete world wide web indexing and
-searching system for a domain or intranet. This system is not meant
-to replace the need for powerful internet-wide search systems like
-Yahoo! or Google. Instead it is meant to cover the needs for a
-single company, campus, or even a sub section of a web site.
-
-   As opposed to some WAIS-based or web-server based search engines,
-ht://Dig can span many web servers as long as they all understand
-the HTTP 1.0 protocol.
diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist
deleted file mode 100644
index e03a8668a49e..000000000000
--- a/textproc/htdig/pkg-plist
+++ /dev/null
@@ -1,208 +0,0 @@
-bin/HtFileType
-bin/htdb_dump
-bin/htdb_load
-bin/htdb_stat
-bin/htdig
-bin/htdump
-bin/htfuzzy
-bin/htload
-bin/htmerge
-bin/htnotify
-bin/htpurge
-bin/htstat
-bin/rundig
-%%ETCDIR%%/HtFileType-magic.mime
-%%ETCDIR%%/cookies.txt
-@sample %%ETCDIR%%/htdig.conf.sample
-%%ETCDIR%%/mime.types
-include/htdig/Configuration.h
-include/htdig/Connection.h
-include/htdig/DB2_db.h
-include/htdig/Database.h
-include/htdig/Dictionary.h
-include/htdig/HtCodec.h
-include/htdig/HtCookie.h
-include/htdig/HtCookieInFileJar.h
-include/htdig/HtCookieJar.h
-include/htdig/HtCookieMemJar.h
-include/htdig/HtDateTime.h
-include/htdig/HtFTP.h
-include/htdig/HtFile.h
-include/htdig/HtHTTP.h
-include/htdig/HtHTTPBasic.h
-include/htdig/HtHTTPSecure.h
-include/htdig/HtHeap.h
-include/htdig/HtMaxMin.h
-include/htdig/HtNNTP.h
-include/htdig/HtPack.h
-include/htdig/HtRandom.h
-include/htdig/HtRegex.h
-include/htdig/HtRegexList.h
-include/htdig/HtRegexReplace.h
-include/htdig/HtRegexReplaceList.h
-include/htdig/HtTime.h
-include/htdig/HtVector.h
-include/htdig/HtVectorGeneric.h
-include/htdig/HtVectorGenericCode.h
-include/htdig/HtVector_String.h
-include/htdig/HtVector_int.h
-include/htdig/HtWordCodec.h
-include/htdig/HtWordType.h
-include/htdig/IntObject.h
-include/htdig/List.h
-include/htdig/Object.h
-include/htdig/ParsedString.h
-include/htdig/Queue.h
-include/htdig/QuotedStringList.h
-include/htdig/SSLConnection.h
-include/htdig/Stack.h
-include/htdig/StringList.h
-include/htdig/StringMatch.h
-include/htdig/Transport.h
-include/htdig/WordBitCompress.h
-include/htdig/WordCaseIsAStatements.h
-include/htdig/WordContext.h
-include/htdig/WordCursor.h
-include/htdig/WordDB.h
-include/htdig/WordDBCompress.h
-include/htdig/WordDBInfo.h
-include/htdig/WordDBPage.h
-include/htdig/WordKey.h
-include/htdig/WordKeyInfo.h
-include/htdig/WordList.h
-include/htdig/WordMonitor.h
-include/htdig/WordRecord.h
-include/htdig/WordRecordInfo.h
-include/htdig/WordReference.h
-include/htdig/WordStat.h
-include/htdig/WordType.h
-include/htdig/ber.h
-include/htdig/clib.h
-include/htdig/good_strtok.h
-include/htdig/gregex.h
-include/htdig/htString.h
-include/htdig/htconfig.h
-include/htdig/lib.h
-include/htdig/libdefs.h
-include/htdig/md5.h
-include/htdig/mhash_md5.h
-include/htdig/myqsort.h
-include/htdig_db/btree.h
-include/htdig_db/btree_auto.h
-include/htdig_db/btree_ext.h
-include/htdig_db/common_ext.h
-include/htdig_db/crdel_auto.h
-include/htdig_db/db.h
-include/htdig_db/db_am.h
-include/htdig_db/db_auto.h
-include/htdig_db/db_config.h
-include/htdig_db/db_dispatch.h
-include/htdig_db/db_ext.h
-include/htdig_db/db_int.h
-include/htdig_db/db_join.h
-include/htdig_db/db_page.h
-include/htdig_db/db_shash.h
-include/htdig_db/db_swap.h
-include/htdig_db/debug.h
-include/htdig_db/env_ext.h
-include/htdig_db/hash.h
-include/htdig_db/hash_auto.h
-include/htdig_db/hash_ext.h
-include/htdig_db/lock.h
-include/htdig_db/lock_ext.h
-include/htdig_db/log.h
-include/htdig_db/log_auto.h
-include/htdig_db/log_ext.h
-include/htdig_db/mp.h
-include/htdig_db/mp_ext.h
-include/htdig_db/mutex.h
-include/htdig_db/mutex_ext.h
-include/htdig_db/os.h
-include/htdig_db/os_ext.h
-include/htdig_db/os_jump.h
-include/htdig_db/qam.h
-include/htdig_db/qam_auto.h
-include/htdig_db/qam_ext.h
-include/htdig_db/queue.h
-include/htdig_db/region.h
-include/htdig_db/shqueue.h
-include/htdig_db/txn.h
-include/htdig_db/txn_auto.h
-include/htdig_db/txn_ext.h
-include/htdig_db/xa.h
-include/htdig_db/xa_ext.h
-lib/htdig/libcommon-3.2.0.so
-lib/htdig/libcommon.a
-lib/htdig/libcommon.so
-lib/htdig/libfuzzy-3.2.0.so
-lib/htdig/libfuzzy.a
-lib/htdig/libfuzzy.so
-lib/htdig/libht-3.2.0.so
-lib/htdig/libht.a
-lib/htdig/libht.so
-lib/htdig/libhtnet-3.2.0.so
-lib/htdig/libhtnet.a
-lib/htdig/libhtnet.so
-lib/htdig/libhtword-3.2.0.so
-lib/htdig/libhtword.a
-lib/htdig/libhtword.so
-lib/htdig_db/libhtdb-3.2.0.so
-lib/htdig_db/libhtdb.a
-lib/htdig_db/libhtdb.so
-share/man/man1/htdig-pdfparser.1.gz
-share/man/man1/htdig.1.gz
-share/man/man1/htdump.1.gz
-share/man/man1/htfuzzy.1.gz
-share/man/man1/htload.1.gz
-share/man/man1/htmerge.1.gz
-share/man/man1/htnotify.1.gz
-share/man/man1/htpurge.1.gz
-share/man/man1/htsearch.1.gz
-share/man/man1/htstat.1.gz
-share/man/man1/rundig.1.gz
-share/man/man8/htdigconfig.8.gz
-%%DATADIR%%/common/bad_words
-%%DATADIR%%/common/english.0
-%%DATADIR%%/common/english.aff
-%%DATADIR%%/common/footer.html
-%%DATADIR%%/common/header.html
-%%DATADIR%%/common/long.html
-%%DATADIR%%/common/nomatch.html
-%%DATADIR%%/common/short.html
-%%DATADIR%%/common/synonyms
-%%DATADIR%%/common/syntax.html
-%%DATADIR%%/common/wrapper.html
-www/cgi-bin/htsearch
-www/cgi-bin/qtest
-www/data/search.html
-www/icons/htdig/button1.gif
-www/icons/htdig/button1.png
-www/icons/htdig/button10.gif
-www/icons/htdig/button10.png
-www/icons/htdig/button2.gif
-www/icons/htdig/button2.png
-www/icons/htdig/button3.gif
-www/icons/htdig/button3.png
-www/icons/htdig/button4.gif
-www/icons/htdig/button4.png
-www/icons/htdig/button5.gif
-www/icons/htdig/button5.png
-www/icons/htdig/button6.gif
-www/icons/htdig/button6.png
-www/icons/htdig/button7.gif
-www/icons/htdig/button7.png
-www/icons/htdig/button8.gif
-www/icons/htdig/button8.png
-www/icons/htdig/button9.gif
-www/icons/htdig/button9.png
-www/icons/htdig/buttonl.gif
-www/icons/htdig/buttonl.png
-www/icons/htdig/buttonr.gif
-www/icons/htdig/buttonr.png
-www/icons/htdig/htdig.gif
-www/icons/htdig/htdig.png
-www/icons/htdig/star.gif
-www/icons/htdig/star.png
-www/icons/htdig/star_blank.gif
-www/icons/htdig/star_blank.png
-@dir %%DATADIR%%/database
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
index 6894f9fd80d1..aa7b21be4483 100644
--- a/textproc/ibus-typing-booster/Makefile
+++ b/textproc/ibus-typing-booster/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ibus-typing-booster
-PORTVERSION=	2.27.31
+PORTVERSION=	2.27.46
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libibus-1.0.so:textproc/ibus	\
 RUN_DEPENDS=	CLDR>0:textproc/CLDR	\
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}		\
+		${PYTHON_PKGNAMEPREFIX}rapidfuzz>0:devel/py-rapidfuzz@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}hunspell>0:textproc/py-hunspell@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR}	\
 		${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD			\
diff --git a/textproc/ibus-typing-booster/distinfo b/textproc/ibus-typing-booster/distinfo
index 4d63dd6d089a..b919aaa723a2 100644
--- a/textproc/ibus-typing-booster/distinfo
+++ b/textproc/ibus-typing-booster/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744378616
-SHA256 (mike-fabian-ibus-typing-booster-2.27.31_GH0.tar.gz) = 9c96e1aa95f09b54818e81e022d712de7394cc6721fa649039c4060781c21059
-SIZE (mike-fabian-ibus-typing-booster-2.27.31_GH0.tar.gz) = 13403098
+TIMESTAMP = 1746539534
+SHA256 (mike-fabian-ibus-typing-booster-2.27.46_GH0.tar.gz) = fa36b95bfd5c0ff1678cca3b78cea270b799e543c4e5dd37617dc6b8f864c22c
+SIZE (mike-fabian-ibus-typing-booster-2.27.46_GH0.tar.gz) = 13425155
diff --git a/textproc/ibus-typing-booster/pkg-plist b/textproc/ibus-typing-booster/pkg-plist
index 83afaee7a9f8..b8b0a158174c 100644
--- a/textproc/ibus-typing-booster/pkg-plist
+++ b/textproc/ibus-typing-booster/pkg-plist
@@ -5,6 +5,7 @@ share/applications/emoji-picker.desktop
 share/applications/ibus-setup-typing-booster.desktop
 %%DATADIR%%/data/Blocks.txt
 %%DATADIR%%/data/DerivedAge.txt
+%%DATADIR%%/data/NameAliases.txt
 %%DATADIR%%/data/UnicodeData.txt
 %%DATADIR%%/data/annotations/af.xml
 %%DATADIR%%/data/annotations/ak.xml
@@ -442,6 +443,7 @@ share/locale/or/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/pl/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/pt/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/pt_BR/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/ro/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/ru/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/si/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/sv/LC_MESSAGES/ibus-typing-booster.mo
diff --git a/textproc/jaq/Makefile b/textproc/jaq/Makefile
index 289bf01103b0..fd9ce3630331 100644
--- a/textproc/jaq/Makefile
+++ b/textproc/jaq/Makefile
@@ -95,4 +95,9 @@ LIB_DEPENDS+=	libatomic.so:lang/gcc${GCC_DEFAULT}
 LDFLAGS+=	-L/usr/local/lib/gcc${GCC_DEFAULT} -latomic
 .endif
 
+# attempt to fix build on i386, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284196#c1
+.if ${ARCH} == i386 && !${CFLAGS:M-march=*}
+CFLAGS+= -march=i586
+.endif
+
 .include <bsd.port.mk>
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
deleted file mode 100644
index fb870805751a..000000000000
--- a/textproc/java2html/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-PORTNAME=		java2html
-PORTVERSION=		0.9.2
-PORTREVISION=		2
-CATEGORIES=		textproc www
-MASTER_SITES=		SUNSITE/apps/www/converters
-
-MAINTAINER=		mkamm@gmx.net
-COMMENT=	Java sources to HTML converter
-WWW=		http://user.cs.tu-berlin.de/~schintke/x2html/
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Upstream is gone and last update 20 years ago
-EXPIRATION_DATE=2025-04-30
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-
-CONFLICTS_INSTALL=	source-highlight # bin/java2html
-
-PORTDOCS=	AUTHORS NEWS README
-PLIST_FILES=	bin/java2html share/man/man1/java2html.1.gz
-
-OPTIONS_DEFINE=	DOCS
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/java2html/distinfo b/textproc/java2html/distinfo
deleted file mode 100644
index cfa6529249c7..000000000000
--- a/textproc/java2html/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (java2html-0.9.2.tar.gz) = b352fa391ea0f1fd39654a7113f9a50baac5dbf6b8d25f79f41f864e2e825188
-SIZE (java2html-0.9.2.tar.gz) = 42927
diff --git a/textproc/java2html/files/patch-Makefile.in b/textproc/java2html/files/patch-Makefile.in
deleted file mode 100644
index 196a2a78308b..000000000000
--- a/textproc/java2html/files/patch-Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
---- ./Makefile.in.orig	2000-05-02 19:13:52.000000000 +0200
-+++ ./Makefile.in	2014-01-21 08:57:35.000000000 +0100
-@@ -27,7 +27,7 @@
- # for gzip because otherwise the load on the web server
- # grows without having big benefits.
- # COMPRESSION = -DCOMPRESSION=4
--COMPRESSION = -DCOMPRESSION=1
-+COMPRESSION ?= -DCOMPRESSION=1
- 
- # Dont change things beyond this line.
- TARGET          = @PROJECT_NAME@
-@@ -52,14 +52,14 @@
- INSTALL_DATA    = @INSTALL_DATA@
- prefix          = @prefix@
- exec_prefix     = ${prefix}
--bindir          = @bindir@
-+bindir          = ${DESTDIR}@bindir@
- mandir          = @mandir@
--man1dir         = @mandir@/man1
-+man1dir         = ${DESTDIR}@mandir@/man1
- srcdir          = @srcdir@
- docdir          = @DOCDIR@
- CPPFLAGS        = @CPPFLAGS@
- 
--CFLAGS += -O2 -Wall
-+CFLAGS ?= -O2 -Wall
- ALL_CFLAGS = $(CFLAGS) -I$(srcdir) -I. $(COMPRESSION) 
- 
- all: $(TARGET)
-@@ -70,10 +70,12 @@
- $(LEXOUTPUT): $(CONFIGS) $(LEXSRCS) $(HDRS)
- 	$(LEX) $(LEXSRCS)
- 
--install: $(TARGET) install-doc
-+install: $(TARGET)
- 	@echo "Installing" $(TARGET) "to" $(bindir)
- 	-mkdir -p $(bindir)
- 	$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-+	-mkdir -p $(man1dir)
-+	$(INSTALL_DATA) $(srcdir)/$(MANPAGE) $(man1dir)/$(MANPAGE)
- 
- install-strip: $(TARGET) install-doc
- 	@echo "Installing" $(TARGET) "to" $(bindir)
-@@ -81,8 +83,7 @@
- 	$(INSTALL_PROGRAM) -s $(TARGET) $(bindir)/$(TARGET)
- 
- install-doc: 
--	-mkdir -p $(man1dir) $(docdir)
--	$(INSTALL_DATA) $(srcdir)/$(MANPAGE) $(man1dir)/$(MANPAGE)
-+	-mkdir -p $(docdir)
- 	$(INSTALL_DATA) $(srcdir)/AUTHORS $(docdir)/AUTHORS
- 	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/COPYING
- 	$(INSTALL_DATA) $(srcdir)/NEWS $(docdir)/NEWS
diff --git a/textproc/java2html/pkg-descr b/textproc/java2html/pkg-descr
deleted file mode 100644
index e4f87878bc1b..000000000000
--- a/textproc/java2html/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Java2html is  a syntax highlighter for  Java and C++  source code that
-produces a highlighted html file as output.
-
-Java2html offers the following features:
-
-    - support for Java and C++
-    - fast (single pass conversion using flex)
-    - doesn't change formatting - only adds <FONT COLOR=#XXXX> tags
-        and properly escapes non-ascii characters
-    - easy integration with webservers - browse your sources colourized
-    - gzips http output for browsers to save bandwidth (only in CGI mode)
-    - documentation and manpage included
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
deleted file mode 100644
index 852fc48c7de8..000000000000
--- a/textproc/jaxup/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-PORTNAME=	jaxup
-PORTVERSION=	1.01
-PORTREVISION=	5
-CATEGORIES=	textproc java
-MASTER_SITES=	http://klomp.org/jaxup/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Java XUpdate engine
-WWW=		https://klomp.org/jaxup/
-
-DEPRECATED=	Abandonware and obsolete, last release in 2003
-EXPIRATION_DATE=2025-04-30 
-
-BUILD_DEPENDS=	${JAR_DEPENDS}
-RUN_DEPENDS=	${JAR_DEPENDS}
-
-JAR_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
-		${JAVALIBDIR}/jaxen-full.jar:java/jaxen \
-		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
-
-USES=		java:ant,run zip
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-
-OPTIONS_DEFINE=	DOCS
-
-ALL_TARGET=	jar
-DOCS_ALL_TARGET=docs
-
-PLIST_FILES+=	%%DATADIR%%/jaxup-xupdater.jar bin/jaxup-xupdater \
-		%%JAVAJARDIR%%/${PORTNAME}.jar
-
-PORTDOCS=	LICENSE.txt api index.html jaxup_files xupdate-wd.html xupdate-wd_files
-
-.include <bsd.port.pre.mk>
-
-UTIL_CLASSPATH_JARS=	jaxen-full saxpath xercesImpl
-UTIL_CLASSPATH!=	${ECHO_CMD} ${UTIL_CLASSPATH_JARS:S,^,${JAVALIBDIR}/,:S,$,.jar,} | ${TR} " " ":"
-
-.if ${PORT_OPTIONS:MDOCS}
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.[4-5] -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
-.if ${JDK_API} != ""
-MAKE_ARGS+=	-Dj2se.apidocs="${JDK_API}"
-.endif
-JAXEN_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jaxen -maxdepth 1 -name javadoc -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
-.if ${JAXEN_API} != ""
-MAKE_ARGS+=	-Djaxen.apidocs="${JAXEN_API}"
-.endif
-.endif
-
-post-extract:
-	${CP} ${FILESDIR}/build.xml ${WRKSRC}/
-	${CP} ${FILESDIR}/DOMXUpdater.java ${WRKDIR}/
-	${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},g ; s,%%DATADIR%%,${DATADIR},g' \
-	  ${FILESDIR}/jaxup-xupdater.sh >${WRKDIR}/jaxup-xupdater
-
-post-build:
-	@${ECHO_MSG} ">> Building utility classes..."
-	cd ${WRKDIR} && ${JAVAC} -classpath "${UTIL_CLASSPATH}:${WRKSRC}/build/lib/jaxup.jar" DOMXUpdater.java
-	${ECHO_CMD} "Main-Class: DOMXUpdater" >${WRKDIR}/MANIFEST
-	cd ${WRKDIR} && ${JAR} -cmf MANIFEST jaxup-xupdater.jar DOMXUpdater.class
-
-do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/build/lib/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/
-	@${ECHO_MSG} " [ DONE ]"
-	@${ECHO_MSG} ">> Installing utility scripts and classes..."
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/jaxup-xupdater.jar ${STAGEDIR}${DATADIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/jaxup-xupdater ${STAGEDIR}${PREFIX}/bin/
-	@${ECHO_MSG} "  [ DONE ]"
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/build/docs \
-	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${STAGEDIR}${DOCSDIR}/
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/textproc/jaxup/distinfo b/textproc/jaxup/distinfo
deleted file mode 100644
index 8e8f13a340eb..000000000000
--- a/textproc/jaxup/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (jaxup-1.01-src.zip) = 06675a6ec3a943d878c824688ff9a3f24cbefa0c1747cfbf280bfaf83b85d7a6
-SIZE (jaxup-1.01-src.zip) = 1836884
diff --git a/textproc/jaxup/files/DOMXUpdater.java b/textproc/jaxup/files/DOMXUpdater.java
deleted file mode 100644
index 7cae303e8c1a..000000000000
--- a/textproc/jaxup/files/DOMXUpdater.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * DOMXUpdater: a command-line XUpdate processor.
- */
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.jaxen.dom.DocumentNavigator;
-import org.jaxup.dom.DOMDocumentUpdater;
-import org.jaxup.xupdate.XUpdate;
-import org.w3c.dom.Document;
-
-public class DOMXUpdater
-{
-	public static void main(String[] args)
-	{
-		if (args.length != 2)
-		{
-			System.out.println("usage: DOMXUpdater <source document url> <XUpdate document url>");
-			System.exit(1);
-		}
-
-		try
-		{
-			DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance();
-			factory.setNamespaceAware(true);
-			DocumentBuilder builder=factory.newDocumentBuilder();
-
-			Document doc=builder.parse(args[0]);
-			Document updateDoc=builder.parse(args[1]);
-
-			XUpdate updater=new XUpdate(new DOMDocumentUpdater(), DocumentNavigator.getInstance());
-			updater.runUpdate(doc, updateDoc.getDocumentElement());
-
-			OutputFormat o=new OutputFormat("xml", "ISO-8859-1", true);
-			o.setIndenting(true);
-			o.setIndent(2);
-			o.setPreserveSpace(true);
-			XMLSerializer serial=new XMLSerializer(System.out, o);
-			serial.serialize(doc);
-			System.out.println();
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-			System.exit(1);
-		}
-	}
-}
diff --git a/textproc/jaxup/files/build.xml b/textproc/jaxup/files/build.xml
deleted file mode 100644
index 49711cd623d3..000000000000
--- a/textproc/jaxup/files/build.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project name="jaxup" default="jar" basedir=".">
-
-  <property name="project.version" value="1.01"/>
-	
-	<property name="build.dir" value="build"/>
-	<property name="build.classes.dir" value="${build.dir}/classes"/>
-	<property name="build.lib.dir" value="${build.dir}/lib"/>
-  <property name="build.docs.dir" value="${build.dir}/docs"/>
-	<property name="build.apidocs.dir" value="${build.docs.dir}/api"/>
-	<property name="src.dir" value="src"/>
-	<property name="src.java.dir" value="${src.dir}/java"/>
-	<property name="src.docs.dir" value="${src.dir}/doc"/>
-	<property name="src.tests.dir" value="${src.dir}/test"/>
-	<property name="lib.dir" value="lib"/>
-	<property name="project.fullname" value="${ant.project.name}-${project.version}"/>
-	<property name="jar.file" value="${build.lib.dir}/${ant.project.name}.jar"/>
-  
-	<path id="project.classpath">
-		<pathelement path="${build.classes.dir}"/>
-		<fileset dir="${lib.dir}" includes="**.jar"/>
-	</path>
-	
-	<target name="build" description="Compile Core Java sources">
-		<mkdir dir="${build.classes.dir}"/>
-		<javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" deprecation="true" debug="Yes">
-			<classpath refid="project.classpath"/>
-		</javac>
-	</target>
-
-	<target name="clean" description="Delete built classes, docs, and JAR files">
-		<delete dir="${build.dir}"/>
-  </target>
-
-	<target name="rebuild" depends="clean, build" description="(Re)compile Java sources"/>
-
-	<target name="jar" depends="build" description="Pack the JARs">
-		<mkdir dir="${build.lib.dir}"/>
-		<jar destfile="${jar.file}">
-			<manifest>
-				<attribute name="Built-By" value="${user.name}"/>
-      </manifest>
-      <fileset dir="${build.classes.dir}" includes="**/*.class"/>
-		</jar>
-	</target>
-		
-  <target name="docs" depends="apidocs" description="Build project docs">
-    <copy todir="${build.docs.dir}">
-      <fileset dir="${src.docs.dir}"/>
-    </copy>
-	</target>
-
-	<target name="apidocs" depends="build" unless="noapidocs" description="Build the API docs (with javadoc)">
-		<mkdir dir="${build.apidocs.dir}"/>
-		<javadoc destdir="${build.apidocs.dir}" windowtitle="${project.fullname}" author="true" version="true" use="true">
-			<fileset dir="${src.java.dir}"/>
-			<classpath refid="project.classpath"/>
-		</javadoc>
-	</target>
-
-</project>
diff --git a/textproc/jaxup/files/jaxup-xupdater.sh b/textproc/jaxup/files/jaxup-xupdater.sh
deleted file mode 100644
index 35208b9c3e69..000000000000
--- a/textproc/jaxup/files/jaxup-xupdater.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-%%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@"
diff --git a/textproc/jaxup/files/patch-build.xml b/textproc/jaxup/files/patch-build.xml
deleted file mode 100644
index 1c6731ab361a..000000000000
--- a/textproc/jaxup/files/patch-build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.orig	Thu Dec  9 14:14:21 2004
-+++ build.xml	Thu Dec  9 14:16:44 2004
-@@ -57,6 +57,8 @@
- 		<javadoc destdir="${build.apidocs.dir}" windowtitle="${project.fullname}" author="true" version="true" use="true">
- 			<fileset dir="${src.java.dir}"/>
- 			<classpath refid="project.classpath"/>
-+      <link href="${jaxen.apidocs}"/>
-+      <link href="${j2se.apidocs}"/>
- 		</javadoc>
- 	</target>
- 
diff --git a/textproc/jaxup/pkg-descr b/textproc/jaxup/pkg-descr
deleted file mode 100644
index a9c3c879e9fd..000000000000
--- a/textproc/jaxup/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Jaxup defines an interface to update XML documents, through which clients can
-work without knowledge of the exact object model that the document uses. The
-interface is called Updater, and the idea behind it is the same as with Jaxen's
-Navigator interface. In addition, an implementation of xmldb.org's proposed
-XUpdate specification is provided. The implementation is in the XUpdate class.
-
-Implementations of the Updater interface are provided for the following object
-models:
-
-  - DOM
-  - Dom4j
-  - JDom
diff --git a/textproc/jless/Makefile b/textproc/jless/Makefile
index 5bfef12ea3a0..2300964e163f 100644
--- a/textproc/jless/Makefile
+++ b/textproc/jless/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	jless
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.2
-PORTREVISION=	29
+DISTVERSION=	0.9.0
 CATEGORIES=	textproc
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -11,80 +10,26 @@ WWW=		https://jless.io
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cargo
+BUILD_DEPENDS=	libxcb>0:x11/libxcb
+LIB_DEPENDS=	libxcb.so:x11/libxcb
+RUN_DEPENDS=	libxcb>0:x11/libxcb
+
+USES=		cargo python shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PaulJuliusMartinez
 
-CARGO_CRATES=	aho-corasick-0.7.18 \
-		atty-0.2.14 \
-		autocfg-1.0.1 \
-		beef-0.5.1 \
-		bitflags-1.2.1 \
-		cc-1.0.69 \
-		cfg-if-0.1.10 \
-		cfg-if-1.0.0 \
-		clap-3.0.14 \
-		clap_derive-3.0.14 \
-		clipboard-win-4.2.1 \
-		dirs-next-2.0.0 \
-		dirs-sys-next-0.1.2 \
-		endian-type-0.1.2 \
-		error-code-2.3.0 \
-		fd-lock-3.0.0 \
-		fnv-1.0.7 \
-		getrandom-0.2.3 \
-		hashbrown-0.11.2 \
-		heck-0.4.0 \
-		hermit-abi-0.1.18 \
-		indexmap-1.8.0 \
-		isatty-0.1.9 \
-		lazy_static-1.4.0 \
-		libc-0.2.99 \
-		libc-stdhandle-0.1.0 \
-		log-0.4.14 \
-		logos-0.12.0 \
-		logos-derive-0.12.0 \
-		memchr-2.4.1 \
-		memoffset-0.6.4 \
-		nibble_vec-0.1.0 \
-		nix-0.22.1 \
-		numtoa-0.1.0 \
-		os_str_bytes-6.0.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.36 \
-		quote-1.0.9 \
-		radix_trie-0.2.1 \
-		redox_syscall-0.1.57 \
-		redox_syscall-0.2.6 \
-		redox_termios-0.1.2 \
-		redox_users-0.4.0 \
-		regex-1.5.4 \
-		regex-syntax-0.6.25 \
-		rustyline-9.0.0 \
-		scopeguard-1.1.0 \
-		signal-hook-0.3.8 \
-		signal-hook-registry-1.3.0 \
-		smallvec-1.6.1 \
-		str-buf-1.0.5 \
-		strsim-0.10.0 \
-		syn-1.0.86 \
-		termcolor-1.1.2 \
-		termion-1.5.6 \
-		textwrap-0.14.2 \
-		unicode-segmentation-1.7.1 \
-		unicode-width-0.1.8 \
-		unicode-xid-0.2.1 \
-		utf8-ranges-1.0.4 \
-		utf8parse-0.2.0 \
-		version_check-0.9.3 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
+USE_XORG=	x11 xcb
+
+SHEBANG_FILES=	cargo-crates/unicode-width-0.1.8/scripts/unicode.py \
+		cargo-crates/xcb-0.8.2/rs_client.py
+
+CARGO_ENV=	LIBRARY_PATH=${LOCALBASE}/lib
 
 PLIST_FILES=	bin/jless
 
+post-patch:
+	${REINPLACE_CMD} -e 's,%%PYTHON_CMD%%,${PYTHON_CMD},' \
+		${WRKSRC}/cargo-crates/xcb-0.8.2/build.rs
+
 .include <bsd.port.mk>
diff --git a/textproc/jless/Makefile.crates b/textproc/jless/Makefile.crates
new file mode 100644
index 000000000000..affcceffb34a
--- /dev/null
+++ b/textproc/jless/Makefile.crates
@@ -0,0 +1,81 @@
+CARGO_CRATES=	aho-corasick-0.7.18 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		beef-0.5.1 \
+		bitflags-1.2.1 \
+		block-0.1.6 \
+		cc-1.0.69 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		clap-4.0.26 \
+		clap_derive-4.0.21 \
+		clap_lex-0.3.3 \
+		clipboard-0.5.0 \
+		clipboard-win-2.2.0 \
+		clipboard-win-4.2.1 \
+		dirs-next-2.0.0 \
+		dirs-sys-next-0.1.2 \
+		endian-type-0.1.2 \
+		error-code-2.3.0 \
+		fd-lock-3.0.0 \
+		fnv-1.0.7 \
+		getrandom-0.2.3 \
+		heck-0.4.0 \
+		hermit-abi-0.1.18 \
+		indoc-1.0.4 \
+		isatty-0.1.9 \
+		lazy_static-1.4.0 \
+		libc-0.2.99 \
+		libc-stdhandle-0.1.0 \
+		linked-hash-map-0.5.4 \
+		log-0.4.14 \
+		logos-0.12.0 \
+		logos-derive-0.12.0 \
+		malloc_buf-0.0.6 \
+		memchr-2.4.1 \
+		memoffset-0.6.4 \
+		nibble_vec-0.1.0 \
+		nix-0.22.1 \
+		numtoa-0.1.0 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		once_cell-1.18.0 \
+		os_str_bytes-6.0.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.63 \
+		quote-1.0.9 \
+		radix_trie-0.2.1 \
+		redox_syscall-0.1.57 \
+		redox_syscall-0.2.6 \
+		redox_termios-0.1.2 \
+		redox_users-0.4.0 \
+		regex-1.5.5 \
+		regex-syntax-0.6.25 \
+		rustyline-9.0.0 \
+		scopeguard-1.1.0 \
+		signal-hook-0.3.8 \
+		signal-hook-registry-1.3.0 \
+		smallvec-1.6.1 \
+		str-buf-1.0.5 \
+		strsim-0.10.0 \
+		syn-1.0.86 \
+		termcolor-1.1.2 \
+		termion-1.5.6 \
+		unicode-ident-1.0.10 \
+		unicode-segmentation-1.7.1 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.1 \
+		unindent-0.1.8 \
+		utf8-ranges-1.0.4 \
+		utf8parse-0.2.0 \
+		version_check-0.9.3 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		x11-clipboard-0.3.3 \
+		xcb-0.8.2 \
+		yaml-rust-0.4.5
diff --git a/textproc/jless/distinfo b/textproc/jless/distinfo
index 8c8a5900ed5d..3276a089ac77 100644
--- a/textproc/jless/distinfo
+++ b/textproc/jless/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1645737128
+TIMESTAMP = 1745722466
 SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
 SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
@@ -9,16 +9,24 @@ SHA256 (rust/crates/beef-0.5.1.crate) = bed554bd50246729a1ec158d08aa3235d1b69d94
 SIZE (rust/crates/beef-0.5.1.crate) = 15177
 SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
 SIZE (rust/crates/bitflags-1.2.1.crate) = 16745
+SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a
+SIZE (rust/crates/block-0.1.6.crate) = 4077
 SHA256 (rust/crates/cc-1.0.69.crate) = e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2
 SIZE (rust/crates/cc-1.0.69.crate) = 56044
 SHA256 (rust/crates/cfg-if-0.1.10.crate) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
 SIZE (rust/crates/cfg-if-0.1.10.crate) = 7933
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/clap-3.0.14.crate) = b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62
-SIZE (rust/crates/clap-3.0.14.crate) = 191513
-SHA256 (rust/crates/clap_derive-3.0.14.crate) = 9a1132dc3944b31c20dd8b906b3a9f0a5d0243e092d59171414969657ac6aa85
-SIZE (rust/crates/clap_derive-3.0.14.crate) = 25314
+SHA256 (rust/crates/clap-4.0.26.crate) = 2148adefda54e14492fb9bddcc600b4344c5d1a3123bd666dcb939c6f0e0e57e
+SIZE (rust/crates/clap-4.0.26.crate) = 205197
+SHA256 (rust/crates/clap_derive-4.0.21.crate) = 0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014
+SIZE (rust/crates/clap_derive-4.0.21.crate) = 27567
+SHA256 (rust/crates/clap_lex-0.3.3.crate) = 033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646
+SIZE (rust/crates/clap_lex-0.3.3.crate) = 9648
+SHA256 (rust/crates/clipboard-0.5.0.crate) = 25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7
+SIZE (rust/crates/clipboard-0.5.0.crate) = 10009
+SHA256 (rust/crates/clipboard-win-2.2.0.crate) = e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b
+SIZE (rust/crates/clipboard-win-2.2.0.crate) = 11079
 SHA256 (rust/crates/clipboard-win-4.2.1.crate) = 4e4ea1881992efc993e4dc50a324cdbd03216e41bdc8385720ff47efc9bd2ca8
 SIZE (rust/crates/clipboard-win-4.2.1.crate) = 12142
 SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
@@ -35,14 +43,12 @@ SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da2
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/getrandom-0.2.3.crate) = 7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753
 SIZE (rust/crates/getrandom-0.2.3.crate) = 26261
-SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
-SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713
 SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
 SIZE (rust/crates/heck-0.4.0.crate) = 11161
 SHA256 (rust/crates/hermit-abi-0.1.18.crate) = 322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c
 SIZE (rust/crates/hermit-abi-0.1.18.crate) = 9936
-SHA256 (rust/crates/indexmap-1.8.0.crate) = 282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223
-SIZE (rust/crates/indexmap-1.8.0.crate) = 52583
+SHA256 (rust/crates/indoc-1.0.4.crate) = e7906a9fababaeacb774f72410e497a1d18de916322e33797bb2cd29baa23c9e
+SIZE (rust/crates/indoc-1.0.4.crate) = 13122
 SHA256 (rust/crates/isatty-0.1.9.crate) = e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc
 SIZE (rust/crates/isatty-0.1.9.crate) = 8009
 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
@@ -51,12 +57,16 @@ SHA256 (rust/crates/libc-0.2.99.crate) = a7f823d141fe0a24df1e23b4af4e3c7ba9e5966
 SIZE (rust/crates/libc-0.2.99.crate) = 524997
 SHA256 (rust/crates/libc-stdhandle-0.1.0.crate) = 6dac2473dc28934c5e0b82250dab231c9d3b94160d91fe9ff483323b05797551
 SIZE (rust/crates/libc-stdhandle-0.1.0.crate) = 2254
+SHA256 (rust/crates/linked-hash-map-0.5.4.crate) = 7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3
+SIZE (rust/crates/linked-hash-map-0.5.4.crate) = 16166
 SHA256 (rust/crates/log-0.4.14.crate) = 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710
 SIZE (rust/crates/log-0.4.14.crate) = 34582
 SHA256 (rust/crates/logos-0.12.0.crate) = 427e2abca5be13136da9afdbf874e6b34ad9001dd70f2b103b083a85daa7b345
 SIZE (rust/crates/logos-0.12.0.crate) = 8849
 SHA256 (rust/crates/logos-derive-0.12.0.crate) = 56a7d287fd2ac3f75b11f19a1c8a874a7d55744bd91f7a1b3e7cf87d4343c36d
 SIZE (rust/crates/logos-derive-0.12.0.crate) = 32455
+SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb
+SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
 SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
 SIZE (rust/crates/memchr-2.4.1.crate) = 64977
 SHA256 (rust/crates/memoffset-0.6.4.crate) = 59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9
@@ -67,14 +77,22 @@ SHA256 (rust/crates/nix-0.22.1.crate) = e7555d6c7164cc913be1ce7f95cbecdabda61eb2
 SIZE (rust/crates/nix-0.22.1.crate) = 227166
 SHA256 (rust/crates/numtoa-0.1.0.crate) = b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef
 SIZE (rust/crates/numtoa-0.1.0.crate) = 8999
+SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1
+SIZE (rust/crates/objc-0.2.7.crate) = 22036
+SHA256 (rust/crates/objc-foundation-0.1.1.crate) = 1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9
+SIZE (rust/crates/objc-foundation-0.1.1.crate) = 9063
+SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b
+SIZE (rust/crates/objc_id-0.1.1.crate) = 3258
+SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d
+SIZE (rust/crates/once_cell-1.18.0.crate) = 32969
 SHA256 (rust/crates/os_str_bytes-6.0.0.crate) = 8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64
 SIZE (rust/crates/os_str_bytes-6.0.0.crate) = 21046
 SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
 SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
-SHA256 (rust/crates/proc-macro2-1.0.36.crate) = c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029
-SIZE (rust/crates/proc-macro2-1.0.36.crate) = 41411
+SHA256 (rust/crates/proc-macro2-1.0.63.crate) = 7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb
+SIZE (rust/crates/proc-macro2-1.0.63.crate) = 44867
 SHA256 (rust/crates/quote-1.0.9.crate) = c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7
 SIZE (rust/crates/quote-1.0.9.crate) = 25042
 SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd
@@ -87,8 +105,8 @@ SHA256 (rust/crates/redox_termios-0.1.2.crate) = 8440d8acb4fd3d277125b4bd01a6f38
 SIZE (rust/crates/redox_termios-0.1.2.crate) = 3268
 SHA256 (rust/crates/redox_users-0.4.0.crate) = 528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64
 SIZE (rust/crates/redox_users-0.4.0.crate) = 13023
-SHA256 (rust/crates/regex-1.5.4.crate) = d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461
-SIZE (rust/crates/regex-1.5.4.crate) = 236581
+SHA256 (rust/crates/regex-1.5.5.crate) = 1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286
+SIZE (rust/crates/regex-1.5.5.crate) = 238119
 SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b
 SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293
 SHA256 (rust/crates/rustyline-9.0.0.crate) = 790487c3881a63489ae77126f57048b42d62d3b2bafbf37453ea19eedb6340d6
@@ -111,14 +129,16 @@ SHA256 (rust/crates/termcolor-1.1.2.crate) = 2dfed899f0eb03f32ee8c6a0aabdb8a7949
 SIZE (rust/crates/termcolor-1.1.2.crate) = 17287
 SHA256 (rust/crates/termion-1.5.6.crate) = 077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e
 SIZE (rust/crates/termion-1.5.6.crate) = 22677
-SHA256 (rust/crates/textwrap-0.14.2.crate) = 0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80
-SIZE (rust/crates/textwrap-0.14.2.crate) = 52016
+SHA256 (rust/crates/unicode-ident-1.0.10.crate) = 22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73
+SIZE (rust/crates/unicode-ident-1.0.10.crate) = 42039
 SHA256 (rust/crates/unicode-segmentation-1.7.1.crate) = bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796
 SIZE (rust/crates/unicode-segmentation-1.7.1.crate) = 93066
 SHA256 (rust/crates/unicode-width-0.1.8.crate) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
 SIZE (rust/crates/unicode-width-0.1.8.crate) = 16732
 SHA256 (rust/crates/unicode-xid-0.2.1.crate) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
 SIZE (rust/crates/unicode-xid-0.2.1.crate) = 14392
+SHA256 (rust/crates/unindent-0.1.8.crate) = 514672a55d7380da379785a4d70ca8386c8883ff7eaae877be4d2081cebe73d8
+SIZE (rust/crates/unindent-0.1.8.crate) = 8326
 SHA256 (rust/crates/utf8-ranges-1.0.4.crate) = b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba
 SIZE (rust/crates/utf8-ranges-1.0.4.crate) = 8575
 SHA256 (rust/crates/utf8parse-0.2.0.crate) = 936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372
@@ -135,5 +155,11 @@ SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e9
 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (PaulJuliusMartinez-jless-v0.7.2_GH0.tar.gz) = 5d776cb6488743ccdaeeffb4bfc54d84862028170cee852a8bb5c156526ed263
-SIZE (PaulJuliusMartinez-jless-v0.7.2_GH0.tar.gz) = 3397918
+SHA256 (rust/crates/x11-clipboard-0.3.3.crate) = 89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea
+SIZE (rust/crates/x11-clipboard-0.3.3.crate) = 7357
+SHA256 (rust/crates/xcb-0.8.2.crate) = 5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de
+SIZE (rust/crates/xcb-0.8.2.crate) = 129071
+SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
+SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
+SHA256 (PaulJuliusMartinez-jless-v0.9.0_GH0.tar.gz) = 43527a78ba2e5e43a7ebd8d0da8b5af17a72455c5f88b4d1134f34908a594239
+SIZE (PaulJuliusMartinez-jless-v0.9.0_GH0.tar.gz) = 1222005
diff --git a/textproc/jless/files/patch-cargo-crates_xcb-0.8.2_build.rs b/textproc/jless/files/patch-cargo-crates_xcb-0.8.2_build.rs
new file mode 100644
index 000000000000..94919cbf009c
--- /dev/null
+++ b/textproc/jless/files/patch-cargo-crates_xcb-0.8.2_build.rs
@@ -0,0 +1,18 @@
+--- cargo-crates/xcb-0.8.2/build.rs.orig	2025-05-05 10:26:31 UTC
++++ cargo-crates/xcb-0.8.2/build.rs
+@@ -64,13 +64,13 @@ fn main() {
+ 
+         if ref_mtime > src_file_mtime || ref_mtime > ffi_file_mtime {
+ 
+-            let status = Command::new("python3")
++            let status = Command::new("%%PYTHON_CMD%%")
+                     .arg(&r_client)
+                     .arg("-o").arg(&src_dir)
+                     .arg(&xml_file)
+                     .env("PYTHONHASHSEED", "0")
+                     .status()
+-                    .expect("Unable to find build dependency python3");
++                    .expect("Unable to find build dependency %%PYTHON_CMD%%");
+             if !status.success() {
+                 panic!("processing of {} returned non-zero ({})",
+                     xml_file.display(), status.code().unwrap());
diff --git a/textproc/jql/Makefile b/textproc/jql/Makefile
index 431844508b91..9e591729548a 100644
--- a/textproc/jql/Makefile
+++ b/textproc/jql/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jql
 DISTVERSIONPREFIX=	jql-v
-DISTVERSION=	8.0.5
+DISTVERSION=	8.0.6
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -24,7 +24,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		anstyle-parse-0.2.6 \
 		anstyle-query-1.1.2 \
 		anstyle-wincon-3.0.6 \
-		anyhow-1.0.97 \
+		anyhow-1.0.98 \
 		autocfg-1.4.0 \
 		backtrace-0.3.74 \
 		bumpalo-3.16.0 \
@@ -35,8 +35,8 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
 		ciborium-ll-0.2.2 \
-		clap-4.5.35 \
-		clap_builder-4.5.35 \
+		clap-4.5.37 \
+		clap_builder-4.5.37 \
 		clap_derive-4.5.32 \
 		clap_lex-0.7.4 \
 		colorchoice-1.0.3 \
@@ -117,7 +117,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		windows_x86_64_gnu-0.52.6 \
 		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_msvc-0.52.6 \
-		winnow-0.7.4 \
+		winnow-0.7.8 \
 		yansi-1.0.1
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/textproc/jql/distinfo b/textproc/jql/distinfo
index eefd85aff6b4..85b2c12c1f7c 100644
--- a/textproc/jql/distinfo
+++ b/textproc/jql/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1744173528
+TIMESTAMP = 1746348989
 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
@@ -17,8 +17,8 @@ SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d6789
 SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
 SHA256 (rust/crates/anstyle-wincon-3.0.6.crate) = 2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125
 SIZE (rust/crates/anstyle-wincon-3.0.6.crate) = 12271
-SHA256 (rust/crates/anyhow-1.0.97.crate) = dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f
-SIZE (rust/crates/anyhow-1.0.97.crate) = 52221
+SHA256 (rust/crates/anyhow-1.0.98.crate) = e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487
+SIZE (rust/crates/anyhow-1.0.98.crate) = 53334
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
 SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
@@ -39,10 +39,10 @@ SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce369
 SIZE (rust/crates/ciborium-io-0.2.2.crate) = 6697
 SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9
 SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695
-SHA256 (rust/crates/clap-4.5.35.crate) = d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944
-SIZE (rust/crates/clap-4.5.35.crate) = 56970
-SHA256 (rust/crates/clap_builder-4.5.35.crate) = 2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9
-SIZE (rust/crates/clap_builder-4.5.35.crate) = 168525
+SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071
+SIZE (rust/crates/clap-4.5.37.crate) = 56962
+SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2
+SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761
 SHA256 (rust/crates/clap_derive-4.5.32.crate) = 09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7
 SIZE (rust/crates/clap_derive-4.5.32.crate) = 33441
 SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6
@@ -203,9 +203,9 @@ SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681
 SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
-SHA256 (rust/crates/winnow-0.7.4.crate) = 0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36
-SIZE (rust/crates/winnow-0.7.4.crate) = 173588
+SHA256 (rust/crates/winnow-0.7.8.crate) = 9e27d6ad3dac991091e4d35de9ba2d2d00647c5d0fc26c5496dee55984ae111b
+SIZE (rust/crates/winnow-0.7.8.crate) = 174444
 SHA256 (rust/crates/yansi-1.0.1.crate) = cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049
 SIZE (rust/crates/yansi-1.0.1.crate) = 75497
-SHA256 (yamafaktory-jql-jql-v8.0.5_GH0.tar.gz) = 8a4441d7ef400967fc953a09e6becba4f60736993e8536082bcb4019a0475074
-SIZE (yamafaktory-jql-jql-v8.0.5_GH0.tar.gz) = 447727
+SHA256 (yamafaktory-jql-jql-v8.0.6_GH0.tar.gz) = 8af2f6c794cffeba9bc2604cf68cd7ddaa6126ec038786060b463474e8a88b5b
+SIZE (yamafaktory-jql-jql-v8.0.6_GH0.tar.gz) = 447699
diff --git a/textproc/lexilla/Makefile b/textproc/lexilla/Makefile
index 700c5296857c..5106d5c771bc 100644
--- a/textproc/lexilla/Makefile
+++ b/textproc/lexilla/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	lexilla
-DISTVERSION=	5.3.2
+DISTVERSION=	5.4.4
 CATEGORIES=	textproc
 MASTER_SITES=	https://www.scintilla.org/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -13,10 +13,9 @@ LICENSE_NAME=	License for Lexilla, Scintilla and SciTE
 LICENSE_FILE=	${WRKSRC}/../License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-#LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
 BUILD_DEPENDS=	scintilla>0:x11-toolkits/scintilla
 
-USES=		compiler:c++17-lang cpe gmake gnome iconv pkgconfig tar:tgz
+USES=		compiler:c++17-lang cpe gmake pkgconfig tar:tgz
 
 USE_LDCONFIG=	yes
 
@@ -41,6 +40,10 @@ PLIST_FILES=	include/lexilla/Lexilla.h \
 MAKE_ARGS+=	CLANG=1
 .endif
 
+pre-configure:
+	${REINPLACE_CMD} -e 's|../../scintilla/include|$$(LOCALBASE)/include/scintilla|g' \
+		${WRKSRC}/deps.mak
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lexilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h \
diff --git a/textproc/lexilla/distinfo b/textproc/lexilla/distinfo
index 186cba86c662..b7f58ea8e589 100644
--- a/textproc/lexilla/distinfo
+++ b/textproc/lexilla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719353875
-SHA256 (lexilla532.tgz) = fc06be954401c9dc1810f927bccd2604c43a70cf98178161cf817e95c4ebf00f
-SIZE (lexilla532.tgz) = 993809
+TIMESTAMP = 1746400565
+SHA256 (lexilla544.tgz) = 9df65d5283ebce2b907cd72cfb2f97d3f162c143122e8d5e57f4da23ff129205
+SIZE (lexilla544.tgz) = 1057566
diff --git a/textproc/lexilla/files/patch-src_deps.mak b/textproc/lexilla/files/patch-src_deps.mak
deleted file mode 100644
index a14b45a63581..000000000000
--- a/textproc/lexilla/files/patch-src_deps.mak
+++ /dev/null
@@ -1,1638 +0,0 @@
---- src/deps.mak.orig	2024-06-25 22:48:45 UTC
-+++ src/deps.mak
-@@ -1,15 +1,15 @@ $(DIR_O)/Lexilla.o: \
- # Created by DepGen.py. To recreate, run DepGen.py.
- $(DIR_O)/Lexilla.o: \
- 	../src/Lexilla.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
- 	../lexlib/LexerModule.h \
- 	../lexlib/CatalogueModules.h
- $(DIR_O)/Accessor.o: \
- 	../lexlib/Accessor.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -23,9 +23,9 @@ $(DIR_O)/DefaultLexer.o: \
- 	../lexlib/CharacterSet.h
- $(DIR_O)/DefaultLexer.o: \
- 	../lexlib/DefaultLexer.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -39,15 +39,15 @@ $(DIR_O)/LexAccessor.o: \
- 	../lexlib/CharacterSet.h
- $(DIR_O)/LexAccessor.o: \
- 	../lexlib/LexAccessor.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
- 	../lexlib/LexAccessor.h \
- 	../lexlib/CharacterSet.h
- $(DIR_O)/LexerBase.o: \
- 	../lexlib/LexerBase.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -57,9 +57,9 @@ $(DIR_O)/LexerModule.o: \
- 	../lexlib/LexerBase.h
- $(DIR_O)/LexerModule.o: \
- 	../lexlib/LexerModule.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -70,9 +70,9 @@ $(DIR_O)/LexerNoExceptions.o: \
- 	../lexlib/LexerSimple.h
- $(DIR_O)/LexerNoExceptions.o: \
- 	../lexlib/LexerNoExceptions.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -83,9 +83,9 @@ $(DIR_O)/LexerSimple.o: \
- 	../lexlib/LexerNoExceptions.h
- $(DIR_O)/LexerSimple.o: \
- 	../lexlib/LexerSimple.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -99,8 +99,8 @@ $(DIR_O)/StyleContext.o: \
- 	../lexlib/PropSetSimple.h
- $(DIR_O)/StyleContext.o: \
- 	../lexlib/StyleContext.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
- 	../lexlib/LexAccessor.h \
- 	../lexlib/Accessor.h \
- 	../lexlib/StyleContext.h \
-@@ -110,9 +110,9 @@ $(DIR_O)/LexA68k.o: \
- 	../lexlib/WordList.h
- $(DIR_O)/LexA68k.o: \
- 	../lexers/LexA68k.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -122,9 +122,9 @@ $(DIR_O)/LexAbaqus.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAbaqus.o: \
- 	../lexers/LexAbaqus.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -134,9 +134,9 @@ $(DIR_O)/LexAda.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAda.o: \
- 	../lexers/LexAda.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -146,9 +146,9 @@ $(DIR_O)/LexAPDL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAPDL.o: \
- 	../lexers/LexAPDL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -158,9 +158,9 @@ $(DIR_O)/LexAsciidoc.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAsciidoc.o: \
- 	../lexers/LexAsciidoc.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -170,9 +170,9 @@ $(DIR_O)/LexAsm.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAsm.o: \
- 	../lexers/LexAsm.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -183,9 +183,9 @@ $(DIR_O)/LexAsn1.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexAsn1.o: \
- 	../lexers/LexAsn1.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -195,9 +195,9 @@ $(DIR_O)/LexASY.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexASY.o: \
- 	../lexers/LexASY.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -207,9 +207,9 @@ $(DIR_O)/LexAU3.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAU3.o: \
- 	../lexers/LexAU3.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -219,9 +219,9 @@ $(DIR_O)/LexAVE.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAVE.o: \
- 	../lexers/LexAVE.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -231,9 +231,9 @@ $(DIR_O)/LexAVS.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexAVS.o: \
- 	../lexers/LexAVS.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -243,9 +243,9 @@ $(DIR_O)/LexBaan.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexBaan.o: \
- 	../lexers/LexBaan.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -256,9 +256,9 @@ $(DIR_O)/LexBash.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexBash.o: \
- 	../lexers/LexBash.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/StringCopy.h \
- 	../lexlib/InList.h \
-@@ -272,9 +272,9 @@ $(DIR_O)/LexBasic.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexBasic.o: \
- 	../lexers/LexBasic.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -285,9 +285,9 @@ $(DIR_O)/LexBatch.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexBatch.o: \
- 	../lexers/LexBatch.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/InList.h \
- 	../lexlib/WordList.h \
-@@ -298,9 +298,9 @@ $(DIR_O)/LexBibTeX.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexBibTeX.o: \
- 	../lexers/LexBibTeX.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -311,9 +311,9 @@ $(DIR_O)/LexBullant.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexBullant.o: \
- 	../lexers/LexBullant.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -323,9 +323,9 @@ $(DIR_O)/LexCaml.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCaml.o: \
- 	../lexers/LexCaml.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -335,9 +335,9 @@ $(DIR_O)/LexCIL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCIL.o: \
- 	../lexers/LexCIL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/StringCopy.h \
- 	../lexlib/WordList.h \
-@@ -350,9 +350,9 @@ $(DIR_O)/LexCLW.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexCLW.o: \
- 	../lexers/LexCLW.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -362,9 +362,9 @@ $(DIR_O)/LexCmake.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCmake.o: \
- 	../lexers/LexCmake.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -374,9 +374,9 @@ $(DIR_O)/LexCOBOL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCOBOL.o: \
- 	../lexers/LexCOBOL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -386,9 +386,9 @@ $(DIR_O)/LexCoffeeScript.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCoffeeScript.o: \
- 	../lexers/LexCoffeeScript.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -398,9 +398,9 @@ $(DIR_O)/LexConf.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexConf.o: \
- 	../lexers/LexConf.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -410,9 +410,9 @@ $(DIR_O)/LexCPP.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCPP.o: \
- 	../lexers/LexCPP.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/StringCopy.h \
- 	../lexlib/WordList.h \
-@@ -426,9 +426,9 @@ $(DIR_O)/LexCrontab.o: \
- 	../lexlib/SubStyles.h
- $(DIR_O)/LexCrontab.o: \
- 	../lexers/LexCrontab.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -438,9 +438,9 @@ $(DIR_O)/LexCsound.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCsound.o: \
- 	../lexers/LexCsound.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -450,9 +450,9 @@ $(DIR_O)/LexCSS.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexCSS.o: \
- 	../lexers/LexCSS.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -462,9 +462,9 @@ $(DIR_O)/LexD.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexD.o: \
- 	../lexers/LexD.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -475,9 +475,9 @@ $(DIR_O)/LexDataflex.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexDataflex.o: \
- 	../lexers/LexDataflex.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -487,9 +487,9 @@ $(DIR_O)/LexDiff.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexDiff.o: \
- 	../lexers/LexDiff.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -499,9 +499,9 @@ $(DIR_O)/LexDMAP.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexDMAP.o: \
- 	../lexers/LexDMAP.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -511,9 +511,9 @@ $(DIR_O)/LexDMIS.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexDMIS.o: \
- 	../lexers/LexDMIS.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -523,9 +523,9 @@ $(DIR_O)/LexECL.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexECL.o: \
- 	../lexers/LexECL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -537,18 +537,18 @@ $(DIR_O)/LexEDIFACT.o: \
- 	../lexlib/OptionSet.h
- $(DIR_O)/LexEDIFACT.o: \
- 	../lexers/LexEDIFACT.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/LexAccessor.h \
- 	../lexlib/LexerModule.h \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexEiffel.o: \
- 	../lexers/LexEiffel.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -558,9 +558,9 @@ $(DIR_O)/LexErlang.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexErlang.o: \
- 	../lexers/LexErlang.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -570,9 +570,9 @@ $(DIR_O)/LexErrorList.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexErrorList.o: \
- 	../lexers/LexErrorList.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/InList.h \
- 	../lexlib/WordList.h \
-@@ -583,9 +583,9 @@ $(DIR_O)/LexEScript.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexEScript.o: \
- 	../lexers/LexEScript.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -595,9 +595,9 @@ $(DIR_O)/LexFlagship.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexFlagship.o: \
- 	../lexers/LexFlagship.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -607,9 +607,9 @@ $(DIR_O)/LexForth.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexForth.o: \
- 	../lexers/LexForth.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -619,9 +619,9 @@ $(DIR_O)/LexFortran.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexFortran.o: \
- 	../lexers/LexFortran.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -631,9 +631,9 @@ $(DIR_O)/LexFSharp.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexFSharp.o: \
- 	../lexers/LexFSharp.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -644,9 +644,9 @@ $(DIR_O)/LexGAP.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexGAP.o: \
- 	../lexers/LexGAP.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -656,9 +656,9 @@ $(DIR_O)/LexGDScript.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexGDScript.o: \
- 	../lexers/LexGDScript.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/StringCopy.h \
- 	../lexlib/WordList.h \
-@@ -673,9 +673,9 @@ $(DIR_O)/LexGui4Cli.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexGui4Cli.o: \
- 	../lexers/LexGui4Cli.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -685,9 +685,9 @@ $(DIR_O)/LexHaskell.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexHaskell.o: \
- 	../lexers/LexHaskell.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -701,9 +701,9 @@ $(DIR_O)/LexHex.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexHex.o: \
- 	../lexers/LexHex.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -713,9 +713,9 @@ $(DIR_O)/LexHollywood.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexHollywood.o: \
- 	../lexers/LexHollywood.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -726,9 +726,9 @@ $(DIR_O)/LexHTML.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexHTML.o: \
- 	../lexers/LexHTML.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/InList.h \
- 	../lexlib/WordList.h \
-@@ -742,9 +742,9 @@ $(DIR_O)/LexIndent.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexIndent.o: \
- 	../lexers/LexIndent.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -754,9 +754,9 @@ $(DIR_O)/LexInno.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexInno.o: \
- 	../lexers/LexInno.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -766,9 +766,9 @@ $(DIR_O)/LexJSON.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexJSON.o: \
- 	../lexers/LexJSON.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -779,9 +779,9 @@ $(DIR_O)/LexJulia.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexJulia.o: \
- 	../lexers/LexJulia.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/StringCopy.h \
- 	../lexlib/PropSetSimple.h \
-@@ -796,9 +796,9 @@ $(DIR_O)/LexKix.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexKix.o: \
- 	../lexers/LexKix.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -808,9 +808,9 @@ $(DIR_O)/LexKVIrc.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexKVIrc.o: \
- 	../lexers/LexKVIrc.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -820,9 +820,9 @@ $(DIR_O)/LexLaTeX.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexLaTeX.o: \
- 	../lexers/LexLaTeX.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -835,9 +835,9 @@ $(DIR_O)/LexLisp.o: \
- 	../lexlib/LexerBase.h
- $(DIR_O)/LexLisp.o: \
- 	../lexers/LexLisp.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -847,9 +847,9 @@ $(DIR_O)/LexLout.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexLout.o: \
- 	../lexers/LexLout.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -859,9 +859,9 @@ $(DIR_O)/LexLua.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexLua.o: \
- 	../lexers/LexLua.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -874,9 +874,9 @@ $(DIR_O)/LexMagik.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexMagik.o: \
- 	../lexers/LexMagik.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -886,9 +886,9 @@ $(DIR_O)/LexMake.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMake.o: \
- 	../lexers/LexMake.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -898,9 +898,9 @@ $(DIR_O)/LexMarkdown.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMarkdown.o: \
- 	../lexers/LexMarkdown.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -910,9 +910,9 @@ $(DIR_O)/LexMatlab.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMatlab.o: \
- 	../lexers/LexMatlab.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -922,9 +922,9 @@ $(DIR_O)/LexMaxima.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMaxima.o: \
- 	../lexers/LexMaxima.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -934,9 +934,9 @@ $(DIR_O)/LexMetapost.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMetapost.o: \
- 	../lexers/LexMetapost.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -946,9 +946,9 @@ $(DIR_O)/LexMMIXAL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMMIXAL.o: \
- 	../lexers/LexMMIXAL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -958,9 +958,9 @@ $(DIR_O)/LexModula.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexModula.o: \
- 	../lexers/LexModula.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -971,9 +971,9 @@ $(DIR_O)/LexMPT.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMPT.o: \
- 	../lexers/LexMPT.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -983,9 +983,9 @@ $(DIR_O)/LexMSSQL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMSSQL.o: \
- 	../lexers/LexMSSQL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -995,9 +995,9 @@ $(DIR_O)/LexMySQL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexMySQL.o: \
- 	../lexers/LexMySQL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1007,9 +1007,9 @@ $(DIR_O)/LexNim.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexNim.o: \
- 	../lexers/LexNim.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/StringCopy.h \
- 	../lexlib/WordList.h \
-@@ -1022,9 +1022,9 @@ $(DIR_O)/LexNimrod.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexNimrod.o: \
- 	../lexers/LexNimrod.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1034,9 +1034,9 @@ $(DIR_O)/LexNsis.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexNsis.o: \
- 	../lexers/LexNsis.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1046,9 +1046,9 @@ $(DIR_O)/LexNull.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexNull.o: \
- 	../lexers/LexNull.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1058,9 +1058,9 @@ $(DIR_O)/LexOpal.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexOpal.o: \
- 	../lexers/LexOpal.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1070,9 +1070,9 @@ $(DIR_O)/LexOScript.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexOScript.o: \
- 	../lexers/LexOScript.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1082,9 +1082,9 @@ $(DIR_O)/LexPascal.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPascal.o: \
- 	../lexers/LexPascal.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1094,9 +1094,9 @@ $(DIR_O)/LexPB.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPB.o: \
- 	../lexers/LexPB.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1106,9 +1106,9 @@ $(DIR_O)/LexPerl.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPerl.o: \
- 	../lexers/LexPerl.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1119,9 +1119,9 @@ $(DIR_O)/LexPLM.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexPLM.o: \
- 	../lexers/LexPLM.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1131,9 +1131,9 @@ $(DIR_O)/LexPO.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPO.o: \
- 	../lexers/LexPO.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1143,9 +1143,9 @@ $(DIR_O)/LexPOV.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPOV.o: \
- 	../lexers/LexPOV.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1155,9 +1155,9 @@ $(DIR_O)/LexPowerPro.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPowerPro.o: \
- 	../lexers/LexPowerPro.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1167,9 +1167,9 @@ $(DIR_O)/LexPowerShell.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPowerShell.o: \
- 	../lexers/LexPowerShell.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1179,9 +1179,9 @@ $(DIR_O)/LexProgress.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexProgress.o: \
- 	../lexers/LexProgress.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1193,9 +1193,9 @@ $(DIR_O)/LexProps.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexProps.o: \
- 	../lexers/LexProps.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1205,9 +1205,9 @@ $(DIR_O)/LexPS.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPS.o: \
- 	../lexers/LexPS.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1217,9 +1217,9 @@ $(DIR_O)/LexPython.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexPython.o: \
- 	../lexers/LexPython.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1233,9 +1233,9 @@ $(DIR_O)/LexR.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexR.o: \
- 	../lexers/LexR.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1245,9 +1245,9 @@ $(DIR_O)/LexRaku.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexRaku.o: \
- 	../lexers/LexRaku.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1259,9 +1259,9 @@ $(DIR_O)/LexRebol.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexRebol.o: \
- 	../lexers/LexRebol.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1271,9 +1271,9 @@ $(DIR_O)/LexRegistry.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexRegistry.o: \
- 	../lexers/LexRegistry.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1284,9 +1284,9 @@ $(DIR_O)/LexRuby.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexRuby.o: \
- 	../lexers/LexRuby.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1296,9 +1296,9 @@ $(DIR_O)/LexRust.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexRust.o: \
- 	../lexers/LexRust.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/PropSetSimple.h \
- 	../lexlib/WordList.h \
-@@ -1311,9 +1311,9 @@ $(DIR_O)/LexSAS.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexSAS.o: \
- 	../lexers/LexSAS.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1323,9 +1323,9 @@ $(DIR_O)/LexScriptol.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexScriptol.o: \
- 	../lexers/LexScriptol.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1335,9 +1335,9 @@ $(DIR_O)/LexSmalltalk.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexSmalltalk.o: \
- 	../lexers/LexSmalltalk.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1347,9 +1347,9 @@ $(DIR_O)/LexSML.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexSML.o: \
- 	../lexers/LexSML.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1359,9 +1359,9 @@ $(DIR_O)/LexSorcus.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexSorcus.o: \
- 	../lexers/LexSorcus.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1371,9 +1371,9 @@ $(DIR_O)/LexSpecman.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexSpecman.o: \
- 	../lexers/LexSpecman.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1383,9 +1383,9 @@ $(DIR_O)/LexSpice.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexSpice.o: \
- 	../lexers/LexSpice.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1395,9 +1395,9 @@ $(DIR_O)/LexSQL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexSQL.o: \
- 	../lexers/LexSQL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1410,9 +1410,9 @@ $(DIR_O)/LexStata.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexStata.o: \
- 	../lexers/LexStata.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1422,9 +1422,9 @@ $(DIR_O)/LexSTTXT.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexSTTXT.o: \
- 	../lexers/LexSTTXT.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1434,9 +1434,9 @@ $(DIR_O)/LexTACL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexTACL.o: \
- 	../lexers/LexTACL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1446,9 +1446,9 @@ $(DIR_O)/LexTADS3.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexTADS3.o: \
- 	../lexers/LexTADS3.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1458,9 +1458,9 @@ $(DIR_O)/LexTAL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexTAL.o: \
- 	../lexers/LexTAL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1470,9 +1470,9 @@ $(DIR_O)/LexTCL.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexTCL.o: \
- 	../lexers/LexTCL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1482,9 +1482,9 @@ $(DIR_O)/LexTCMD.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexTCMD.o: \
- 	../lexers/LexTCMD.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1494,9 +1494,9 @@ $(DIR_O)/LexTeX.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexTeX.o: \
- 	../lexers/LexTeX.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1506,9 +1506,9 @@ $(DIR_O)/LexTxt2tags.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexTxt2tags.o: \
- 	../lexers/LexTxt2tags.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1518,9 +1518,9 @@ $(DIR_O)/LexVB.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexVB.o: \
- 	../lexers/LexVB.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1530,9 +1530,9 @@ $(DIR_O)/LexVerilog.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexVerilog.o: \
- 	../lexers/LexVerilog.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1545,9 +1545,9 @@ $(DIR_O)/LexVHDL.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexVHDL.o: \
- 	../lexers/LexVHDL.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1557,9 +1557,9 @@ $(DIR_O)/LexVisualProlog.o: \
- 	../lexlib/LexerModule.h
- $(DIR_O)/LexVisualProlog.o: \
- 	../lexers/LexVisualProlog.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
-@@ -1572,17 +1572,17 @@ $(DIR_O)/LexX12.o: \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexX12.o: \
- 	../lexers/LexX12.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/LexerModule.h \
- 	../lexlib/DefaultLexer.h
- $(DIR_O)/LexYAML.o: \
- 	../lexers/LexYAML.cxx \
--	../../scintilla/include/ILexer.h \
--	../../scintilla/include/Sci_Position.h \
--	../../scintilla/include/Scintilla.h \
-+	$(LOCALBASE)/include/scintilla/ILexer.h \
-+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
-+	$(LOCALBASE)/include/scintilla/Scintilla.h \
- 	../include/SciLexer.h \
- 	../lexlib/WordList.h \
- 	../lexlib/LexAccessor.h \
diff --git a/textproc/libuninameslist/Makefile b/textproc/libuninameslist/Makefile
index f08d432c319e..d3cd70357d3b 100644
--- a/textproc/libuninameslist/Makefile
+++ b/textproc/libuninameslist/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libuninameslist
-DISTVERSION=	20221022
-PORTREVISION=	1
+DISTVERSION=	20240910
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/fontforge/${PORTNAME}/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-dist-${DISTVERSION}
@@ -15,17 +14,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 INSTALL_TARGET=	install-strip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-OPTIONS_DEFINE=	FRENCH
-OPTIONS_DEFAULT=FRENCH
-OPTIONS_SUB=yes
+OPTIONS_DEFINE=		FRENCH
+OPTIONS_DEFAULT=	FRENCH
+OPTIONS_SUB=		yes
 
-FRENCH_DESC=	Build French library
+FRENCH_DESC=			Build French library
 FRENCH_CONFIGURE_ENABLE=	frenchlib
 
 .include <bsd.port.mk>
diff --git a/textproc/libuninameslist/distinfo b/textproc/libuninameslist/distinfo
index b988bc5207be..c2cbd6d9278d 100644
--- a/textproc/libuninameslist/distinfo
+++ b/textproc/libuninameslist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669660536
-SHA256 (libuninameslist-dist-20221022.tar.gz) = 92c833936d653b2f205fb5e7ac82818311824dabdc7abdc2e81f07c3a0ea39bb
-SIZE (libuninameslist-dist-20221022.tar.gz) = 1254897
+TIMESTAMP = 1746317075
+SHA256 (libuninameslist-dist-20240910.tar.gz) = e59aab324ca0a3a713fe85c09a56c40c680a8458438d90624597920b3ef0be26
+SIZE (libuninameslist-dist-20240910.tar.gz) = 1340371
diff --git a/textproc/libuninameslist/pkg-plist b/textproc/libuninameslist/pkg-plist
index ca193c23d295..4c4f6a8fe018 100644
--- a/textproc/libuninameslist/pkg-plist
+++ b/textproc/libuninameslist/pkg-plist
@@ -3,11 +3,11 @@ include/uninameslist.h
 %%FRENCH%%lib/libuninameslist-fr.a
 %%FRENCH%%lib/libuninameslist-fr.so
 %%FRENCH%%lib/libuninameslist-fr.so.1
-%%FRENCH%%lib/libuninameslist-fr.so.1.0.5
+%%FRENCH%%lib/libuninameslist-fr.so.1.0.7
 lib/libuninameslist.a
 lib/libuninameslist.so
 lib/libuninameslist.so.1
-lib/libuninameslist.so.1.0.12
+lib/libuninameslist.so.1.0.15
 libdata/pkgconfig/libuninameslist.pc
 %%FRENCH%%share/man/man3/libuninameslist-fr.3.gz
 share/man/man3/libuninameslist.3.gz
diff --git a/textproc/linux-rl9-libxslt/Makefile b/textproc/linux-rl9-libxslt/Makefile
index c2f28b697ceb..e268e3b4fc5a 100644
--- a/textproc/linux-rl9-libxslt/Makefile
+++ b/textproc/linux-rl9-libxslt/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libxslt
 PORTVERSION=	1.1.34
-DISTVERSIONSUFFIX=	-9.el9_5.1
+DISTVERSIONSUFFIX=	-9.el9_5.3
 PORTREVISION=	2
 CATEGORIES=	textproc linux
 
diff --git a/textproc/linux-rl9-libxslt/distinfo b/textproc/linux-rl9-libxslt/distinfo
index 561c9ebde98c..e06834de8ae3 100644
--- a/textproc/linux-rl9-libxslt/distinfo
+++ b/textproc/linux-rl9-libxslt/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1744754694
-SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.1.aarch64.rpm) = cbe61dc639f541a8998bfbf6a9c41e6496eff9ab39b0006f9ac07118b6689951
-SIZE (rocky/l/libxslt-1.1.34-9.el9_5.1.aarch64.rpm) = 242600
-SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.1.i686.rpm) = 274e2576c6800556b287619f90d123590311a7302bb6c1657964d9dabd3c3185
-SIZE (rocky/l/libxslt-1.1.34-9.el9_5.1.i686.rpm) = 261262
-SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.1.x86_64.rpm) = abc25ff53b49c8f8c42f1fdddaf2dfeea0b6e3a4699442a310761b0ad27b4c86
-SIZE (rocky/l/libxslt-1.1.34-9.el9_5.1.x86_64.rpm) = 245091
-SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.1.src.rpm) = 83724d28f93124e3e60357bae957d3837b638f2d29da0ec48a760b1dd19c62f2
-SIZE (rocky/l/libxslt-1.1.34-9.el9_5.1.src.rpm) = 3550701
+TIMESTAMP = 1746515269
+SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.3.aarch64.rpm) = e3129459d32ce481efadea71a39088d369fbd3ed422897dc82d663d3cf2445a8
+SIZE (rocky/l/libxslt-1.1.34-9.el9_5.3.aarch64.rpm) = 242701
+SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.3.i686.rpm) = ed444faf1edadfecb9e2587513ad646992a90e9626e5edc88ee13c7547c80d58
+SIZE (rocky/l/libxslt-1.1.34-9.el9_5.3.i686.rpm) = 261593
+SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.3.x86_64.rpm) = 208fe9293cbdce22f5a67dbbea78a42ad1151639132f1c2bc5164128e074a34f
+SIZE (rocky/l/libxslt-1.1.34-9.el9_5.3.x86_64.rpm) = 245204
+SHA256 (rocky/l/libxslt-1.1.34-9.el9_5.3.src.rpm) = 2aecab508b6612bc42d9a895e8f46d99cd0245f6194c99697ac2ada287ca9590
+SIZE (rocky/l/libxslt-1.1.34-9.el9_5.3.src.rpm) = 3552090
diff --git a/textproc/linux-rl9-libxslt/pkg-plist.aarch64 b/textproc/linux-rl9-libxslt/pkg-plist.aarch64
index 5c21ae65d59b..32ea42d04d4d 100644
--- a/textproc/linux-rl9-libxslt/pkg-plist.aarch64
+++ b/textproc/linux-rl9-libxslt/pkg-plist.aarch64
@@ -1,7 +1,7 @@
 usr/bin/xsltproc
-usr/lib/.build-id/00/06c35ff12fe99ac60ffb103fc504f904d20087
-usr/lib/.build-id/12/3a570e5d7b672b9823ae5261f001921795cffa
-usr/lib/.build-id/33/fc047ddac2ee12bc870d28fc0545c3de84c35e
+usr/lib/.build-id/99/055e62cafca7cc892d8990947109a181d05c8e
+usr/lib/.build-id/ec/bb423f672cbdc4b768c2eabb76649cad655c4d
+usr/lib/.build-id/f1/a88b9f7efb5d3df4c53375b11d7e7b711ae66a
 usr/lib64/libexslt.so.0
 usr/lib64/libexslt.so.0.8.20
 usr/lib64/libxslt.so.1
diff --git a/textproc/linux-rl9-libxslt/pkg-plist.amd64 b/textproc/linux-rl9-libxslt/pkg-plist.amd64
index 3ba7b03c02b9..01106ad7f46f 100644
--- a/textproc/linux-rl9-libxslt/pkg-plist.amd64
+++ b/textproc/linux-rl9-libxslt/pkg-plist.amd64
@@ -1,10 +1,10 @@
 usr/bin/xsltproc
-usr/lib/.build-id/29/d846afce21d780104c69c56fa2474089f31185
-usr/lib/.build-id/65/4d7585adb9fd8988cf1fb8eac8ab7d1d4f049b
-usr/lib/.build-id/95/3532ae3833a4536f7e2bd548b21d9974b55a9f
-usr/lib/.build-id/e2/2df8e6f51aecaf7ffcf8691302001dfe7c1676
-usr/lib/.build-id/f3/789beaaa48463304a9a012849642032d704f3c
-usr/lib/.build-id/ff/a4a18bc8f6e821fb4fd1c0550289b66c4d7abc
+usr/lib/.build-id/46/8f11721e309e853f46641fff184cbe015cbd2f
+usr/lib/.build-id/7d/19066164a1d8ac47ae9102c988086fe122177e
+usr/lib/.build-id/7d/a35be296e0ea1c54fed5f478a502a476087c48
+usr/lib/.build-id/c0/4948d6638edc8e46034e15398d8445a920e393
+usr/lib/.build-id/e6/229eabc11399a3bd16e959bb06ad5c4728c379
+usr/lib/.build-id/fc/2273893de1a264258a2e4dae36a5590304b8b5
 usr/lib/libexslt.so.0
 usr/lib/libexslt.so.0.8.20
 usr/lib/libxslt.so.1
diff --git a/textproc/mdbook/Makefile b/textproc/mdbook/Makefile
index 34fce731453f..909b92830e7a 100644
--- a/textproc/mdbook/Makefile
+++ b/textproc/mdbook/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	mdbook
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.48
-PORTREVISION=	1
+DISTVERSION=	0.4.49
 CATEGORIES=	textproc
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/textproc/mdbook/Makefile.crates b/textproc/mdbook/Makefile.crates
index 794974e42edd..93ef3836562a 100644
--- a/textproc/mdbook/Makefile.crates
+++ b/textproc/mdbook/Makefile.crates
@@ -1,63 +1,67 @@
 CARGO_CRATES=	addr2line-0.24.2 \
 		adler2-2.0.0 \
 		aho-corasick-1.1.3 \
-		ammonia-4.0.0 \
+		ammonia-4.1.0 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.5 \
 		anstream-0.6.18 \
 		anstyle-1.0.10 \
+		anstyle-lossy-1.1.3 \
 		anstyle-parse-0.2.6 \
 		anstyle-query-1.1.2 \
+		anstyle-svg-0.1.7 \
 		anstyle-wincon-3.0.7 \
-		anyhow-1.0.95 \
-		assert_cmd-2.0.16 \
+		anyhow-1.0.98 \
 		autocfg-1.4.0 \
 		backtrace-0.3.74 \
 		base64-0.21.7 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
-		bitflags-2.8.0 \
+		bitflags-2.9.0 \
 		block-buffer-0.10.4 \
-		bstr-1.11.3 \
-		bumpalo-3.16.0 \
+		bstr-1.12.0 \
+		bumpalo-3.17.0 \
 		byteorder-1.5.0 \
-		bytes-1.9.0 \
-		cc-1.2.10 \
+		bytes-1.10.1 \
+		cc-1.2.21 \
 		cfg-if-1.0.0 \
-		chrono-0.4.39 \
-		clap-4.5.27 \
-		clap_builder-4.5.27 \
-		clap_complete-4.5.43 \
+		chrono-0.4.41 \
+		clap-4.5.37 \
+		clap_builder-4.5.37 \
+		clap_complete-4.5.48 \
 		clap_lex-0.7.4 \
 		colorchoice-1.0.3 \
+		content_inspector-0.2.4 \
 		core-foundation-sys-0.8.7 \
 		cpufeatures-0.2.17 \
 		crossbeam-deque-0.8.6 \
 		crossbeam-epoch-0.9.18 \
 		crossbeam-utils-0.8.21 \
 		crypto-common-0.1.6 \
-		darling-0.20.10 \
-		darling_core-0.20.10 \
-		darling_macro-0.20.10 \
-		data-encoding-2.7.0 \
+		cssparser-0.35.0 \
+		cssparser-macros-0.6.1 \
+		darling-0.20.11 \
+		darling_core-0.20.11 \
+		darling_macro-0.20.11 \
+		data-encoding-2.9.0 \
 		dbus-0.9.7 \
 		derive_builder-0.20.2 \
 		derive_builder_core-0.20.2 \
 		derive_builder_macro-0.20.2 \
 		diff-0.1.13 \
-		difflib-0.4.0 \
 		digest-0.10.7 \
 		displaydoc-0.2.5 \
-		doc-comment-0.3.3 \
+		dtoa-1.0.10 \
+		dtoa-short-0.3.5 \
+		dunce-1.0.5 \
 		elasticlunr-rs-3.0.2 \
 		env_filter-0.1.3 \
-		env_logger-0.11.6 \
-		equivalent-1.0.1 \
-		errno-0.3.10 \
+		env_logger-0.11.8 \
+		equivalent-1.0.2 \
+		errno-0.3.11 \
 		fastrand-2.3.0 \
 		filetime-0.2.25 \
-		float-cmp-0.10.0 \
 		fnv-1.0.7 \
 		form_urlencoded-1.2.1 \
 		fsevent-sys-4.1.0 \
@@ -69,64 +73,68 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		futures-task-0.3.31 \
 		futures-util-0.3.31 \
 		generic-array-0.14.7 \
-		getrandom-0.2.15 \
+		getrandom-0.2.16 \
+		getrandom-0.3.2 \
 		gimli-0.31.1 \
-		globset-0.4.15 \
+		globset-0.4.16 \
 		h2-0.3.26 \
-		handlebars-6.3.0 \
-		hashbrown-0.15.2 \
+		handlebars-6.3.2 \
+		hashbrown-0.15.3 \
 		headers-0.3.9 \
 		headers-core-0.2.0 \
 		hex-0.4.3 \
+		html-escape-0.2.13 \
 		html5ever-0.26.0 \
-		html5ever-0.27.0 \
+		html5ever-0.31.0 \
 		http-0.2.12 \
-		http-1.2.0 \
+		http-1.3.1 \
 		http-body-0.4.6 \
-		httparse-1.10.0 \
+		httparse-1.10.1 \
 		httpdate-1.0.3 \
-		humantime-2.1.0 \
 		hyper-0.14.32 \
-		iana-time-zone-0.1.61 \
+		iana-time-zone-0.1.63 \
 		iana-time-zone-haiku-0.1.2 \
 		icu_collections-1.5.0 \
 		icu_locid-1.5.0 \
 		icu_locid_transform-1.5.0 \
-		icu_locid_transform_data-1.5.0 \
+		icu_locid_transform_data-1.5.1 \
 		icu_normalizer-1.5.0 \
-		icu_normalizer_data-1.5.0 \
+		icu_normalizer_data-1.5.1 \
 		icu_properties-1.5.1 \
-		icu_properties_data-1.5.0 \
+		icu_properties_data-1.5.1 \
 		icu_provider-1.5.0 \
 		icu_provider_macros-1.5.0 \
 		ident_case-1.0.1 \
 		idna-1.0.3 \
 		idna_adapter-1.2.0 \
 		ignore-0.4.23 \
-		indexmap-2.7.1 \
+		indexmap-2.9.0 \
 		inotify-0.11.0 \
 		inotify-sys-0.1.5 \
 		is_terminal_polyfill-1.70.1 \
-		itoa-1.0.14 \
+		itoa-1.0.15 \
+		jiff-0.2.12 \
+		jiff-static-0.2.12 \
 		js-sys-0.3.77 \
 		kqueue-1.0.8 \
 		kqueue-sys-1.0.4 \
-		libc-0.2.169 \
+		libc-0.2.172 \
 		libdbus-sys-0.2.5 \
 		libredox-0.1.3 \
-		linux-raw-sys-0.4.15 \
-		litemap-0.7.4 \
+		linux-raw-sys-0.9.4 \
+		litemap-0.7.5 \
 		lock_api-0.4.12 \
-		log-0.4.25 \
+		log-0.4.27 \
 		mac-0.1.1 \
 		maplit-1.0.2 \
 		markup5ever-0.11.0 \
-		markup5ever-0.12.1 \
+		markup5ever-0.16.1 \
 		markup5ever_rcdom-0.2.0 \
+		match_token-0.1.0 \
 		memchr-2.7.4 \
 		mime-0.3.17 \
 		mime_guess-2.0.5 \
-		miniz_oxide-0.8.3 \
+		miniz_oxide-0.8.8 \
 		mio-1.0.3 \
 		new_debug_unreachable-1.0.6 \
 		normalize-line-endings-0.3.0 \
@@ -138,89 +146,92 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		num-order-1.2.0 \
 		num-traits-0.2.19 \
 		object-0.36.7 \
-		once_cell-1.20.2 \
+		once_cell-1.21.3 \
 		opener-0.7.2 \
 		parking_lot-0.12.3 \
 		parking_lot_core-0.9.10 \
 		pathdiff-0.2.3 \
 		percent-encoding-2.3.1 \
-		pest-2.7.15 \
-		pest_derive-2.7.15 \
-		pest_generator-2.7.15 \
-		pest_meta-2.7.15 \
+		pest-2.8.0 \
+		pest_derive-2.8.0 \
+		pest_generator-2.8.0 \
+		pest_meta-2.8.0 \
 		phf-0.10.1 \
 		phf-0.11.3 \
 		phf_codegen-0.10.0 \
 		phf_codegen-0.11.3 \
 		phf_generator-0.10.0 \
 		phf_generator-0.11.3 \
+		phf_macros-0.11.3 \
 		phf_shared-0.10.0 \
 		phf_shared-0.11.3 \
-		pin-project-1.1.8 \
-		pin-project-internal-1.1.8 \
+		pin-project-1.1.10 \
+		pin-project-internal-1.1.10 \
 		pin-project-lite-0.2.16 \
 		pin-utils-0.1.0 \
-		pkg-config-0.3.31 \
-		ppv-lite86-0.2.20 \
+		pkg-config-0.3.32 \
+		portable-atomic-1.11.0 \
+		portable-atomic-util-0.2.4 \
+		ppv-lite86-0.2.21 \
 		precomputed-hash-0.1.1 \
-		predicates-3.1.3 \
-		predicates-core-1.0.9 \
-		predicates-tree-1.0.12 \
 		pretty_assertions-1.4.1 \
-		proc-macro2-1.0.93 \
+		proc-macro2-1.0.95 \
 		pulldown-cmark-0.10.3 \
 		pulldown-cmark-0.12.2 \
 		pulldown-cmark-escape-0.10.1 \
 		pulldown-cmark-to-cmark-18.0.0 \
-		quote-1.0.38 \
+		quote-1.0.40 \
+		r-efi-5.2.0 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
-		redox_syscall-0.5.8 \
+		redox_syscall-0.5.12 \
 		regex-1.11.1 \
 		regex-automata-0.4.9 \
 		regex-syntax-0.8.5 \
 		rustc-demangle-0.1.24 \
-		rustix-0.38.44 \
-		rustversion-1.0.19 \
-		ryu-1.0.19 \
+		rustix-1.0.7 \
+		rustversion-1.0.20 \
+		ryu-1.0.20 \
 		same-file-1.0.6 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.2.0 \
-		select-0.6.0 \
-		semver-1.0.25 \
-		serde-1.0.217 \
-		serde_derive-1.0.217 \
-		serde_json-1.0.137 \
+		select-0.6.1 \
+		semver-1.0.26 \
+		serde-1.0.219 \
+		serde_derive-1.0.219 \
+		serde_json-1.0.140 \
 		serde_urlencoded-0.7.1 \
 		sha1-0.10.6 \
-		sha2-0.10.8 \
+		sha2-0.10.9 \
 		shlex-1.3.0 \
+		similar-2.7.0 \
 		siphasher-0.3.11 \
 		siphasher-1.0.1 \
 		slab-0.4.9 \
-		smallvec-1.13.2 \
-		socket2-0.5.8 \
+		smallvec-1.15.0 \
+		snapbox-0.6.21 \
+		snapbox-macros-0.3.10 \
+		socket2-0.5.9 \
 		stable_deref_trait-1.2.0 \
-		string_cache-0.8.7 \
-		string_cache_codegen-0.5.2 \
+		string_cache-0.8.9 \
+		string_cache_codegen-0.5.4 \
 		strsim-0.11.1 \
 		syn-1.0.109 \
-		syn-2.0.96 \
-		synstructure-0.13.1 \
-		tempfile-3.15.0 \
+		syn-2.0.101 \
+		synstructure-0.13.2 \
+		tempfile-3.19.1 \
 		tendril-0.4.3 \
-		terminal_size-0.4.1 \
-		termtree-0.5.1 \
+		terminal_size-0.4.2 \
 		thiserror-1.0.69 \
-		thiserror-2.0.11 \
+		thiserror-2.0.12 \
 		thiserror-impl-1.0.69 \
-		thiserror-impl-2.0.11 \
+		thiserror-impl-2.0.12 \
 		tinystr-0.7.6 \
-		tokio-1.43.0 \
+		tokio-1.44.2 \
 		tokio-macros-2.5.0 \
 		tokio-tungstenite-0.21.0 \
-		tokio-util-0.7.13 \
+		tokio-util-0.7.15 \
 		toml-0.5.11 \
 		topological-sort-0.2.2 \
 		tower-service-0.3.3 \
@@ -228,31 +239,39 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		tracing-core-0.1.33 \
 		try-lock-0.2.5 \
 		tungstenite-0.21.0 \
-		typenum-1.17.0 \
+		typenum-1.18.0 \
 		ucd-trie-0.1.7 \
 		unicase-2.8.1 \
-		unicode-ident-1.0.16 \
+		unicode-ident-1.0.18 \
+		unicode-width-0.2.0 \
 		url-2.5.4 \
 		utf-8-0.7.6 \
 		utf16_iter-1.0.5 \
+		utf8-width-0.1.7 \
 		utf8_iter-1.0.4 \
 		utf8parse-0.2.2 \
 		version_check-0.9.5 \
-		wait-timeout-0.2.0 \
 		walkdir-2.5.0 \
 		want-0.3.1 \
 		warp-0.3.7 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasi-0.14.2+wasi-0.2.4 \
 		wasm-bindgen-0.2.100 \
 		wasm-bindgen-backend-0.2.100 \
 		wasm-bindgen-macro-0.2.100 \
 		wasm-bindgen-macro-support-0.2.100 \
 		wasm-bindgen-shared-0.2.100 \
+		web_atoms-0.1.1 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.9 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-core-0.52.0 \
+		windows-core-0.61.0 \
+		windows-implement-0.60.0 \
+		windows-interface-0.59.1 \
+		windows-link-0.1.1 \
+		windows-result-0.3.2 \
+		windows-strings-0.4.0 \
 		windows-sys-0.52.0 \
 		windows-sys-0.59.0 \
 		windows-targets-0.52.6 \
@@ -264,15 +283,16 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		windows_x86_64_gnu-0.52.6 \
 		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_msvc-0.52.6 \
+		wit-bindgen-rt-0.39.0 \
 		write16-1.0.0 \
 		writeable-0.5.5 \
 		xml5ever-0.17.0 \
 		yansi-1.0.1 \
 		yoke-0.7.5 \
 		yoke-derive-0.7.5 \
-		zerocopy-0.7.35 \
-		zerocopy-derive-0.7.35 \
-		zerofrom-0.1.5 \
-		zerofrom-derive-0.1.5 \
+		zerocopy-0.8.25 \
+		zerocopy-derive-0.8.25 \
+		zerofrom-0.1.6 \
+		zerofrom-derive-0.1.6 \
 		zerovec-0.10.4 \
 		zerovec-derive-0.10.3
diff --git a/textproc/mdbook/distinfo b/textproc/mdbook/distinfo
index 2c5ad1ffc91e..2e6f21b95860 100644
--- a/textproc/mdbook/distinfo
+++ b/textproc/mdbook/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1743507473
+TIMESTAMP = 1746486137
 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
 SIZE (rust/crates/adler2-2.0.0.crate) = 13529
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
-SHA256 (rust/crates/ammonia-4.0.0.crate) = 1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459
-SIZE (rust/crates/ammonia-4.0.0.crate) = 47763
+SHA256 (rust/crates/ammonia-4.1.0.crate) = 3ada2ee439075a3e70b6992fce18ac4e407cd05aea9ca3f75d2c0b0c20bbb364
+SIZE (rust/crates/ammonia-4.1.0.crate) = 53061
 SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
 SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
@@ -15,16 +15,18 @@ SHA256 (rust/crates/anstream-0.6.18.crate) = 8acc5369981196006228e28809f761875c0
 SIZE (rust/crates/anstream-0.6.18.crate) = 29681
 SHA256 (rust/crates/anstyle-1.0.10.crate) = 55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9
 SIZE (rust/crates/anstyle-1.0.10.crate) = 15725
+SHA256 (rust/crates/anstyle-lossy-1.1.3.crate) = 934ff8719effd2023a48cf63e69536c1c3ced9d3895068f6f5cc9a4ff845e59b
+SIZE (rust/crates/anstyle-lossy-1.1.3.crate) = 9983
 SHA256 (rust/crates/anstyle-parse-0.2.6.crate) = 3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9
 SIZE (rust/crates/anstyle-parse-0.2.6.crate) = 22343
 SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c
 SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969
+SHA256 (rust/crates/anstyle-svg-0.1.7.crate) = d3607949e9f6de49ea4bafe12f5e4fd73613ebf24795e48587302a8cc0e4bb35
+SIZE (rust/crates/anstyle-svg-0.1.7.crate) = 12966
 SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e
 SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400
-SHA256 (rust/crates/anyhow-1.0.95.crate) = 34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04
-SIZE (rust/crates/anyhow-1.0.95.crate) = 52155
-SHA256 (rust/crates/assert_cmd-2.0.16.crate) = dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d
-SIZE (rust/crates/assert_cmd-2.0.16.crate) = 26554
+SHA256 (rust/crates/anyhow-1.0.98.crate) = e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487
+SIZE (rust/crates/anyhow-1.0.98.crate) = 53334
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
 SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
@@ -37,34 +39,36 @@ SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41a
 SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.8.0.crate) = 8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36
-SIZE (rust/crates/bitflags-2.8.0.crate) = 47482
+SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd
+SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
-SHA256 (rust/crates/bstr-1.11.3.crate) = 531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0
-SIZE (rust/crates/bstr-1.11.3.crate) = 351536
-SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
-SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/bstr-1.12.0.crate) = 234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4
+SIZE (rust/crates/bstr-1.12.0.crate) = 351557
+SHA256 (rust/crates/bumpalo-3.17.0.crate) = 1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf
+SIZE (rust/crates/bumpalo-3.17.0.crate) = 91975
 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
-SHA256 (rust/crates/bytes-1.9.0.crate) = 325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b
-SIZE (rust/crates/bytes-1.9.0.crate) = 67320
-SHA256 (rust/crates/cc-1.2.10.crate) = 13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229
-SIZE (rust/crates/cc-1.2.10.crate) = 101251
+SHA256 (rust/crates/bytes-1.10.1.crate) = d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a
+SIZE (rust/crates/bytes-1.10.1.crate) = 76779
+SHA256 (rust/crates/cc-1.2.21.crate) = 8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0
+SIZE (rust/crates/cc-1.2.21.crate) = 106117
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/chrono-0.4.39.crate) = 7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825
-SIZE (rust/crates/chrono-0.4.39.crate) = 222248
-SHA256 (rust/crates/clap-4.5.27.crate) = 769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796
-SIZE (rust/crates/clap-4.5.27.crate) = 55737
-SHA256 (rust/crates/clap_builder-4.5.27.crate) = 1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7
-SIZE (rust/crates/clap_builder-4.5.27.crate) = 168024
-SHA256 (rust/crates/clap_complete-4.5.43.crate) = 0952013545c9c6dca60f491602655b795c6c062ab180c9cb0bccb83135461861
-SIZE (rust/crates/clap_complete-4.5.43.crate) = 47944
+SHA256 (rust/crates/chrono-0.4.41.crate) = c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d
+SIZE (rust/crates/chrono-0.4.41.crate) = 234621
+SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071
+SIZE (rust/crates/clap-4.5.37.crate) = 56962
+SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2
+SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761
+SHA256 (rust/crates/clap_complete-4.5.48.crate) = be8c97f3a6f02b9e24cadc12aaba75201d18754b53ea0a9d99642f806ccdb4c9
+SIZE (rust/crates/clap_complete-4.5.48.crate) = 48036
 SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6
 SIZE (rust/crates/clap_lex-0.7.4.crate) = 12858
 SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990
 SIZE (rust/crates/colorchoice-1.0.3.crate) = 7923
+SHA256 (rust/crates/content_inspector-0.2.4.crate) = b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38
+SIZE (rust/crates/content_inspector-0.2.4.crate) = 11386
 SHA256 (rust/crates/core-foundation-sys-0.8.7.crate) = 773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b
 SIZE (rust/crates/core-foundation-sys-0.8.7.crate) = 37712
 SHA256 (rust/crates/cpufeatures-0.2.17.crate) = 59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280
@@ -77,14 +81,18 @@ SHA256 (rust/crates/crossbeam-utils-0.8.21.crate) = d0a5c400df2834b80a4c3327b3aa
 SIZE (rust/crates/crossbeam-utils-0.8.21.crate) = 42691
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
-SHA256 (rust/crates/darling-0.20.10.crate) = 6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989
-SIZE (rust/crates/darling-0.20.10.crate) = 32031
-SHA256 (rust/crates/darling_core-0.20.10.crate) = 95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5
-SIZE (rust/crates/darling_core-0.20.10.crate) = 65015
-SHA256 (rust/crates/darling_macro-0.20.10.crate) = d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806
-SIZE (rust/crates/darling_macro-0.20.10.crate) = 1874
-SHA256 (rust/crates/data-encoding-2.7.0.crate) = 0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f
-SIZE (rust/crates/data-encoding-2.7.0.crate) = 21086
+SHA256 (rust/crates/cssparser-0.35.0.crate) = 4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa
+SIZE (rust/crates/cssparser-0.35.0.crate) = 54145
+SHA256 (rust/crates/cssparser-macros-0.6.1.crate) = 13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331
+SIZE (rust/crates/cssparser-macros-0.6.1.crate) = 7914
+SHA256 (rust/crates/darling-0.20.11.crate) = fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee
+SIZE (rust/crates/darling-0.20.11.crate) = 37614
+SHA256 (rust/crates/darling_core-0.20.11.crate) = 0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e
+SIZE (rust/crates/darling_core-0.20.11.crate) = 68006
+SHA256 (rust/crates/darling_macro-0.20.11.crate) = fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead
+SIZE (rust/crates/darling_macro-0.20.11.crate) = 2532
+SHA256 (rust/crates/data-encoding-2.9.0.crate) = 2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476
+SIZE (rust/crates/data-encoding-2.9.0.crate) = 21564
 SHA256 (rust/crates/dbus-0.9.7.crate) = 1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b
 SIZE (rust/crates/dbus-0.9.7.crate) = 104206
 SHA256 (rust/crates/derive_builder-0.20.2.crate) = 507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947
@@ -95,30 +103,30 @@ SHA256 (rust/crates/derive_builder_macro-0.20.2.crate) = ab63b0e2bf4d5928aff72e8
 SIZE (rust/crates/derive_builder_macro-0.20.2.crate) = 6360
 SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8
 SIZE (rust/crates/diff-0.1.13.crate) = 46216
-SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
-SIZE (rust/crates/difflib-0.4.0.crate) = 7638
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
 SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
 SIZE (rust/crates/displaydoc-0.2.5.crate) = 24219
-SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
-SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
+SHA256 (rust/crates/dtoa-1.0.10.crate) = d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04
+SIZE (rust/crates/dtoa-1.0.10.crate) = 17584
+SHA256 (rust/crates/dtoa-short-0.3.5.crate) = cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87
+SIZE (rust/crates/dtoa-short-0.3.5.crate) = 8287
+SHA256 (rust/crates/dunce-1.0.5.crate) = 92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813
+SIZE (rust/crates/dunce-1.0.5.crate) = 8244
 SHA256 (rust/crates/elasticlunr-rs-3.0.2.crate) = 41e83863a500656dfa214fee6682de9c5b9f03de6860fec531235ed2ae9f6571
 SIZE (rust/crates/elasticlunr-rs-3.0.2.crate) = 109533
 SHA256 (rust/crates/env_filter-0.1.3.crate) = 186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0
 SIZE (rust/crates/env_filter-0.1.3.crate) = 15191
-SHA256 (rust/crates/env_logger-0.11.6.crate) = dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0
-SIZE (rust/crates/env_logger-0.11.6.crate) = 31105
-SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
-SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.10.crate) = 33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d
-SIZE (rust/crates/errno-0.3.10.crate) = 11824
+SHA256 (rust/crates/env_logger-0.11.8.crate) = 13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f
+SIZE (rust/crates/env_logger-0.11.8.crate) = 32538
+SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
+SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
+SHA256 (rust/crates/errno-0.3.11.crate) = 976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e
+SIZE (rust/crates/errno-0.3.11.crate) = 12048
 SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be
 SIZE (rust/crates/fastrand-2.3.0.crate) = 15076
 SHA256 (rust/crates/filetime-0.2.25.crate) = 35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586
 SIZE (rust/crates/filetime-0.2.25.crate) = 14940
-SHA256 (rust/crates/float-cmp-0.10.0.crate) = b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8
-SIZE (rust/crates/float-cmp-0.10.0.crate) = 10702
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
@@ -141,44 +149,46 @@ SHA256 (rust/crates/futures-util-0.3.31.crate) = 9fa08315bb612088cc391249efdc3bc
 SIZE (rust/crates/futures-util-0.3.31.crate) = 162124
 SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
 SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
-SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
-SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592
+SIZE (rust/crates/getrandom-0.2.16.crate) = 40163
+SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0
+SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
 SHA256 (rust/crates/gimli-0.31.1.crate) = 07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f
 SIZE (rust/crates/gimli-0.31.1.crate) = 279515
-SHA256 (rust/crates/globset-0.4.15.crate) = 15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19
-SIZE (rust/crates/globset-0.4.15.crate) = 25177
+SHA256 (rust/crates/globset-0.4.16.crate) = 54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5
+SIZE (rust/crates/globset-0.4.16.crate) = 26533
 SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
 SIZE (rust/crates/h2-0.3.26.crate) = 168315
-SHA256 (rust/crates/handlebars-6.3.0.crate) = 3d6b224b95c1e668ac0270325ad563b2eef1469fbbb8959bc7c692c844b813d9
-SIZE (rust/crates/handlebars-6.3.0.crate) = 104433
-SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
-SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
+SHA256 (rust/crates/handlebars-6.3.2.crate) = 759e2d5aea3287cb1190c8ec394f42866cb5bf74fcbf213f354e3c856ea26098
+SIZE (rust/crates/handlebars-6.3.2.crate) = 105065
+SHA256 (rust/crates/hashbrown-0.15.3.crate) = 84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3
+SIZE (rust/crates/hashbrown-0.15.3.crate) = 140413
 SHA256 (rust/crates/headers-0.3.9.crate) = 06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270
 SIZE (rust/crates/headers-0.3.9.crate) = 68290
 SHA256 (rust/crates/headers-core-0.2.0.crate) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429
 SIZE (rust/crates/headers-core-0.2.0.crate) = 2380
 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
 SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/html-escape-0.2.13.crate) = 6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476
+SIZE (rust/crates/html-escape-0.2.13.crate) = 23345
 SHA256 (rust/crates/html5ever-0.26.0.crate) = bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7
 SIZE (rust/crates/html5ever-0.26.0.crate) = 72921
-SHA256 (rust/crates/html5ever-0.27.0.crate) = c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4
-SIZE (rust/crates/html5ever-0.27.0.crate) = 72913
+SHA256 (rust/crates/html5ever-0.31.0.crate) = 953cbbe631aae7fc0a112702ad5d3aaf09da38beaf45ea84610d6e1c358f569c
+SIZE (rust/crates/html5ever-0.31.0.crate) = 72775
 SHA256 (rust/crates/http-0.2.12.crate) = 601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1
 SIZE (rust/crates/http-0.2.12.crate) = 101964
-SHA256 (rust/crates/http-1.2.0.crate) = f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea
-SIZE (rust/crates/http-1.2.0.crate) = 105932
+SHA256 (rust/crates/http-1.3.1.crate) = f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565
+SIZE (rust/crates/http-1.3.1.crate) = 106063
 SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
 SIZE (rust/crates/http-body-0.4.6.crate) = 10773
-SHA256 (rust/crates/httparse-1.10.0.crate) = f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a
-SIZE (rust/crates/httparse-1.10.0.crate) = 44882
+SHA256 (rust/crates/httparse-1.10.1.crate) = 6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87
+SIZE (rust/crates/httparse-1.10.1.crate) = 45190
 SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
 SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
-SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
-SIZE (rust/crates/humantime-2.1.0.crate) = 16749
 SHA256 (rust/crates/hyper-0.14.32.crate) = 41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7
 SIZE (rust/crates/hyper-0.14.32.crate) = 199622
-SHA256 (rust/crates/iana-time-zone-0.1.61.crate) = 235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220
-SIZE (rust/crates/iana-time-zone-0.1.61.crate) = 27685
+SHA256 (rust/crates/iana-time-zone-0.1.63.crate) = b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8
+SIZE (rust/crates/iana-time-zone-0.1.63.crate) = 32919
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
 SHA256 (rust/crates/icu_collections-1.5.0.crate) = db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526
@@ -187,16 +197,16 @@ SHA256 (rust/crates/icu_locid-1.5.0.crate) = 13acbb8371917fc971be86fc8057c41a64b
 SIZE (rust/crates/icu_locid-1.5.0.crate) = 55131
 SHA256 (rust/crates/icu_locid_transform-1.5.0.crate) = 01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e
 SIZE (rust/crates/icu_locid_transform-1.5.0.crate) = 29094
-SHA256 (rust/crates/icu_locid_transform_data-1.5.0.crate) = fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e
-SIZE (rust/crates/icu_locid_transform_data-1.5.0.crate) = 44727
+SHA256 (rust/crates/icu_locid_transform_data-1.5.1.crate) = 7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d
+SIZE (rust/crates/icu_locid_transform_data-1.5.1.crate) = 42937
 SHA256 (rust/crates/icu_normalizer-1.5.0.crate) = 19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f
 SIZE (rust/crates/icu_normalizer-1.5.0.crate) = 53113
-SHA256 (rust/crates/icu_normalizer_data-1.5.0.crate) = f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516
-SIZE (rust/crates/icu_normalizer_data-1.5.0.crate) = 50561
+SHA256 (rust/crates/icu_normalizer_data-1.5.1.crate) = c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7
+SIZE (rust/crates/icu_normalizer_data-1.5.1.crate) = 50737
 SHA256 (rust/crates/icu_properties-1.5.1.crate) = 93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5
 SIZE (rust/crates/icu_properties-1.5.1.crate) = 64479
-SHA256 (rust/crates/icu_properties_data-1.5.0.crate) = 67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569
-SIZE (rust/crates/icu_properties_data-1.5.0.crate) = 227993
+SHA256 (rust/crates/icu_properties_data-1.5.1.crate) = 85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2
+SIZE (rust/crates/icu_properties_data-1.5.1.crate) = 229231
 SHA256 (rust/crates/icu_provider-1.5.0.crate) = 6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9
 SIZE (rust/crates/icu_provider-1.5.0.crate) = 52722
 SHA256 (rust/crates/icu_provider_macros-1.5.0.crate) = 1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6
@@ -209,54 +219,60 @@ SHA256 (rust/crates/idna_adapter-1.2.0.crate) = daca1df1c957320b2cf139ac61e7bd64
 SIZE (rust/crates/idna_adapter-1.2.0.crate) = 8206
 SHA256 (rust/crates/ignore-0.4.23.crate) = 6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b
 SIZE (rust/crates/ignore-0.4.23.crate) = 55901
-SHA256 (rust/crates/indexmap-2.7.1.crate) = 8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652
-SIZE (rust/crates/indexmap-2.7.1.crate) = 88644
+SHA256 (rust/crates/indexmap-2.9.0.crate) = cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e
+SIZE (rust/crates/indexmap-2.9.0.crate) = 91214
 SHA256 (rust/crates/inotify-0.11.0.crate) = f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3
 SIZE (rust/crates/inotify-0.11.0.crate) = 26241
 SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
 SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965
 SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
 SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
-SHA256 (rust/crates/itoa-1.0.14.crate) = d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674
-SIZE (rust/crates/itoa-1.0.14.crate) = 11210
+SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
+SIZE (rust/crates/itoa-1.0.15.crate) = 11231
+SHA256 (rust/crates/jiff-0.2.12.crate) = d07d8d955d798e7a4d6f9c58cd1f1916e790b42b092758a9ef6e16fef9f1b3fd
+SIZE (rust/crates/jiff-0.2.12.crate) = 706826
+SHA256 (rust/crates/jiff-static-0.2.12.crate) = f244cfe006d98d26f859c7abd1318d85327e1882dc9cef80f62daeeb0adcf300
+SIZE (rust/crates/jiff-static-0.2.12.crate) = 76130
 SHA256 (rust/crates/js-sys-0.3.77.crate) = 1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f
 SIZE (rust/crates/js-sys-0.3.77.crate) = 55538
 SHA256 (rust/crates/kqueue-1.0.8.crate) = 7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c
 SIZE (rust/crates/kqueue-1.0.8.crate) = 12642
 SHA256 (rust/crates/kqueue-sys-1.0.4.crate) = ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b
 SIZE (rust/crates/kqueue-sys-1.0.4.crate) = 7160
-SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a
-SIZE (rust/crates/libc-0.2.169.crate) = 757901
+SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa
+SIZE (rust/crates/libc-0.2.172.crate) = 791646
 SHA256 (rust/crates/libdbus-sys-0.2.5.crate) = 06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72
 SIZE (rust/crates/libdbus-sys-0.2.5.crate) = 1557017
 SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
 SIZE (rust/crates/libredox-0.1.3.crate) = 6068
-SHA256 (rust/crates/linux-raw-sys-0.4.15.crate) = d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab
-SIZE (rust/crates/linux-raw-sys-0.4.15.crate) = 2150898
-SHA256 (rust/crates/litemap-0.7.4.crate) = 4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104
-SIZE (rust/crates/litemap-0.7.4.crate) = 28257
+SHA256 (rust/crates/linux-raw-sys-0.9.4.crate) = cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12
+SIZE (rust/crates/linux-raw-sys-0.9.4.crate) = 2311088
+SHA256 (rust/crates/litemap-0.7.5.crate) = 23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856
+SIZE (rust/crates/litemap-0.7.5.crate) = 29962
 SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
 SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
-SHA256 (rust/crates/log-0.4.25.crate) = 04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f
-SIZE (rust/crates/log-0.4.25.crate) = 44876
+SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
+SIZE (rust/crates/log-0.4.27.crate) = 48120
 SHA256 (rust/crates/mac-0.1.1.crate) = c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4
 SIZE (rust/crates/mac-0.1.1.crate) = 4838
 SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d
 SIZE (rust/crates/maplit-1.0.2.crate) = 8871
 SHA256 (rust/crates/markup5ever-0.11.0.crate) = 7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016
 SIZE (rust/crates/markup5ever-0.11.0.crate) = 34667
-SHA256 (rust/crates/markup5ever-0.12.1.crate) = 16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45
-SIZE (rust/crates/markup5ever-0.12.1.crate) = 34763
+SHA256 (rust/crates/markup5ever-0.16.1.crate) = d0a8096766c229e8c88a3900c9b44b7e06aa7f7343cc229158c3e58ef8f9973a
+SIZE (rust/crates/markup5ever-0.16.1.crate) = 18706
 SHA256 (rust/crates/markup5ever_rcdom-0.2.0.crate) = b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2
 SIZE (rust/crates/markup5ever_rcdom-0.2.0.crate) = 222948
+SHA256 (rust/crates/match_token-0.1.0.crate) = 88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b
+SIZE (rust/crates/match_token-0.1.0.crate) = 4903
 SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
 SIZE (rust/crates/memchr-2.7.4.crate) = 96670
 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
 SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/mime_guess-2.0.5.crate) = f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e
 SIZE (rust/crates/mime_guess-2.0.5.crate) = 27166
-SHA256 (rust/crates/miniz_oxide-0.8.3.crate) = b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924
-SIZE (rust/crates/miniz_oxide-0.8.3.crate) = 61827
+SHA256 (rust/crates/miniz_oxide-0.8.8.crate) = 3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a
+SIZE (rust/crates/miniz_oxide-0.8.8.crate) = 67065
 SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
 SIZE (rust/crates/mio-1.0.3.crate) = 103703
 SHA256 (rust/crates/new_debug_unreachable-1.0.6.crate) = 650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086
@@ -279,8 +295,8 @@ SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0
 SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
 SHA256 (rust/crates/object-0.36.7.crate) = 62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87
 SIZE (rust/crates/object-0.36.7.crate) = 329938
-SHA256 (rust/crates/once_cell-1.20.2.crate) = 1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775
-SIZE (rust/crates/once_cell-1.20.2.crate) = 33394
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
 SHA256 (rust/crates/opener-0.7.2.crate) = d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681
 SIZE (rust/crates/opener-0.7.2.crate) = 19229
 SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
@@ -291,14 +307,14 @@ SHA256 (rust/crates/pathdiff-0.2.3.crate) = df94ce210e5bc13cb6651479fa48d14f601d
 SIZE (rust/crates/pathdiff-0.2.3.crate) = 7495
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
-SHA256 (rust/crates/pest-2.7.15.crate) = 8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc
-SIZE (rust/crates/pest-2.7.15.crate) = 127895
-SHA256 (rust/crates/pest_derive-2.7.15.crate) = 816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e
-SIZE (rust/crates/pest_derive-2.7.15.crate) = 40745
-SHA256 (rust/crates/pest_generator-2.7.15.crate) = 7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b
-SIZE (rust/crates/pest_generator-2.7.15.crate) = 18417
-SHA256 (rust/crates/pest_meta-2.7.15.crate) = e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea
-SIZE (rust/crates/pest_meta-2.7.15.crate) = 42121
+SHA256 (rust/crates/pest-2.8.0.crate) = 198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6
+SIZE (rust/crates/pest-2.8.0.crate) = 128955
+SHA256 (rust/crates/pest_derive-2.8.0.crate) = d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5
+SIZE (rust/crates/pest_derive-2.8.0.crate) = 42196
+SHA256 (rust/crates/pest_generator-2.8.0.crate) = db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841
+SIZE (rust/crates/pest_generator-2.8.0.crate) = 18617
+SHA256 (rust/crates/pest_meta-2.8.0.crate) = 7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0
+SIZE (rust/crates/pest_meta-2.8.0.crate) = 42931
 SHA256 (rust/crates/phf-0.10.1.crate) = fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259
 SIZE (rust/crates/phf-0.10.1.crate) = 5406
 SHA256 (rust/crates/phf-0.11.3.crate) = 1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078
@@ -311,34 +327,34 @@ SHA256 (rust/crates/phf_generator-0.10.0.crate) = 5d5285893bb5eb82e6aaf5d59ee909
 SIZE (rust/crates/phf_generator-0.10.0.crate) = 7525
 SHA256 (rust/crates/phf_generator-0.11.3.crate) = 3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d
 SIZE (rust/crates/phf_generator-0.11.3.crate) = 15431
+SHA256 (rust/crates/phf_macros-0.11.3.crate) = f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216
+SIZE (rust/crates/phf_macros-0.11.3.crate) = 18436
 SHA256 (rust/crates/phf_shared-0.10.0.crate) = b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096
 SIZE (rust/crates/phf_shared-0.10.0.crate) = 4095
 SHA256 (rust/crates/phf_shared-0.11.3.crate) = 67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5
 SIZE (rust/crates/phf_shared-0.11.3.crate) = 15199
-SHA256 (rust/crates/pin-project-1.1.8.crate) = 1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916
-SIZE (rust/crates/pin-project-1.1.8.crate) = 56118
-SHA256 (rust/crates/pin-project-internal-1.1.8.crate) = d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb
-SIZE (rust/crates/pin-project-internal-1.1.8.crate) = 28634
+SHA256 (rust/crates/pin-project-1.1.10.crate) = 677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a
+SIZE (rust/crates/pin-project-1.1.10.crate) = 56348
+SHA256 (rust/crates/pin-project-internal-1.1.10.crate) = 6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861
+SIZE (rust/crates/pin-project-internal-1.1.10.crate) = 29162
 SHA256 (rust/crates/pin-project-lite-0.2.16.crate) = 3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b
 SIZE (rust/crates/pin-project-lite-0.2.16.crate) = 30504
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
-SHA256 (rust/crates/pkg-config-0.3.31.crate) = 953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2
-SIZE (rust/crates/pkg-config-0.3.31.crate) = 20880
-SHA256 (rust/crates/ppv-lite86-0.2.20.crate) = 77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04
-SIZE (rust/crates/ppv-lite86-0.2.20.crate) = 22478
+SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c
+SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370
+SHA256 (rust/crates/portable-atomic-1.11.0.crate) = 350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e
+SIZE (rust/crates/portable-atomic-1.11.0.crate) = 181258
+SHA256 (rust/crates/portable-atomic-util-0.2.4.crate) = d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507
+SIZE (rust/crates/portable-atomic-util-0.2.4.crate) = 47043
+SHA256 (rust/crates/ppv-lite86-0.2.21.crate) = 85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9
+SIZE (rust/crates/ppv-lite86-0.2.21.crate) = 22522
 SHA256 (rust/crates/precomputed-hash-0.1.1.crate) = 925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c
 SIZE (rust/crates/precomputed-hash-0.1.1.crate) = 1640
-SHA256 (rust/crates/predicates-3.1.3.crate) = a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573
-SIZE (rust/crates/predicates-3.1.3.crate) = 24063
-SHA256 (rust/crates/predicates-core-1.0.9.crate) = 727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa
-SIZE (rust/crates/predicates-core-1.0.9.crate) = 8618
-SHA256 (rust/crates/predicates-tree-1.0.12.crate) = 72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c
-SIZE (rust/crates/predicates-tree-1.0.12.crate) = 8392
 SHA256 (rust/crates/pretty_assertions-1.4.1.crate) = 3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d
 SIZE (rust/crates/pretty_assertions-1.4.1.crate) = 78952
-SHA256 (rust/crates/proc-macro2-1.0.93.crate) = 60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99
-SIZE (rust/crates/proc-macro2-1.0.93.crate) = 52388
+SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
+SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
 SHA256 (rust/crates/pulldown-cmark-0.10.3.crate) = 76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993
 SIZE (rust/crates/pulldown-cmark-0.10.3.crate) = 141746
 SHA256 (rust/crates/pulldown-cmark-0.12.2.crate) = f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14
@@ -347,16 +363,18 @@ SHA256 (rust/crates/pulldown-cmark-escape-0.10.1.crate) = bd348ff538bc9caeda7ee8
 SIZE (rust/crates/pulldown-cmark-escape-0.10.1.crate) = 6672
 SHA256 (rust/crates/pulldown-cmark-to-cmark-18.0.0.crate) = 1e02b63adcb49f2eb675b1694b413b3e9fedbf549dfe2cc98727ad97a0c30650
 SIZE (rust/crates/pulldown-cmark-to-cmark-18.0.0.crate) = 33515
-SHA256 (rust/crates/quote-1.0.38.crate) = 0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc
-SIZE (rust/crates/quote-1.0.38.crate) = 31252
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
+SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
+SIZE (rust/crates/r-efi-5.2.0.crate) = 64764
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
-SHA256 (rust/crates/redox_syscall-0.5.8.crate) = 03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834
-SIZE (rust/crates/redox_syscall-0.5.8.crate) = 26319
+SHA256 (rust/crates/redox_syscall-0.5.12.crate) = 928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af
+SIZE (rust/crates/redox_syscall-0.5.12.crate) = 29544
 SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191
 SIZE (rust/crates/regex-1.11.1.crate) = 254170
 SHA256 (rust/crates/regex-automata-0.4.9.crate) = 809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908
@@ -365,86 +383,90 @@ SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303af
 SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
 SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
 SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
-SHA256 (rust/crates/rustix-0.38.44.crate) = fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154
-SIZE (rust/crates/rustix-0.38.44.crate) = 379347
-SHA256 (rust/crates/rustversion-1.0.19.crate) = f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4
-SIZE (rust/crates/rustversion-1.0.19.crate) = 20616
-SHA256 (rust/crates/ryu-1.0.19.crate) = 6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd
-SIZE (rust/crates/ryu-1.0.19.crate) = 48770
+SHA256 (rust/crates/rustix-1.0.7.crate) = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
+SIZE (rust/crates/rustix-1.0.7.crate) = 414500
+SHA256 (rust/crates/rustversion-1.0.20.crate) = eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2
+SIZE (rust/crates/rustversion-1.0.20.crate) = 20666
+SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f
+SIZE (rust/crates/ryu-1.0.20.crate) = 48738
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/select-0.6.0.crate) = 6f9da09dc3f4dfdb6374cbffff7a2cffcec316874d4429899eefdc97b3b94dcd
-SIZE (rust/crates/select-0.6.0.crate) = 60292
-SHA256 (rust/crates/semver-1.0.25.crate) = f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03
-SIZE (rust/crates/semver-1.0.25.crate) = 31291
-SHA256 (rust/crates/serde-1.0.217.crate) = 02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70
-SIZE (rust/crates/serde-1.0.217.crate) = 79019
-SHA256 (rust/crates/serde_derive-1.0.217.crate) = 5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0
-SIZE (rust/crates/serde_derive-1.0.217.crate) = 57749
-SHA256 (rust/crates/serde_json-1.0.137.crate) = 930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b
-SIZE (rust/crates/serde_json-1.0.137.crate) = 154512
+SHA256 (rust/crates/select-0.6.1.crate) = 5910c1d91bd7e6e178c0f8eb9e4ad01f814064b4a1c0ae3c906224a3cbf12879
+SIZE (rust/crates/select-0.6.1.crate) = 12520
+SHA256 (rust/crates/semver-1.0.26.crate) = 56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0
+SIZE (rust/crates/semver-1.0.26.crate) = 31303
+SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
+SIZE (rust/crates/serde-1.0.219.crate) = 78983
+SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
+SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798
+SHA256 (rust/crates/serde_json-1.0.140.crate) = 20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373
+SIZE (rust/crates/serde_json-1.0.140.crate) = 154852
 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
 SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
 SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
 SIZE (rust/crates/sha1-0.10.6.crate) = 13517
-SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
-SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sha2-0.10.9.crate) = a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283
+SIZE (rust/crates/sha2-0.10.9.crate) = 29271
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/similar-2.7.0.crate) = bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa
+SIZE (rust/crates/similar-2.7.0.crate) = 53928
 SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
 SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
 SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
 SIZE (rust/crates/siphasher-1.0.1.crate) = 10351
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
-SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
-SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
-SHA256 (rust/crates/socket2-0.5.8.crate) = c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8
-SIZE (rust/crates/socket2-0.5.8.crate) = 56309
+SHA256 (rust/crates/smallvec-1.15.0.crate) = 8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9
+SIZE (rust/crates/smallvec-1.15.0.crate) = 38113
+SHA256 (rust/crates/snapbox-0.6.21.crate) = 96dcfc4581e3355d70ac2ee14cfdf81dce3d85c85f1ed9e2c1d3013f53b3436b
+SIZE (rust/crates/snapbox-0.6.21.crate) = 55301
+SHA256 (rust/crates/snapbox-macros-0.3.10.crate) = 16569f53ca23a41bb6f62e0a5084aa1661f4814a67fa33696a79073e03a664af
+SIZE (rust/crates/snapbox-macros-0.3.10.crate) = 7129
+SHA256 (rust/crates/socket2-0.5.9.crate) = 4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef
+SIZE (rust/crates/socket2-0.5.9.crate) = 57432
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
-SHA256 (rust/crates/string_cache-0.8.7.crate) = f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b
-SIZE (rust/crates/string_cache-0.8.7.crate) = 16655
-SHA256 (rust/crates/string_cache_codegen-0.5.2.crate) = 6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988
-SIZE (rust/crates/string_cache_codegen-0.5.2.crate) = 8156
+SHA256 (rust/crates/string_cache-0.8.9.crate) = bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f
+SIZE (rust/crates/string_cache-0.8.9.crate) = 17408
+SHA256 (rust/crates/string_cache_codegen-0.5.4.crate) = c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0
+SIZE (rust/crates/string_cache_codegen-0.5.4.crate) = 9406
 SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
 SIZE (rust/crates/strsim-0.11.1.crate) = 14266
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.96.crate) = d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80
-SIZE (rust/crates/syn-2.0.96.crate) = 297497
-SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
-SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
-SHA256 (rust/crates/tempfile-3.15.0.crate) = 9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704
-SIZE (rust/crates/tempfile-3.15.0.crate) = 35693
+SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf
+SIZE (rust/crates/syn-2.0.101.crate) = 299250
+SHA256 (rust/crates/synstructure-0.13.2.crate) = 728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2
+SIZE (rust/crates/synstructure-0.13.2.crate) = 18950
+SHA256 (rust/crates/tempfile-3.19.1.crate) = 7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf
+SIZE (rust/crates/tempfile-3.19.1.crate) = 39634
 SHA256 (rust/crates/tendril-0.4.3.crate) = d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0
 SIZE (rust/crates/tendril-0.4.3.crate) = 37210
-SHA256 (rust/crates/terminal_size-0.4.1.crate) = 5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9
-SIZE (rust/crates/terminal_size-0.4.1.crate) = 10037
-SHA256 (rust/crates/termtree-0.5.1.crate) = 8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683
-SIZE (rust/crates/termtree-0.5.1.crate) = 8498
+SHA256 (rust/crates/terminal_size-0.4.2.crate) = 45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed
+SIZE (rust/crates/terminal_size-0.4.2.crate) = 9976
 SHA256 (rust/crates/thiserror-1.0.69.crate) = b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52
 SIZE (rust/crates/thiserror-1.0.69.crate) = 22198
-SHA256 (rust/crates/thiserror-2.0.11.crate) = d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc
-SIZE (rust/crates/thiserror-2.0.11.crate) = 28648
+SHA256 (rust/crates/thiserror-2.0.12.crate) = 567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708
+SIZE (rust/crates/thiserror-2.0.12.crate) = 28693
 SHA256 (rust/crates/thiserror-impl-1.0.69.crate) = 4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1
 SIZE (rust/crates/thiserror-impl-1.0.69.crate) = 18365
-SHA256 (rust/crates/thiserror-impl-2.0.11.crate) = 26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2
-SIZE (rust/crates/thiserror-impl-2.0.11.crate) = 21067
+SHA256 (rust/crates/thiserror-impl-2.0.12.crate) = 7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d
+SIZE (rust/crates/thiserror-impl-2.0.12.crate) = 21141
 SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f
 SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
-SHA256 (rust/crates/tokio-1.43.0.crate) = 3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e
-SIZE (rust/crates/tokio-1.43.0.crate) = 817422
+SHA256 (rust/crates/tokio-1.44.2.crate) = e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48
+SIZE (rust/crates/tokio-1.44.2.crate) = 841618
 SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
 SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
 SHA256 (rust/crates/tokio-tungstenite-0.21.0.crate) = c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38
 SIZE (rust/crates/tokio-tungstenite-0.21.0.crate) = 28159
-SHA256 (rust/crates/tokio-util-0.7.13.crate) = d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078
-SIZE (rust/crates/tokio-util-0.7.13.crate) = 115191
+SHA256 (rust/crates/tokio-util-0.7.15.crate) = 66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df
+SIZE (rust/crates/tokio-util-0.7.15.crate) = 124255
 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
 SIZE (rust/crates/toml-0.5.11.crate) = 54910
 SHA256 (rust/crates/topological-sort-0.2.2.crate) = ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d
@@ -459,28 +481,30 @@ SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418
 SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
 SHA256 (rust/crates/tungstenite-0.21.0.crate) = 9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1
 SIZE (rust/crates/tungstenite-0.21.0.crate) = 59858
-SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
-SIZE (rust/crates/typenum-1.17.0.crate) = 42849
+SHA256 (rust/crates/typenum-1.18.0.crate) = 1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f
+SIZE (rust/crates/typenum-1.18.0.crate) = 74871
 SHA256 (rust/crates/ucd-trie-0.1.7.crate) = 2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971
 SIZE (rust/crates/ucd-trie-0.1.7.crate) = 46795
 SHA256 (rust/crates/unicase-2.8.1.crate) = 75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539
 SIZE (rust/crates/unicase-2.8.1.crate) = 24088
-SHA256 (rust/crates/unicode-ident-1.0.16.crate) = a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034
-SIZE (rust/crates/unicode-ident-1.0.16.crate) = 47684
+SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
+SIZE (rust/crates/unicode-ident-1.0.18.crate) = 47743
+SHA256 (rust/crates/unicode-width-0.2.0.crate) = 1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd
+SIZE (rust/crates/unicode-width-0.2.0.crate) = 271509
 SHA256 (rust/crates/url-2.5.4.crate) = 32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60
 SIZE (rust/crates/url-2.5.4.crate) = 81097
 SHA256 (rust/crates/utf-8-0.7.6.crate) = 09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9
 SIZE (rust/crates/utf-8-0.7.6.crate) = 10422
 SHA256 (rust/crates/utf16_iter-1.0.5.crate) = c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246
 SIZE (rust/crates/utf16_iter-1.0.5.crate) = 9736
+SHA256 (rust/crates/utf8-width-0.1.7.crate) = 86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3
+SIZE (rust/crates/utf8-width-0.1.7.crate) = 2977
 SHA256 (rust/crates/utf8_iter-1.0.4.crate) = b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be
 SIZE (rust/crates/utf8_iter-1.0.4.crate) = 10437
 SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
 SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
 SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
 SIZE (rust/crates/version_check-0.9.5.crate) = 15554
-SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
-SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
@@ -489,6 +513,8 @@ SHA256 (rust/crates/warp-0.3.7.crate) = 4378d202ff965b011c64817db11d5829506d3404
 SIZE (rust/crates/warp-0.3.7.crate) = 117428
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3
+SIZE (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 140921
 SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
 SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
 SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
@@ -499,6 +525,8 @@ SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689f
 SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
 SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
 SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
+SHA256 (rust/crates/web_atoms-0.1.1.crate) = 08bcbdcad8fb2e316072ba6bbe09419afdb550285668ac2534f4230a6f2da0ee
+SIZE (rust/crates/web_atoms-0.1.1.crate) = 27361
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
@@ -507,8 +535,18 @@ SHA256 (rust/crates/winapi-util-0.1.9.crate) = cf221c93e13a30d793f7645a0e7762c55
 SIZE (rust/crates/winapi-util-0.1.9.crate) = 12464
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
-SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-core-0.61.0.crate) = 4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980
+SIZE (rust/crates/windows-core-0.61.0.crate) = 36707
+SHA256 (rust/crates/windows-implement-0.60.0.crate) = a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836
+SIZE (rust/crates/windows-implement-0.60.0.crate) = 15073
+SHA256 (rust/crates/windows-interface-0.59.1.crate) = bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8
+SIZE (rust/crates/windows-interface-0.59.1.crate) = 11735
+SHA256 (rust/crates/windows-link-0.1.1.crate) = 76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38
+SIZE (rust/crates/windows-link-0.1.1.crate) = 6154
+SHA256 (rust/crates/windows-result-0.3.2.crate) = c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252
+SIZE (rust/crates/windows-result-0.3.2.crate) = 13399
+SHA256 (rust/crates/windows-strings-0.4.0.crate) = 7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97
+SIZE (rust/crates/windows-strings-0.4.0.crate) = 13939
 SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
 SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
 SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
@@ -531,6 +569,8 @@ SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681
 SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
+SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
+SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241
 SHA256 (rust/crates/write16-1.0.0.crate) = d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936
 SIZE (rust/crates/write16-1.0.0.crate) = 7218
 SHA256 (rust/crates/writeable-0.5.5.crate) = 1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51
@@ -543,17 +583,17 @@ SHA256 (rust/crates/yoke-0.7.5.crate) = 120e6aef9aa629e3d4f52dc8cc43a015c7724194
 SIZE (rust/crates/yoke-0.7.5.crate) = 29673
 SHA256 (rust/crates/yoke-derive-0.7.5.crate) = 2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154
 SIZE (rust/crates/yoke-derive-0.7.5.crate) = 7525
-SHA256 (rust/crates/zerocopy-0.7.35.crate) = 1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0
-SIZE (rust/crates/zerocopy-0.7.35.crate) = 152645
-SHA256 (rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e
-SIZE (rust/crates/zerocopy-derive-0.7.35.crate) = 37829
-SHA256 (rust/crates/zerofrom-0.1.5.crate) = cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e
-SIZE (rust/crates/zerofrom-0.1.5.crate) = 5091
-SHA256 (rust/crates/zerofrom-derive-0.1.5.crate) = 595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808
-SIZE (rust/crates/zerofrom-derive-0.1.5.crate) = 8285
+SHA256 (rust/crates/zerocopy-0.8.25.crate) = a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb
+SIZE (rust/crates/zerocopy-0.8.25.crate) = 252714
+SHA256 (rust/crates/zerocopy-derive-0.8.25.crate) = 28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef
+SIZE (rust/crates/zerocopy-derive-0.8.25.crate) = 87671
+SHA256 (rust/crates/zerofrom-0.1.6.crate) = 50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5
+SIZE (rust/crates/zerofrom-0.1.6.crate) = 5669
+SHA256 (rust/crates/zerofrom-derive-0.1.6.crate) = d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502
+SIZE (rust/crates/zerofrom-derive-0.1.6.crate) = 8305
 SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079
 SIZE (rust/crates/zerovec-0.10.4.crate) = 126398
 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6
 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438
-SHA256 (rust-lang-mdBook-v0.4.48_GH0.tar.gz) = 65021ceca2a2f5a1ceda243953ce764bf34c466b7a83db38e167a2b7d1131dcf
-SIZE (rust-lang-mdBook-v0.4.48_GH0.tar.gz) = 1556726
+SHA256 (rust-lang-mdBook-v0.4.49_GH0.tar.gz) = 103a1cae7a8036c81dfce14e8e421ba6d983acc708b52ebbffc98ca544419906
+SIZE (rust-lang-mdBook-v0.4.49_GH0.tar.gz) = 1552268
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
deleted file mode 100644
index b1c9c017ba8f..000000000000
--- a/textproc/mifluz/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-PORTNAME=	mifluz
-PORTVERSION=	0.26.0
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	GNU
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C++ library to build and query a full text inverted index
-WWW=		https://www.gnu.org/software/mifluz/
-
-LICENSE=	GPLv3
-
-DEPRECATED=	Obsolete, no activity upstream since 2014 and unmaintained in tree for years
-EXPIRATION_DATE=2025-04-30
-
-USES=		bison compiler iconv libtool localbase:ldflags pathfix
-USE_LDCONFIG=	yes
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--enable-posixmutexes \
-		--localstatedir="${PREFIX}/var" \
-		--without-unac
-
-INSTALL_TARGET=	install-strip
-
-CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
-CXXFLAGS_clang=	-Wno-c++11-narrowing
-
-CONFLICTS_INSTALL=	htdig # bin/htdb_dump bin/htdb_load bin/htdb_stat
-
-SUB_FILES=	pkg-message
-
-INFO=		mifluz
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^#ifndef HAVE_ALLOCA/s|_H||' ${WRKSRC}/clib/strncoll2.c
-
-.include <bsd.port.mk>
diff --git a/textproc/mifluz/distinfo b/textproc/mifluz/distinfo
deleted file mode 100644
index fbd15e1f780f..000000000000
--- a/textproc/mifluz/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mifluz-0.26.0.tar.gz) = e220ad4a23a972acfffedb05d63e8c7b13a422f9008bd6af95fdb4339f94b6a4
-SIZE (mifluz-0.26.0.tar.gz) = 1648324
diff --git a/textproc/mifluz/files/patch-Makefile.in b/textproc/mifluz/files/patch-Makefile.in
deleted file mode 100644
index 7679808b0693..000000000000
--- a/textproc/mifluz/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Makefile.in.orig	2013-01-16 13:41:40.786389684 +0800
-+++ ./Makefile.in	2013-01-16 13:51:11.373721235 +0800
-@@ -363,7 +363,7 @@
- # or the GNU General Public License version 2 or later
- # <http://www.gnu.org/copyleft/gpl.html>
- #
--SUBDIRS = clib db mifluz htdb search man doc test examples
-+SUBDIRS = clib db mifluz htdb search man doc test
- DISTCLEANFILES = autom4te.cache
- EXTRA_DIST = .version acconfig.h Makefile.config mifluz.conf acinclude.m4
- bin_SCRIPTS = mifluz-config
-@@ -956,7 +956,7 @@
- 	mkdir -p ${DESTDIR}${localstatedir}/cache/mifluz
- 	@if [ ! -d ${DESTDIR}${sysconfdir} ] ; then mkdir -p ${DESTDIR}${sysconfdir} ; fi
- 	@if [ ! -f ${DESTDIR}${sysconfdir}/mifluz.conf ] ; \
--	then a="cp ${srcdir}/mifluz.conf ${DESTDIR}${sysconfdir}/mifluz.conf" ; echo $$a ; $$a ; \
-+	then a="cp ${srcdir}/mifluz.conf ${DESTDIR}${sysconfdir}/mifluz.conf.sample" ; echo $$a ; $$a ; \
- 	else echo "${DESTDIR}${sysconfdir}/mifluz.conf exists, not overwritten" ; \
- 	fi
- 
diff --git a/textproc/mifluz/files/patch-clib-strcasestr2.c b/textproc/mifluz/files/patch-clib-strcasestr2.c
deleted file mode 100644
index 921449169729..000000000000
--- a/textproc/mifluz/files/patch-clib-strcasestr2.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./clib/strcasestr2.c.orig	2013-01-16 13:42:43.213865659 +0800
-+++ ./clib/strcasestr2.c	2013-01-16 13:50:06.277425451 +0800
-@@ -12,6 +12,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifndef HAVE_STRCASESTR
- #include <ctype.h>
- #include <string.h>
- 
-@@ -32,3 +33,4 @@
-     }
-     return 0;
- }
-+#endif /* HAVE_STRCASESTR */
diff --git a/textproc/mifluz/files/patch-db-db_int.h b/textproc/mifluz/files/patch-db-db_int.h
deleted file mode 100644
index 5df5bd529e27..000000000000
--- a/textproc/mifluz/files/patch-db-db_int.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./db/db_int.h.orig	2013-01-16 13:43:03.627123979 +0800
-+++ ./db/db_int.h	2013-01-16 13:49:17.653734397 +0800
-@@ -108,7 +108,7 @@
-  * an array.
-  */
- #undef	SSZ
--#define	SSZ(name, field)	((int)&(((name *)0)->field))
-+#define	SSZ(name, field)	((size_t)&(((name *)0)->field))
- 
- #undef	SSZA
- #define	SSZA(name, field)	((long)&(((name *)0)->field[0]))
diff --git a/textproc/mifluz/files/patch-db__mut_pthread.c b/textproc/mifluz/files/patch-db__mut_pthread.c
deleted file mode 100644
index 322b6b22187e..000000000000
--- a/textproc/mifluz/files/patch-db__mut_pthread.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- db/mut_pthread.c.orig
-+++ db/mut_pthread.c
-@@ -50,6 +50,10 @@
- #define	pthread_self		thr_self
- #endif
- 
-+#ifndef ETIME
-+#define ETIME ETIMEDOUT
-+#endif
-+
- /*
-  * __db_pthread_mutex_init --
-  *	Initialize a MUTEX.
diff --git a/textproc/mifluz/files/patch-mifluz-Makefile.in b/textproc/mifluz/files/patch-mifluz-Makefile.in
deleted file mode 100644
index 87d315133c7f..000000000000
--- a/textproc/mifluz/files/patch-mifluz-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./mifluz/Makefile.in.orig	2013-01-16 13:43:17.443734240 +0800
-+++ ./mifluz/Makefile.in	2013-01-16 13:47:04.575242382 +0800
-@@ -361,7 +361,7 @@
- 	WordType.cc
- 
- libmifluz_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
--libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la
-+libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la $(LIBICONV)
- include_HEADERS = \
- 	mifluz.h
- 
diff --git a/textproc/mifluz/files/patch-search-WordResults.cc b/textproc/mifluz/files/patch-search-WordResults.cc
deleted file mode 100644
index 7c122040b4a5..000000000000
--- a/textproc/mifluz/files/patch-search-WordResults.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./search/WordResults.cc.orig	2013-01-16 13:44:02.283818270 +0800
-+++ ./search/WordResults.cc	2013-01-16 13:45:27.643665365 +0800
-@@ -29,7 +29,7 @@
- 
-   WordKeyNum* a_values = (WordKeyNum*)a->data;
-   WordKeyNum* b_values = (WordKeyNum*)b->data;
--  for(int i = 0; i < length; i++) {
-+  for(long i = 0; i < length; i++) {
-     if(a_values[i] != b_values[i]) {
-       return a_values[i] > b_values[i] ? 1 : -1;
-     }
-@@ -198,7 +198,7 @@
-   }
- 
-   if((error = ranked->set_re_len(ranked, sizeof(WordKeyNum) * document_length)) != 0) {
--    fprintf(stderr, "WordResults::Open ranked->set_re_len(%d) failed: %s\n", sizeof(WordKeyNum) * document_length, CDB_db_strerror(error));
-+    fprintf(stderr, "WordResults::Open ranked->set_re_len(%lu) failed: %s\n", sizeof(WordKeyNum) * document_length, CDB_db_strerror(error));
-     return NOTOK;
-   }
- 
diff --git a/textproc/mifluz/files/pkg-message.in b/textproc/mifluz/files/pkg-message.in
deleted file mode 100644
index e1a4534d3169..000000000000
--- a/textproc/mifluz/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-A sample configuration file has been written in
-%%PREFIX%%/etc/mifluz.conf.sample
-
-You will have to copy this file to %%PREFIX%%/etc/mifluz.conf
-and edit it before using mifluz.
-EOM
-}
-]
diff --git a/textproc/mifluz/pkg-descr b/textproc/mifluz/pkg-descr
deleted file mode 100644
index 1bfed0b2bd96..000000000000
--- a/textproc/mifluz/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-GNU mifluz has two main characteristics : it is very
-simple (one might say stupid :-) and uses 50% of the size of the
-indexed text for the index. It is simple because it provides only
-a few basic functionalities. It does not contain document parsers
-(HTML, PDF etc...). It does not contain a full text query parser.
-It does not provide result display functions or other user friendly
-stuff. It only provides functions to store word occurrences and retrieve
-them. The fact that it uses 50% of the size of the indexed text is
-rather atypical. Most well known full text indexing systems only use
-30%. The advantage GNU mifluz has over most full text indexing systems
-is that it is fully dynamic (update, delete, insert), uses only a
-controlled amount of memory while resolving a query, has higher upper
-limits and has a simple storage scheme. Consuming more disk space
-allows all this.
diff --git a/textproc/mifluz/pkg-plist b/textproc/mifluz/pkg-plist
deleted file mode 100644
index 7d7cd625dc2d..000000000000
--- a/textproc/mifluz/pkg-plist
+++ /dev/null
@@ -1,120 +0,0 @@
-bin/htdb_dump
-bin/htdb_load
-bin/htdb_stat
-bin/mifluz-config
-bin/mifluzdict
-bin/mifluzdump
-bin/mifluzload
-bin/mifluzsearch
-@sample etc/mifluz.conf.sample
-include/mifluz.h
-include/mifluz/Configuration.h
-include/mifluz/Dictionary.h
-include/mifluz/HtMaxMin.h
-include/mifluz/HtTime.h
-include/mifluz/List.h
-include/mifluz/Object.h
-include/mifluz/ParsedString.h
-include/mifluz/StringList.h
-include/mifluz/WordBitCompress.h
-include/mifluz/WordContext.h
-include/mifluz/WordCursor.h
-include/mifluz/WordCursorOne.h
-include/mifluz/WordDB.h
-include/mifluz/WordDBCache.h
-include/mifluz/WordDBCompress.h
-include/mifluz/WordDBInfo.h
-include/mifluz/WordDead.h
-include/mifluz/WordDict.h
-include/mifluz/WordKey.h
-include/mifluz/WordKeyInfo.h
-include/mifluz/WordList.h
-include/mifluz/WordListMulti.h
-include/mifluz/WordListOne.h
-include/mifluz/WordMeta.h
-include/mifluz/WordMonitor.h
-include/mifluz/WordRecord.h
-include/mifluz/WordRecordInfo.h
-include/mifluz/WordReference.h
-include/mifluz/WordType.h
-include/mifluz/ber.h
-include/mifluz/btree.h
-include/mifluz/btree_auto.h
-include/mifluz/btree_ext.h
-include/mifluz/clib.h
-include/mifluz/common_ext.h
-include/mifluz/config.h
-include/mifluz/crdel_auto.h
-include/mifluz/db.h
-include/mifluz/db_am.h
-include/mifluz/db_auto.h
-include/mifluz/db_dispatch.h
-include/mifluz/db_ext.h
-include/mifluz/db_int.h
-include/mifluz/db_join.h
-include/mifluz/db_page.h
-include/mifluz/db_shash.h
-include/mifluz/db_swap.h
-include/mifluz/db_upgrade.h
-include/mifluz/db_verify.h
-include/mifluz/debug.h
-include/mifluz/env_ext.h
-include/mifluz/hash.h
-include/mifluz/hash_auto.h
-include/mifluz/hash_ext.h
-include/mifluz/htString.h
-include/mifluz/lib.h
-include/mifluz/lock.h
-include/mifluz/lock_ext.h
-include/mifluz/log.h
-include/mifluz/log_auto.h
-include/mifluz/log_ext.h
-include/mifluz/mp.h
-include/mifluz/mp_ext.h
-include/mifluz/mutex.h
-include/mifluz/mutex_ext.h
-include/mifluz/myqsort.h
-include/mifluz/os.h
-include/mifluz/os_ext.h
-include/mifluz/os_jump.h
-include/mifluz/qam.h
-include/mifluz/qam_auto.h
-include/mifluz/qam_ext.h
-include/mifluz/queue.h
-include/mifluz/region.h
-include/mifluz/shqueue.h
-include/mifluz/txn.h
-include/mifluz/txn_auto.h
-include/mifluz/txn_ext.h
-include/mifluz/unac.h
-include/mifluz/xa.h
-include/mifluz/xa_ext.h
-lib/libmifluz.a
-lib/libmifluz.so
-lib/libmifluz.so.0
-lib/libmifluz.so.0.0.26
-share/man/man1/htdb_dump.1.gz
-share/man/man1/htdb_load.1.gz
-share/man/man1/htdb_stat.1.gz
-share/man/man1/mifluz-config.1.gz
-share/man/man1/mifluzdict.1.gz
-share/man/man1/mifluzdump.1.gz
-share/man/man1/mifluzload.1.gz
-share/man/man1/mifluzsearch.1.gz
-share/man/man3/Configuration.3.gz
-share/man/man3/WordContext.3.gz
-share/man/man3/WordCursor.3.gz
-share/man/man3/WordCursorOne.3.gz
-share/man/man3/WordDBInfo.3.gz
-share/man/man3/WordDict.3.gz
-share/man/man3/WordKey.3.gz
-share/man/man3/WordKeyInfo.3.gz
-share/man/man3/WordList.3.gz
-share/man/man3/WordListOne.3.gz
-share/man/man3/WordMonitor.3.gz
-share/man/man3/WordRecord.3.gz
-share/man/man3/WordRecordInfo.3.gz
-share/man/man3/WordReference.3.gz
-share/man/man3/WordType.3.gz
-share/man/man3/mifluz.3.gz
-@dir var/cache/mifluz
diff --git a/textproc/mysqlviz/Makefile b/textproc/mysqlviz/Makefile
deleted file mode 100644
index 8719f2ba0243..000000000000
--- a/textproc/mysqlviz/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-PORTNAME=	mysqlviz
-PORTVERSION=	0.3
-PORTREVISION=	1
-CATEGORIES=	textproc
-
-MAINTAINER=	tota@FreeBSD.org
-COMMENT=	MySQL and SQLite Database Visualisation Tool
-WWW=		https://github.com/globalcitizen/mysqlviz
-
-LICENSE=	GPLv3
-
-BROKEN=		Unfetchable
-DEPRECATED=	Repo deleted upstream
-EXPIRATION_DATE=2025-04-30
-
-NO_BUILD=	yes
-USES=	php:cli tar:bzip2
-USE_GITHUB=	yes
-GH_ACCOUNT=	globalcitizen
-
-PLIST_FILES=	bin/${PORTNAME}
-
-PORTEXAMPLES=	eg.png eg.sql sqlite-eg.sql
-
-OPTIONS_DEFINE=	EXAMPLES
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|/usr/bin/php|${LOCALBASE}/bin/php|' \
-		${WRKSRC}/${PORTNAME}
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/mysqlviz/distinfo b/textproc/mysqlviz/distinfo
deleted file mode 100644
index 4141571ddf0a..000000000000
--- a/textproc/mysqlviz/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1490527116
-SHA256 (globalcitizen-mysqlviz-0.3_GH0.tar.gz) = 0e95b85258ca8908c59459eaf170176d34ac70b1f4cc5ffbd216640037c5f89f
-SIZE (globalcitizen-mysqlviz-0.3_GH0.tar.gz) = 14749
diff --git a/textproc/mysqlviz/files/patch-mysqlviz b/textproc/mysqlviz/files/patch-mysqlviz
deleted file mode 100644
index 219230ccbc44..000000000000
--- a/textproc/mysqlviz/files/patch-mysqlviz
+++ /dev/null
@@ -1,25 +0,0 @@
---- mysqlviz.orig	2010-11-12 23:53:55 UTC
-+++ mysqlviz
-@@ -184,17 +184,16 @@ exit(0);
- 
- # usage information
- function usage() {
-- global $argv;
-- print '[' . basename($argv[0]) . " - mysql + sqlite database visualisation tool]\n\n";
-+ print "[mysqlviz - mysql + sqlite database visualisation tool]\n\n";
-  print "usage:\n";
-- print "  " . $argv[0] . " -f <sqldumpfile> [-r]\n";
-- print "                                 ^--- 'redump' mode: generates a\n";
-- print "                                      mysqldump command line to redump.\n";
-+ print "  mysqlviz -f <sqldumpfile> [-r]\n";
-+ print "                               ^--- 'redump' mode: generates a\n";
-+ print "                                    mysqldump command line to redump.\n";
-  print "toolchain:\n";
-  print " $ mysqldump -d db >db.sql          # MySQL: -d = 'no data', only structure\n";
-  print "    - OR -\n";
-  print " $ sqlite database.db .dump >db.sql # SQLite (also: 'sqlite3 ...')\n";
-- print " $ $argv[0] -f ./db.sql >./db.dot # 'dot' is a graphviz format.\n";
-+ print " $ mysqlviz -f ./db.sql >./db.dot # 'dot' is a graphviz format.\n";
-  print " $ dot -Tpng db.dot >db.png         # generate image with graphviz\n\n";
-  print "notes:\n";
-  print " if you do not have any foreign keys defined, relationships will be\n";
diff --git a/textproc/mysqlviz/pkg-descr b/textproc/mysqlviz/pkg-descr
deleted file mode 100644
index bb2105e57173..000000000000
--- a/textproc/mysqlviz/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Render a graphical representation of a MySQL or SQLite database
-from a mysqldump or sqlite3 .dump file.
-
-Features:
-- Can infer foreign key relationships if you do not have them defined
-- Handles partial dumps (FK to tables that are not defined within the dump)
-- Fast! Uses sed and grep for data extraction (MySQL only)
diff --git a/textproc/nerdlog/Makefile b/textproc/nerdlog/Makefile
new file mode 100644
index 000000000000..bc0939f962a1
--- /dev/null
+++ b/textproc/nerdlog/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	nerdlog
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.6.0
+CATEGORIES=	textproc
+
+MAINTAINER=	lwhsu@FreeBSD.org
+COMMENT=	Fast, multi-host TUI log viewer with timeline histogram
+WWW=		https://dmitryfrank.com/projects/nerdlog/article
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	gawk:lang/gawk
+
+USES=		go:modules
+
+GO_MODULE=	github.com/dimonomid/nerdlog
+GO_TARGET=	./cmd/nerdlog
+
+PLIST_FILES=	bin/nerdlog
+
+.include <bsd.port.mk>
diff --git a/textproc/nerdlog/distinfo b/textproc/nerdlog/distinfo
new file mode 100644
index 000000000000..cbf9a2a5896a
--- /dev/null
+++ b/textproc/nerdlog/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1746533765
+SHA256 (go/textproc_nerdlog/nerdlog-v1.6.0/v1.6.0.mod) = 84c90da8b68005e016c1cfb86a87ea46ed0dfa374d53dd0128ede3438f89e0ff
+SIZE (go/textproc_nerdlog/nerdlog-v1.6.0/v1.6.0.mod) = 1211
+SHA256 (go/textproc_nerdlog/nerdlog-v1.6.0/v1.6.0.zip) = 099b21d3f460b3f065be1bf9358bfb3c6aac46b286cea5e3ef4861e9dec88f0d
+SIZE (go/textproc_nerdlog/nerdlog-v1.6.0/v1.6.0.zip) = 2009588
diff --git a/textproc/nerdlog/pkg-descr b/textproc/nerdlog/pkg-descr
new file mode 100644
index 000000000000..9ae0933b8848
--- /dev/null
+++ b/textproc/nerdlog/pkg-descr
@@ -0,0 +1,3 @@
+Nerdlog is a fast, remote-first, multi-host TUI log viewer with timeline
+histogram and no central server. Loosely inspired by Graylog/Kibana, but
+without the bloat. Pretty much no setup needed, either.
diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile
deleted file mode 100644
index c82c02b86317..000000000000
--- a/textproc/nux/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-PORTNAME=	nux
-PORTVERSION=	1.6
-PORTREVISION=	3
-PORTEPOCH=	1
-CATEGORIES=	textproc java
-MASTER_SITES=	http://dst.lbl.gov/ACSSoftware/nux/nux-download/releases/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Small open-source XQuery extension of the XOM library
-WWW=		https://dst.lbl.gov/ACSSoftware/nux/
-
-RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:textproc/xom \
-		${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel
-
-USES=		java
-
-DEPRECATED=	Depends on deprecated port textproc/saxon-devel
-EXPIRATION_DATE=2025-04-30
-
-NO_BUILD=	yes
-NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-PORTDOCS=	api changelog.html cvs.html dependencies.html \
-		gettingstarted.html images index.html license.html licenses \
-		mailing.html readme.html related.html style.css todo.html
-
-OPTIONS_DEFINE=		XQUERY_TOOL DOCS
-OPTIONS_DEFAULT=	XQUERY_TOOL
-
-XQUERY_TOOL_DESC=	Install the XQuery command-line tool
-XQUERY_TOOL_RUN_DEPENDS=${JAVALIBDIR}/java-getopt.jar:java/java-getopt
-XQUERY_TOOL_PLIST_FILES=bin/fire-xquery
-XQUERY_TOOL_SUB_FILES=	fire-xquery.sh
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}
-
-do-install-XQUERY_TOOL-on:
-	${INSTALL_SCRIPT} ${WRKDIR}/fire-xquery.sh ${STAGEDIR}${PREFIX}/bin/fire-xquery
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/nux/distinfo b/textproc/nux/distinfo
deleted file mode 100644
index cf417651a570..000000000000
--- a/textproc/nux/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (nux-1.6.tar.gz) = 23f5a9ae41faeaef037f0ac2aa7027c1716422d3d0c9558a1c9b269d46e54418
-SIZE (nux-1.6.tar.gz) = 16999259
diff --git a/textproc/nux/files/fire-xquery.sh.in b/textproc/nux/files/fire-xquery.sh.in
deleted file mode 100644
index 2d0bc7b436bc..000000000000
--- a/textproc/nux/files/fire-xquery.sh.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec "%%LOCALBASE%%/bin/java" -classpath "`%%LOCALBASE%%/bin/classpath`" nux.xom.tests.XQueryCommand "$@"
diff --git a/textproc/nux/pkg-descr b/textproc/nux/pkg-descr
deleted file mode 100644
index c5a93caa95bf..000000000000
--- a/textproc/nux/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Nux is a small, straightforward, and surprisingly effective open-source
-extension of the XOM XML library. Nux is geared towards versatile embedded
-integration and interchange, in particular for high-throughput server container
-environments (e.g. large-scale Peer-to-Peer messaging network infrastructures
-over high-bandwidth networks, scalable MOMs, etc). But its simplicity also
-makes it useful for client side XML query/transformation workflow pipelines.
-Features include:
-
-- Seamless W3C XQuery support for XOM.
-- Efficient and flexible pools and factories for XQueries, XSL Transforms, as
-  well as Builders that validate against various schema languages, including
-  W3C XML Schemas, DTDs, RELAX NG, Schematron, etc.
-- For simple and complex continuous queries and/or transformations over very
-  large or infinitely long XML input, a convenient streaming path filter API
-  combines full XQuery support with straightforward filtering.
-- Glue for integration with JAXB and for queries over ill-formed HTML.
-- All this is rock-solid, dependable, well documented, and ships in a jar file
-  that weighs just 60 KB.
diff --git a/textproc/p5-PPI/Makefile b/textproc/p5-PPI/Makefile
index ef8c7eda2cb1..1674fd7269b4 100644
--- a/textproc/p5-PPI/Makefile
+++ b/textproc/p5-PPI/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	PPI
-PORTVERSION=	1.278
+PORTVERSION=	1.283
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:OALDERS
+MASTER_SITE_SUBDIR=	CPAN:MITHALDU
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -16,7 +16,8 @@ LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Clone>=0.30:devel/p5-Clone \
 		p5-Params-Util>=1.00:devel/p5-Params-Util \
-		p5-Task-Weaken>=0:devel/p5-Task-Weaken
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-YAML-PP>=0:textproc/p5-YAML-PP
 TEST_DEPENDS=	p5-Class-Inspector>=1.22:devel/p5-Class-Inspector \
 		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
 		p5-Test-Object>=0.07:devel/p5-Test-Object \
diff --git a/textproc/p5-PPI/distinfo b/textproc/p5-PPI/distinfo
index a92430388bc6..0b822935e6cc 100644
--- a/textproc/p5-PPI/distinfo
+++ b/textproc/p5-PPI/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710712794
-SHA256 (PPI-1.278.tar.gz) = 1c867b2e9b10056978db9ddaadab599af9a5c9a66805ed03ef4b201f1105d427
-SIZE (PPI-1.278.tar.gz) = 248797
+TIMESTAMP = 1746359071
+SHA256 (PPI-1.283.tar.gz) = 70becc9dfad8a72d231bbe88d20a82acfd31c13ca03c6fb359703a5ac0004059
+SIZE (PPI-1.283.tar.gz) = 251927
diff --git a/textproc/p5-PPI/pkg-plist b/textproc/p5-PPI/pkg-plist
index 4a1a481a0253..8c08f96dc404 100644
--- a/textproc/p5-PPI/pkg-plist
+++ b/textproc/p5-PPI/pkg-plist
@@ -38,6 +38,7 @@
 %%SITE_PERL%%/PPI/Structure/For.pm
 %%SITE_PERL%%/PPI/Structure/Given.pm
 %%SITE_PERL%%/PPI/Structure/List.pm
+%%SITE_PERL%%/PPI/Structure/Signature.pm
 %%SITE_PERL%%/PPI/Structure/Subscript.pm
 %%SITE_PERL%%/PPI/Structure/Unknown.pm
 %%SITE_PERL%%/PPI/Structure/When.pm
@@ -130,6 +131,7 @@
 %%PERL5_MAN3%%/PPI::Structure::For.3.gz
 %%PERL5_MAN3%%/PPI::Structure::Given.3.gz
 %%PERL5_MAN3%%/PPI::Structure::List.3.gz
+%%PERL5_MAN3%%/PPI::Structure::Signature.3.gz
 %%PERL5_MAN3%%/PPI::Structure::Subscript.3.gz
 %%PERL5_MAN3%%/PPI::Structure::Unknown.3.gz
 %%PERL5_MAN3%%/PPI::Structure::When.3.gz
diff --git a/textproc/p5-Regexp-Common/Makefile b/textproc/p5-Regexp-Common/Makefile
index f0bfc708a66c..a6276021b862 100644
--- a/textproc/p5-Regexp-Common/Makefile
+++ b/textproc/p5-Regexp-Common/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Regexp-Common
-PORTVERSION=	2017060201
+PORTVERSION=	2024080801
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,6 +11,8 @@ WWW=		https://metacpan.org/release/Regexp-Common
 LICENSE=	ART10 ART20 BSD3CLAUSE MIT
 LICENSE_COMB=	dual
 
+TEST_DEPENDS=	p5-Test-Regexp>0:textproc/p5-Test-Regexp
+
 USES=		perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
diff --git a/textproc/p5-Regexp-Common/distinfo b/textproc/p5-Regexp-Common/distinfo
index 21a75ed745b7..a82a9e34883e 100644
--- a/textproc/p5-Regexp-Common/distinfo
+++ b/textproc/p5-Regexp-Common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536301828
-SHA256 (Regexp-Common-2017060201.tar.gz) = ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b
-SIZE (Regexp-Common-2017060201.tar.gz) = 237881
+TIMESTAMP = 1744917908
+SHA256 (Regexp-Common-2024080801.tar.gz) = 0677afaec8e1300cefe246b4d809e75cdf55e2cc0f77c486d13073b69ab4fbdd
+SIZE (Regexp-Common-2024080801.tar.gz) = 238498
diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile
deleted file mode 100644
index 08a43d129e04..000000000000
--- a/textproc/p5-Search-Saryer/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PORTNAME=	Search-Saryer
-PORTVERSION=	0.40
-PORTREVISION=	3
-CATEGORIES=	textproc perl5
-MASTER_SITES=	http://namazu.org/~tsuchiya/perl/
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Perl interface to the Sary library
-WWW=		http://sary.namazu.org/index.html.en
-
-DEPRECATED=	Depends on deprecated port textproc/sary
-EXPIRATION_DATE=2025-04-30
-
-LIB_DEPENDS=	libsary.so:textproc/sary
-
-USES=		perl5 pkgconfig
-USE_PERL5=	configure
-
-.include <bsd.port.mk>
diff --git a/textproc/p5-Search-Saryer/distinfo b/textproc/p5-Search-Saryer/distinfo
deleted file mode 100644
index ee494dda2d98..000000000000
--- a/textproc/p5-Search-Saryer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Search-Saryer-0.40.tar.gz) = 8fcf7f9ca14163d0e1b33f2f30806f70de9dfb4b7ec043273a52d8ade1cfd5c4
-SIZE (Search-Saryer-0.40.tar.gz) = 5162
diff --git a/textproc/p5-Search-Saryer/files/patch-Saryer.pm b/textproc/p5-Search-Saryer/files/patch-Saryer.pm
deleted file mode 100644
index d910b25f3093..000000000000
--- a/textproc/p5-Search-Saryer/files/patch-Saryer.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- Saryer.pm.orig	Mon Jul 11 02:19:01 2005
-+++ Saryer.pm	Fri Jun 23 13:38:04 2006
-@@ -13,7 +13,7 @@
- 
- =head1 SYNOPSIS
- 
--  my $saryer = new Search::Saryer(filename->'search.txt');
-+  my $saryer = new Search::Saryer(filename=>'search.txt');
-   print $saryer->grep($pattern)
- 
- =head1 CONSTRUCTOR
diff --git a/textproc/p5-Search-Saryer/pkg-descr b/textproc/p5-Search-Saryer/pkg-descr
deleted file mode 100644
index b0babda11613..000000000000
--- a/textproc/p5-Search-Saryer/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This module is a Perl interface to the Sary library.
diff --git a/textproc/p5-Search-Saryer/pkg-plist b/textproc/p5-Search-Saryer/pkg-plist
deleted file mode 100644
index b6157e8aa022..000000000000
--- a/textproc/p5-Search-Saryer/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PERL5_MAN3%%/Search::Saryer.3.gz
-%%SITE_ARCH%%/Search/Saryer.pm
-%%SITE_ARCH%%/auto/Search/Saryer/Saryer.so
diff --git a/textproc/print-n-times/Makefile b/textproc/print-n-times/Makefile
deleted file mode 100644
index 1e01ec22e11a..000000000000
--- a/textproc/print-n-times/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PORTNAME=	print-n-times
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	textproc
-MASTER_SITES=	http://aaronland.info/xsl/string/print-n-times/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Print a string (n) times
-WWW=		https://aaronland.info/xsl/string/print-n-times
-
-DEPRECATED=	Obsolete and unmaintained in tree for years
-EXPIRATION_DATE=2025-04-30
-
-NO_BUILD=	yes
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsl/string
-	${INSTALL_DATA} ${WRKSRC}/*.xsl ${STAGEDIR}${PREFIX}/share/xsl/string
-
-.include <bsd.port.mk>
diff --git a/textproc/print-n-times/distinfo b/textproc/print-n-times/distinfo
deleted file mode 100644
index b69b6ef362c8..000000000000
--- a/textproc/print-n-times/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (print-n-times-1.0.tar.gz) = 56edd1d5e9fb8a662bfdc51699fb3b1139a985b70fada37aba28562616f0f433
-SIZE (print-n-times-1.0.tar.gz) = 1475
diff --git a/textproc/print-n-times/pkg-descr b/textproc/print-n-times/pkg-descr
deleted file mode 100644
index f986a37348d6..000000000000
--- a/textproc/print-n-times/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Print a string (n) times
diff --git a/textproc/print-n-times/pkg-plist b/textproc/print-n-times/pkg-plist
deleted file mode 100644
index 52cb93a95067..000000000000
--- a/textproc/print-n-times/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-share/xsl/string/print-n-times.xsl
diff --git a/textproc/py-docstring-to-markdown/Makefile b/textproc/py-docstring-to-markdown/Makefile
index c59391c5991a..9e8bae1ed769 100644
--- a/textproc/py-docstring-to-markdown/Makefile
+++ b/textproc/py-docstring-to-markdown/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	docstring-to-markdown
-PORTVERSION=	0.16
+PORTVERSION=	0.17
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +12,10 @@ WWW=		https://github.com/python-lsp/docstring-to-markdown
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-flake8>0:devel/py-pytest-flake8@${PY_FLAVOR} \
@@ -23,7 +25,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils pytest
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
diff --git a/textproc/py-docstring-to-markdown/distinfo b/textproc/py-docstring-to-markdown/distinfo
index 62e42a4fbab0..01e24750137b 100644
--- a/textproc/py-docstring-to-markdown/distinfo
+++ b/textproc/py-docstring-to-markdown/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742991922
-SHA256 (docstring_to_markdown-0.16.tar.gz) = 097bf502fdf040b0d019688a7cc1abb89b98196801448721740e8aa3e5075627
-SIZE (docstring_to_markdown-0.16.tar.gz) = 31157
+TIMESTAMP = 1746342697
+SHA256 (docstring_to_markdown-0.17.tar.gz) = df72a112294c7492487c9da2451cae0faeee06e86008245c188c5761c9590ca3
+SIZE (docstring_to_markdown-0.17.tar.gz) = 32260
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index a1fc126dd422..f23efec48fd6 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qrcode
-PORTVERSION=	8.1
+PORTVERSION=	8.2
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-qrcode/distinfo b/textproc/py-qrcode/distinfo
index a968cc701b54..1c764328d201 100644
--- a/textproc/py-qrcode/distinfo
+++ b/textproc/py-qrcode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743808972
-SHA256 (qrcode-8.1.tar.gz) = e8df73caf72c3bace3e93d9fa0af5aa78267d4f3f5bc7ab1b208f271605a5e48
-SIZE (qrcode-8.1.tar.gz) = 41549
+TIMESTAMP = 1746644281
+SHA256 (qrcode-8.2.tar.gz) = 35c3f2a4172b33136ab9f6b3ef1c00260dd2f66f858f24d88418a015f446506c
+SIZE (qrcode-8.2.tar.gz) = 43317
diff --git a/textproc/py-regex/Makefile b/textproc/py-regex/Makefile
index bbe09c3be375..93a0729b17cd 100644
--- a/textproc/py-regex/Makefile
+++ b/textproc/py-regex/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	regex
-DISTVERSION=	2024.7.24
-PORTREVISION=	1
+DISTVERSION=	2024.11.6
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,8 +10,11 @@ WWW=		https://github.com/mrabarnett/mrab-regex
 
 LICENSE=	PSFL
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
 USES=		python
-USE_PYTHON=	autoplist distutils pytest # 1 test fails, see https://github.com/mrabarnett/mrab-regex/issues/482
+USE_PYTHON=	autoplist pep517 pytest # 1 test fails, see https://github.com/mrabarnett/mrab-regex/issues/482
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
diff --git a/textproc/py-regex/distinfo b/textproc/py-regex/distinfo
index 3d702de476a4..9ac7ca657d9c 100644
--- a/textproc/py-regex/distinfo
+++ b/textproc/py-regex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723558090
-SHA256 (regex-2024.7.24.tar.gz) = 9cfd009eed1a46b27c14039ad5bbc5e71b6367c5b2e6d5f5da0ea91600817506
-SIZE (regex-2024.7.24.tar.gz) = 393485
+TIMESTAMP = 1746521205
+SHA256 (regex-2024.11.6.tar.gz) = 7ab159b063c52a0333c884e4679f8d7a85112ee3078fe3d9004b2dd875585519
+SIZE (regex-2024.11.6.tar.gz) = 399494
diff --git a/textproc/py-sphinx-markdown-tables/Makefile b/textproc/py-sphinx-markdown-tables/Makefile
index 1babe66c37dd..e58b9fcbd7ef 100644
--- a/textproc/py-sphinx-markdown-tables/Makefile
+++ b/textproc/py-sphinx-markdown-tables/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sphinx-markdown-tables
 PORTVERSION=	0.0.17
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
@@ -11,7 +11,6 @@ COMMENT=	Sphinx extension for rendering tables written in markdown
 WWW=		https://github.com/ryanfox/sphinx-markdown-tables
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=3.4:textproc/py-markdown@${PY_FLAVOR}
 
diff --git a/textproc/py-sphinx-markdown-tables/files/patch-setup.py b/textproc/py-sphinx-markdown-tables/files/patch-setup.py
new file mode 100644
index 000000000000..ef1387c2193f
--- /dev/null
+++ b/textproc/py-sphinx-markdown-tables/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2025-05-04 09:13:44 UTC
++++ setup.py
+@@ -29,7 +29,7 @@ setup(
+     keywords='sphinx markdown tables',
+     packages=['sphinx_markdown_tables'],
+     install_requires=['markdown>=3.4'],
+-    data_files=[('', ['LICENSE'])],
++#    data_files=[('', ['LICENSE'])],
+     project_urls={
+         'Bug Reports': 'https://github.com/ryanfox/sphinx-markdown-tables/issues',
+         'Say Thanks!': 'https://foxrow.com',
diff --git a/textproc/quarto/Makefile b/textproc/quarto/Makefile
index b29c42427e00..9b479ec01002 100644
--- a/textproc/quarto/Makefile
+++ b/textproc/quarto/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	quarto # quarto also requires some Linux base to be installed, for example linux_base-rl9
-DISTVERSION=	1.7.29
+DISTVERSION=	1.7.30
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/quarto-dev/quarto-cli/releases/download/v${DISTVERSION}/
 DISTFILES=	quarto-${DISTVERSION}-linux-amd64.tar.gz # same for all architectures
diff --git a/textproc/quarto/distinfo b/textproc/quarto/distinfo
index 34cd8b149c71..ab1468b00a1e 100644
--- a/textproc/quarto/distinfo
+++ b/textproc/quarto/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745988936
-SHA256 (quarto-1.7.29-linux-amd64.tar.gz) = 5055cdca8becbd198b4c01d0dcffd7619c0be2cbbdc709ab4d0085cb755791a9
-SIZE (quarto-1.7.29-linux-amd64.tar.gz) = 132100418
-SHA256 (quarto-dev-quarto-cli-v1.7.29_GH0.tar.gz) = 360ea3697dab9bdfff4d4d5c1f06144b0b67d75baa00eed02b00dbea2db6b59c
-SIZE (quarto-dev-quarto-cli-v1.7.29_GH0.tar.gz) = 110033327
+TIMESTAMP = 1746509031
+SHA256 (quarto-1.7.30-linux-amd64.tar.gz) = 25c0de6467b1bd5c422dfd55720b39f48b252d8002b346e021a18c229862c3f9
+SIZE (quarto-1.7.30-linux-amd64.tar.gz) = 132101946
+SHA256 (quarto-dev-quarto-cli-v1.7.30_GH0.tar.gz) = 2938b315502352c7fcd63640cd0681af0c0d18c150fc7a0819b62ac3496828b5
+SIZE (quarto-dev-quarto-cli-v1.7.30_GH0.tar.gz) = 110033341
diff --git a/textproc/resume-extensions/Makefile b/textproc/resume-extensions/Makefile
deleted file mode 100644
index d846202081d0..000000000000
--- a/textproc/resume-extensions/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-PORTNAME=	resume-extensions
-PORTVERSION=	0.5
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://aaronland.info/xsl/xmlresume/
-DISTNAME=	xml${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Extends the XML Resume library
-WWW=		https://aaronland.info/xsl/xmlresume/
-
-DEPRECATED=	Depends on deprecated port textproc/resume
-EXPIRATION_DATE=2025-04-30
-
-RUN_DEPENDS=	resume>0:textproc/resume \
-		${LOCALBASE}/share/xsl/string/print-n-times.xsl:textproc/print-n-times \
-		${LOCALBASE}/share/xsl/xhtml/add-css-links.xsl:textproc/add-css-links
-
-NO_BUILD=	yes
-
-post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local/share|${LOCALBASE}/share|' \
-		${WRKSRC}/lib/extrefs.xsl
-	${REINPLACE_CMD} -e 's|/usr/local/share|${LOCALBASE}/share|' \
-		${WRKSRC}/format/html.xsl
-	${FIND} ${WRKSRC} -name '*.bak' -delete
-
-do-install:
-	@${ECHO} "Installing in ${PREFIX}/share/xsl/${PORTNAME}"
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}
-	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}
-
-.include <bsd.port.mk>
diff --git a/textproc/resume-extensions/distinfo b/textproc/resume-extensions/distinfo
deleted file mode 100644
index e94bcce89878..000000000000
--- a/textproc/resume-extensions/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xmlresume-extensions-0.5.tar.gz) = df8b1c85fa1c8b0fead50d707c65bec7e6dbb79f2686566394c8dfcd9632bb49
-SIZE (xmlresume-extensions-0.5.tar.gz) = 6744
diff --git a/textproc/resume-extensions/pkg-descr b/textproc/resume-extensions/pkg-descr
deleted file mode 100644
index ca516041f71f..000000000000
--- a/textproc/resume-extensions/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Extend the XML Resume library.
diff --git a/textproc/resume-extensions/pkg-plist b/textproc/resume-extensions/pkg-plist
deleted file mode 100644
index 04ef44c443b0..000000000000
--- a/textproc/resume-extensions/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-share/xsl/resume-extensions/Changes.txt
-share/xsl/resume-extensions/format/fo.xsl
-share/xsl/resume-extensions/format/html.xsl
-share/xsl/resume-extensions/format/text.xsl
-share/xsl/resume-extensions/format/xml.xsl
-share/xsl/resume-extensions/lib/extrefs.xsl
-share/xsl/resume-extensions/params.xsl
diff --git a/textproc/resume/Makefile b/textproc/resume/Makefile
deleted file mode 100644
index 55ef9a908c1b..000000000000
--- a/textproc/resume/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-PORTNAME=	resume
-DISTVERSION=	1_5_1
-PORTREVISION=	2
-CATEGORIES=	textproc java
-MASTER_SITES=	SF/xml${PORTNAME}/xml${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XML Resume library
-WWW=		https://xmlresume.sourceforge.net/
-
-LICENSE=	MIT
-
-DEPRECATED=	Obsolete XML and XSL based system that targets résumés and curricu vitae
-EXPIRATION_DATE=2025-04-30
-
-USES=		java tar:tgz
-
-NO_BUILD=	yes
-NO_ARCH=	yes
-SUB_FILES=	pkg-message
-
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|\.\./\.\./css|css|' ${WRKSRC}/xsl/params.xsl
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
-
-do-install:
-	cd ${WRKSRC}/dtd && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/xml/${PORTNAME}
-	cd ${WRKSRC}/xsl && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} css ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}/format
-	${INSTALL_DATA} ${WRKSRC}/java/*.jar ${STAGEDIR}${JAVAJARDIR}
-
-do-install-EXAMPLES-on:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/resume/distinfo b/textproc/resume/distinfo
deleted file mode 100644
index 71f6093e2a11..000000000000
--- a/textproc/resume/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (resume-1_5_1.tgz) = 6d4cd4b85318e72034d9d2e0a3b5aa4544dc80265965582d7dd8d1008b86301c
-SIZE (resume-1_5_1.tgz) = 286910
diff --git a/textproc/resume/files/pkg-message.in b/textproc/resume/files/pkg-message.in
deleted file mode 100644
index 2a79ecaa4ffc..000000000000
--- a/textproc/resume/files/pkg-message.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-For the impatient: You can get a result just in two steps!
-
-1. Install textproc/libxslt.
-
-2. Run the command below.
-
-    $ xsltproc %%PREFIX%%/share/xsl/resume/output/us-html.xsl \
-               %%PREFIX%%/share/examples/resume/example1.xml
-EOM
-}
-]
diff --git a/textproc/resume/pkg-descr b/textproc/resume/pkg-descr
deleted file mode 100644
index 83d947014414..000000000000
--- a/textproc/resume/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-The XML Resume Library is an XML Document Type Definition (DTD) and
-Extensible Stylesheet Language (XSL) file set for declaration, B2B
-exchange, and presentation of resumes.
diff --git a/textproc/resume/pkg-plist b/textproc/resume/pkg-plist
deleted file mode 100644
index 8bcc26d1e5ee..000000000000
--- a/textproc/resume/pkg-plist
+++ /dev/null
@@ -1,76 +0,0 @@
-share/xml/resume/catalog
-share/xml/resume/iso-lat1.ent
-share/xml/resume/resume.dcl
-share/xml/resume/resume.dtd
-share/xsl/resume/country/br.xsl
-share/xsl/resume/country/de.xsl
-share/xsl/resume/country/es.xsl
-share/xsl/resume/country/fr.xsl
-share/xsl/resume/country/it.xsl
-share/xsl/resume/country/nl.xsl
-share/xsl/resume/country/propogate-params.sh
-share/xsl/resume/country/uk.xsl
-share/xsl/resume/country/us.xsl
-share/xsl/resume/format/css/NOTICE
-share/xsl/resume/format/css/blueorange.css
-share/xsl/resume/format/css/compact.css
-share/xsl/resume/format/css/cssClasses.sh
-share/xsl/resume/format/css/cssClasses.txt
-share/xsl/resume/format/css/gray.css
-share/xsl/resume/format/css/original.css
-share/xsl/resume/format/css/professional.css
-share/xsl/resume/format/fo.xsl
-share/xsl/resume/format/html.xsl
-share/xsl/resume/format/text.xsl
-share/xsl/resume/lib/address.xsl
-share/xsl/resume/lib/common.xsl
-share/xsl/resume/lib/deprecated.xsl
-share/xsl/resume/lib/pub.xsl
-share/xsl/resume/lib/string.xsl
-share/xsl/resume/lib/textlayout.xsl
-share/xsl/resume/misc/124-130.xsl
-share/xsl/resume/misc/13x-140.xsl
-share/xsl/resume/misc/default.xsl
-share/xsl/resume/misc/html_contemporary.xsl
-share/xsl/resume/misc/html_professional.xsl
-share/xsl/resume/misc/normalize-whitespace.xsl
-share/xsl/resume/output/br-a4.xsl
-share/xsl/resume/output/br-html.xsl
-share/xsl/resume/output/br-text.xsl
-share/xsl/resume/output/de-a4.xsl
-share/xsl/resume/output/de-html.xsl
-share/xsl/resume/output/de-text.xsl
-share/xsl/resume/output/fr-a4.xsl
-share/xsl/resume/output/fr-html.xsl
-share/xsl/resume/output/fr-text.xsl
-share/xsl/resume/output/it-a4.xsl
-share/xsl/resume/output/it-html.xsl
-share/xsl/resume/output/it-text.xsl
-share/xsl/resume/output/nl-a4.xsl
-share/xsl/resume/output/nl-html.xsl
-share/xsl/resume/output/nl-text.xsl
-share/xsl/resume/output/uk-a4.xsl
-share/xsl/resume/output/uk-html.xsl
-share/xsl/resume/output/uk-text.xsl
-share/xsl/resume/output/us-html.xsl
-share/xsl/resume/output/us-letter.xsl
-share/xsl/resume/output/us-text.xsl
-share/xsl/resume/paper/a4.xsl
-share/xsl/resume/paper/letter.xsl
-share/xsl/resume/params.xsl
-%%JAVAJARDIR%%/xmlresume-filter.jar
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/brazil.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/canada.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/ireland.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/italy.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/norway.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/nz.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/uk.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/untagged.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/usa.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.xml
diff --git a/textproc/rubygem-actionpack-xml_parser-rails52/Makefile b/textproc/rubygem-actionpack-xml_parser-rails52/Makefile
index 0df8f6afc0be..ca26875f83da 100644
--- a/textproc/rubygem-actionpack-xml_parser-rails52/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser-rails52/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails52
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack
 WWW=		https://github.com/rails/actionpack-xml_parser
 
diff --git a/textproc/rubygem-actionpack-xml_parser-rails61/Makefile b/textproc/rubygem-actionpack-xml_parser-rails61/Makefile
index 0b6cfdc5981b..72a8f7282a85 100644
--- a/textproc/rubygem-actionpack-xml_parser-rails61/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser-rails61/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack
 WWW=		https://github.com/rails/actionpack-xml_parser
 
diff --git a/textproc/rubygem-actionpack-xml_parser-rails72/Makefile b/textproc/rubygem-actionpack-xml_parser-rails72/Makefile
index 869f0908d4ae..c3dcbce85005 100644
--- a/textproc/rubygem-actionpack-xml_parser-rails72/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser-rails72/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails72
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack
 WWW=		https://github.com/rails/actionpack-xml_parser
 
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
deleted file mode 100644
index dff322b8c788..000000000000
--- a/textproc/sary/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-PORTNAME=	sary
-PORTVERSION=	1.2.0
-PORTREVISION=	6
-CATEGORIES=	textproc
-MASTER_SITES=	http://sary.sourceforge.net/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Suffix array library and tools, which provide fast full-text search
-WWW=		https://sary.sourceforge.net/index.html.en
-
-DEPRECATED=	Last release in 2005 and unmaintained in tree for years
-EXPIRATION_DATE=2025-04-30
-
-USES=		gnome libtool pathfix pkgconfig
-USE_GNOME=	glib20
-USE_LDCONFIG=	yes
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.in
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsary.so
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/docs && ${FIND} . ! -name "*Makefile*" | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/sary/distinfo b/textproc/sary/distinfo
deleted file mode 100644
index 89d0a06f7049..000000000000
--- a/textproc/sary/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sary-1.2.0.tar.gz) = d4b16e32c97a253b546922d2926c8600383352f0af0d95e2938b6d846dfc6a11
-SIZE (sary-1.2.0.tar.gz) = 393787
diff --git a/textproc/sary/files/patch-sary_builder.c b/textproc/sary/files/patch-sary_builder.c
deleted file mode 100644
index 05902dcc52ea..000000000000
--- a/textproc/sary/files/patch-sary_builder.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sary/builder.c.orig	2005-01-28 08:50:24 UTC
-+++ sary/builder.c
-@@ -45,7 +45,7 @@ struct _SaryBuilder{
-     gpointer		progress_func_data;
- };
- 
--static SaryInt	index		(SaryBuilder	*builder, 
-+static SaryInt	sary_index	(SaryBuilder	*builder, 
- 				 SaryProgress	*progress,
- 				 SaryWriter	*writer);
- static void	progress_quiet	(SaryProgress	*progress);
-@@ -124,7 +124,7 @@ sary_builder_index (SaryBuilder *builder)
- 			  builder->progress_func, 
- 			  builder->progress_func_data);
- 
--    count = index(builder, progress, writer);
-+    count = sary_index(builder, progress, writer);
- 
-     sary_progress_destroy(progress);
-     sary_writer_destroy(writer);
-@@ -219,7 +219,7 @@ sary_builder_connect_progress (SaryBuilder *builder,
- }
- 
- static SaryInt
--index (SaryBuilder *builder, SaryProgress *progress, SaryWriter *writer)
-+sary_index (SaryBuilder *builder, SaryProgress *progress, SaryWriter *writer)
- {
-     gchar *bof, *cursor;
-     SaryInt count;
diff --git a/textproc/sary/files/patch-src_mksary.c b/textproc/sary/files/patch-src_mksary.c
deleted file mode 100644
index f2bbaaf10e1a..000000000000
--- a/textproc/sary/files/patch-src_mksary.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/mksary.c.orig	2004-06-11 18:57:28 UTC
-+++ src/mksary.c
-@@ -59,7 +59,7 @@ CodesetFunc codeset_func_tab[] = {
- static SaryIpointFunc	dispatch_codeset_func	(const gchar *codeset);
- static SaryBuilder*	new_builder		(const gchar *file_name, 
- 						 const gchar *array_name);
--static void		index			(SaryBuilder *builder,
-+static void		mk_index		(SaryBuilder *builder,
- 						 const gchar *file_name,
- 						 const gchar *array_name);
- static void		sort			(SaryBuilder *builder,
-@@ -149,7 +149,7 @@ new_builder (const gchar *file_name, const gchar *arra
- }
- 
- static void
--index (SaryBuilder *builder,
-+mk_index (SaryBuilder *builder,
-        const gchar *file_name, 
-        const gchar *array_name)
- {
-@@ -186,7 +186,7 @@ index_and_sort (SaryBuilder *builder,
- 		const gchar *file_name, 
- 		const gchar *array_name)
- {
--    index(builder, file_name, array_name);
-+    mk_index(builder, file_name, array_name);
-     sort(builder, file_name, array_name);
- }
- 
-@@ -358,7 +358,7 @@ parse_options (int argc, char **argv)
- 	    show_help();
- 	    break;
- 	case 'i':
--	    process = index;
-+	    process = mk_index;
- 	    break;
- 	case 'l':
- 	    ipoint_func = sary_ipoint_line;
diff --git a/textproc/sary/pkg-descr b/textproc/sary/pkg-descr
deleted file mode 100644
index 56e50499948d..000000000000
--- a/textproc/sary/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Sary is a suffix array library and tools.  It provides fast full-text
-search facilities for text files on the order of 10 to 100 MB using a
-data structure called a suffix array.  It can also search specific
-fields in a text file by assigning index points to those fields.
diff --git a/textproc/sary/pkg-plist b/textproc/sary/pkg-plist
deleted file mode 100644
index 23c33fe4589f..000000000000
--- a/textproc/sary/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-bin/mksary
-bin/sary
-include/sary.h
-include/sary/array.h
-include/sary/bsearch.h
-include/sary/builder.h
-include/sary/cache.h
-include/sary/i.h
-include/sary/ipoint.h
-include/sary/merger.h
-include/sary/mkqsort.h
-include/sary/mmap.h
-include/sary/progress.h
-include/sary/saryconfig.h
-include/sary/searcher.h
-include/sary/sorter.h
-include/sary/str.h
-include/sary/text.h
-include/sary/writer.h
-lib/libsary.a
-lib/libsary.so
-lib/libsary.so.10
-lib/libsary.so.10.0.0
-libdata/pkgconfig/sary.pc
-share/man/man1/mksary.1.gz
-share/man/man1/sary.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/en/libsary.html
-%%PORTDOCS%%%%DOCSDIR%%/en/suffix-array.html
-%%PORTDOCS%%%%DOCSDIR%%/images/figure1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/figure2.png
-%%PORTDOCS%%%%DOCSDIR%%/images/figure3.png
-%%PORTDOCS%%%%DOCSDIR%%/images/figure4.png
-%%PORTDOCS%%%%DOCSDIR%%/images/figure5.png
-%%PORTDOCS%%%%DOCSDIR%%/ja/libsary.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/suffix-array.html
-%%PORTDOCS%%%%DOCSDIR%%/sary.css
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
deleted file mode 100644
index 02c8c60b20d3..000000000000
--- a/textproc/saxon-devel/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-PORTNAME=	saxon
-PORTVERSION=	9.1.0.8
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	textproc java
-MASTER_SITES=	SF/${PORTNAME}/Saxon-B/${PORTVERSION}:binary	\
-		SF/${PORTNAME}/Saxon-B/9.1.0.7:resources
-PKGNAMESUFFIX=	-devel
-DISTFILES=	${PORTNAME}b${PORTVERSION:S,.,-,g}j.zip:binary	\
-		${PORTNAME}-resources9-1-0-1.zip:resources
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
-WWW=		https://saxon.sourceforge.net/
-
-DEPRECATED=	Deprecated and unsupported upstream, consider using textproc/saxon-he
-EXPIRATION_DATE=2025-04-30
-
-USES=		java zip
-
-OPTIONS_DEFINE=	JDOM DOM4J XOM DOCS
-JDOM_DESC=	Jdom support
-DOM4J_DESC=	dom4j support
-XOM_DESC=	XOM support
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-
-CONFLICTS=	saxon-6.*
-
-JARFILES=	saxon9-sql.jar saxon9.jar saxon9-xpath.jar saxon9-dom.jar \
-		saxon9-xqj.jar saxon9-s9api.jar
-PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon bin/saxon-xquery
-PORTDOCS=	*
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJDOM}
-JARFILES+=	saxon9-jdom.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/jdom.jar:java/jdom
-.endif
-
-.if ${PORT_OPTIONS:MDOM4J}
-JARFILES+=	saxon9-dom4j.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/dom4j.jar:textproc/dom4j
-.endif
-
-.if ${PORT_OPTIONS:MXOM}
-JARFILES+=	saxon9-xom.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/xom.jar:textproc/xom
-.endif
-
-SUB_FILES=	saxon.sh
-SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
-
-do-install:
-	@${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}/..."
-	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-.for file in ${JARFILES}
-	@${ECHO_MSG} -n " ${file}"
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${JAVAJARDIR}/
-.endfor
-	@${ECHO_MSG} " [ DONE ]"
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..."
-	cd ${WRKSRC}/samples/ \
-	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
-	@${ECHO_MSG} " [ DONE ]"
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	cd ${WRKSRC}/doc/ \
-	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-	@${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..."
-.for scriptfile in saxon saxon-xquery
-	@${ECHO_MSG} -n " ${scriptfile}"
-	${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/${scriptfile}
-.endfor
-	@${ECHO_MSG} " [ DONE ]"
-
-post-install-DOCS-on:
-	${FIND} -s ${WRKSRC}/samples -not -type d | \
-		${SED} -ne 's|^${WRKSRC}/samples|${EXAMPLESDIR:S,${PREFIX}/,,}|p' >> ${TMPPLIST}
-
-.include <bsd.port.mk>
diff --git a/textproc/saxon-devel/distinfo b/textproc/saxon-devel/distinfo
deleted file mode 100644
index e3f372ae675c..000000000000
--- a/textproc/saxon-devel/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (saxonb9-1-0-8j.zip) = 92bcdc4a0680c7866fe5828adb92c714cfe88dcf3fa0caf5bf638fcc6d9369b4
-SIZE (saxonb9-1-0-8j.zip) = 2041548
-SHA256 (saxon-resources9-1-0-1.zip) = 371fbb245d283396f734555e893c41d6df150ebe1576e38211f12df93fc34def
-SIZE (saxon-resources9-1-0-1.zip) = 12219434
diff --git a/textproc/saxon-devel/files/saxon.sh.in b/textproc/saxon-devel/files/saxon.sh.in
deleted file mode 100644
index 3cb3014693c0..000000000000
--- a/textproc/saxon-devel/files/saxon.sh.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-IAM="`basename "$0"`"
-
-if [ "${IAM}" = "saxon-xquery" ]
-then
-	LAUNCHER_CLASS="net.sf.saxon.Query"
-else
-	LAUNCHER_CLASS="net.sf.saxon.Transform"
-fi
-
-SAXON_CLASSPATH=""
-for jarfile in %%SAXON_JARS%%
-do
-	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
-done
-
-exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
diff --git a/textproc/saxon-devel/pkg-descr b/textproc/saxon-devel/pkg-descr
deleted file mode 100644
index e94add350fb7..000000000000
--- a/textproc/saxon-devel/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-The Saxon-B 9.1 package is a collection of tools for processing XML documents.
-The main components are:
-
-- An XSLT 2.0 processor, that can be used from the command line, or invoked
-  from a Java application by use of the standard JAXP API. Saxon can be
-  integrated with Java applications using the JAXP API, which means it is
-  possible for a Java application to switch between different XSLT processors
-  without changing the application code. As well as conforming closely with the
-  XSLT 2.0 specification, Saxon offers a number of powerful extensions.
-- An XPath 2.0 processor accessible via an API to Java applications.
-- An XQuery 1.0 processor that can be used from the command line, or invoked
-  from a Java application by use of an API.
-- An XML Schema 1.0 processor. This can be used on its own to validate a schema
-  for correctness, or to validate a source document against the definitions in
-  a schema. It is also used to support the schema-aware functionality of the
-  XSLT and XQuery processors.
-
-So you can use Saxon to process XML by writing XSLT stylesheets, by writing
-XQuery queries, by writing Java applications, or by combinations of the
-approaches.
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
deleted file mode 100644
index 9c8730c4c2ba..000000000000
--- a/textproc/saxon/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME=	saxon
-PORTVERSION=	6.5.5
-PORTREVISION=	1
-CATEGORIES=	textproc java
-MASTER_SITES=	SF/${PORTNAME}/saxon6/${PORTVERSION}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/g}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XSLT 1.0 processor for Java
-WWW=		https://saxon.sourceforge.net/
-
-LICENSE=	MPL10
-
-DEPRECATED=	Deprecated and unsupported upstream, consider using textproc/saxon-he
-EXPIRATION_DATE=2025-04-30
-
-USES=		java zip
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-NO_ARCH=	yes
-
-CONFLICTS=	saxon-devel-8.*
-
-JARFILES=	saxon-jdom.jar saxon.jar
-PLIST_FILES=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon
-PORTDOCS=	api api-guide.html changes.html conditions.html \
-		conformance.html dtdgen.html expressions.html \
-		extensibility.html extensions.html index.html \
-		instant.html limitations.html patterns.html samples.html \
-		saxon-style.css using-xsl.html xsl-elements.html
-
-SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
-SUB_FILES=	saxon.sh
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-do-install:
-.for JARFILE in ${JARFILES}
-	${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/saxon
-
-do-install-DOCS-on:
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-
-do-install-EXAMPLES-on:
-	@cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/saxon/distinfo b/textproc/saxon/distinfo
deleted file mode 100644
index 4fe6e503c305..000000000000
--- a/textproc/saxon/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (saxon6-5-5.zip) = a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4
-SIZE (saxon6-5-5.zip) = 3346162
diff --git a/textproc/saxon/files/saxon.sh.in b/textproc/saxon/files/saxon.sh.in
deleted file mode 100644
index 71f8b847656f..000000000000
--- a/textproc/saxon/files/saxon.sh.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-SAXON_CLASSPATH=""
-for jarfile in %%SAXON_JARS%%
-do
-	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
-done
-
-"%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" com.icl.saxon.StyleSheet "$@"
diff --git a/textproc/saxon/pkg-descr b/textproc/saxon/pkg-descr
deleted file mode 100644
index 09f33e652cd8..000000000000
--- a/textproc/saxon/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-The SAXON package is a collection of tools for processing XML
-documents. The main components are:
-
-  - An XSLT processor, which implements the Version 1.0 XSLT and XPath
-    Recommendations with a number of powerful extensions.
-
-  - A Java library, which supports a similar processing model to XSL,
-    but allows full programming capability.
-
-  - A slightly improved version of the Alfred parser from Microstar.
diff --git a/textproc/saxon/pkg-plist b/textproc/saxon/pkg-plist
deleted file mode 100644
index 96c4b85d9aee..000000000000
--- a/textproc/saxon/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/books.dtd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/books.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/othello.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/play.dtd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ExampleContentHandler.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ExampleContentHandler.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/JDOMExample.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/JDOMExample.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/SaxonServlet.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/SaxonServlet.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ShowBooks$1.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ShowBooks$BookListHandler.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ShowBooks$BooksHandler.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ShowBooks$CategoryHandler.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ShowBooks$ItemHandler.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ShowBooks.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/ShowBooks.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/TraxExamples$1.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/TraxExamples$ModifyStylesheetFilter.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/TraxExamples$UserURIResolver.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/TraxExamples.class
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/TraxExamples.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/bible.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/books-attsets.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/books-csv.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/books-sql.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/books-tle.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/books.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/play.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/total.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/tour10.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/tour11.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/exampleSimple2.out
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xml/baz.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xml/embedded.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xml/foo.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xml/subdir1/foo2.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xml/subdir1/subdir2/foo3.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/baz.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/foo.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/foo2.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/foo3.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/inc1/inc1.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/inc1/inc2/inc2.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/preamble.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trax/xsl/text.xsl
diff --git a/textproc/sd/Makefile b/textproc/sd/Makefile
index a237ffef41c2..1b746d838748 100644
--- a/textproc/sd/Makefile
+++ b/textproc/sd/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	1.0.0
 PORTREVISION=	14
 CATEGORIES=	textproc
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Intuitive find and replace tool
 WWW=		https://github.com/chmln/sd
 
diff --git a/textproc/sdif/Makefile b/textproc/sdif/Makefile
deleted file mode 100644
index 8af6b1051b97..000000000000
--- a/textproc/sdif/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-PORTNAME=	sdif
-PORTVERSION=	2.8.20170401
-DISTVERSIONPREFIX=	v
-CATEGORIES=	textproc
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Side-by-side diff viewer for ANSI terminal
-WWW=		https://github.com/kaz-utashiro/sdif
-
-LICENSE=	GREPLE
-LICENSE_NAME=	GREPLE License
-LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED=	Deprecated upstream, repo archived Nov 21, 2018
-EXPIRATION_DATE=2025-04-30
-
-RUN_DEPENDS=	${SITE_PERL}/Getopt/EX.pm:devel/p5-Getopt-EX
-
-USES=		perl5 shebangfix
-SHEBANG_FILES=	${PORTNAME}
-USE_GITHUB=	yes
-GH_ACCOUNT=	kaz-utashiro
-GH_TAGNAME=	356575d
-NO_BUILD=	yes
-NO_ARCH=	yes
-PLIST_FILES=	bin/sdif \
-		%%SITE_PERL%%/App/sdif/colors.pm \
-		%%SITE_PERL%%/App/sdif/osx_autocolor.pm
-
-post-extract:
-	cd ${WRKSRC} && \
-	    ${SED} -n "/^## Copyright/,/^$$/p" sdif > LICENSE
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	cd ${WRKSRC}/lib && \
-	    ${COPYTREE_SHARE} App ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
-
-.include <bsd.port.mk>
diff --git a/textproc/sdif/distinfo b/textproc/sdif/distinfo
deleted file mode 100644
index 25ea15d30271..000000000000
--- a/textproc/sdif/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1491037017
-SHA256 (kaz-utashiro-sdif-v2.8.20170401-356575d_GH0.tar.gz) = e2ee2814f585dccc9b90e5b76fc55cf5b6edace91043831e3a839ead5856fdb2
-SIZE (kaz-utashiro-sdif-v2.8.20170401-356575d_GH0.tar.gz) = 16067
diff --git a/textproc/sdif/pkg-descr b/textproc/sdif/pkg-descr
deleted file mode 100644
index 4eb05ae990fb..000000000000
--- a/textproc/sdif/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-sdif is inspired by System V sdiff(1) command.  The basic feature of
-sdif is making a side-by-side listing of two different files.  All
-contents of two files are listed on left and right sides.  Center
-column is used to indicate how different those lines.  No mark means
-no difference.  Added, deleted and modified lines are marked with `-'
-and `+' character.
-
-It also reads and formats the output from diff command from standard
-input.  Besides normal diff output, context diff -c and unified diff
--u output will be handled properly.  Combined diff format is also
-supported, but currently limited upto three files.
diff --git a/textproc/sonic/Makefile b/textproc/sonic/Makefile
index 9f3ffe936e6b..3a72719c9109 100644
--- a/textproc/sonic/Makefile
+++ b/textproc/sonic/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	textproc
 MASTER_SITES+=	https://clrd.ninjal.ac.jp/unidic_archive/cwj/2.1.2/:unidic
 DISTFILES+=	unidic-mecab-2.1.2_src.zip:unidic # check cargo-crates/lindera-unidic-XXX/build.rs
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast, lightweight, and schema-less search backend
 WWW=		https://github.com/valeriansaliou/sonic
 
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
deleted file mode 100644
index 24614481afbc..000000000000
--- a/textproc/soothsayer/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-PORTNAME=	soothsayer
-PORTVERSION=	0.6.3
-PORTREVISION=	4
-CATEGORIES=	textproc
-MASTER_SITES=	SF/presage/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Intelligent predictive text entry platform
-WWW=		http://presage.sourceforge.net/
-
-LICENSE=	GPLv2+
-
-DEPRECATED=	Deprecated upstream, consider using deskutils/presage
-EXPIRATION_DATE=2025-04-30
-
-BUILD_DEPENDS=	help2man:misc/help2man
-
-USES=		compiler libtool localbase ncurses pkgconfig sqlite
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ENV=	ac_cv_path_CPPUNIT_CONFIG=no \
-		ac_cv_path_PYTHON=no \
-		ac_cv_path_SWIG=no \
-		ac_cv_prog_HAVE_DOT=no \
-		ac_cv_prog_HAVE_DOXYGEN=no
-CONFIGURE_ARGS=	--disable-python-binding --localstatedir="${PREFIX}/var"
-CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
-CXXFLAGS_clang=	-Wno-c++11-narrowing
-INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
-
-MAKE_JOBS_UNSAFE=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|\$$\^|$${.ALLSRC}| ; \
-		 s|lib/soothsayer|soothsayer|g' ${WRKSRC}/resources/Makefile.in
-	@${REINPLACE_CMD} -e 's|lib/soothsayer|soothsayer|' \
-		${WRKSRC}/resources/profiles/Makefile.in
-	@${REINPLACE_CMD} -e 's@lcurses@lncurses@g' \
-		${WRKSRC}/src/tools/Makefile.in
-	@${REINPLACE_CMD} -E -e "s|(LIBS=.*)-lsqlite3(.*)|\1\`pkg-config --static --libs sqlite3\`\2|" \
-		-e "s|(.*SQLITE_LIBS=.*)-lsqlite3(.*)|\1\`pkg-config --static --libs sqlite3\`\2|" \
-		-e 's@lcurses@lncurses@g' \
-		${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/textproc/soothsayer/distinfo b/textproc/soothsayer/distinfo
deleted file mode 100644
index 904feae2d666..000000000000
--- a/textproc/soothsayer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (soothsayer-0.6.3.tar.gz) = 4385d0010b82e845b3622cfe6651c669e9bc3bde57c90e7b8c34044bb9406b2e
-SIZE (soothsayer-0.6.3.tar.gz) = 1119435
diff --git a/textproc/soothsayer/files/patch-src_lib_core_profileManager.cpp b/textproc/soothsayer/files/patch-src_lib_core_profileManager.cpp
deleted file mode 100644
index 4a1593a20b4e..000000000000
--- a/textproc/soothsayer/files/patch-src_lib_core_profileManager.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/core/profileManager.cpp.orig	2008-06-02 13:29:06 UTC
-+++ src/lib/core/profileManager.cpp
-@@ -31,6 +31,8 @@
- #endif
- 
- #include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/types.h>
- 
- /** Constructor.
-  *
diff --git a/textproc/soothsayer/files/patch-src_lib_core_utility.cpp b/textproc/soothsayer/files/patch-src_lib_core_utility.cpp
deleted file mode 100644
index 04350495200d..000000000000
--- a/textproc/soothsayer/files/patch-src_lib_core_utility.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/core/utility.cpp.orig	2008-06-02 13:29:06 UTC
-+++ src/lib/core/utility.cpp
-@@ -22,6 +22,8 @@
-                                                                 **********(*)*/
- 
- #include "utility.h"
-+#include <cstdlib>
-+#include <cstring>
- 
- 
- /** Convert string to lower case
diff --git a/textproc/soothsayer/files/patch-src_lib_plugins_plugin.cpp b/textproc/soothsayer/files/patch-src_lib_plugins_plugin.cpp
deleted file mode 100644
index 94ba4d7e0588..000000000000
--- a/textproc/soothsayer/files/patch-src_lib_plugins_plugin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lib/plugins/plugin.cpp.orig	2008-06-02 13:29:01 UTC
-+++ src/lib/plugins/plugin.cpp
-@@ -22,6 +22,7 @@
-                                                                 **********(*)*/
- 
- #include "plugins/plugin.h"
-+#include <cstdlib>
- 
- /** Creates a plugin object.
-  *
diff --git a/textproc/soothsayer/files/patch-src_lib_plugins_smoothedCountPlugin.cpp b/textproc/soothsayer/files/patch-src_lib_plugins_smoothedCountPlugin.cpp
deleted file mode 100644
index 7374958fe4a4..000000000000
--- a/textproc/soothsayer/files/patch-src_lib_plugins_smoothedCountPlugin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lib/plugins/smoothedCountPlugin.cpp.orig	2008-06-02 13:29:01 UTC
-+++ src/lib/plugins/smoothedCountPlugin.cpp
-@@ -22,6 +22,7 @@
-                                                                 **********(*)*/
- 
- #include "plugins/smoothedCountPlugin.h"
-+#include <cstring>
- 
- 
- SmoothedCountPlugin::SmoothedCountPlugin(Configuration* config, ContextTracker* ct)
diff --git a/textproc/soothsayer/files/patch-src_lib_plugins_smoothedNgramPlugin.cpp b/textproc/soothsayer/files/patch-src_lib_plugins_smoothedNgramPlugin.cpp
deleted file mode 100644
index c3edf463dc72..000000000000
--- a/textproc/soothsayer/files/patch-src_lib_plugins_smoothedNgramPlugin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lib/plugins/smoothedNgramPlugin.cpp.orig	2008-06-02 13:29:01 UTC
-+++ src/lib/plugins/smoothedNgramPlugin.cpp
-@@ -23,6 +23,7 @@
- 
- #include "plugins/smoothedNgramPlugin.h"
- #include <sstream>
-+#include <algorithm>
- 
- 
- SmoothedNgramPlugin::SmoothedNgramPlugin(Configuration* config, ContextTracker* ct)
diff --git a/textproc/soothsayer/files/patch-src_tools_soothsayerDemo.cpp b/textproc/soothsayer/files/patch-src_tools_soothsayerDemo.cpp
deleted file mode 100644
index 645370b319f2..000000000000
--- a/textproc/soothsayer/files/patch-src_tools_soothsayerDemo.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tools/soothsayerDemo.cpp.orig	2008-06-02 13:29:00 UTC
-+++ src/tools/soothsayerDemo.cpp
-@@ -36,6 +36,7 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstdlib>
- #include <getopt.h>
- #include <list>
- 
diff --git a/textproc/soothsayer/files/patch-src_tools_soothsayerDemoText.cpp b/textproc/soothsayer/files/patch-src_tools_soothsayerDemoText.cpp
deleted file mode 100644
index a75decc54cd3..000000000000
--- a/textproc/soothsayer/files/patch-src_tools_soothsayerDemoText.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tools/soothsayerDemoText.cpp.orig	2008-06-02 13:29:00 UTC
-+++ src/tools/soothsayerDemoText.cpp
-@@ -26,6 +26,7 @@
- #include <iostream>
- #include <sstream>
- #include <getopt.h>
-+#include <cstdlib>
- 
- const char PROGRAM_NAME[] = "soothsayerDemoText";
- 
diff --git a/textproc/soothsayer/files/patch-src_tools_soothsayerSimulator.cpp b/textproc/soothsayer/files/patch-src_tools_soothsayerSimulator.cpp
deleted file mode 100644
index b6f052fcff9b..000000000000
--- a/textproc/soothsayer/files/patch-src_tools_soothsayerSimulator.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tools/soothsayerSimulator.cpp.orig	2008-06-02 13:29:00 UTC
-+++ src/tools/soothsayerSimulator.cpp
-@@ -23,6 +23,7 @@
- 
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- #include <string.h>
- 
- #include <getopt.h>
diff --git a/textproc/soothsayer/files/patch-src_tools_text2ngram.cpp b/textproc/soothsayer/files/patch-src_tools_text2ngram.cpp
deleted file mode 100644
index 68b6e60b89f8..000000000000
--- a/textproc/soothsayer/files/patch-src_tools_text2ngram.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tools/text2ngram.cpp.orig	2008-06-02 13:29:00 UTC
-+++ src/tools/text2ngram.cpp
-@@ -29,6 +29,7 @@
- #include <list>
- #include <string>
- #include <map>
-+#include <cstdlib>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
diff --git a/textproc/soothsayer/pkg-descr b/textproc/soothsayer/pkg-descr
deleted file mode 100644
index 51e848853afa..000000000000
--- a/textproc/soothsayer/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Soothsayer is an intelligent predictive text entry platform. Soothsayer
-exploits redundant information embedded in natural languages to generate
-predictions. Soothsayer's modular and pluggable architecture allows its
-language model to be extended and customized to utilize statistical,
-syntactic, and semantic information sources.
-
-A predictive text entry system attempts to improve ease and speed of
-textual input. Word prediction consists in computing which word tokens
-or word completions are most likely to be entered next. The system
-analyses the text already entered and combines the information thus
-extracted with other information sources to calculate a set of most
-probable tokens.
diff --git a/textproc/soothsayer/pkg-plist b/textproc/soothsayer/pkg-plist
deleted file mode 100644
index b094accec948..000000000000
--- a/textproc/soothsayer/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/soothsayer_demo
-bin/soothsayer_demo_text
-bin/soothsayer_simulator
-bin/text2ngram
-etc/soothsayer.xml
-include/soothsayer.h
-include/soothsayerException.h
-lib/libsoothsayer.a
-lib/libsoothsayer.so
-lib/libsoothsayer.so.0
-lib/libsoothsayer.so.0.0.0
-share/man/man1/soothsayer_demo.1.gz
-share/man/man1/soothsayer_demo_text.1.gz
-share/man/man1/soothsayer_simulator.1.gz
-share/man/man1/text2ngram.1.gz
-var/soothsayer/abbreviations_en.txt
-var/soothsayer/abbreviations_it.txt
-var/soothsayer/database_en.db
-var/soothsayer/database_it.db
diff --git a/textproc/sxml/Makefile b/textproc/sxml/Makefile
deleted file mode 100644
index dd7eae8a1fd5..000000000000
--- a/textproc/sxml/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-PORTNAME=	sxml
-PORTVERSION=	1.0.7
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.MysticWALL.COM/download/
-
-MAINTAINER=	takefu@airport.fm
-COMMENT=	Skimpy XML parsing and grafting library for C language
-WWW=		http://www.MysticWALL.COM/software/sxml/index.html
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	No consumers in tree and no active development upstream for over a decade
-EXPIRATION_DATE=2025-04-30
-
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USES=		tar:bzip2
-
-do-test:
-	cd ${BUILD_WRKSRC}/examples && ${MAKE} all
-
-.include <bsd.port.mk>
diff --git a/textproc/sxml/distinfo b/textproc/sxml/distinfo
deleted file mode 100644
index 5605c7cf73ba..000000000000
--- a/textproc/sxml/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1497916868
-SHA256 (sxml-1.0.7.tar.bz2) = b7ed703252976074488044e49de070bc01a9f3eff7633c772dac05f089825470
-SIZE (sxml-1.0.7.tar.bz2) = 83491
diff --git a/textproc/sxml/files/patch-Makefile.in b/textproc/sxml/files/patch-Makefile.in
deleted file mode 100644
index 43edbefb84fd..000000000000
--- a/textproc/sxml/files/patch-Makefile.in
+++ /dev/null
@@ -1,85 +0,0 @@
---- Makefile.in.orig	2010-03-26 07:56:17 UTC
-+++ Makefile.in
-@@ -30,11 +30,11 @@ CTAGS=@CTAGS@
- EDITOR=@EDITOR@
- 
- INSTALL=@INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@ -s
-+INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
- 
- DEFS= @DEFS@
--OPTS= -fforce-addr -fstrength-reduce -funroll-loops -finline-functions
-+OPTS= -fstrength-reduce -funroll-loops -finline-functions
- CPPFLAGS= -I@srcdir@
- CFLAGS= ${DEFS} ${CPPFLAGS} ${OPTS} @CFLAGS@
- 
-@@ -121,43 +121,43 @@ libsxmlrpc.dylib: ${SXMLRPC_SOBJ}
- install:: check-dirs install-libsxml install-libsxmlrpc
- 
- install-libsxml::
--	-${RM} ${libdir}/${SXML_PLIB}
--	${INSTALL_DATA} ${SXML_PLIB} ${libdir}
--	${RANLIB} -t ${libdir}/${SXML_PLIB}
--	-${RM} ${libdir}/${SXML_SLIB}
--	-${RM} ${libdir}/${SXML_DLIB}
--	-${RM} ${libdir}/${SXML_LIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXML_PLIB}
-+	${INSTALL_DATA} ${SXML_PLIB} ${DESTDIR}${libdir}
-+	${RANLIB} -t ${DESTDIR}${libdir}/${SXML_PLIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXML_SLIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXML_DLIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXML_LIB}
- 	if [ -f ${SXML_SLIB} ]; then \
--	  ${INSTALL} ${SXML_SLIB} ${libdir}; \
--	  (cd ${libdir}; ${LN_S} ${SXML_SLIB} ${SXML_LIB}); \
-+	  ${INSTALL_PROGRAM} ${SXML_SLIB} ${DESTDIR}${libdir}; \
-+	  (cd ${DESTDIR}${libdir}; ${LN_S} ${SXML_SLIB} ${SXML_LIB}); \
- 	fi
- 	if [ -f ${SXML_DYLIB} ]; then \
--	  ${INSTALL} ${SXML_DYLIB} ${libdir}; \
--	  (cd ${libdir}; ${LN_S} ${SXML_DYLIB} ${SXML_DLIB}); \
-+	  ${INSTALL} ${SXML_DYLIB} ${DESTDIR}${libdir}; \
-+	  (cd ${DESTDIR}${libdir}; ${LN_S} ${SXML_DYLIB} ${SXML_DLIB}); \
- 	fi
--	${INSTALL_DATA} ${SXML_HDR} ${includedir}
-+	${INSTALL_DATA} ${SXML_HDR} ${DESTDIR}${includedir}
- 
- install-libsxmlrpc::
--	-${RM} ${libdir}/${SXMLRPC_PLIB}
--	${INSTALL_DATA} ${SXMLRPC_PLIB} ${libdir}
--	${RANLIB} -t ${libdir}/${SXMLRPC_PLIB}
--	-${RM} ${libdir}/${SXMLRPC_SLIB}
--	-${RM} ${libdir}/${SXMLRPC_DLIB}
--	-${RM} ${libdir}/${SXMLRPC_LIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXMLRPC_PLIB}
-+	${INSTALL_DATA} ${SXMLRPC_PLIB} ${DESTDIR}${libdir}
-+	${RANLIB} -t ${DESTDIR}${libdir}/${SXMLRPC_PLIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXMLRPC_SLIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXMLRPC_DLIB}
-+	-${RM} ${DESTDIR}${libdir}/${SXMLRPC_LIB}
- 	if [ -f ${SXMLRPC_SLIB} ]; then \
--	  ${INSTALL} ${SXMLRPC_SLIB} ${libdir}; \
--	  (cd ${libdir}; ${LN_S} ${SXMLRPC_SLIB} ${SXMLRPC_LIB}); \
-+	  ${INSTALL_PROGRAM} ${SXMLRPC_SLIB} ${DESTDIR}${libdir}; \
-+	  (cd ${DESTDIR}${libdir}; ${LN_S} ${SXMLRPC_SLIB} ${SXMLRPC_LIB}); \
- 	fi
- 	if [ -f ${SXMLRPC_DYLIB} ]; then \
--	  ${INSTALL} ${SXMLRPC_DYLIB} ${libdir}; \
--	  (cd ${libdir}; ${LN_S} ${SXMLRPC_DYLIB} ${SXMLRPC_DLIB}); \
-+	  ${INSTALL} ${SXMLRPC_DYLIB} ${DESTDIR}${libdir}; \
-+	  (cd ${DESTDIR}${libdir}; ${LN_S} ${SXMLRPC_DYLIB} ${SXMLRPC_DLIB}); \
- 	fi
--	${INSTALL_DATA} ${SXMLRPC_HDR} ${includedir}
-+	${INSTALL_DATA} ${SXMLRPC_HDR} ${DESTDIR}${includedir}
- 
- check-dirs::
--	@if [ ! -d ${prefix}     ]; then ${MKDIR} ${prefix};     fi
--	@if [ ! -d ${libdir}     ]; then ${MKDIR} ${libdir};     fi
--	@if [ ! -d ${includedir} ]; then ${MKDIR} ${includedir}; fi
-+	@if [ ! -d ${prefix}     ]; then ${MKDIR} ${DESTDIR}${prefix};     fi
-+	@if [ ! -d ${libdir}     ]; then ${MKDIR} ${DESTDIR}${libdir};     fi
-+	@if [ ! -d ${includedir} ]; then ${MKDIR} ${DESTDIR}${includedir}; fi
- 
- ###############################################################################
- 
diff --git a/textproc/sxml/files/patch-examples_Makefile.in b/textproc/sxml/files/patch-examples_Makefile.in
deleted file mode 100644
index 8754201ca4df..000000000000
--- a/textproc/sxml/files/patch-examples_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	2008-02-05 14:03:37 UTC
-+++ examples/Makefile.in
-@@ -34,7 +34,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ -s
- INSTALL_DATA=@INSTALL_DATA@
- 
- DEFS= @DEFS@
--OPTS= -fforce-mem -fforce-addr -fstrength-reduce -funroll-loops -finline-functions
-+OPTS= -fstrength-reduce -funroll-loops -finline-functions
- CPPFLAGS= -I.. -L..
- CFLAGS= ${DEFS} ${CPPFLAGS} ${OPTS} @CFLAGS@
- 
diff --git a/textproc/sxml/pkg-descr b/textproc/sxml/pkg-descr
deleted file mode 100644
index 76073e5c6287..000000000000
--- a/textproc/sxml/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-SXML is a skimpy XML parsing and grafting C library that you can use to read
-and write XML-like configuration file for your application.
-
-Author:	Kouichi ABE (WALL) <kouichi@MysticWALL.COM>
diff --git a/textproc/sxml/pkg-plist b/textproc/sxml/pkg-plist
deleted file mode 100644
index 45da67e35055..000000000000
--- a/textproc/sxml/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/sxmlrpc.h
-include/sxml.h
-lib/libsxmlrpc.a
-lib/libsxmlrpc.so
-lib/libsxmlrpc.so.1
-lib/libsxml.a
-lib/libsxml.so
-lib/libsxml.so.1
diff --git a/textproc/syck/Makefile b/textproc/syck/Makefile
deleted file mode 100644
index 89c529376c8f..000000000000
--- a/textproc/syck/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	syck
-PORTVERSION=	0.70
-CATEGORIES=	textproc devel
-MASTER_SITES=	GHC
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Library for reading and writing YAML 1.0
-WWW=		http://wiki.github.com/indeyets/syck
-
-BROKEN=		Unfetchable
-DEPRECATED=	Unfetchable, no response from upstream in a year
-EXPIRATION_DATE=2025-04-30
-
-USES=		bison
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	indeyets
-
-GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-CFLAGS+=	-fPIC
-
-.include <bsd.port.mk>
diff --git a/textproc/syck/distinfo b/textproc/syck/distinfo
deleted file mode 100644
index 56c2e8b6dbd5..000000000000
--- a/textproc/syck/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (syck-0.70.tar.gz) = 4c94c472ee8314e0d76eb2cca84f6029dc8fc58bfbc47748d50dcb289fda094e
-SIZE (syck-0.70.tar.gz) = 401917
diff --git a/textproc/syck/files/patch-lib_gram.y b/textproc/syck/files/patch-lib_gram.y
deleted file mode 100644
index 5664bcd94686..000000000000
--- a/textproc/syck/files/patch-lib_gram.y
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/gram.y.orig	2013-03-14 21:31:55.000000000 +0800
-+++ lib/gram.y	2013-03-14 21:32:31.000000000 +0800
-@@ -9,7 +9,8 @@
- 
- %start doc
- %pure-parser
--
-+%parse-param {void* parser}
-+%lex-param {void* parser}
- 
- %{
- 
-@@ -24,9 +25,6 @@
- 
- void apply_seq_in_map( SyckParser *parser, SyckNode *n );
- 
--#define YYPARSE_PARAM   parser
--#define YYLEX_PARAM     parser
--
- #define NULL_NODE(parser, node) \
-         SyckNode *node = syck_new_str( "", scalar_plain ); \
-         if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
diff --git a/textproc/syck/files/patch-lib_syck.h b/textproc/syck/files/patch-lib_syck.h
deleted file mode 100644
index 43ce75290936..000000000000
--- a/textproc/syck/files/patch-lib_syck.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/syck.h.orig	2013-03-14 21:32:03.000000000 +0800
-+++ lib/syck.h	2013-03-14 21:32:45.000000000 +0800
-@@ -467,7 +467,7 @@
- /*
-  * Lexer prototypes
-  */
--void syckerror( const char * );
-+void syckerror( void *, const char * );
- int syckparse( void * );
- 
- #if defined(__cplusplus)
diff --git a/textproc/syck/files/patch-lib_token.c b/textproc/syck/files/patch-lib_token.c
deleted file mode 100644
index 83d31be8d93a..000000000000
--- a/textproc/syck/files/patch-lib_token.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- lib/token.c.orig	2013-03-14 21:32:08.000000000 +0800
-+++ lib/token.c	2013-03-14 21:33:14.000000000 +0800
-@@ -200,7 +200,7 @@
-     { \
-         if ( *indent == '\t' ) \
-         { \
--            syckerror("TAB found in your indentation, please remove"); \
-+            syckerror(0, "TAB found in your indentation, please remove"); \
-             return 0; \
-         } \
-         else if ( is_newline( ++indent ) ) \
-@@ -266,11 +266,11 @@
-         return sycklex_yaml_utf8( sycklval, parser );
- 
-         case syck_yaml_utf16:
--            syckerror( "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-+            syckerror( 0, "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-         break;
- 
-         case syck_yaml_utf32:
--            syckerror( "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-+            syckerror( 0, "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-         break;
- 
-         case syck_bytecode_utf8:
-@@ -2758,7 +2758,7 @@
- }
- 
- void 
--syckerror( const char *msg )
-+syckerror( void * parser, const char *msg )
- {
-     if ( syck_parser_ptr->error_handler == NULL )
-         syck_parser_ptr->error_handler = syck_default_error_handler;
diff --git a/textproc/syck/pkg-descr b/textproc/syck/pkg-descr
deleted file mode 100644
index 5ff4ae5a5c7e..000000000000
--- a/textproc/syck/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Syck is an extension for reading and writing YAML swiftly in popular
-scripting languages. As Syck loads the YAML, it stores the data
-directly in your language's symbol table. This means speed. This
-means power. This means Do not disturb Syck because it is so focused
-on the task at hand that it will slay you mortally if you get in its
-way.
diff --git a/textproc/syck/pkg-plist b/textproc/syck/pkg-plist
deleted file mode 100644
index 9ecb1bfa671f..000000000000
--- a/textproc/syck/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-include/syck.h
-include/syck_st.h
-lib/libsyck.a
diff --git a/textproc/turboxsl/Makefile b/textproc/turboxsl/Makefile
deleted file mode 100644
index 735a11e47dd0..000000000000
--- a/textproc/turboxsl/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-PORTNAME=	turboxsl
-DISTVERSION=	b03c2c9
-PORTEPOCH=	1
-CATEGORIES=	textproc
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Fast, multithreaded XML+XSLT transformation library
-WWW=		https://github.com/Litres/turboxsl
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Obsolete, supports only legacy versions of XML and XSLT
-EXPIRATION_DATE=2025-04-30
-
-ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64 powerpc64le
-
-LIB_DEPENDS=	libck.so:devel/concurrencykit \
-		libmemcached.so:databases/libmemcached
-
-USES=		autoreconf libtool pathfix pkgconfig
-USE_LDCONFIG=	yes
-USE_GITHUB=	yes
-GH_ACCOUNT=	Litres
-
-GNU_CONFIGURE=	yes
-CFLAGS+=	-fcommon
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
-
-.include <bsd.port.mk>
diff --git a/textproc/turboxsl/distinfo b/textproc/turboxsl/distinfo
deleted file mode 100644
index e620acd3ba33..000000000000
--- a/textproc/turboxsl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1464025327
-SHA256 (Litres-turboxsl-b03c2c9_GH0.tar.gz) = 4f14d57d5ad6237bdd19871d293e75a86a70d9650acf4cec3c549a273981ffaf
-SIZE (Litres-turboxsl-b03c2c9_GH0.tar.gz) = 884391
diff --git a/textproc/turboxsl/files/patch-configure.ac b/textproc/turboxsl/files/patch-configure.ac
deleted file mode 100644
index 104de7d172f2..000000000000
--- a/textproc/turboxsl/files/patch-configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig	2015-07-02 18:01:10 UTC
-+++ configure.ac
-@@ -23,14 +23,6 @@ AC_SUBST(XSLT_LIBS)
- AC_SUBST(EXTRA_LIBS)
- AC_SUBST(M_LIBS)
- 
--dnl These are for debug -O2 disabling 
--CPPFLAGS="${CXXFLAGS}"
--CXXFLAGS="${CPPFLAGS}"
--CFLAGS=""
--AC_SUBST(CXXFLAGS)
--AC_SUBST(CPPFLAGS)
--AC_SUBST(CLAGS)
--
- AC_OUTPUT([
- Makefile
- libturboxsl.pc
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-category.c b/textproc/turboxsl/files/patch-src-zlog-src-category.c
deleted file mode 100644
index 3942a2f4d190..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-category.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/zlog/src/category.c.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/category.c
-@@ -6,6 +6,7 @@
-  * Licensed under the LGPL v2.1, see the file COPYING in base directory.
-  */
- #include "fmacros.h"
-+#include <sys/types.h>
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-category_table.c b/textproc/turboxsl/files/patch-src-zlog-src-category_table.c
deleted file mode 100644
index f7a850200add..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-category_table.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/zlog/src/category_table.c.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/category_table.c
-@@ -6,6 +6,7 @@
-  * Licensed under the LGPL v2.1, see the file COPYING in base directory.
-  */
- 
-+#include <sys/types.h>
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-event.c b/textproc/turboxsl/files/patch-src-zlog-src-event.c
deleted file mode 100644
index fb4219946602..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-event.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/zlog/src/event.c.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/event.c
-@@ -7,6 +7,7 @@
-  */
- 
- #include "fmacros.h"
-+#include <sys/types.h>
- #include <string.h>
- #include <stdarg.h>
- #include <stdlib.h>
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-record_table.c b/textproc/turboxsl/files/patch-src-zlog-src-record_table.c
deleted file mode 100644
index 116dfa16ae3f..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-record_table.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/zlog/src/record_table.c.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/record_table.c
-@@ -6,6 +6,7 @@
-  * Licensed under the LGPL v2.1, see the file COPYING in base directory.
-  */
- 
-+#include <sys/types.h>
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-rotater.c b/textproc/turboxsl/files/patch-src-zlog-src-rotater.c
deleted file mode 100644
index b04db493d03e..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-rotater.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/zlog/src/rotater.c.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/rotater.c
-@@ -6,6 +6,7 @@
-  * Licensed under the LGPL v2.1, see the file COPYING in base directory.
-  */
- 
-+#include <sys/types.h>
- #include <string.h>
- #include <glob.h>
- #include <stdio.h>
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-rule.c b/textproc/turboxsl/files/patch-src-zlog-src-rule.c
deleted file mode 100644
index f2e839d83763..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-rule.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/zlog/src/rule.c.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/rule.c
-@@ -8,12 +8,12 @@
- 
- #include "fmacros.h"
- 
-+#include <sys/types.h>
- #include <string.h>
- #include <ctype.h>
- #include <syslog.h>
- #include <errno.h>
- #include <stdlib.h>
--#include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-zc_util.c b/textproc/turboxsl/files/patch-src-zlog-src-zc_util.c
deleted file mode 100644
index 38ed6e6e7a51..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-zc_util.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/zlog/src/zc_util.c.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/zc_util.c
-@@ -6,6 +6,7 @@
-  * Licensed under the LGPL v2.1, see the file COPYING in base directory.
-  */
- 
-+#include <sys/types.h>
- #include <string.h>
- #include <syslog.h>
- #include <stdlib.h>
diff --git a/textproc/turboxsl/files/patch-src-zlog-src-zc_xplatform.h b/textproc/turboxsl/files/patch-src-zlog-src-zc_xplatform.h
deleted file mode 100644
index 77bc9e7b103c..000000000000
--- a/textproc/turboxsl/files/patch-src-zlog-src-zc_xplatform.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/zlog/src/zc_xplatform.h.orig	2015-07-02 18:01:10 UTC
-+++ src/zlog/src/zc_xplatform.h
-@@ -9,6 +9,7 @@
- #define __zc_xplatform_h
- 
- #include <limits.h>
-+#include <strings.h>
- 
- #define ZLOG_INT32_LEN   sizeof("-2147483648") - 1
- #define ZLOG_INT64_LEN   sizeof("-9223372036854775808") - 1
diff --git a/textproc/turboxsl/pkg-descr b/textproc/turboxsl/pkg-descr
deleted file mode 100644
index 86673b2c40df..000000000000
--- a/textproc/turboxsl/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-turboxsl is an XSLT 1.0 transform engine with proper multithreading support.
diff --git a/textproc/turboxsl/pkg-plist b/textproc/turboxsl/pkg-plist
deleted file mode 100644
index d1dbacffefbc..000000000000
--- a/textproc/turboxsl/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/turboxsl-config
-bin/turboxsltproc
-include/turboxsl/turboxsl.h
-lib/libturboxsl.so
-lib/libturboxsl.so.0
-lib/libturboxsl.so.0.0.0
-lib/libturboxsl.a
-libdata/pkgconfig/libturboxsl.pc
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index ad1538efca96..f82792bc976f 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	uim-el
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.3
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index 12a5be3cdcd8..c44b7f345200 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745067376
-SHA256 (uim-uim-1.9.1_GH0.tar.gz) = a0af856130a0da6e3b42304a55c59f4acb5f8ad88d6886111241c36951b1be0e
-SIZE (uim-uim-1.9.1_GH0.tar.gz) = 4050008
+TIMESTAMP = 1746443050
+SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35
+SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603
diff --git a/textproc/uim-qt5/pkg-plist b/textproc/uim-qt5/pkg-plist
index a3630246057c..bed63089645f 100644
--- a/textproc/uim-qt5/pkg-plist
+++ b/textproc/uim-qt5/pkg-plist
@@ -6,9 +6,7 @@ bin/uim-toolbar-qt5
 %%QT_QMLDIR%%/com/github/uim/qmldir
 %%QT_PLUGINDIR%%/platforminputcontexts/libuimplatforminputcontextplugin.so
 libexec/uim-candwin-qt5
-share/kservices5/plasma-applet-com.github.uim.status.desktop
 share/metainfo/com.github.uim.status.appdata.xml
 share/plasma/plasmoids/com.github.uim.status/contents/ui/main.qml
 share/plasma/plasmoids/com.github.uim.status/contents/ui/messageProcessor.js
-share/plasma/plasmoids/com.github.uim.status/metadata.desktop
 share/plasma/plasmoids/com.github.uim.status/metadata.json
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 31ead1715646..9fa042279485 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	uim
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.3
 CATEGORIES?=	textproc
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index a76b61b8cf63..50fcefff1b04 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1744556086
-SHA256 (uim-uim-1.9.1_GH0.tar.gz) = a0af856130a0da6e3b42304a55c59f4acb5f8ad88d6886111241c36951b1be0e
-SIZE (uim-uim-1.9.1_GH0.tar.gz) = 4050008
+TIMESTAMP = 1746442886
+SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35
+SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603
 SHA256 (uim-sigscheme-ccf1f92_GH0.tar.gz) = 320e0e9af6c64fb9fa2b58643792b9ed5b66b9add3ed233a391b6a2518a6313f
 SIZE (uim-sigscheme-ccf1f92_GH0.tar.gz) = 570780
 SHA256 (uim-libgcroots-f019129_GH0.tar.gz) = b88a61336ddf230b083f7185eb94aa0f1d3168204a84d35578eccaf0a61c1800
diff --git a/textproc/unoconv/Makefile b/textproc/unoconv/Makefile
deleted file mode 100644
index bf11271242ca..000000000000
--- a/textproc/unoconv/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PORTNAME=	unoconv
-PORTVERSION=	0.7
-PORTREVISION=	1
-CATEGORIES=	textproc python
-MASTER_SITES=	http://dag.wieers.com/home-made/${PORTNAME}/ \
-		SF/nemysisfreebsdp/textproc/:icons
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}.png:icons
-DIST_SUBDIR=	python
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Convert any document from and to any LibreOffice supported format
-WWW=		http://dag.wieers.com/home-made/unoconv/
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Deprecated upstream in 2021
-EXPIRATION_DATE=2025-04-30
-
-RUN_DEPENDS=	xsltproc:textproc/libxslt
-
-USES=		python
-NO_BUILD=	yes
-
-PORTDOCS=	*
-
-DOC_FILES=	AUTHORS ChangeLog README.adoc
-DOC_FILES2=	errcode.adoc filters.adoc formats.adoc \
-		office-installations.adoc selinux.adoc unoconv.1.adoc
-
-OPTIONS_DEFINE=	DOCS
-
-SUB_FILES=	${PORTNAME} pkg-message
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
-		${WRKSRC}/${PORTNAME}
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@${MKDIR} ${STAGEDIR}${DATADIR}/tests/
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
-.for f in *.odt *.csv
-	@(cd ${WRKSRC}/tests && ${INSTALL_DATA} ${f} ${STAGEDIR}${DATADIR}/tests)
-.endfor
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
-		${STAGEDIR}${PREFIX}/share/man/man1/
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/textproc/unoconv/distinfo b/textproc/unoconv/distinfo
deleted file mode 100644
index 1876a12a5362..000000000000
--- a/textproc/unoconv/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1436398005
-SHA256 (python/unoconv-0.7.tar.gz) = 56abbec55632b19dcaff7d506ad6e2fd86f53afff412e622cc1e162afb1263fa
-SIZE (python/unoconv-0.7.tar.gz) = 95732
-SHA256 (python/unoconv.png) = 459f7dbc60e34ccce5c9d46a7317be02dd3c8275e7f7588b7b3885c67b6738eb
-SIZE (python/unoconv.png) = 744
diff --git a/textproc/unoconv/files/pkg-message.in b/textproc/unoconv/files/pkg-message.in
deleted file mode 100644
index 0ae6c453c466..000000000000
--- a/textproc/unoconv/files/pkg-message.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Universal Office Converter (unoconv) has been installed.
-
-For Document conversions is needed that is LibreOffice or OpenOffice installed
-
-editors/libreoffice
-
-editors/openoffice*
-EOM
-}
-]
diff --git a/textproc/unoconv/files/unoconv.in b/textproc/unoconv/files/unoconv.in
deleted file mode 100644
index e657f82df2ed..000000000000
--- a/textproc/unoconv/files/unoconv.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec %%DATADIR%%/unoconv "$@"
diff --git a/textproc/unoconv/pkg-descr b/textproc/unoconv/pkg-descr
deleted file mode 100644
index 3258f3978199..000000000000
--- a/textproc/unoconv/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Universal Office Converter (unoconv) is a command line tool to convert any
-document format that LibreOffice can import to any document format that
-LibreOffice can export. It makes use of the LibreOffice's UNO bindings for
-non-interactive conversion of documents.
-
-For practical reasons we mention LibreOffice, but OpenOffice is supported by
-unoconv as well.
diff --git a/textproc/unoconv/pkg-plist b/textproc/unoconv/pkg-plist
deleted file mode 100644
index 49a765b6b2be..000000000000
--- a/textproc/unoconv/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/unoconv
-share/man/man1/unoconv.1.gz
-share/pixmaps/unoconv.png
-%%DATADIR%%/tests/document-example.odt
-%%DATADIR%%/tests/spreadsheet-example.csv
-%%DATADIR%%/unoconv
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
deleted file mode 100644
index 3dfebbaa2d4e..000000000000
--- a/textproc/word2x/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PORTNAME=	word2x
-PORTVERSION=	0.005
-PORTREVISION=	3
-CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-zero/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Converter from MS Word to text, HTML, or LaTeX
-WWW=		https://word2x.sourceforge.net/
-
-DEPRECATED=	Obsolete converter than only supports ancient versions of Word documents
-EXPIRATION_DATE=2025-04-30
-
-USES=		gmake
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-
-PLIST_FILES=	bin/rtest2 bin/word2x share/man/man1/word2x.1.gz
-
-.include <bsd.port.mk>
diff --git a/textproc/word2x/distinfo b/textproc/word2x/distinfo
deleted file mode 100644
index 6778e81a3f26..000000000000
--- a/textproc/word2x/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (word2x-0.005.tar.gz) = 7363bcd34f46e2557ece2ea672b9a1167f195af4636b96a67a829da6de2e29b8
-SIZE (word2x-0.005.tar.gz) = 272336
diff --git a/textproc/word2x/files/patch-Makefile.in b/textproc/word2x/files/patch-Makefile.in
deleted file mode 100644
index 25179c29ecd3..000000000000
--- a/textproc/word2x/files/patch-Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- Makefile.in.orig	1998-12-29 05:17:43.000000000 +0800
-+++ Makefile.in	2014-06-11 20:35:12.384582119 +0800
-@@ -2,14 +2,15 @@
- #
- # My test system is Linux 2.1.30, gcc 2.7.2, libc 5.4.27
- 
--CC=@CC@
--CPP=@CXX@
-+CC=@CC@ @CFLAGS@
-+CPP=@CXX@ @CXXFLAGS@
- 
- #seek_set_hdr is a hack for Sun OS (and others? I hope not)
--CPPFLAGS=-g -Wall @DEFS@ @seek_set_hdr@
-+CPPFLAGS=@CPPFLAGS@ @DEFS@ @seek_set_hdr@
- LD=@ld@
-+LDFLAGS=@LDFLAGS@
- 
--CCFLAGS=-O3 @DEFS@
-+CCFLAGS=@DEFS@
- LIBOBJS=wordwrap.o nullproc.o tblock.o scan_num.o map_chars.o col-align.o \
- 	compat.o num_unit_probe.o part_num_probe.o
- AR=ar
-@@ -86,7 +87,7 @@ liboutfmt.a: $(LIBOBJS)
- 	$(RANLIB) $@
- 
- rtest2:	rtest2.o $(READER) tblock.o
--	g++ -o rtest2 rtest2.o $(READER) tblock.o
-+	$(CPP) -o rtest2 rtest2.o $(READER) tblock.o
- 
- fmt-text.o: text-fmt.o text-table.o
- 	$(LD) -r -o $@ text-fmt.o text-table.o
-@@ -107,10 +108,10 @@ gopt.o: getopt.o getopt1.o
- 	$(LD) -r -o gopt.o getopt.o getopt1.o
- 
- word2x: $(PROGOBJS)
--	$(CPP) -o $@ $(PROGOBJS)
-+	$(CPP) -o $@ $(PROGOBJS) $(LDFLAGS)
- 
- install: $(TARGETS) $(MANP)
--	@INSTALL@ $(MANP) -m 644 @mandir@/man1
-+	@INSTALL_DATA@ $(MANP) $(DESTDIR)@mandir@/man1
- 	for I in $(TARGETS); do \
--		@INSTALL@ $${I} -m 755 @bindir@; \
-+		@INSTALL_PROGRAM@ $${I} $(DESTDIR)@bindir@; \
- 	done
diff --git a/textproc/word2x/files/patch-col-align.cc b/textproc/word2x/files/patch-col-align.cc
deleted file mode 100644
index 5d8bd38cfa41..000000000000
--- a/textproc/word2x/files/patch-col-align.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- col-align.cc.orig	Fri Jul 24 06:59:12 1998
-+++ col-align.cc	Mon Sep 14 10:30:36 1998
-@@ -50,7 +50,7 @@
- 	}
- 	if (strlen(cdp)>(unsigned) max_wd[2])
- 	    max_wd[2]=strlen(cdp);
--	for (lt_sp=0, sc=cdp; isspace(*sc); sc++, lt_sp++)
-+	for (lt_sp=0, sc=cdp; isspace((unsigned char)*sc); sc++, lt_sp++)
- 	{
- 	    if (*sc==CH_SUSPECT)
- 		align_set=1;
-@@ -62,7 +62,7 @@
- 	{
- 	    if (*sc==CH_SUSPECT)
- 		align_set=1;
--	    if (isspace(*sc))
-+	    if (isspace((unsigned char)*sc))
- 		rt_sp++;
- 	    else
- 		rt_sp=0;
diff --git a/textproc/word2x/files/patch-fifo.h b/textproc/word2x/files/patch-fifo.h
deleted file mode 100644
index cc80ff4338c6..000000000000
--- a/textproc/word2x/files/patch-fifo.h
+++ /dev/null
@@ -1,92 +0,0 @@
---- fifo.h.orig	Fri Aug  6 09:09:02 1999
-+++ fifo.h	Wed Aug 18 22:28:00 2004
-@@ -4,7 +4,8 @@
- #ifndef __FIFO_H__
- #define __FIFO_H__
- 
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <stddef.h>
- #ifndef NULL
- #define NULL (void *) 0
-@@ -19,8 +20,8 @@
- 	const T *data;
- 	struct queue *next;
-     } queue;
--    struct queue *start;
--    struct queue **end;
-+    struct fifo<T>::queue *start;
-+    struct fifo<T>::queue **end;
-     int length;
- 
- public:
-@@ -61,7 +62,7 @@
- template<class T>
- void fifo<T>::clear(void)
- {
--    struct queue *ptr, *next;
-+    struct fifo<T>::queue *ptr, *next;
-     
-     ptr=start;
-     while (ptr!=NULL)
-@@ -79,7 +80,7 @@
- template<class T>
- fifo<T>::~fifo(void)
- {
--    struct queue *ptr, *next;
-+    struct fifo<T>::queue *ptr, *next;
-     
-     ptr=start;
-     while (ptr!=NULL)
-@@ -94,12 +95,12 @@
- template<class T>
- void fifo<T>::enqueue(const T *d)
- {
--    struct queue *q;
-+    struct fifo<T>::queue *q;
-     
- #ifdef DEBUG_FIFO
-     cerr<<"Queue "<<(void *) d<<"\n";
- #endif
--    q=new(struct queue);
-+    q=new(struct fifo<T>::queue);
-     q->next=NULL;
-     q->data=d;
-     *end=q;
-@@ -110,7 +111,7 @@
- template<class T>
- void fifo<T>::insert(const T *d)
- {
--    struct queue *q;
-+    struct fifo<T>::queue *q;
- #ifdef CONSIST_CHECK
-     if (end==NULL)
-     {
-@@ -119,7 +120,7 @@
-     }
- #endif
-     
--    q=new(struct queue);
-+    q=new(struct fifo<T>::queue);
-     q->next=start;
-     q->data=d;
-     start=q;
-@@ -132,7 +133,7 @@
- const T *fifo<T>::dequeue(void)
- {
-     const T *d;
--    struct queue *q;
-+    struct fifo<T>::queue *q;
- #ifdef CONSIST_CHECK
-     if (end==NULL)
-     {
-@@ -206,7 +207,7 @@
- template<class T>
- void fifo<T>::rev(void)
- {
--    struct queue *p, *n, *hdr, **ep;
-+    struct fifo<T>::queue *p, *n, *hdr, **ep;
- #ifdef CONSIST_CHECK
-     if (end==NULL || d->end==NULL)
-     {
diff --git a/textproc/word2x/files/patch-html-table.cc b/textproc/word2x/files/patch-html-table.cc
deleted file mode 100644
index f53a03cdaccd..000000000000
--- a/textproc/word2x/files/patch-html-table.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- html-table.cc.orig	Fri Aug  6 09:12:08 1999
-+++ html-table.cc	Wed Mar 31 20:10:02 2004
-@@ -3,7 +3,8 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef HAVE_STRING_H
-@@ -17,7 +18,8 @@
- #define __EXCLUDE_READER_CLASSES
- #include "lib.h"
- #ifndef HAVE_ALLOCA_H
--extern "C" char *alloca(int);
-+/* extern "C" char *alloca(int); */
-+#include <stdlib.h> /* stupid linux specific weenie code. */
- #else
- #include <alloca.h>
- #endif /* HAVE_ALLOCA_H */
diff --git a/textproc/word2x/files/patch-latex-table.cc b/textproc/word2x/files/patch-latex-table.cc
deleted file mode 100644
index ff73d775b356..000000000000
--- a/textproc/word2x/files/patch-latex-table.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- latex-table.cc.orig	Thu Oct  8 03:12:09 1998
-+++ latex-table.cc	Wed Mar 31 20:14:59 2004
-@@ -18,7 +18,8 @@
- #endif /* HAVE_ALLOCA_H */
- #endif /* __GNUC__ */
- 
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef HAVE_STRING_H
diff --git a/textproc/word2x/files/patch-map_chars.cc b/textproc/word2x/files/patch-map_chars.cc
deleted file mode 100644
index 099335f705c3..000000000000
--- a/textproc/word2x/files/patch-map_chars.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- map_chars.cc.orig	Fri Mar 10 20:32:25 2000
-+++ map_chars.cc	Fri Mar 10 20:33:59 2000
-@@ -1,7 +1,7 @@
- /* $Id: map_chars.cc,v 1.2 1997/03/23 13:19:26 dps Exp $ */
- 
- #include "tblock.h"
--#ifndef NULL
-+#ifdef EXCESS_COCAINE_USAGE_BY_AUTHOR
- #define NULL (void *) 0
- #endif
- #define __EXCLUDE_READER_CLASSES
diff --git a/textproc/word2x/files/patch-reader.cc b/textproc/word2x/files/patch-reader.cc
deleted file mode 100644
index a739c2a0c15d..000000000000
--- a/textproc/word2x/files/patch-reader.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- reader.cc.orig	Thu Oct  8 03:12:09 1998
-+++ reader.cc	Wed Mar 31 21:00:36 2004
-@@ -18,7 +18,8 @@
- #endif /* HAVE_ALLOCA_H */
- #endif /* __GNUC__ */
- 
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <stdio.h>
- #ifdef HAVE_STRING_H
- #include <string.h>
-@@ -40,7 +41,7 @@
- /* Please be aware that the junk should be stripped from in */
- static int read_character(istream *in)
- {
--    unsigned char c,d;
-+    char c,d;
-     static int s_ch=-1;
- 
-     if (s_ch==-1)
diff --git a/textproc/word2x/files/patch-reader.h b/textproc/word2x/files/patch-reader.h
deleted file mode 100644
index 7b9a59ac59b3..000000000000
--- a/textproc/word2x/files/patch-reader.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- reader.h.orig	Thu Oct  8 03:12:09 1998
-+++ reader.h	Wed Mar 31 20:12:28 2004
-@@ -13,7 +13,8 @@
- #ifdef HAVE_STRINGS_H
- #include <strings.h>
- #endif /* HAVE_STRINGS_H */
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include "tblock.h"
- #include "interface.h"
- #include "fifo.h"
diff --git a/textproc/word2x/files/patch-rtest2.cc b/textproc/word2x/files/patch-rtest2.cc
deleted file mode 100644
index b04cdd65ab7d..000000000000
--- a/textproc/word2x/files/patch-rtest2.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- rtest2.cc.orig	Thu Oct  8 03:12:09 1998
-+++ rtest2.cc	Wed Mar 31 20:13:32 2004
-@@ -3,7 +3,8 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include "strip.h"
- #include "interface.h"
- 
diff --git a/textproc/word2x/files/patch-strip.cc b/textproc/word2x/files/patch-strip.cc
deleted file mode 100644
index 8532cbb51a66..000000000000
--- a/textproc/word2x/files/patch-strip.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- strip.cc.orig	Sun May  9 23:50:49 1999
-+++ strip.cc	Wed Mar 31 21:15:43 2004
-@@ -16,9 +16,9 @@
- #ifdef HAVE_CTYPE_H
- #include <ctype.h>
- #endif /* HAVE_CTYPE_H */
--#include <stream.h>
--#include <iostream.h>
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
-+using namespace std;
- #include "strip.h"
- #include "tune.h"
- 
diff --git a/textproc/word2x/files/patch-strip.h b/textproc/word2x/files/patch-strip.h
deleted file mode 100644
index ada73e931c3b..000000000000
--- a/textproc/word2x/files/patch-strip.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- strip.h.orig	Fri Aug  6 09:09:27 1999
-+++ strip.h	Wed Mar 31 20:15:31 2004
-@@ -2,8 +2,9 @@
- 
- #ifndef __JUNK_FILTER_H__
- #define __JUNK_FILTER_H__
--#include <iostream.h>
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
-+using namespace std;
- #include <stdlib.h>
- #include "tune.h"
- 
diff --git a/textproc/word2x/files/patch-tblock.cc b/textproc/word2x/files/patch-tblock.cc
deleted file mode 100644
index 3b09ace90296..000000000000
--- a/textproc/word2x/files/patch-tblock.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- tblock.cc.orig	Thu Oct  8 03:12:09 1998
-+++ tblock.cc	Wed Mar 31 20:11:29 2004
-@@ -11,7 +11,8 @@
- #ifdef HAVE_STRINGS_H
- #include <strings.h>
- #endif /* HAVE_STRINGS_H */
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include "tblock.h"
- 
- const struct tblock::block tblock::dummy_init={0,0,NULL,NULL};
diff --git a/textproc/word2x/files/patch-tblock.h b/textproc/word2x/files/patch-tblock.h
deleted file mode 100644
index f9b447752e47..000000000000
--- a/textproc/word2x/files/patch-tblock.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- tblock.h.dist	Thu Oct  8 03:12:09 1998
-+++ tblock.h	Wed Mar 31 21:06:40 2004
-@@ -4,6 +4,13 @@
- #ifndef __tblock_h__
- #define __tblock_h__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#ifdef HAVE_STRING_H
-+#include <string.h>
-+#endif
-+
- class tblock
- {
- private:
diff --git a/textproc/word2x/files/patch-text-table.cc b/textproc/word2x/files/patch-text-table.cc
deleted file mode 100644
index ca8d7684f365..000000000000
--- a/textproc/word2x/files/patch-text-table.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- text-table.cc.orig	Thu Oct  8 03:12:09 1998
-+++ text-table.cc	Wed Mar 31 20:14:23 2004
-@@ -18,7 +18,8 @@
- #endif /* HAVE_ALLOCA_H */
- #endif /* __GNUC__ */
- 
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef HAVE_STRING_H
diff --git a/textproc/word2x/pkg-descr b/textproc/word2x/pkg-descr
deleted file mode 100644
index a9863167af55..000000000000
--- a/textproc/word2x/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Despite the fact that open formats like RTF are good and widely
-avialable, far too many idiots seem to insist on using Word .doc
-format. This program is an attempt to limit the damage this causes
-users of non-Microsoft systems and text processing systems, for
-example LaTeX.
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index aa0697f0fc2d..e47c71337daa 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -12,6 +12,9 @@ WWW=		https://xincluder.sourceforge.net/
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/lgpl.txt
 
+DEPRECATED=	Depends on expiring java/jdom
+EXPIRATION_DATE=2025-06-04
+
 BUILD_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
 		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
deleted file mode 100644
index 4d10b9494237..000000000000
--- a/textproc/xp/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-PORTNAME=	xp
-PORTVERSION=	0.5
-PORTREVISION=	4
-CATEGORIES=	textproc java
-MASTER_SITES=	ftp://ftp.jclark.com/pub/xml/
-DISTNAME=	${PORTNAME}
-
-MAINTAINER=	mike@vee.net
-COMMENT=	XML parser written in Java
-WWW=		http://www.jclark.com/xml/xp/index.html
-
-DEPRECATED=     Obsolete, never versions of Java already include XML parser(s)
-EXPIRATION_DATE=2025-04-30
-
-USES=		java zip
-
-NO_BUILD=	yes
-
-PORTDOCS=	api copying.txt index.html
-
-JARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	%%JAVAJARDIR%%/${JARFILE}
-
-OPTIONS_DEFINE=	DOCS
-
-do-install:
-	@${ECHO_CMD} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
-	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/
-	@${ECHO_CMD} " [ DONE ]"
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${CP} -r ${WRKDIR}/docs/${DOCFILE} ${STAGEDIR}${DOCSDIR}/
-	@${ECHO_CMD} -n " ${DOCFILE}"
-.endfor
-	@${ECHO_CMD} " [ DONE ]"
-
-.include <bsd.port.mk>
diff --git a/textproc/xp/distinfo b/textproc/xp/distinfo
deleted file mode 100644
index ec62ae510d48..000000000000
--- a/textproc/xp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xp.zip) = 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d
-SIZE (xp.zip) = 281324
diff --git a/textproc/xp/pkg-descr b/textproc/xp/pkg-descr
deleted file mode 100644
index 600af946ed8e..000000000000
--- a/textproc/xp/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-From the XP homepage:
-
-    XP is an XML 1.0 parser written in Java. It is fully conforming: it
-    detects all non well-formed documents.
-
-XP has the following design goals: Conformance and correctness, high
-performance and a layered structure. It is currently non-validating but can
-parse all external entities.
-
-For more details, please see the XP homepage:
diff --git a/textproc/xsv-rs/Makefile b/textproc/xsv-rs/Makefile
index 82297d50a312..23efd530ea6c 100644
--- a/textproc/xsv-rs/Makefile
+++ b/textproc/xsv-rs/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	66
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	-rs
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast CSV toolkit
 WWW=		https://github.com/BurntSushi/xsv
 
diff --git a/www/Makefile b/www/Makefile
index b0c2a5906b36..ba55f2b6fd84 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -22,6 +22,7 @@
     SUBDIR += R-cran-shinyjs
     SUBDIR += R-cran-webshot
     SUBDIR += R-cran-webutils
+    SUBDIR += SNIP
     SUBDIR += UniversalFeedCreator
     SUBDIR += adguardhome
     SUBDIR += adjuster
@@ -150,7 +151,6 @@
     SUBDIR += domoticz
     SUBDIR += domoticz-devel
     SUBDIR += dooble
-    SUBDIR += dot-http
     SUBDIR += dothttp
     SUBDIR += dpp
     SUBDIR += drill
@@ -446,8 +446,6 @@
     SUBDIR += moinmoincli
     SUBDIR += mongoose
     SUBDIR += monolith
-    SUBDIR += moodle41
-    SUBDIR += moodle43
     SUBDIR += moodle44
     SUBDIR += moodle45
     SUBDIR += moodle50
@@ -1458,7 +1456,6 @@
     SUBDIR += privoxy
     SUBDIR += protovis
     SUBDIR += proxygen
-    SUBDIR += publicfile
     SUBDIR += punbb
     SUBDIR += py-Pituophis
     SUBDIR += py-Tenjin
@@ -1538,23 +1535,34 @@
     SUBDIR += py-dj50-drf-spectacular-sidecar
     SUBDIR += py-dj50-strawberry-graphql-django
     SUBDIR += py-dj51-channels
+    SUBDIR += py-dj51-channels-redis
+    SUBDIR += py-dj51-django-allauth
+    SUBDIR += py-dj51-django-auditlog
     SUBDIR += py-dj51-django-auth-ldap
+    SUBDIR += py-dj51-django-celery-results
     SUBDIR += py-dj51-django-choices-field
+    SUBDIR += py-dj51-django-compression-middleware
     SUBDIR += py-dj51-django-cors-headers
     SUBDIR += py-dj51-django-debug-toolbar
+    SUBDIR += py-dj51-django-extensions
     SUBDIR += py-dj51-django-filter
+    SUBDIR += py-dj51-django-guardian
     SUBDIR += py-dj51-django-htmx
     SUBDIR += py-dj51-django-js-asset
     SUBDIR += py-dj51-django-mptt
+    SUBDIR += py-dj51-django-multiselectfield
     SUBDIR += py-dj51-django-prometheus
     SUBDIR += py-dj51-django-redis
     SUBDIR += py-dj51-django-rich
+    SUBDIR += py-dj51-django-soft-delete
     SUBDIR += py-dj51-django-tables2
     SUBDIR += py-dj51-django-taggit
     SUBDIR += py-dj51-django-timezone-field
     SUBDIR += py-dj51-djangorestframework
+    SUBDIR += py-dj51-djangorestframework-guardian
     SUBDIR += py-dj51-drf-spectacular
     SUBDIR += py-dj51-drf-spectacular-sidecar
+    SUBDIR += py-dj51-drf-writable-nested
     SUBDIR += py-dj51-social-auth-app-django
     SUBDIR += py-dj51-strawberry-graphql-django
     SUBDIR += py-django-admin-rangefilter
@@ -1768,6 +1776,7 @@
     SUBDIR += py-google-cloud-vision
     SUBDIR += py-google-resumable-media
     SUBDIR += py-grafana-dashboard-manager
+    SUBDIR += py-granian
     SUBDIR += py-graphite-api
     SUBDIR += py-grequests
     SUBDIR += py-grimoirelab
@@ -2441,6 +2450,7 @@
     SUBDIR += serf
     SUBDIR += servlet-api
     SUBDIR += sfeed
+    SUBDIR += shellinabox
     SUBDIR += shiori
     SUBDIR += silicon
     SUBDIR += simple-web-server
diff --git a/www/SNIP/Makefile b/www/SNIP/Makefile
new file mode 100644
index 000000000000..9f7b1550b139
--- /dev/null
+++ b/www/SNIP/Makefile
@@ -0,0 +1,59 @@
+PORTNAME=	SNIP
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.0
+CATEGORIES=	www
+
+MAINTAINER=	ek@purplehat.org
+COMMENT=	SNIP is a powerful, simple, and easy to use Open-Source PHP Pastebin
+WWW=		https://github.com/MercanoGlobal/SNIP
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		php:web
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	MercanoGlobal
+
+USE_PHP=	ctype filter gd session
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	pkg-message
+PLIST_SUB+=	WWWGRP="${WWWGRP}" \
+		WWWOWN="${WWWOWN}"
+
+OPTIONS_DEFAULT=	MYSQLI
+OPTIONS_SINGLE=		DB
+OPTIONS_SINGLE_DB=	MYSQLI PGSQL SQLITE
+
+MYSQLI_DESC=	Install MySQLi Support for PHP
+
+MYSQLI_USE=	PHP=mysqli
+PGSQL_USES=	pgsql
+PGSQL_USE=	PHP=pgsql
+SQLITE_USES=	sqlite
+SQLITE_USE=	PHP=sqlite3
+
+do-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC}/htdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
+	${FIND} ${STAGEDIR}${WWWDIR} -type f -iname "*.orig" -delete
+	${INSTALL_DATA} ${STAGEDIR}${WWWDIR}/application/config/snip.php.dist ${STAGEDIR}${ETCDIR}/snip.php.sample
+	${LN} -sf ${ETCDIR}/snip.php ${STAGEDIR}${WWWDIR}/application/config/
+
+post-install:
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
+	${FIND} -s ${STAGEDIR}${ETCDIR} -not -type d | ${SORT} | \
+		${SED} -e 's#^${STAGEDIR}${ETCDIR}#${ETCDIR_REL}#' | \
+		${SED} -E -e '/sample$$/ s#^#@sample(,,0640) #;' >> ${TMPPLIST}
+	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
+		${SED} -E -e '/snip.php(\.dist)?/ s#^#@(,,0640) #;' >> ${TMPPLIST}
+	${FIND} -s ${STAGEDIR}${WWWDIR} -type d -exec echo "@dir {}" \; | ${SORT} | \
+		${SED} -e 's#^@dir ${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
+
+.include <bsd.port.mk>
diff --git a/www/SNIP/distinfo b/www/SNIP/distinfo
new file mode 100644
index 000000000000..6d5aebe1c581
--- /dev/null
+++ b/www/SNIP/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1745194264
+SHA256 (MercanoGlobal-SNIP-v1.1.0_GH0.tar.gz) = 94c6461b7b7f4b823148bac47e9d7fa0510d593aa8fce5c6a70ccc0ddd2a6893
+SIZE (MercanoGlobal-SNIP-v1.1.0_GH0.tar.gz) = 15305696
diff --git a/www/SNIP/files/pkg-message.in b/www/SNIP/files/pkg-message.in
new file mode 100644
index 000000000000..cd4a6724162c
--- /dev/null
+++ b/www/SNIP/files/pkg-message.in
@@ -0,0 +1,20 @@
+[
+{ type: install
+  message: <<EOM
+The configuration file is in %%ETCDIR%%/snip.php
+
+This package contains a true_paste feature which has been sent
+upstream but has not yet been included.
+
+There are the minimal configuration items:
+
+Set driver to one of:
+
+* 'postgres'
+* 'mysqli'
+* 'sqlite'
+
+Set appropriate values in the 'Database connection' section.
+EOM
+}
+]
diff --git a/www/SNIP/pkg-descr b/www/SNIP/pkg-descr
new file mode 100644
index 000000000000..9dfe9a5699bb
--- /dev/null
+++ b/www/SNIP/pkg-descr
@@ -0,0 +1,24 @@
+SNIP is a powerful Open-Source PHP Pastebin, with the aim of keeping
+a simple and easy to use user interface. SNIP allows you to easily
+share code and files with anyone you wish. Based on the original
+Stikked with lots of bug fixes and improvements.
+
+Prerequisites:
+* A web server: Apache, LiteSpeed, Nginx, Lighttpd, Cherokee.
+* A database: MySQL / MariaDB, Postgres. OR a writable folder for SQLite.
+* PHP version 7.0 or newer is required.
+* PHP-GD for the creation of QR-codes.
+
+Here are some features:
+* Syntax highlighting including live highlighting with CodeMirror
+* Paste replies
+* Diff view between the original paste and the reply
+* An API
+* Trending pastes
+* Encrypted pastes
+* Burn on reading
+* File upload and preview
+* Anti-Spam features
+* Multilanguage support
+* SNIP client with support for client side encryption/decryption: gostikkit
+* Another CLI tool requiring only curl program: pbin
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 7419af664a6f..7ce5d02167fe 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chromium
-PORTVERSION=	135.0.7049.114
+PORTVERSION=	136.0.7103.92
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	www wayland
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index f1e073a6a719..8897a937751d 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1745384067
-SHA256 (chromium-135.0.7049.114.tar.xz) = aa85ce2bf36ed71261109fd7e700fac596a28b7be035a40a518c6a6fcf973c22
-SIZE (chromium-135.0.7049.114.tar.xz) = 7133024128
+TIMESTAMP = 1746600351
+SHA256 (chromium-136.0.7103.92.tar.xz) = 3fa7f88ef186566948367bf1e9a9f0612e753fc69285c1654728f6a015cd4cf2
+SIZE (chromium-136.0.7103.92.tar.xz) = 7188412240
 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (chromium-135.0.7049.114-testdata.tar.xz) = 587010be844abae797a57ddcab83ffa29dc441fcffeb9c66806d63eac6f9fe91
-SIZE (chromium-135.0.7049.114-testdata.tar.xz) = 646720320
+SHA256 (chromium-136.0.7103.92-testdata.tar.xz) = 6e5bb3fba5b61ffc9e91b9d2fc9cc758bebe4d16806a68b1a32b189193c78256
+SIZE (chromium-136.0.7103.92-testdata.tar.xz) = 651393856
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 063375c24428..e2d07fba8ebe 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ BUILD.gn
 @@ -71,7 +71,7 @@ declare_args() {
    root_extra_deps = []
@@ -17,7 +17,7 @@
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -448,7 +447,7 @@ group("gn_all") {
+@@ -449,7 +448,7 @@ group("gn_all") {
        }
      }
  
@@ -26,7 +26,7 @@
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -638,6 +637,15 @@ group("gn_all") {
+@@ -636,6 +635,15 @@ group("gn_all") {
        }
      }
  
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
-@@ -686,7 +694,7 @@ group("gn_all") {
+@@ -684,7 +692,7 @@ group("gn_all") {
        }
      }
  
@@ -51,7 +51,7 @@
        # The official builders use this binary from the default toolchain's
        # output directory after building in order to upload the symbols of that
        # binary. They build the binary like `ninja symupload` which requires the
-@@ -721,7 +729,7 @@ group("gn_all") {
+@@ -719,7 +727,7 @@ group("gn_all") {
        ]
      }
  
@@ -60,16 +60,16 @@
        deps += [
          "//third_party/crashpad/crashpad:crashpad_tests",
          "//third_party/crashpad/crashpad/handler:crashpad_handler",
-@@ -1126,7 +1134,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1128,7 +1136,7 @@ if (use_blink && !is_cronet_build) {
+       "//third_party/blink/public:all_blink",
      ]
  
-     if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android &&
--        !is_castos) {
-+        !is_castos && !is_bsd) {
+-    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos) {
++    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
        deps += [
          ":chrome_wpt_tests",
          ":headless_shell_wpt",
-@@ -1273,7 +1281,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
  
@@ -78,7 +78,7 @@
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1287,7 +1295,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1289,7 +1297,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms" ]
      }
  
@@ -87,7 +87,7 @@
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1757,7 +1765,7 @@ group("chromium_builder_perf") {
+@@ -1760,7 +1768,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
  
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 77901440a733..4a758d31f154 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- base/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ base/BUILD.gn
-@@ -1094,11 +1094,26 @@ component("base") {
+@@ -1104,11 +1104,26 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -28,7 +28,7 @@
    if (use_allocator_shim) {
      if (is_apple) {
        sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1118,7 +1133,7 @@ component("base") {
+@@ -1128,7 +1143,7 @@ component("base") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -37,7 +37,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -2142,6 +2157,22 @@ component("base") {
+@@ -2152,6 +2167,22 @@ component("base") {
      ]
    }
  
@@ -60,7 +60,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2300,6 +2331,33 @@ component("base") {
+@@ -2312,6 +2343,33 @@ component("base") {
      }
    }
  
@@ -94,7 +94,7 @@
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2649,7 +2707,7 @@ buildflag_header("protected_memory_buildflags") {
+@@ -2690,7 +2748,7 @@ buildflag_header("protected_memory_buildflags") {
    header = "protected_memory_buildflags.h"
    header_dir = "base/memory"
  
@@ -103,7 +103,7 @@
                               (is_win || is_linux || is_android || is_mac)
  
    flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
-@@ -3122,7 +3180,7 @@ if (is_apple) {
+@@ -3163,7 +3221,7 @@ if (is_apple) {
    }
  }
  
@@ -112,7 +112,7 @@
    # This test must compile with -fstack-protector-all
    source_set("stack_canary_linux_unittests") {
      testonly = true
-@@ -3808,7 +3866,7 @@ test("base_unittests") {
+@@ -3851,7 +3909,7 @@ test("base_unittests") {
      ]
    }
  
@@ -121,7 +121,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3836,7 +3894,7 @@ test("base_unittests") {
+@@ -3879,7 +3937,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -130,7 +130,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3847,7 +3905,7 @@ test("base_unittests") {
+@@ -3890,7 +3948,7 @@ test("base_unittests") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -139,7 +139,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -4037,7 +4095,7 @@ test("base_unittests") {
+@@ -4080,7 +4138,7 @@ test("base_unittests") {
      deps += [ ":base_profiler_test_support_library" ]
    }
  
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index 47ed3fb65dc6..05daeff8fd05 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,15 +1,15 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-03-05 08:14:56 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-05-05 10:57:53 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
 @@ -89,7 +89,7 @@ if (is_nacl) {
+ # TODO(crbug.com/329199197): Clean this up when experiments are complete.
  use_large_empty_slot_span_ring = true
  
- has_memory_tagging =
--    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
-+    current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android)
+-has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan &&
++has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd &&
+                      !is_hwasan && (is_linux || is_android)
  
  declare_args() {
-   # Debug configuration.
-@@ -347,7 +347,7 @@ declare_args() {
+@@ -348,7 +348,7 @@ declare_args() {
  declare_args() {
    # Shadow metadata is still under development and only supports Linux
    # for now.
@@ -18,7 +18,7 @@
  }
  
  declare_args() {
-@@ -490,7 +490,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
+@@ -491,7 +491,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
  # dependencies that use partition_allocator are compiled in AOSP against a
  # version of glibc that does not include pkeys syscall numbers.
  is_pkeys_available =
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index 9f9e31936df8..31819f0c10e5 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
+@@ -886,7 +886,7 @@ if (is_clang_or_gcc) {
          configs -= [ partition_alloc_enable_arc_config ]
        }
      }
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
index f839103f305b..d9bac77867cb 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-02-19 07:43:18 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
 @@ -18,7 +18,7 @@
  #include "partition_alloc/partition_alloc_base/logging.h"
@@ -7,5 +7,5 @@
 -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
 +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
  #include <sys/syscall.h>
- 
  #include <atomic>
+ #endif
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index a47d4a2695d5..eadece532674 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,15 +1,14 @@
---- base/files/file_util_posix.cc.orig	2025-04-04 08:52:13 UTC
+--- base/files/file_util_posix.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/files/file_util_posix.cc
-@@ -902,6 +902,8 @@ bool CreateNewTempDirectory(const FilePath::StringType
+@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePath::StringType
  bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
    ScopedBlockingCall scoped_blocking_call(
        FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
 +  const FilePath kFileSystemRoot("/");
-+
+ 
    // Avoid checking subdirs if directory already exists.
    if (DirectoryExists(full_path)) {
-     return true;
-@@ -910,8 +912,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
    // Collect a list of all missing directories.
    std::vector<FilePath> missing_subpaths({full_path});
    FilePath last_path = full_path;
@@ -20,11 +19,11 @@
      if (DirectoryExists(path)) {
        break;
      }
-@@ -921,21 +923,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+     }
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
-   // Iterate through the missing directories and create.
-   for (const FilePath& subpath : base::Reversed(missing_subpaths)) {
--    if (mkdir(subpath.value().c_str(), 0700) == 0) {
+-    if (mkdir(subpath.value().c_str(), mode) == 0) {
 -      continue;
 -    }
 -    // Mkdir failed, but it might have failed with EEXIST, or some other error
@@ -34,7 +33,7 @@
 -    int saved_errno = errno;
 -    if (!DirectoryExists(subpath)) {
 -      if (error) {
-+    if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
++    if ((mkdir(subpath.value().c_str(), mode) == -1) &&
 +        ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
 +      int saved_errno = errno;
 +      if (error)
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index 1143a76baf9d..bc89b666a1e1 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,6 +1,6 @@
---- base/i18n/icu_util.cc.orig	2024-03-22 08:19:40 UTC
+--- base/i18n/icu_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/i18n/icu_util.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #endif
  
@@ -9,7 +9,7 @@
      BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  #endif
-@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() {
+@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() {
        FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc
index a7f210512396..cf5196d922d0 100644
--- a/www/chromium/files/patch-base_logging__unittest.cc
+++ b/www/chromium/files/patch-base_logging__unittest.cc
@@ -1,4 +1,4 @@
---- base/logging_unittest.cc.orig	2025-04-04 08:52:13 UTC
+--- base/logging_unittest.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/logging_unittest.cc
 @@ -40,7 +40,7 @@
  #include "base/posix/eintr_wrapper.h"
@@ -9,7 +9,7 @@
  #include <ucontext.h>
  #endif
  
-@@ -588,14 +588,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -586,14 +586,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
    // need the arch-specific boilerplate below, which is inspired by breakpad.
    // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
    uintptr_t crash_addr = 0;
diff --git a/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc b/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc
index 0962f540835b..11ce03e2ac9a 100644
--- a/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc
+++ b/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc
@@ -1,6 +1,6 @@
---- base/profiler/stack_base_address_posix.cc.orig	2025-04-04 08:52:13 UTC
+--- base/profiler/stack_base_address_posix.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/profiler/stack_base_address_posix.cc
-@@ -17,6 +17,10 @@
+@@ -18,6 +18,10 @@
  #include "base/files/scoped_file.h"
  #endif
  
@@ -11,7 +11,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
  extern "C" void* __libc_stack_end;
  #endif
-@@ -47,7 +51,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
+@@ -49,7 +53,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
  
  #if !BUILDFLAG(IS_LINUX)
  uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
@@ -33,7 +33,7 @@
    // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox
    // and pthread_id refers to a different thread, due to the use of
    // sched_getaffinity().
-@@ -60,12 +78,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr
+@@ -62,12 +80,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr
                        << logging::SystemErrorCodeToString(result);
    // See crbug.com/617730 for limitations of this approach on Linux-like
    // systems.
@@ -48,7 +48,7 @@
    const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
    return base_address;
  }
-@@ -82,7 +102,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
+@@ -84,7 +104,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
    // trying to work around the problem.
    return std::nullopt;
  #else
diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h
index 02d814a4ae20..239d6d1782af 100644
--- a/www/chromium/files/patch-base_rand__util.h
+++ b/www/chromium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig	2025-03-05 08:14:56 UTC
+--- base/rand_util.h.orig	2025-05-05 10:57:53 UTC
 +++ base/rand_util.h
-@@ -209,7 +209,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -213,7 +213,7 @@ void RandomShuffle(Itr first, Itr last) {
    std::shuffle(first, last, RandomBitGenerator());
  }
  
diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc
index 4a32567851bd..2fdaf4b8cc62 100644
--- a/www/chromium/files/patch-base_rand__util__posix.cc
+++ b/www/chromium/files/patch-base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- base/rand_util_posix.cc.orig	2025-03-05 08:14:56 UTC
+--- base/rand_util_posix.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/rand_util_posix.cc
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  #include "base/time/time.h"
  #include "build/build_config.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/lss/linux_syscall_support.h"
  #elif BUILDFLAG(IS_MAC)
  // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK.
-@@ -44,6 +44,7 @@ namespace base {
+@@ -45,6 +45,7 @@ namespace base {
  
  namespace {
  
@@ -17,7 +17,7 @@
  #if BUILDFLAG(IS_AIX)
  // AIX has no 64-bit support for O_CLOEXEC.
  static constexpr int kOpenFlags = O_RDONLY;
-@@ -68,10 +69,11 @@ class URandomFd {
+@@ -69,10 +70,11 @@ class URandomFd {
   private:
    const int fd_;
  };
@@ -27,10 +27,10 @@
       BUILDFLAG(IS_ANDROID)) &&                        \
 -    !BUILDFLAG(IS_NACL)
 +    !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- // TODO(pasko): Unify reading kernel version numbers in:
- // mojo/core/channel_linux.cc
- // chrome/browser/android/seccomp_support_detector.cc
-@@ -156,6 +158,7 @@ bool UseBoringSSLForRandBytes() {
+ 
+ bool KernelSupportsGetRandom() {
+   return base::SysInfo::KernelVersionNumber::Current() >=
+@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() {
  namespace {
  
  void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
@@ -38,7 +38,7 @@
  #if !BUILDFLAG(IS_NACL)
    // The BoringSSL experiment takes priority over everything else.
    if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -190,6 +193,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
+@@ -163,6 +166,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
    const int urandom_fd = GetUrandomFD();
    const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
    CHECK(success);
@@ -48,7 +48,7 @@
  }
  
  }  // namespace
-@@ -209,9 +215,11 @@ void RandBytes(span<uint8_t> output) {
+@@ -182,9 +188,11 @@ void RandBytes(span<uint8_t> output) {
    RandBytesInternal(output, /*avoid_allocation=*/false);
  }
  
diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h
index 5915cd66be95..c00c584359ff 100644
--- a/www/chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig	2024-08-26 12:06:38 UTC
+--- base/synchronization/lock_impl.h.orig	2025-05-05 10:57:53 UTC
 +++ base/synchronization/lock_impl.h
-@@ -109,6 +109,10 @@ void LockImpl::Unlock() {
+@@ -110,6 +110,10 @@ void LockImpl::Unlock() {
  }
  
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -11,7 +11,7 @@
  
  #if DCHECK_IS_ON()
  BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -129,6 +133,9 @@ void LockImpl::Unlock() {
+@@ -130,6 +134,9 @@ void LockImpl::Unlock() {
    dcheck_unlock_result(rv);
  #endif
  }
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index 423ee198ff3d..4da2a17d13d6 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2025-03-05 08:14:56 UTC
+--- base/system/sys_info.h.orig	2025-05-05 10:57:53 UTC
 +++ base/system/sys_info.h
-@@ -332,6 +332,8 @@ class BASE_EXPORT SysInfo {
+@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo {
    static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
  
@@ -9,7 +9,7 @@
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -344,7 +346,7 @@ class BASE_EXPORT SysInfo {
+@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc
index d7c0ad5cd84f..e229baa6f240 100644
--- a/www/chromium/files/patch-base_system_sys__info__posix.cc
+++ b/www/chromium/files/patch-base_system_sys__info__posix.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_posix.cc.orig	2025-03-05 08:14:56 UTC
+--- base/system/sys_info_posix.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/system/sys_info_posix.cc
-@@ -124,7 +124,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
+@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* major_version,
  
  namespace base {
  
@@ -9,7 +9,7 @@
  // static
  int SysInfo::NumberOfProcessors() {
  #if BUILDFLAG(IS_MAC)
-@@ -180,7 +180,7 @@ int SysInfo::NumberOfProcessors() {
+@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() {
  
    return cached_num_cpus;
  }
@@ -18,7 +18,7 @@
  
  // static
  uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -268,6 +268,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
index 6505214daff1..785c54eb3ae6 100644
--- a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
+++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
@@ -1,15 +1,15 @@
---- base/task/thread_pool/environment_config_unittest.cc.orig	2025-03-05 08:14:56 UTC
+--- base/task/thread_pool/environment_config_unittest.cc.orig	2025-05-05 10:57:53 UTC
 +++ base/task/thread_pool/environment_config_unittest.cc
-@@ -14,7 +14,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
-   EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread());
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
+             base::FeatureList::IsEnabled(
+                 FeatureControllingBackgroundPriorityWorkerThreads()));
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
    EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread());
  #else
  #error Platform doesn't match any block
-@@ -23,7 +23,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
+@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
    EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread());
  #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
index b0cbe6ef0138..b0ec51d03b3a 100644
--- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,4 +1,4 @@
---- build/config/BUILDCONFIG.gn.orig	2025-01-15 09:18:26 UTC
+--- build/config/BUILDCONFIG.gn.orig	2025-05-05 10:57:53 UTC
 +++ build/config/BUILDCONFIG.gn
 @@ -136,7 +136,8 @@ declare_args() {
    is_official_build = false
@@ -10,7 +10,7 @@
               (current_cpu != "s390x" && current_cpu != "s390" &&
                current_cpu != "ppc64" && current_cpu != "ppc" &&
                current_cpu != "mips" && current_cpu != "mips64" &&
-@@ -234,6 +235,10 @@ if (host_toolchain == "") {
+@@ -235,6 +236,10 @@ if (host_toolchain == "") {
      host_toolchain = "//build/toolchain/aix:$host_cpu"
    } else if (host_os == "zos") {
      host_toolchain = "//build/toolchain/zos:$host_cpu"
@@ -21,7 +21,7 @@
    } else {
      assert(false, "Unsupported host_os: $host_os")
    }
-@@ -278,6 +283,8 @@ if (target_os == "android") {
+@@ -279,6 +284,8 @@ if (target_os == "android") {
    _default_toolchain = "//build/toolchain/aix:$target_cpu"
  } else if (target_os == "zos") {
    _default_toolchain = "//build/toolchain/zos:$target_cpu"
@@ -30,7 +30,7 @@
  } else {
    assert(false, "Unsupported target_os: $target_os")
  }
-@@ -312,7 +319,11 @@ is_android = current_os == "android"
+@@ -313,7 +320,11 @@ is_android = current_os == "android"
  is_chromeos = current_os == "chromeos"
  is_fuchsia = current_os == "fuchsia"
  is_ios = current_os == "ios"
@@ -42,4 +42,4 @@
 +is_bsd = current_os == "openbsd" || current_os == "freebsd"
  is_mac = current_os == "mac"
  is_nacl = current_os == "nacl"
- is_watchos = current_os == "watchos"
+ is_wasm = current_os == "emscripten"
diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn
index 2e5a6b429e26..2f8062523c14 100644
--- a/www/chromium/files/patch-build_config_clang_BUILD.gn
+++ b/www/chromium/files/patch-build_config_clang_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/clang/BUILD.gn.orig	2025-04-15 07:33:26 UTC
+--- build/config/clang/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ build/config/clang/BUILD.gn
-@@ -251,7 +251,12 @@ template("clang_lib") {
+@@ -252,7 +252,12 @@ template("clang_lib") {
  
  # Adds a dependency on the Clang runtime library clang_rt.builtins.
  clang_lib("compiler_builtins") {
@@ -13,4 +13,4 @@
 +  } else if (is_mac) {
      libname = "osx"
    } else if (is_ios) {
-     if (target_environment == "simulator") {
+     if (target_platform == "iphoneos") {
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 8683b7a7c300..bb0d8fca2b5f 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- build/config/compiler/BUILD.gn.orig	2025-05-07 13:11:00 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -198,7 +198,7 @@ declare_args() {
+@@ -197,7 +197,7 @@ declare_args() {
    # This greatly reduces the size of debug builds, at the cost of
    # debugging information which is required by some specialized
    # debugging tools.
@@ -9,7 +9,7 @@
  }
  
  declare_args() {
-@@ -255,13 +255,16 @@ config("default_include_dirs") {
+@@ -254,13 +254,16 @@ config("default_include_dirs") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
  # the executable they are loaded into, so they are unresolved at link-time.
  config("no_unresolved_symbols") {
@@ -27,7 +27,7 @@
  }
  
  # compiler ---------------------------------------------------------------------
-@@ -519,6 +522,10 @@ config("compiler") {
+@@ -508,6 +511,10 @@ config("compiler") {
      }
    }
  
@@ -38,7 +38,7 @@
    # Linux-specific compiler flags setup.
    # ------------------------------------
    if (use_icf && (!is_apple || use_lld)) {
-@@ -578,7 +585,7 @@ config("compiler") {
+@@ -567,7 +574,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -47,7 +47,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
      if (save_reproducers_on_lld_crash && use_lld) {
        ldflags += [
-@@ -1223,7 +1230,7 @@ config("compiler_cpu_abi") {
+@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -56,7 +56,7 @@
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
        }
-@@ -1238,7 +1245,7 @@ config("compiler_cpu_abi") {
+@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
        if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
@@ -65,7 +65,7 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1572,7 +1579,7 @@ config("compiler_deterministic") {
+@@ -1561,7 +1568,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -74,7 +74,7 @@
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1630,7 +1637,7 @@ config("compiler_deterministic") {
+@@ -1619,7 +1626,7 @@ config("compiler_deterministic") {
  }
  
  config("clang_revision") {
@@ -83,32 +83,26 @@
        current_os != "zos") {
      update_args = [
        "--print-revision",
-@@ -1960,23 +1967,12 @@ config("default_warnings") {
-         ]
-       }
+@@ -1652,7 +1659,7 @@ config("clang_revision") {
+ # e.g. by setting in the the project's .gn file.
+ config("clang_warning_suppression") {
+   # Some build configs use older versions of clang that don't support WSMs
+-  if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
++  if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
+       !llvm_android_mainline && is_clang &&
+       clang_warning_suppression_file != "") {
+     from_build_root =
+@@ -1985,9 +1992,6 @@ config("default_warnings") {
  
--      cflags += [
--        # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
--        "-Wno-cast-function-type",
--
--        # TODO(crbug.com/40284799): Fix and re-enable.
--        "-Wno-thread-safety-reference-return",
+         # TODO(crbug.com/40284799): Fix and re-enable.
+         "-Wno-thread-safety-reference-return",
 -
 -        # TODO(crbug.com/376641662): Fix and re-enable.
 -        "-Wno-nontrivial-memcall",
--      ]
--
-       cflags_cc += [
-         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
-         "-Wenum-compare-conditional",
        ]
  
--      if (!is_nacl) {
-+      if (!is_nacl && !is_bsd) {
-         cflags_cc += [
-           # TODO(crbug.com/41486292): Fix and re-enable.
-           "-Wno-c++11-narrowing-const-reference",
-@@ -2742,7 +2738,7 @@ config("afdo_optimize_size") {
+       cflags_cc += [
+@@ -2776,7 +2780,7 @@ config("afdo_optimize_size") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -117,7 +111,7 @@
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2769,7 +2765,7 @@ config("afdo") {
+@@ -2803,7 +2807,7 @@ config("afdo") {
        cflags += [ "-Wno-backend-plugin" ]
        inputs = [ _clang_sample_profile ]
      }
@@ -126,7 +120,7 @@
      cflags = [ "-fauto-profile=${auto_profile_path}" ]
      inputs = [ auto_profile_path ]
    }
-@@ -2946,7 +2942,7 @@ config("symbols") {
+@@ -2980,7 +2984,7 @@ config("symbols") {
      cflags += [ "-gomit-unreferenced-methods" ]
    }
  
diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni
index 181b05b5405f..1510c61ec39a 100644
--- a/www/chromium/files/patch-build_config_ozone.gni
+++ b/www/chromium/files/patch-build_config_ozone.gni
@@ -1,6 +1,6 @@
---- build/config/ozone.gni.orig	2025-04-04 08:52:13 UTC
+--- build/config/ozone.gni.orig	2025-05-05 10:57:53 UTC
 +++ build/config/ozone.gni
-@@ -81,7 +81,15 @@ declare_args() {
+@@ -80,7 +80,15 @@ declare_args() {
        ozone_platform = "x11"
        ozone_platform_drm = true
        ozone_platform_x11 = true
diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni
index ef8467486d04..af76f8815f02 100644
--- a/www/chromium/files/patch-build_config_rust.gni
+++ b/www/chromium/files/patch-build_config_rust.gni
@@ -1,6 +1,6 @@
---- build/config/rust.gni.orig	2025-02-19 07:43:18 UTC
+--- build/config/rust.gni.orig	2025-05-05 10:57:53 UTC
 +++ build/config/rust.gni
-@@ -297,6 +297,10 @@ if (is_linux || is_chromeos) {
+@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) {
    }
  }
  
diff --git a/www/chromium/files/patch-build_toolchain_toolchain.gni b/www/chromium/files/patch-build_toolchain_toolchain.gni
index 26757ccf3900..d06083c24da2 100644
--- a/www/chromium/files/patch-build_toolchain_toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_toolchain.gni
@@ -1,6 +1,6 @@
---- build/toolchain/toolchain.gni.orig	2025-04-04 08:52:13 UTC
+--- build/toolchain/toolchain.gni.orig	2025-05-05 10:57:53 UTC
 +++ build/toolchain/toolchain.gni
-@@ -72,7 +72,7 @@ if (host_os == "mac") {
+@@ -75,7 +75,7 @@ if (host_os == "mac") {
    host_shlib_extension = ".dylib"
  } else if (host_os == "win") {
    host_shlib_extension = ".dll"
diff --git a/www/chromium/files/patch-cc_base_features.cc b/www/chromium/files/patch-cc_base_features.cc
index 86a88390ed71..00646eb75430 100644
--- a/www/chromium/files/patch-cc_base_features.cc
+++ b/www/chromium/files/patch-cc_base_features.cc
@@ -1,6 +1,6 @@
---- cc/base/features.cc.orig	2025-02-19 07:43:18 UTC
+--- cc/base/features.cc.orig	2025-05-05 10:57:53 UTC
 +++ cc/base/features.cc
-@@ -43,7 +43,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
+@@ -48,7 +48,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
  // be using a separate flag to control the launch on GL.
  BASE_FEATURE(kUseDMSAAForTiles,
               "UseDMSAAForTiles",
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 0e87864fa4f6..bc0c86815b63 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/app/chrome_main_delegate.cc
 @@ -147,7 +147,7 @@
  #include "components/webui/about/credit_utils.h"
@@ -129,7 +129,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess &&
        !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) {
-@@ -1532,13 +1532,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1532,13 +1532,13 @@ std::variant<int, content::MainFunctionParams> ChromeM
  #else
  
  #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \
diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn
index 44ae9ca16854..c2af312323e3 100644
--- a/www/chromium/files/patch-chrome_browser_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/BUILD.gn
-@@ -6819,6 +6819,13 @@ static_library("browser") {
+@@ -6866,6 +6866,13 @@ static_library("browser") {
            [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ]
      }
  
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index ebcf84031ef7..ef6b8ae7f3fe 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/about_flags.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/about_flags.cc
-@@ -258,7 +258,7 @@
+@@ -260,7 +260,7 @@
  #include "extensions/common/extension_features.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -344,7 +344,7 @@
+@@ -349,7 +349,7 @@
  #include "device/vr/public/cpp/switches.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "ui/ozone/public/ozone_switches.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -354,7 +354,7 @@
+@@ -359,7 +359,7 @@
  #include "chrome/browser/win/mica_titlebar.h"
  #endif
  
@@ -26,8 +26,8 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/contextual_cueing/contextual_cueing_features.h"  // nogncheck
  #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -365,7 +365,7 @@
+ #include "chrome/browser/enterprise/webstore/features.h"
+@@ -371,7 +371,7 @@
  #include "components/user_education/common/user_education_features.h"  // nogncheck
  #endif
  
@@ -36,7 +36,16 @@
  #include "chrome/browser/ui/ui_features.h"
  #include "ui/base/ui_base_features.h"
  #endif
-@@ -520,7 +520,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -423,7 +423,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = {
+ #endif  // USE_AURA
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ 
+ const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = {
+     {"LocalNetworkAccessChecksWarn", "false"}};
+@@ -539,7 +539,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
      {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
  #endif
  
@@ -45,7 +54,7 @@
  const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
      {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
      {flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -821,6 +821,26 @@ const FeatureEntry::FeatureVariation
+@@ -852,6 +852,26 @@ const FeatureEntry::FeatureVariation
           std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
           nullptr}};
  
@@ -72,8 +81,8 @@
  const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
      {"UIClipboardMaximumAge", "60"}};
  const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
-@@ -1184,7 +1204,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
- };
+@@ -1227,7 +1247,7 @@ constexpr FeatureEntry::FeatureVariation
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
@@ -81,7 +90,7 @@
  const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
      {"AtKeywordAcceleration", "true"},
  };
-@@ -1222,7 +1242,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
+@@ -1265,7 +1285,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
  };
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -89,8 +98,8 @@
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  
  // A limited number of combinations of the rich autocompletion params.
- const FeatureEntry::FeatureParam
-@@ -3582,7 +3602,7 @@ const FeatureEntry::FeatureVariation
+ const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = {
+@@ -3555,7 +3575,7 @@ const FeatureEntry::FeatureVariation
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -99,7 +108,7 @@
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
      {{"link_capturing_state", "on_by_default"}};
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
-@@ -4088,7 +4108,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
+@@ -4059,7 +4079,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
       std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
  };
  
@@ -108,7 +117,7 @@
  const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
      {"TranslationAPIAcceptLanguagesCheck", "false"},
      {"TranslationAPILimitLanguagePackCount", "false"}};
-@@ -4154,7 +4174,7 @@ const FeatureEntry::FeatureVariation
+@@ -4125,7 +4145,7 @@ const FeatureEntry::FeatureVariation
           1, nullptr},
  };
  
@@ -117,7 +126,7 @@
  const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
      {"BackoffTime", "0h"},
      {"BackoffMultiplierBase", "0.0"},
-@@ -4997,7 +5017,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4992,7 +5012,7 @@ const FeatureEntry kFeatureEntries[] = {
      },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -126,7 +135,7 @@
      {
          "fluent-overlay-scrollbars",
          flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5286,7 +5306,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5279,7 +5299,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableIsolatedWebAppDevModeName,
       flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
@@ -135,7 +144,7 @@
      {"enable-iwa-key-distribution-component",
       flag_descriptions::kEnableIwaKeyDistributionComponentName,
       flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
-@@ -5545,7 +5565,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5500,7 +5520,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kWebShare)},
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  
@@ -144,10 +153,10 @@
      {"pulseaudio-loopback-for-cast",
       flag_descriptions::kPulseaudioLoopbackForCastName,
       flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
-@@ -5581,6 +5601,16 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWaylandLinuxDrmSyncobjName,
-      flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)},
+@@ -5541,6 +5561,16 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWaylandSessionManagementName,
+      flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
+      FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
 +
 +#if BUILDFLAG(IS_BSD)
 +    {"audio-backend",
@@ -161,7 +170,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(ENABLE_VR)
-@@ -6461,7 +6491,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6427,7 +6457,7 @@ const FeatureEntry kFeatureEntries[] = {
                                      "MlUrlScoring")},
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -170,16 +179,16 @@
      {"omnibox-domain-suggestions",
       flag_descriptions::kOmniboxDomainSuggestionsName,
       flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
-@@ -6674,7 +6704,7 @@ const FeatureEntry kFeatureEntries[] = {
-                                     "OrganicRepeatableQueries")},
- 
+@@ -6697,7 +6727,7 @@ const FeatureEntry kFeatureEntries[] = {
+                                     kNumSrpZpsRelatedSearches,
+                                     "PowerTools")},
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
       flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
       FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
-@@ -7171,7 +7201,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7189,7 +7219,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -188,7 +197,7 @@
      {"cups-ipp-printing-backend",
       flag_descriptions::kCupsIppPrintingBackendName,
       flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
-@@ -7436,7 +7466,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7437,7 +7467,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)},
  
@@ -197,7 +206,7 @@
      {"wasm-tts-component-updater-enabled",
       flag_descriptions::kWasmTtsComponentUpdaterEnabledName,
       flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop,
-@@ -8092,7 +8122,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8109,7 +8139,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
  #endif  // !BUILDFLAG(IS_CHROMEOS)
  
@@ -206,7 +215,7 @@
      {"enable-network-service-sandbox",
       flag_descriptions::kEnableNetworkServiceSandboxName,
       flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8773,7 +8803,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8774,7 +8804,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -215,7 +224,7 @@
      {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
       flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
-@@ -8798,7 +8828,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8799,7 +8829,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
  
@@ -224,7 +233,7 @@
      {
          "ui-debug-tools",
          flag_descriptions::kUIDebugToolsName,
-@@ -9265,7 +9295,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9275,7 +9305,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -233,7 +242,7 @@
      {"media-session-enter-picture-in-picture",
       flag_descriptions::kMediaSessionEnterPictureInPictureName,
       flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -9903,7 +9933,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9924,7 +9954,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
  
@@ -242,7 +251,7 @@
      {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
       flag_descriptions::kCameraMicEffectsDescription,
       static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10027,7 +10057,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10048,7 +10078,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)},
  #endif
  
@@ -251,7 +260,7 @@
      {"third-party-profile-management",
       flag_descriptions::kThirdPartyProfileManagementName,
       flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10062,7 +10092,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10077,7 +10107,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -260,16 +269,16 @@
      {"enable-user-navigation-capturing-pwa",
       flag_descriptions::kPwaNavigationCapturingName,
       flag_descriptions::kPwaNavigationCapturingDescription,
-@@ -10823,7 +10853,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10817,7 +10847,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCanvasHibernationDescription, kOsAll,
       FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"sync-enable-bookmarks-in-transport-mode",
-      flag_descriptions::kSyncEnableBookmarksInTransportModeName,
-      flag_descriptions::kSyncEnableBookmarksInTransportModeDescription,
-@@ -10939,7 +10969,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-history-sync-optin",
+      flag_descriptions::kEnableHistorySyncOptinName,
+      flag_descriptions::kEnableHistorySyncOptinDescription,
+@@ -10920,7 +10950,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)},
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -278,7 +287,7 @@
      {"supervised-profile-safe-search",
       flag_descriptions::kSupervisedProfileSafeSearchName,
       flag_descriptions::kSupervisedProfileSafeSearchDescription,
-@@ -11186,7 +11216,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11167,7 +11197,7 @@ const FeatureEntry kFeatureEntries[] = {
           segmentation_platform::features::kSegmentationSurveyPage)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -287,7 +296,7 @@
      {"autofill-enable-buy-now-pay-later",
       flag_descriptions::kAutofillEnableBuyNowPayLaterName,
       flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
-@@ -11306,7 +11336,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11282,7 +11312,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
  
@@ -296,7 +305,7 @@
      {"translation-api", flag_descriptions::kTranslationAPIName,
       flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
       FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
-@@ -11343,7 +11373,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11319,7 +11349,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           password_manager::features::kPasswordFormClientsideClassifier)},
  
@@ -305,7 +314,7 @@
      {"contextual-cueing", flag_descriptions::kContextualCueingName,
       flag_descriptions::kContextualCueingDescription,
       kOsLinux | kOsMac | kOsWin,
-@@ -11662,7 +11692,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11653,7 +11683,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -314,7 +323,7 @@
      {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
       flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
       FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
-@@ -11712,7 +11742,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11703,7 +11733,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -323,7 +332,7 @@
      {"autofill-enable-amount-extraction-desktop",
       flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
       flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
-@@ -11732,7 +11762,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11723,7 +11753,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -332,3 +341,39 @@
      {"autofill-enable-amount-extraction-allowlist-desktop",
       flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
       flag_descriptions::
+@@ -11834,7 +11864,7 @@ const FeatureEntry kFeatureEntries[] = {
+          apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)},
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     {"chrome-web-store-navigation-throttle",
+      flag_descriptions::kChromeWebStoreNavigationThrottleName,
+      flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
+@@ -11869,7 +11899,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"autofill-enable-amount-extraction-desktop-logging",
+      flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName,
+      flag_descriptions::
+@@ -11899,7 +11929,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)},
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"root-scrollbar-follows-browser-theme",
+      flag_descriptions::kRootScrollbarFollowsTheme,
+      flag_descriptions::kRootScrollbarFollowsThemeDescription,
+@@ -11921,7 +11951,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"local-network-access-check",
+      flag_descriptions::kLocalNetworkAccessChecksName,
+      flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop,
diff --git a/www/chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc b/www/chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
index 37ab8e9e5fa4..5a9dc9fb48c7 100644
--- a/www/chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
+++ b/www/chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
@@ -1,6 +1,6 @@
---- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/background/glic/glic_status_icon.cc
-@@ -83,7 +83,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
+@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
    if (!status_icon_) {
      return;
    }
@@ -9,8 +9,8 @@
    //  Set a vector icon for proper themeing on Linux.
    status_icon_->SetIcon(
        GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON));
-@@ -113,7 +113,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
- GlicStatusIcon::~GlicStatusIcon() {
+@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() {
+ 
    context_menu_ = nullptr;
    if (status_icon_) {
 -#if !BUILDFLAG(IS_LINUX)
@@ -18,7 +18,16 @@
      status_icon_->RemoveObserver(this);
  #endif
      std::unique_ptr<StatusIcon> removed_icon =
-@@ -201,7 +201,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
+@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const ui::Accelerato
+ }
+ 
+ void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (context_menu_) {
+     context_menu_->SetCommandIdVisible(IDC_GLIC_STATUS_ICON_MENU_EXIT,
+                                        BrowserList::GetInstance()->empty());
+@@ -272,7 +272,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
    menu->AddItem(
        IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON,
        l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON));
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc
index a72496111c57..ed9fe2084511 100644
--- a/www/chromium/files/patch-chrome_browser_browser__features.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__features.cc
@@ -1,15 +1,15 @@
---- chrome/browser/browser_features.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/browser_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/browser_features.cc
-@@ -81,7 +81,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode,
-              "ContentUsesBrowserThemeColorMode",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDestruction,
+              "ClearUserDataUponProfileDestruction",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Enables usage of os_crypt_async::SecretPortalKeyProvider.  Once
  // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be
  // disabled without losing data.
-@@ -100,7 +100,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
+@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
  // the browser exits.
  BASE_FEATURE(kDestroyProfileOnBrowserClose,
               "DestroyProfileOnBrowserClose",
@@ -18,7 +18,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT);
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -233,7 +233,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
+@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
               "SandboxExternalProtocolBlockedWarning",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.h b/www/chromium/files/patch-chrome_browser_browser__features.h
index fcd411f95c5a..5ba7e440c631 100644
--- a/www/chromium/files/patch-chrome_browser_browser__features.h
+++ b/www/chromium/files/patch-chrome_browser_browser__features.h
@@ -1,15 +1,15 @@
---- chrome/browser/browser_features.h.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/browser_features.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/browser_features.h
-@@ -39,7 +39,7 @@ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
- 
- BASE_DECLARE_FEATURE(kContentUsesBrowserThemeColorMode);
+@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore
+ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
+ BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kDbusSecretPortal);
  BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider);
  #endif
-@@ -101,7 +101,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
+@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked);
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning);
  
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
index a49c945bbf60..f892437d71ea 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/browser_process_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/browser_process_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/browser_process_impl.cc
 @@ -259,7 +259,7 @@
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@@ -18,7 +18,7 @@
  // How often to check if the persistent instance of Chrome needs to restart
  // to install an update.
  static const int kUpdateCheckIntervalHours = 6;
-@@ -1133,7 +1133,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
+@@ -1145,7 +1145,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
                                  GoogleUpdateSettings::GetCollectStatsConsent());
    registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
  
@@ -27,7 +27,7 @@
    os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
  #endif
  }
-@@ -1401,7 +1401,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1413,7 +1413,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
            local_state())));
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -36,7 +36,7 @@
    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) !=
        "basic") {
-@@ -1670,7 +1670,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1682,7 +1682,7 @@ void BrowserProcessImpl::Unpin() {
  }
  
  // Mac is currently not supported.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
index 8ae00829f583..c8930a941880 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/chrome_browser_interface_binders_webui.cc
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
  #include "content/public/browser/web_ui_controller_interface_binder.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
  #endif
  
@@ -17,8 +17,8 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
-@@ -440,7 +440,7 @@ void PopulateChromeWebUIFrameBinders(
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin.mojom.h"
+@@ -445,7 +445,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
    RegisterWebUIControllerInterfaceBinder<
        connectors_internals::mojom::PageHandler,
        enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -451,7 +451,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -456,7 +456,7 @@ void PopulateChromeWebUIFrameBinders(
                                           policy::DlpInternalsUI>(map);
  #endif
  
@@ -36,9 +36,9 @@
    RegisterWebUIControllerInterfaceBinder<
        app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
  
-@@ -544,14 +544,14 @@ void PopulateChromeWebUIFrameBinders(
-       page_image_service::mojom::PageImageServiceHandler, HistoryUI,
-       HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
+@@ -583,14 +583,14 @@ void PopulateChromeWebUIFrameBinders(
+         HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
+   }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
@@ -53,7 +53,7 @@
        WhatsNewUI,
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
        NewTabPageUI>(map);
-@@ -1084,7 +1084,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1123,7 +1123,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 96abeb2ab555..ee12605d1af4 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -504,7 +504,7 @@
+@@ -506,7 +506,7 @@
  #include "components/user_manager/user_manager.h"
  #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
  #include "storage/browser/file_system/external_mount_points.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #elif BUILDFLAG(IS_ANDROID)
-@@ -618,11 +618,11 @@
+@@ -622,11 +622,11 @@
  #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
  #endif  //  !BUILDFLAG(IS_ANDROID)
  
@@ -23,7 +23,7 @@
  #include "components/crash/core/app/crash_switches.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -633,7 +633,7 @@
+@@ -637,7 +637,7 @@
  #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
  #endif
  
@@ -32,7 +32,7 @@
  #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
  #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
  #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
-@@ -642,7 +642,7 @@
+@@ -646,7 +646,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -41,7 +41,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -651,7 +651,7 @@
+@@ -655,7 +655,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -50,7 +50,7 @@
  #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
  #elif BUILDFLAG(IS_OZONE)
  #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1544,7 +1544,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+@@ -1549,7 +1549,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
    registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache,
                                  false);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -59,7 +59,7 @@
    registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
                                  true);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1758,7 +1758,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  #elif BUILDFLAG(IS_CHROMEOS)
    main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>(
        is_integration_test, &startup_data_);
@@ -68,7 +68,7 @@
    main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
        is_integration_test, &startup_data_);
  #elif BUILDFLAG(IS_ANDROID)
-@@ -1781,7 +1781,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1787,7 +1787,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
      // Construct additional browser parts. Stages are called in the order in
      // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -77,7 +77,7 @@
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -1798,7 +1798,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>());
  #endif
  
@@ -86,7 +86,7 @@
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
  #elif BUILDFLAG(IS_OZONE)
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1817,7 +1817,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1823,7 +1823,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  
    chrome::AddMetricsExtraParts(main_parts.get());
  
@@ -95,7 +95,7 @@
    main_parts->AddParts(
        std::make_unique<
            enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2700,7 +2700,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
+@@ -2706,7 +2706,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
  void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
      base::CommandLine* command_line,
      int child_process_id) {
@@ -105,7 +105,7 @@
  #if BUILDFLAG(IS_MAC)
    std::unique_ptr<metrics::ClientInfo> client_info =
        GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -2709,7 +2711,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2715,7 +2717,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
                                      client_info->client_id);
    }
  #elif BUILDFLAG(IS_POSIX)
@@ -114,7 +114,7 @@
    pid_t pid;
    if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
      command_line->AppendSwitchASCII(
-@@ -3069,7 +3071,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -3080,7 +3082,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      }
    }
  
@@ -123,7 +123,25 @@
    // Opt into a hardened stack canary mitigation if it hasn't already been
    // force-disabled.
    if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4911,7 +4913,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4030,7 +4032,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr
+   return old_preferred_color_scheme != web_prefs->preferred_color_scheme;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a
+ // custom colored frame for the UI.
+ void UpdateRootScrollbarThemeColor(Profile* profile,
+@@ -4657,7 +4659,7 @@ void ChromeContentBrowserClient::OverrideWebPreference
+ 
+   UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(),
+                              web_contents, GetWebTheme());
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs);
+ #endif  //  BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+ 
+@@ -4973,7 +4975,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -132,7 +150,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -5423,7 +5425,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5485,7 +5487,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
          &throttles);
    }
  
@@ -141,7 +159,7 @@
    MaybeAddThrottle(
        WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
        &throttles);
-@@ -5440,7 +5442,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5502,7 +5504,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -150,7 +168,7 @@
    MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -5481,7 +5483,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5543,7 +5545,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
    }
  #endif
  
@@ -159,7 +177,7 @@
    MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -7419,7 +7421,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -7496,7 +7498,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
  bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
  // This enterprise policy is supported on Android, but the feature will not be
  // launched there.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index ec8f754e51b0..bd8ab9a04eff 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -555,7 +555,7 @@ class ChromeContentBrowserClient : public content::Con
    bool IsPluginAllowedToUseDevChannelAPIs(
        content::BrowserContext* browser_context,
        const GURL& url) override;
diff --git a/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
index ab635411cd56..ccc64fc33650 100644
--- a/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc
-@@ -100,7 +100,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo
+@@ -102,7 +102,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo
    // This configuration object allows us to control platform specific behavior.
    MessagingBackendConfiguration configuration;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
index d885c09d6335..7977e58b2774 100644
--- a/www/chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
+++ b/www/chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
@@ -1,6 +1,6 @@
---- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc
-@@ -56,7 +56,7 @@ void OnDemandUpdateCompleted(update_client::Error err)
+@@ -64,7 +64,7 @@ component_updater::OnDemandUpdater::Priority GetOnDema
  
  namespace component_updater {
  
@@ -9,7 +9,7 @@
  BASE_FEATURE(kIwaKeyDistributionComponent,
               "IwaKeyDistributionComponent",
  #if BUILDFLAG(IS_CHROMEOS)
-@@ -81,7 +81,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
+@@ -89,7 +89,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
    // the main IWA feature.
  #if BUILDFLAG(IS_WIN)
    return base::FeatureList::IsEnabled(features::kIsolatedWebApps);
diff --git a/www/chromium/files/patch-chrome_browser_devtools_features.cc b/www/chromium/files/patch-chrome_browser_devtools_features.cc
new file mode 100644
index 000000000000..95476b4a43f9
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_devtools_features.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/features.cc.orig	2025-05-05 10:57:53 UTC
++++ chrome/browser/devtools/features.cc
+@@ -157,7 +157,7 @@ BASE_FEATURE(kDevToolsAiGeneratedTimelineLabels,
+              "DevToolsAiGeneratedTimelineLabels",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If enabled, DevTools does not accept remote debugging connections unless
+ // using a non-default user data dir via the --user-data-dir switch.
+ BASE_FEATURE(kDevToolsDebuggingRestrictions,
diff --git a/www/chromium/files/patch-chrome_browser_devtools_features.h b/www/chromium/files/patch-chrome_browser_devtools_features.h
new file mode 100644
index 000000000000..3357fbd1acaf
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_devtools_features.h
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/features.h.orig	2025-05-05 10:57:53 UTC
++++ chrome/browser/devtools/features.h
+@@ -89,7 +89,7 @@ BASE_DECLARE_FEATURE(kDevToolsCssValueTracing);
+ 
+ BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabels);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc b/www/chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc
new file mode 100644
index 000000000000..703521dd27a1
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/remote_debugging_server.cc.orig	2025-05-05 10:57:53 UTC
++++ chrome/browser/devtools/remote_debugging_server.cc
+@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::optional<bool>& is
+         RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy);
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) &&
+       is_default_user_data_dir.value_or(true)) {
+     return base::unexpected(
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 0363d50dc4ec..455d51b8f53e 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_item_model.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/download/download_item_model.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/download/download_item_model.cc
 @@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked(
               download_crx_util::IsExtensionDownload(*download_);
@@ -18,7 +18,7 @@
        if (download_commands->CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1215,7 +1215,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1206,7 +1206,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
      return;
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc
index 24dd157edbe5..1e930d3c73a5 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/common.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/enterprise/connectors/common.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/enterprise/connectors/common.cc
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  #include "components/user_manager/user.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/prefs/pref_service.h"
  #endif
-@@ -191,7 +191,7 @@ std::string GetProfileEmail(Profile* profile) {
+@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* profile) {
    std::string email =
        GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
index 8ac2219ff332..a2390067c4e7 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -470,7 +470,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope(
+@@ -476,7 +476,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope(
  bool ConnectorsService::ConnectorsEnabled() const {
    Profile* profile = Profile::FromBrowserContext(context_);
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
index da4cae30d8a2..8f915a331722 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
-@@ -55,7 +55,7 @@
+@@ -53,7 +53,7 @@
  #include "base/strings/utf_string_conversions.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/device_signals/core/browser/signals_aggregator.h"
-@@ -160,7 +160,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
+@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
                                       /*include_profile_user_name=*/false);
  }
  
@@ -18,7 +18,7 @@
  
  void AddCrowdstrikeSignalsToEvent(
      base::Value::Dict& event,
-@@ -196,7 +196,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
+@@ -194,7 +194,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
    username_ =
        identity_manager_ ? GetProfileEmail(identity_manager_) : std::string();
  
@@ -27,7 +27,7 @@
    if (username_.empty()) {
      username_ = Profile::FromBrowserContext(context_)->GetPrefs()->GetString(
          enterprise_signin::prefs::kProfileUserEmail);
-@@ -248,7 +248,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
+@@ -246,7 +246,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
    return client_id;
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
index ed8ae72110e5..f04d4f38f616 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
 @@ -19,7 +19,7 @@
  #include "components/keyed_service/core/keyed_service.h"
@@ -9,7 +9,7 @@
  #include "components/device_signals/core/browser/signals_types.h"
  #endif
  
-@@ -118,7 +118,7 @@ class RealtimeReportingClient : public RealtimeReporti
+@@ -113,7 +113,7 @@ class RealtimeReportingClient : public RealtimeReporti
        const std::string& dm_token) override;
  #endif
  
@@ -18,7 +18,7 @@
    // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...).
    void MaybeCollectDeviceSignalsAndReportEventDeprecated(
        base::Value::Dict event,
-@@ -168,7 +168,7 @@ class RealtimeReportingClient : public RealtimeReporti
+@@ -163,7 +163,7 @@ class RealtimeReportingClient : public RealtimeReporti
    base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
  };
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
new file mode 100644
index 000000000000..b35efa1b5c3d
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig	2025-05-05 10:57:53 UTC
++++ chrome/browser/enterprise/signals/context_info_fetcher.cc
+@@ -179,6 +179,8 @@ std::vector<std::string> ContextInfoFetcher::GetOnSecu
+ SettingValue ContextInfoFetcher::GetOSFirewall() {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+   return device_signals::GetOSFirewall();
++#elif BUILDFLAG(IS_OPENBSD)
++  return SettingValue::ENABLED;
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return GetChromeosFirewall();
+ #else
+@@ -198,7 +200,7 @@ ScopedUfwConfigPathForTesting::~ScopedUfwConfigPathFor
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+ std::vector<std::string> ContextInfoFetcher::GetDnsServers() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   return device_signals::GetSystemDnsServers();
+ #else
+   return std::vector<std::string>();
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
index af7965b9f406..2c9e37aee9f4 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/enterprise/signals/device_info_fetcher.cc
 @@ -10,7 +10,7 @@
  #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
  #endif
  
-@@ -74,7 +74,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
+@@ -76,7 +76,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
    return CreateInstanceInternal();
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
index f85df72de320..da2fe67857b2 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/enterprise/util/managed_browser_utils.cc
-@@ -224,7 +224,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
+@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
+       profile_manager->GetProfileAttributesStorage()
            .GetProfileAttributesWithPath(profile->GetPath());
    if (entry) {
-     entry->SetUserAcceptedAccountManagement(accepted);
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     entry->SetEnterpriseProfileLabel(GetEnterpriseLabel(profile));
+     SetEnterpriseProfileLabel(profile);
  #endif
-   }
+     entry->SetUserAcceptedAccountManagement(accepted);
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index 22d1ecc35bf2..4164c1ff0c7d 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1436,6 +1436,10 @@ source_set("extensions") {
+@@ -1464,6 +1464,10 @@ source_set("extensions") {
        deps += [ "//chrome/services/printing/public/mojom" ]
      }
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index 0e61fb151a08..c12e349ee015 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 @@ -40,7 +40,7 @@
  #include "components/reporting/util/statusor.h"
@@ -9,7 +9,7 @@
  #include <optional>
  
  #include "base/strings/string_util.h"
-@@ -157,7 +157,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+@@ -156,7 +156,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
  }
  
  bool AllowClientCertificateReportingForUsers() {
@@ -18,7 +18,7 @@
    return base::FeatureList::IsEnabled(
        enterprise_signals::features::kAllowClientCertificateReportingForUsers);
  #else
-@@ -170,7 +170,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin
+@@ -169,7 +169,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin
    return pref && pref->IsManaged();
  }
  
@@ -27,7 +27,7 @@
  
  device_signals::SignalsAggregationRequest CreateAggregationRequest(
      device_signals::SignalName signal_name) {
-@@ -232,7 +232,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -231,7 +231,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
  
  // getPersistentSecret
  
@@ -36,7 +36,7 @@
  
  EnterpriseReportingPrivateGetPersistentSecretFunction::
      EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -672,7 +672,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+@@ -671,7 +671,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
  }
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
index 6c2664a6c4c5..3fbaa19b06c5 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -409,7 +409,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
+@@ -410,7 +410,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
    apps::LaunchContainer launch_container =
        GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
    Profile* profile = Profile::FromBrowserContext(context);
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index 6f91a483eff7..775fd3efc06e 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -293,7 +293,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+@@ -292,7 +292,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PlatformOs::kLinux;
    } else if (strcmp(os, "openbsd") == 0) {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index e0305f57a6a1..9025bca3363d 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,15 +1,15 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] =
        settings_api::PrefType::kBoolean;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] =
-       settings_api::PrefType::kBoolean;
    (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] =
-@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+       settings_api::PrefType::kBoolean;
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
        settings_api::PrefType::kBoolean;
  
@@ -18,7 +18,7 @@
    (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::kBoolean;
  #endif
-@@ -223,7 +223,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
    (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
    (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
index 9582d1e9337f..17f5e5c68aec 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -931,7 +931,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
+@@ -932,7 +932,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
  // created as minimized.
  // TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
  // TODO(crbug.com/40254339): Find a fix for wayland as well.
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index a3ca2aa380fd..9f85be29dc4d 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -795,7 +795,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
    if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
@@ -9,7 +9,7 @@
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
          base::MakeRefCounted<ExternalPrefLoader>(
-@@ -823,7 +823,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders(
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.
diff --git a/www/chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/www/chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
index 81cede602aea..0fbde92c54da 100644
--- a/www/chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
+++ b/www/chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
@@ -1,6 +1,6 @@
---- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
-@@ -38,7 +38,7 @@
+@@ -37,7 +37,7 @@
  #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
  #endif
  
-@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content
+@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content
    fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>());
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/www/chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
index 0c20cf02a663..1576c0eba56b 100644
--- a/www/chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
+++ b/www/chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
@@ -1,6 +1,6 @@
---- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc
-@@ -45,7 +45,7 @@
+@@ -44,7 +44,7 @@
  #include "services/network/public/cpp/shared_url_loader_factory.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
  #endif
  
-@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil
+@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil
    fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data));
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index b2216588b1e8..a25bb9b61a6c 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -562,7 +562,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
+@@ -602,7 +602,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
      "Autofill suggestions on the allowlisted merchant websites.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kAutofillEnableAmountExtractionAllowlistDesktopName[] =
      "Enable loading and querying the checkout amount extraction allowlist on "
      "Chrome Desktop";
-@@ -580,7 +580,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr
+@@ -626,7 +626,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi
          // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  const char kAutofillEnableBuyNowPayLaterName[] =
      "Enable buy now pay later on Autofill";
  const char kAutofillEnableBuyNowPayLaterDescription[] =
-@@ -992,7 +992,7 @@ const char kDevicePostureDescription[] =
+@@ -1031,7 +1031,7 @@ const char kDevicePostureDescription[] =
      "Enables Device Posture API (foldable devices)";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -27,16 +27,16 @@
  const char kDocumentPictureInPictureAnimateResizeName[] =
      "Document Picture-in-Picture Animate Resize";
  const char kDocumentPictureInPictureAnimateResizeDescription[] =
-@@ -1077,7 +1077,7 @@ const char kCompressionDictionaryTransportRequireKnown
-     "when the connection is using a well known root cert or when the server is "
-     "a localhost.";
+@@ -1123,7 +1123,7 @@ const char kContextMenuEmptySpaceDescription[] =
+     "space, a context menu containing page-related items will be shown.";
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  const char kContextualCueingName[] = "Contextual cueing";
  const char kContextualCueingDescription[] =
-     "Enables the contextual cueing system to support showing actions";
-@@ -1496,7 +1496,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
+     "Enables the contextual cueing system to support showing actions.";
+@@ -1563,7 +1563,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
  const char kEnableIsolatedWebAppDevModeDescription[] =
      "Enables the installation of unverified Isolated Web Apps";
  
@@ -45,7 +45,16 @@
  const char kEnableIwaKeyDistributionComponentName[] =
      "Enable the Iwa Key Distribution component";
  const char kEnableIwaKeyDistributionComponentDescription[] =
-@@ -3494,7 +3494,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
+@@ -3430,7 +3430,7 @@ const char kRetainOmniboxOnFocusDescription[] =
+     "exhibit a change in behavior.";
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme";
+ const char kRootScrollbarFollowsThemeDescription[] =
+     "If enabled makes the root scrollbar follow the browser's theme color.";
+@@ -3648,7 +3648,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
      "SiteInstance.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,25 +63,25 @@
  const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing";
  const char kPwaNavigationCapturingDescription[] =
      "Enables opening links from Chrome in an installed PWA. Currently under "
-@@ -3729,7 +3729,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
+@@ -3863,7 +3863,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
      "Force the Translate Triggering on English pages experiment to be enabled "
      "with the selected language model active.";
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kTranslationAPIName[] = "Experimental translation API";
- const char kTranslationAPIDescription[] =
-     "Enables the on-device language translation API. "
-@@ -5352,7 +5352,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes
-     "Enables a mitigation during web app install on CrOS for syncing "
-     "user_display_mode: kStandalone to non-CrOS devices.";
+ const char kEnableHistorySyncOptinName[] = "History Sync Opt-in";
+ const char kEnableHistorySyncOptinDescription[] =
+     "Enables the History Sync Opt-in screen on Desktop platforms. The screen "
+@@ -5451,7 +5451,7 @@ const char kTranslateOpenSettingsDescription[] =
+     "Add an option to the translate bubble menu to open language settings.";
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  const char kWasmTtsComponentUpdaterEnabledName[] =
      "Enable Wasm TTS Extension Component";
  const char kWasmTtsComponentUpdaterEnabledDescription[] =
-@@ -7350,7 +7350,7 @@ const char kTetheringExperimentalFunctionalityDescript
+@@ -7459,7 +7459,7 @@ const char kTetheringExperimentalFunctionalityDescript
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -81,7 +90,7 @@
  const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
  const char kGetAllScreensMediaDescription[] =
      "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7580,7 +7580,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
+@@ -7688,7 +7688,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
  
  // Linux -----------------------------------------------------------------------
  
@@ -90,7 +99,7 @@
  const char kOzonePlatformHintChoiceDefault[] = "Default";
  const char kOzonePlatformHintChoiceAuto[] = "Auto";
  const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7626,6 +7626,18 @@ const char kWaylandUiScalingDescription[] =
+@@ -7738,6 +7738,18 @@ const char kWaylandUiScalingDescription[] =
      "Enable experimental support for text scaling in the Wayland backend "
      "backed by full UI scaling. Requires #wayland-per-window-scaling to be "
      "enabled too.";
@@ -109,7 +118,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -7638,7 +7650,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+@@ -7750,7 +7762,7 @@ const char kZeroCopyVideoCaptureDescription[] =
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -118,16 +127,16 @@
  const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
  const char kFollowingFeedSidepanelDescription[] =
      "Enables the following feed in the sidepanel.";
-@@ -7671,7 +7683,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
-     "Enables a refreshed design for the Task Manager on Desktop platforms.";
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -7793,7 +7805,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P
+ const char kGroupPromoPrototypeDescription[] =
+     "Enables prototype for group promo.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  const char kEnableNetworkServiceSandboxName[] =
      "Enable the network service sandbox.";
  const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7703,7 +7715,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7825,7 +7837,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
      "Bluetooth";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -136,7 +145,7 @@
  #if BUILDFLAG(ENABLE_PRINTING)
  const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend";
  const char kCupsIppPrintingBackendDescription[] =
-@@ -7848,7 +7860,7 @@ const char kElementCaptureDescription[] =
+@@ -7967,7 +7979,7 @@ const char kElementCaptureDescription[] =
      "media track into a track capturing just a specific DOM element.";
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -145,7 +154,7 @@
  const char kUIDebugToolsName[] = "Debugging tools for UI";
  const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
-@@ -7904,7 +7916,7 @@ const char kComposeUpfrontInputModesDescription[] =
+@@ -8018,7 +8030,7 @@ const char kComposeUpfrontInputModesDescription[] =
      "Enables upfront input modes in the Compose dialog";
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -154,9 +163,9 @@
  const char kThirdPartyProfileManagementName[] =
      "Third party profile management";
  const char kThirdPartyProfileManagementDescription[] =
-@@ -8048,7 +8060,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] =
-     "Enable the OS settings for overlay scrollbars on ChromeOS.";
- #endif  // BUILDFLAG(IS_CHROMEOS)
+@@ -8154,7 +8166,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] =
+ const char kSupervisedUserBlockInterstitialV3Description[] =
+     "Enables URL filter interstitial V3 for Family Link users.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 56099e6cda0b..9690610a788e 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/flag_descriptions.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -356,7 +356,7 @@ extern const char
+@@ -373,7 +373,7 @@ extern const char
      kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[];
  extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[];
  extern const char kAutofillEnableAmountExtractionDesktopName[];
-@@ -365,7 +365,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
+@@ -384,7 +384,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
          // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,16 +18,16 @@
  extern const char kAutofillEnableBuyNowPayLaterName[];
  extern const char kAutofillEnableBuyNowPayLaterDescription[];
  
-@@ -581,7 +581,7 @@ extern const char kCrossTabRegionCaptureName[];
- extern const char kCrossTabRegionCaptureDescription[];
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -602,7 +602,7 @@ extern const char kContextMenuEmptySpaceName[];
+ extern const char kContextMenuEmptySpaceDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  extern const char kContextualCueingName[];
  extern const char kContextualCueingDescription[];
- #endif  // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -753,7 +753,7 @@ extern const char kDevicePostureName[];
+ extern const char kGlicZeroStateSuggestionsName[];
+@@ -786,7 +786,7 @@ extern const char kDevicePostureName[];
  extern const char kDevicePostureDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +36,7 @@
  extern const char kDocumentPictureInPictureAnimateResizeName[];
  extern const char kDocumentPictureInPictureAnimateResizeDescription[];
  
-@@ -915,7 +915,7 @@ extern const char kEnableIsolatedWebAppManagedGuestSes
+@@ -948,7 +948,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri
  extern const char kEnableIsolatedWebAppDevModeName[];
  extern const char kEnableIsolatedWebAppDevModeDescription[];
  
@@ -45,7 +45,16 @@
  extern const char kEnableIwaKeyDistributionComponentName[];
  extern const char kEnableIwaKeyDistributionComponentDescription[];
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -2017,7 +2017,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
+@@ -1964,7 +1964,7 @@ extern const char kRetainOmniboxOnFocusName[];
+ extern const char kRetainOmniboxOnFocusDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kRootScrollbarFollowsTheme[];
+ extern const char kRootScrollbarFollowsThemeDescription[];
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+@@ -2096,7 +2096,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
  extern const char kDefaultSiteInstanceGroupsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,25 +63,25 @@
  extern const char kPwaNavigationCapturingName[];
  extern const char kPwaNavigationCapturingDescription[];
  #endif
-@@ -2177,7 +2177,7 @@ extern const char kTouchTextEditingRedesignDescription
+@@ -2242,7 +2242,7 @@ extern const char kTouchTextEditingRedesignDescription
  extern const char kTranslateForceTriggerOnEnglishName[];
  extern const char kTranslateForceTriggerOnEnglishDescription[];
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kTranslationAPIName[];
- extern const char kTranslationAPIDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -3144,7 +3144,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio
- extern const char kUserDisplayModeSyncStandaloneMitigationName[];
- extern const char kUserDisplayModeSyncStandaloneMitigationDescription[];
+ extern const char kEnableHistorySyncOptinName[];
+ extern const char kEnableHistorySyncOptinDescription[];
+ 
+@@ -3197,7 +3197,7 @@ extern const char kTranslateOpenSettingsName[];
+ extern const char kTranslateOpenSettingsDescription[];
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  extern const char kWasmTtsComponentUpdaterEnabledName[];
  extern const char kWasmTtsComponentUpdaterEnabledDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -4325,7 +4325,7 @@ extern const char kTetheringExperimentalFunctionalityD
+@@ -4385,7 +4385,7 @@ extern const char kTetheringExperimentalFunctionalityD
  
  #endif  // #if BUILDFLAG(IS_CHROMEOS)
  
@@ -81,7 +90,7 @@
  extern const char kGetAllScreensMediaName[];
  extern const char kGetAllScreensMediaDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4460,7 +4460,7 @@ extern const char kEnableArmHwdrmDescription[];
+@@ -4520,7 +4520,7 @@ extern const char kEnableArmHwdrmDescription[];
  
  // Linux ---------------------------------------------------------------------
  
@@ -90,7 +99,7 @@
  extern const char kOzonePlatformHintChoiceDefault[];
  extern const char kOzonePlatformHintChoiceAuto[];
  extern const char kOzonePlatformHintChoiceX11[];
-@@ -4488,6 +4488,9 @@ extern const char kWaylandTextInputV3Description[];
+@@ -4551,6 +4551,9 @@ extern const char kWaylandTextInputV3Description[];
  
  extern const char kWaylandUiScalingName[];
  extern const char kWaylandUiScalingDescription[];
@@ -100,7 +109,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -4507,7 +4510,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -4570,7 +4573,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
  extern const char kWebBluetoothConfirmPairingSupportDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -109,7 +118,7 @@
  #if BUILDFLAG(ENABLE_PRINTING)
  extern const char kCupsIppPrintingBackendName[];
  extern const char kCupsIppPrintingBackendDescription[];
-@@ -4520,7 +4523,7 @@ extern const char kScreenlockReauthCardDescription[];
+@@ -4583,7 +4586,7 @@ extern const char kScreenlockReauthCardDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -117,8 +126,8 @@
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kFollowingFeedSidepanelName[];
  extern const char kFollowingFeedSidepanelDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4534,7 +4537,7 @@ extern const char kTaskManagerDesktopRefreshName[];
+ 
+@@ -4600,7 +4603,7 @@ extern const char kTaskManagerDesktopRefreshName[];
  extern const char kTaskManagerDesktopRefreshDescription[];
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -127,7 +136,7 @@
  extern const char kEnableNetworkServiceSandboxName[];
  extern const char kEnableNetworkServiceSandboxDescription[];
  
-@@ -4629,7 +4632,7 @@ extern const char kElementCaptureName[];
+@@ -4695,7 +4698,7 @@ extern const char kElementCaptureName[];
  extern const char kElementCaptureDescription[];
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -136,7 +145,7 @@
  extern const char kUIDebugToolsName[];
  extern const char kUIDebugToolsDescription[];
  #endif
-@@ -4671,7 +4674,7 @@ extern const char kComposeUpfrontInputModesName[];
+@@ -4734,7 +4737,7 @@ extern const char kComposeUpfrontInputModesName[];
  extern const char kComposeUpfrontInputModesDescription[];
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -145,9 +154,9 @@
  extern const char kThirdPartyProfileManagementName[];
  extern const char kThirdPartyProfileManagementDescription[];
  
-@@ -4756,7 +4759,7 @@ extern const char kEnablePolicyPromotionBannerName[];
- extern const char kEnablePolicyPromotionBannerDescription[];
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -4814,7 +4817,7 @@ extern const char kEnablePolicyPromotionBannerDescript
+ extern const char kSupervisedUserBlockInterstitialV3Name[];
+ extern const char kSupervisedUserBlockInterstitialV3Description[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_global__features.cc b/www/chromium/files/patch-chrome_browser_global__features.cc
index 496e2db94eb8..ad2052343aab 100644
--- a/www/chromium/files/patch-chrome_browser_global__features.cc
+++ b/www/chromium/files/patch-chrome_browser_global__features.cc
@@ -1,7 +1,7 @@
---- chrome/browser/global_features.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/global_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/global_features.cc
-@@ -21,7 +21,7 @@
- #include "chrome/browser/glic/glic_profile_manager.h"  // nogncheck
+@@ -22,7 +22,7 @@
+ #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h"  // nogncheck
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
  // This causes a gn error on Android builds, because gn does not understand
  // buildflags, so we include it only on platforms where it is used.
  #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h"
-@@ -60,7 +60,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
+@@ -61,7 +61,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
  
  void GlobalFeatures::Init() {
    system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
@@ -18,7 +18,7 @@
    whats_new_registry_ = CreateWhatsNewRegistry();
  #endif
  
-@@ -88,7 +88,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
+@@ -93,7 +93,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
    return system_permission_settings::PlatformHandle::Create();
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_global__features.h b/www/chromium/files/patch-chrome_browser_global__features.h
index 77061e3b363d..02fe710870c4 100644
--- a/www/chromium/files/patch-chrome_browser_global__features.h
+++ b/www/chromium/files/patch-chrome_browser_global__features.h
@@ -1,4 +1,4 @@
---- chrome/browser/global_features.h.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/global_features.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/global_features.h
 @@ -14,7 +14,7 @@
  namespace system_permission_settings {
@@ -9,7 +9,7 @@
  namespace whats_new {
  class WhatsNewRegistry;
  }  // namespace whats_new
-@@ -55,7 +55,7 @@ class GlobalFeatures {
+@@ -56,7 +56,7 @@ class GlobalFeatures {
    system_permissions_platform_handle() {
      return system_permissions_platform_handle_.get();
    }
@@ -18,7 +18,7 @@
    whats_new::WhatsNewRegistry* whats_new_registry() {
      return whats_new_registry_.get();
    }
-@@ -80,7 +80,7 @@ class GlobalFeatures {
+@@ -85,7 +85,7 @@ class GlobalFeatures {
  
    virtual std::unique_ptr<system_permission_settings::PlatformHandle>
    CreateSystemPermissionsPlatformHandle();
@@ -27,7 +27,7 @@
    virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry();
  #endif
  
-@@ -90,7 +90,7 @@ class GlobalFeatures {
+@@ -95,7 +95,7 @@ class GlobalFeatures {
  
    std::unique_ptr<system_permission_settings::PlatformHandle>
        system_permissions_platform_handle_;
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
index febee5bf85f5..e2a2d256eb0d 100644
--- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-01-15 09:18:26 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index b2f46d89e5e9..a1710581bf04 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -86,7 +86,7 @@
+@@ -85,7 +85,7 @@
  #include "chrome/browser/flags/android/chrome_session_state.h"
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -9,7 +9,7 @@
  #if defined(__GLIBC__)
  #include <gnu/libc-version.h>
  #endif  // defined(__GLIBC__)
-@@ -111,7 +111,7 @@
+@@ -110,7 +110,7 @@
  #include "chrome/installer/util/taskbar_util.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -18,7 +18,7 @@
  #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -120,7 +120,7 @@
+@@ -119,7 +119,7 @@
  #include "components/user_manager/user_manager.h"
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -27,7 +27,7 @@
  #include "components/power_metrics/system_power_monitor.h"
  #endif
  
-@@ -872,7 +872,7 @@ void RecordStartupMetrics() {
+@@ -873,7 +873,7 @@ void RecordStartupMetrics() {
  
    // Record whether Chrome is the default browser or not.
    // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -36,7 +36,7 @@
    shell_integration::DefaultWebClientState default_state =
        shell_integration::GetDefaultBrowser();
    base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1183,11 +1183,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -1181,11 +1181,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
        std::make_unique<web_app::SamplingMetricsProvider>();
  #endif  // !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index d9dca66e0070..c23c053dc3a7 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -196,11 +196,11 @@
+@@ -197,11 +197,11 @@
  #include "chrome/browser/metrics/google_update_metrics_provider_mac.h"
  #endif
  
@@ -41,7 +41,7 @@
    // Register the environment with the crash reporter. Note that there is a
    // window from startup to this point during which crash reports will not have
    // an environment set.
-@@ -724,7 +724,7 @@ void ChromeMetricsServiceClient::Initialize() {
+@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::Initialize() {
          std::make_unique<metrics::dwa::DwaService>(this, local_state);
    }
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -50,7 +50,7 @@
    metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
        base::SequencedTaskRunner::GetCurrentDefault());
  #endif
-@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -781,7 +781,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::CPUMetricsProvider>());
  
@@ -59,7 +59,7 @@
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::MotherboardMetricsProvider>());
  #endif
-@@ -873,7 +873,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
        std::make_unique<GoogleUpdateMetricsProviderMac>());
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
index 0f248c8ac0af..4cac38be1df0 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/metrics/perf/cpu_identity.cc
-@@ -145,7 +145,7 @@ CPUIdentity GetCPUIdentity() {
+@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() {
    result.release =
  #if BUILDFLAG(IS_CHROMEOS)
        base::SysInfo::KernelVersion();
diff --git a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc
index 348deb04c9ab..98f38582892d 100644
--- a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc
+++ b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc
@@ -1,15 +1,15 @@
---- chrome/browser/net/profile_network_context_service.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/net/profile_network_context_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/net/profile_network_context_service.cc
-@@ -134,7 +134,7 @@
+@@ -135,7 +135,7 @@
  #include "extensions/common/constants.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -261,7 +261,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+@@ -276,7 +276,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
        });
  }
  
@@ -18,7 +18,7 @@
  std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
      Profile* profile,
      std::unique_ptr<net::ClientCertStore> platform_store) {
-@@ -1202,7 +1202,7 @@ ProfileNetworkContextService::CreateClientCertStore() 
+@@ -1228,7 +1228,7 @@ ProfileNetworkContextService::CreateClientCertStore() 
        std::make_unique<net::ClientCertStoreNSS>(
            base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate,
                                kCryptoModulePasswordClientAuth));
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 7d21a4c7f55c..f11b50cbdcf8 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -134,7 +134,7 @@ SystemNetworkContextManager* g_system_network_context_
+@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_
  // received a failed launch for a sandboxed network service.
  bool g_previously_failed_to_launch_sandboxed_service = false;
  
@@ -9,7 +9,7 @@
  // Whether kerberos library loading will work in the network service due to the
  // sandbox.
  bool g_network_service_will_allow_gssapi_library_load = false;
-@@ -142,7 +142,7 @@ bool g_network_service_will_allow_gssapi_library_load 
+@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load 
  const char* kGssapiDesiredPref =
  #if BUILDFLAG(IS_CHROMEOS)
      prefs::kKerberosEnabled;
@@ -18,7 +18,7 @@
      prefs::kReceivedHttpAuthNegotiateHeader;
  #endif
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -188,7 +188,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
    auth_dynamic_params->basic_over_http_enabled =
        local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
  
@@ -27,7 +27,7 @@
    auth_dynamic_params->delegate_by_kdc_policy =
        local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -203,7 +203,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
        local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -36,7 +36,7 @@
    auth_dynamic_params->allow_gssapi_library_load =
        local_state->GetBoolean(kGssapiDesiredPref);
  #endif  // BUILDFLAG(IS_CHROMEOS)
-@@ -213,7 +213,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
  
  void OnNewHttpAuthDynamicParams(
      network::mojom::HttpAuthDynamicParamsPtr& params) {
@@ -45,7 +45,7 @@
    // The kerberos library is incompatible with the network service sandbox, so
    // if library loading is now enabled, the network service needs to be
    // restarted. It will be restarted unsandboxed because is
-@@ -255,11 +255,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    if (g_previously_failed_to_launch_sandboxed_service) {
      return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
    }
@@ -59,7 +59,7 @@
    // The network service sandbox and the kerberos library are incompatible.
    // If kerberos is enabled by policy, disable the network service sandbox.
    if (g_network_service_will_allow_gssapi_library_load ||
-@@ -275,7 +275,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -68,7 +68,7 @@
    if (local_state &&
        local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
      return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -519,7 +519,7 @@ void SystemNetworkContextManager::DeleteInstance() {
+@@ -522,7 +522,7 @@ void SystemNetworkContextManager::DeleteInstance() {
    g_system_network_context_manager = nullptr;
  }
  
@@ -77,7 +77,7 @@
  SystemNetworkContextManager::GssapiLibraryLoadObserver::
      GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
      : owner_(owner) {}
-@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
                               auth_pref_callback);
  
@@ -86,7 +86,7 @@
    pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -591,7 +591,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -95,7 +95,7 @@
    pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  
-@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -659,7 +659,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
                                 std::string());
  
@@ -104,7 +104,7 @@
    registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
                                  false);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -681,11 +681,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -684,11 +684,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
  
    registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
  
@@ -118,7 +118,7 @@
    registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -738,7 +738,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -741,7 +741,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
    network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
  
@@ -127,7 +127,7 @@
    gssapi_library_loader_observer_.Install(network_service);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
+@@ -960,7 +960,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
        break;
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index c5483b66150f..f11cc7710fd9 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -642,7 +642,7 @@ void ChromePasswordManagerClient::
+@@ -638,7 +638,7 @@ void ChromePasswordManagerClient::
  bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
      device_reauth::DeviceAuthenticator* authenticator) {
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
    if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
      return false;
    }
-@@ -920,7 +920,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
+@@ -916,7 +916,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
  }
  
  void ChromePasswordManagerClient::NotifyKeychainError() {
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index e5c62d964a2d..aa13bc946885 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
 @@ -255,19 +255,19 @@
  #include "components/spellcheck/browser/pref_names.h"
@@ -39,7 +39,7 @@
  #include "components/search_engines/enterprise/search_aggregator_policy_handler.h"
  #include "components/search_engines/enterprise/site_search_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -595,7 +595,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -592,7 +592,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
    { key::kDefaultDirectSocketsSetting,
      prefs::kManagedDefaultDirectSocketsSetting,
      base::Value::Type::INTEGER },
@@ -48,7 +48,7 @@
    { key::kDeletingUndecryptablePasswordsEnabled,
      password_manager::prefs::kDeletingUndecryptablePasswordsEnabled,
      base::Value::Type::BOOLEAN },
-@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -957,7 +957,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kManagedDefaultGeolocationSetting,
      base::Value::Type::INTEGER },
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -57,7 +57,7 @@
    { key::kRequireOnlineRevocationChecksForLocalAnchors,
      prefs::kCertRevocationCheckingRequiredLocalAnchors,
      base::Value::Type::BOOLEAN },
-@@ -975,7 +975,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
          // || BUILDFLAG(IS_WIN)  || BUILDFLAG(IS_MAC)
@@ -66,7 +66,7 @@
    { key::kFullscreenAllowed,
      prefs::kFullscreenAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1821,7 +1821,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::INTEGER},
  #endif // BUILDFLAG(IS_CHROMEOS)
  
@@ -75,7 +75,7 @@
    { key::kGSSAPILibraryName,
      prefs::kGSSAPILibraryName,
      base::Value::Type::STRING },
-@@ -1880,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -84,7 +84,7 @@
    { key::kNetworkServiceSandboxEnabled,
      prefs::kNetworkServiceSandboxEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1900,12 +1900,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1921,12 +1921,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kTotalMemoryLimitMb,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -99,7 +99,7 @@
    { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
      device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1916,7 +1916,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1937,7 +1937,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kLiveTranslateEnabled,
      base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -108,7 +108,7 @@
    { key::kDefaultBrowserSettingEnabled,
      prefs::kDefaultBrowserSettingEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1928,7 +1928,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -117,7 +117,7 @@
    { key::kAutoplayAllowed,
      prefs::kAutoplayAllowed,
      base::Value::Type::BOOLEAN },
-@@ -2029,7 +2029,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2050,7 +2050,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
  
@@ -126,8 +126,8 @@
    { key::kAlternativeBrowserPath,
      browser_switcher::prefs::kAlternativeBrowserPath,
      base::Value::Type::STRING },
-@@ -2131,7 +2131,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::LIST },
+@@ -2155,7 +2155,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -135,7 +135,7 @@
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
-@@ -2202,7 +2202,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      ash::prefs::kUrlParameterToAutofillSAMLUsername,
      base::Value::Type::STRING },
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -144,7 +144,7 @@
    { key::kTabDiscardingExceptions,
      performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
      base::Value::Type::LIST },
-@@ -2231,7 +2231,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kUiAutomationProviderEnabled,
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
@@ -153,7 +153,7 @@
    { key::kOutOfProcessSystemDnsResolutionEnabled,
      prefs::kOutOfProcessSystemDnsResolutionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2271,7 +2271,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2298,7 +2298,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::INTEGER },
  #endif
  #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -162,7 +162,7 @@
    { key::kExtensionInstallTypeBlocklist,
      extensions::pref_names::kExtensionInstallTypeBlocklist,
      base::Value::Type::LIST},
-@@ -2297,7 +2297,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2324,7 +2324,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
    { key::kTabCompareSettings,
      optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
      base::Value::Type::INTEGER},
@@ -171,7 +171,7 @@
    { key::kChromeForTestingAllowed,
      prefs::kChromeForTestingAllowed,
      base::Value::Type::BOOLEAN },
-@@ -2483,7 +2483,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2513,7 +2513,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    // Policies for all platforms - End
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -180,7 +180,7 @@
    handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
        key::kMemorySaverModeSavings,
        performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
-@@ -2710,7 +2710,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2734,7 +2734,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -189,7 +189,7 @@
    handlers->AddHandler(
        std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
    handlers->AddHandler(
-@@ -2763,7 +2763,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2793,7 +2793,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
        key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
        chrome_schema));
  
@@ -198,7 +198,7 @@
    handlers->AddHandler(std::make_unique<GuestModePolicyHandler>());
    handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
    handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
-@@ -2849,7 +2849,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2890,7 +2890,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
        signin_legacy_policies;
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -207,7 +207,7 @@
    signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
        key::kForceBrowserSignin, prefs::kForceBrowserSignin,
        base::Value::Type::BOOLEAN));
-@@ -3221,7 +3221,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3262,7 +3262,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif
  
  #if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -216,7 +216,7 @@
    handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
    handlers->AddHandler(
        std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -3229,7 +3229,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3270,7 +3270,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -225,7 +225,7 @@
    handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
        key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
        base::Value::Type::BOOLEAN));
-@@ -3247,7 +3247,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3288,7 +3288,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            first_party_sets::FirstPartySetsOverridesPolicyHandler>(
            key::kRelatedWebsiteSetsOverrides, chrome_schema)));
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -234,7 +234,7 @@
    handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-@@ -3270,7 +3270,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3311,7 +3311,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            base::Value::Type::BOOLEAN)));
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -243,7 +243,7 @@
    handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -3288,7 +3288,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3329,7 +3329,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails>
        gen_ai_default_policies;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index 254df20e98aa..e2256696bbcd 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,15 +1,15 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -312,7 +312,7 @@
- #include "components/ntp_tiles/custom_links_manager_impl.h"
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -316,7 +316,7 @@
+ #include "chrome/browser/devtools/devtools_window.h"
+ #endif  // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -481,11 +481,11 @@
+@@ -487,11 +487,11 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -23,7 +23,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
-@@ -513,7 +513,7 @@
+@@ -519,7 +519,7 @@
  #include "chrome/browser/sessions/session_service_log.h"
  #endif
  
@@ -32,7 +32,7 @@
  #include "ui/color/system_theme.h"
  #endif
  
-@@ -1663,7 +1663,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+@@ -1664,7 +1664,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
    on_device_translation::RegisterLocalStatePrefs(registry);
  #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
  
@@ -41,7 +41,7 @@
    WhatsNewUI::RegisterLocalStatePrefs(registry);
  #endif
  
-@@ -1822,7 +1822,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+@@ -1821,7 +1821,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
  #endif  // BUILDFLAG(ENABLE_PDF)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -50,7 +50,7 @@
    registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
  #endif
  
-@@ -2176,12 +2176,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -2177,12 +2177,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_printing_printer__query.cc b/www/chromium/files/patch-chrome_browser_printing_printer__query.cc
index c59a3ef146e0..0ff8137c63c5 100644
--- a/www/chromium/files/patch-chrome_browser_printing_printer__query.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_printer__query.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/printer_query.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/printing/printer_query.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/printing/printer_query.cc
-@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
+@@ -342,7 +342,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
      crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
          printer_name, print_backend->GetPrinterDriverInfo(printer_name));
  
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index e3861cf1054c..308895bb39e3 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -350,7 +350,7 @@
+@@ -358,7 +358,7 @@
  #endif
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/idle/idle_service_factory.h"
  #endif
  
-@@ -392,7 +392,7 @@
+@@ -400,7 +400,7 @@
  #endif
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
  #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
-@@ -400,7 +400,7 @@
+@@ -408,7 +408,7 @@
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
  #endif
  
@@ -27,7 +27,7 @@
  #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
  #endif
  
-@@ -408,7 +408,7 @@
+@@ -416,7 +416,7 @@
  #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h"
  #endif
  
@@ -36,7 +36,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
-@@ -722,7 +722,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    DiceBoundSessionCookieServiceFactory::GetInstance();
  #endif
  #endif
@@ -45,7 +45,7 @@
    browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
  #endif
    browser_sync::UserEventServiceFactory::GetInstance();
-@@ -779,7 +779,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -787,7 +787,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    commerce::ShoppingServiceFactory::GetInstance();
    ConsentAuditorFactory::GetInstance();
    ContentIndexProviderFactory::GetInstance();
@@ -54,9 +54,9 @@
    contextual_cueing::ContextualCueingServiceFactory::GetInstance();
  #endif
    CookieControlsServiceFactory::GetInstance();
-@@ -834,31 +834,31 @@ void ChromeBrowserMainExtraPartsProfiles::
- #endif
+@@ -843,31 +843,31 @@ void ChromeBrowserMainExtraPartsProfiles::
    enterprise_connectors::ConnectorsServiceFactory::GetInstance();
+   enterprise_connectors::ReportingEventRouterFactory::GetInstance();
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
@@ -92,7 +92,7 @@
    enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
  #endif
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -985,7 +985,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_ANDROID)
    MerchantViewerDataManagerFactory::GetInstance();
  #endif
@@ -101,7 +101,7 @@
    metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1101,7 +1101,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_CHROMEOS)
    policy::PolicyCertServiceFactory::GetInstance();
  #endif
@@ -110,7 +110,7 @@
    policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
-@@ -1147,7 +1147,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1157,7 +1157,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
    ProfileStatisticsFactory::GetInstance();
  #endif
@@ -119,7 +119,7 @@
    ProfileTokenWebSigninInterceptorFactory::GetInstance();
    OidcAuthenticationSigninInterceptorFactory::GetInstance();
  #endif
-@@ -1167,7 +1167,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1177,7 +1177,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    ReduceAcceptLanguageFactory::GetInstance();
    RendererUpdaterFactory::GetInstance();
    regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance();
@@ -128,7 +128,7 @@
    reporting::ManualTestHeartbeatEventFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1354,7 +1354,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1368,7 +1368,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    WebDataServiceFactory::GetInstance();
    webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
index e97c5af61f73..e67848c14ce6 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/profiles/profile_impl.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/profiles/profile_impl.cc
 @@ -270,6 +270,10 @@
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -20,7 +20,7 @@
      ProfileManager* profile_manager = g_browser_process->profile_manager();
      ProfileAttributesEntry* entry =
          profile_manager->GetProfileAttributesStorage()
-@@ -892,7 +896,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
+@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
  }
  
  base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
index bdee9dee0344..405556ee5075 100644
--- a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
@@ -1,24 +1,6 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc
-@@ -8,7 +8,7 @@
- #include "base/strings/string_util.h"
- #include "components/country_codes/country_codes.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/variations/service/variations_service.h"
- #endif
- 
-@@ -20,7 +20,7 @@
- #endif
- 
- namespace regional_capabilities {
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- RegionalCapabilitiesServiceClient::RegionalCapabilitiesServiceClient(
-     variations::VariationsService* variations_service)
-@@ -56,7 +56,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId
+@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId
        base::android::AttachCurrentThread(),
        reinterpret_cast<intptr_t>(heap_callback.release()));
  }
@@ -26,4 +8,4 @@
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void RegionalCapabilitiesServiceClient::FetchCountryId(
      CountryIdCallback on_country_id_fetched) {
-   std::move(on_country_id_fetched).Run(variations_country_id_);
+   std::move(on_country_id_fetched).Run(variations_latest_country_id_);
diff --git a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h
deleted file mode 100644
index 96cd8c09366b..000000000000
--- a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_client.h.orig	2025-03-05 08:14:56 UTC
-+++ chrome/browser/regional_capabilities/regional_capabilities_service_client.h
-@@ -21,7 +21,7 @@ namespace regional_capabilities {
- class RegionalCapabilitiesServiceClient
-     : public RegionalCapabilitiesService::Client {
-  public:
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   explicit RegionalCapabilitiesServiceClient(
-       variations::VariationsService* variations_service);
- #else
-@@ -35,7 +35,7 @@ class RegionalCapabilitiesServiceClient
-   void FetchCountryId(CountryIdCallback country_id_fetched_callback) override;
- 
-  private:
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const int variations_country_id_;
- #endif
- };
diff --git a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc
deleted file mode 100644
index 11f11df7ae7b..000000000000
--- a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc.orig	2025-03-05 08:14:56 UTC
-+++ chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc
-@@ -12,7 +12,7 @@
- #include "chrome/browser/regional_capabilities/regional_capabilities_service_client.h"
- #include "components/regional_capabilities/regional_capabilities_service.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/variations/service/variations_service.h"
- #endif
- 
-@@ -57,7 +57,7 @@ RegionalCapabilitiesServiceFactory::BuildServiceInstan
-   Profile* profile = Profile::FromBrowserContext(context);
-   auto regional_capabilities_service_client =
-       std::make_unique<RegionalCapabilitiesServiceClient>(
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-           g_browser_process->variations_service()
- #endif
-       );
diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
index ac0e47ea0c69..b42bc309272f 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
  #include "ui/views/controls/textfield/textfield.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/linux/linux_ui.h"
-@@ -181,7 +181,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -180,7 +180,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
    prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
  #endif
  
@@ -18,7 +18,7 @@
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    if (linux_ui_theme) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -204,7 +204,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -203,7 +203,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
index f65000f90872..61548d175aac 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-02-19 07:43:18 UTC
+--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
-@@ -1251,7 +1251,7 @@ std::string ChromePasswordProtectionService::GetOrgani
+@@ -1262,7 +1262,7 @@ std::string ChromePasswordProtectionService::GetOrgani
      ReusedPasswordAccountType password_type) const {
    if (base::FeatureList::IsEnabled(
            safe_browsing::kEnterprisePasswordReuseUiRefresh)) {
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
index 74c1434d94af..192f8b507a6a 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
@@ -1,8 +1,8 @@
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
 @@ -20,7 +20,7 @@
+ #include "components/safe_browsing/core/common/safebrowsing_switches.h"
  #include "net/base/url_util.h"
- #include "third_party/abseil-cpp/absl/types/variant.h"
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
index f5c2ca5b3c28..ccb69ca04edf 100644
--- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
+++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
@@ -1,6 +1,6 @@
---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/screen_ai/screen_ai_service_router.cc
-@@ -316,7 +316,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -403,7 +403,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
    base::FilePath binary_path = state_instance->get_component_binary_path();
  #if BUILDFLAG(IS_WIN)
    std::vector<base::FilePath> preload_libraries = {binary_path};
@@ -9,7 +9,7 @@
    std::vector<std::string> extra_switches = {
        base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
                           binary_path.MaybeAsASCII().c_str())};
-@@ -330,7 +330,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -417,7 +417,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
            .WithPreloadedLibraries(
                preload_libraries,
                content::ServiceProcessHostPreloadLibraries::GetPassKey())
diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
deleted file mode 100644
index 659c452c1a4b..000000000000
--- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2024-06-17 12:56:06 UTC
-+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
-@@ -15,7 +15,7 @@
- #include "components/send_tab_to_self/features.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
-@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController*
- ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
-     Profile* profile) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   for (const std::unique_ptr<ReceivingUiHandler>& handler :
-        applicable_handlers_) {
-     auto* button_controller =
diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
deleted file mode 100644
index 2e99aa0f1f64..000000000000
--- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig	2024-03-22 08:19:40 UTC
-+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
-@@ -16,7 +16,7 @@
- #include "components/send_tab_to_self/send_tab_to_self_model.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
- 
-@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
-     const std::vector<const SendTabToSelfEntry*>& new_entries) {
-   for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     // Only respond to notifications corresponding to this service's profile
-     // for these OSes; mobile does not have a Profile.
-     // Cast note: on desktop, handlers are guaranteed to be the derived class
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
index cb3d1726a05e..4df75046d0f7 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-02-19 07:43:18 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
-@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
+@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
        return;
      }
    }
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
index 1e43c4457ab2..cb219644e757 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
-@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager::
+@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager::
      ActivateManagementPolicyAndUpdateRegistration() {
    SetActiveForSupervisedUsers();
    UpdateManagementPolicyRegistration();
@@ -9,7 +9,7 @@
    MaybeMarkExtensionsLocallyParentApproved();
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  }
-@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
+@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
    return false;
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
index d5817248aa74..e2e36bef40ea 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
-@@ -34,12 +34,12 @@
+@@ -33,12 +33,12 @@
  #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "ui/android/view_android.h"
@@ -15,7 +15,7 @@
  namespace {
  bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) {
    if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) {
-@@ -161,7 +161,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
+@@ -160,7 +160,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
      return content::NavigationThrottle::DEFER;
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index 72bf7ecb0049..5c7472ee96ec 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -227,7 +227,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
index fc8fb599d72d..7b934e2558a8 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/themes/theme_service.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/themes/theme_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/themes/theme_service.cc
-@@ -71,7 +71,7 @@
+@@ -72,7 +72,7 @@
  #include "extensions/browser/extension_registry_observer.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #include "ui/ozone/public/ozone_platform.h"  // nogncheck
  #endif
-@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
+@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
  }
  
  bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
index d19754fecb12..365508a09335 100644
--- a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
+++ b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/actions/chrome_action_id.h
-@@ -495,7 +495,7 @@
+@@ -497,7 +497,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
  #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
    E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU)
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h
index 6817880469e2..c2bb0430604d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser.h.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/browser.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/browser.h
-@@ -300,7 +300,7 @@ class Browser : public TabStripModelObserver,
+@@ -301,7 +301,7 @@ class Browser : public TabStripModelObserver,
      std::optional<int64_t> display_id;
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index a18a1e07ea5d..f3faad55e1d2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,14 +1,14 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -127,7 +127,7 @@
+@@ -126,7 +126,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/base/ime/text_edit_commands.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
- #endif
 @@ -136,7 +136,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif
@@ -18,7 +18,7 @@
  #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h"
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  
-@@ -329,7 +329,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -332,7 +332,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  #endif
    }
  
@@ -27,7 +27,7 @@
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    auto* linux_ui = ui::LinuxUi::instance();
-@@ -581,7 +581,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -595,7 +595,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -36,7 +36,7 @@
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -801,7 +801,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -812,7 +812,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
      case IDC_CREATE_SHORTCUT:
        base::RecordAction(base::UserMetricsAction("CreateShortcut"));
@@ -45,7 +45,7 @@
        chrome::CreateDesktopShortcutForActiveWebContents(browser_);
  #else
        web_app::CreateWebAppFromCurrentWebContents(
-@@ -968,7 +968,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -979,7 +979,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
      case IDC_CHROME_WHATS_NEW:
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
@@ -54,7 +54,7 @@
        ShowChromeWhatsNew(browser_);
        break;
  #else
-@@ -1284,7 +1284,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1324,7 +1324,7 @@ void BrowserCommandController::InitCommandState() {
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
  #endif
@@ -63,7 +63,7 @@
    command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
-@@ -1640,7 +1640,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
+@@ -1682,7 +1682,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
    bool can_create_web_app = web_app::CanCreateWebApp(browser_);
    command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
index 0100ef1f4ba1..14767a619b02 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_commands.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/browser_commands.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/browser_commands.cc
-@@ -1991,7 +1991,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
+@@ -1980,7 +1980,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
    } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
      UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
    } else {
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
index 691f6afd796a..f0d91f49c60e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/browser_ui_prefs.cc
-@@ -71,7 +71,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
+@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
    registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
    registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime,
                               base::Time());
@@ -9,7 +9,7 @@
    registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser,
                                 std::string());
    registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser,
-@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
+@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
    registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
index 17315a7f1243..afe68115c9f6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/chrome_pages.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/chrome_pages.cc
-@@ -85,7 +85,7 @@
+@@ -84,7 +84,7 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/web_applications/web_app_utils.h"
  #endif
  
-@@ -379,7 +379,7 @@ void ShowChromeTips(Browser* browser) {
+@@ -381,7 +381,7 @@ void ShowChromeTips(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeTipsURL));
  }
  
@@ -18,7 +18,7 @@
  void ShowChromeWhatsNew(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL));
  }
-@@ -702,7 +702,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+@@ -699,7 +699,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/www/chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
new file mode 100644
index 000000000000..4eb8e8132d6c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig	2025-05-05 10:57:53 UTC
++++ chrome/browser/ui/prefs/prefs_tab_helper.cc
+@@ -66,7 +66,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If a font name in prefs default values starts with a comma, consider it's a
+ // comma-separated font list and resolve it to the first available font.
+ #define PREFS_FONT_LIST 1
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
index fa61a3ee45c6..c03d91816c5f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/signin/signin_view_controller.cc
-@@ -428,7 +428,7 @@ void SigninViewController::ShowModalSyncConfirmationDi
+@@ -443,7 +443,7 @@ void SigninViewController::ShowModalSyncConfirmationDi
  void SigninViewController::ShowModalManagedUserNoticeDialog(
      std::unique_ptr<signin::EnterpriseProfileCreationDialogParams>
          create_param) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 0d982f92228b..8c49c2a1b83d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-02-19 07:43:18 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -94,7 +94,7 @@ const char* const kBadFlags[] = {
+@@ -95,7 +95,7 @@ const char* const kBadFlags[] = {
      extensions::switches::kExtensionsOnChromeURLs,
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
index a3ee1d989aa6..1a918056de7c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
 @@ -76,7 +76,7 @@
  #include "components/app_restore/full_restore_utils.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -207,7 +207,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
      // at the state of the MessageLoop.
      Browser::CreateParams params = Browser::CreateParams(profile_, false);
      params.creation_source = Browser::CreationSource::kStartupCreator;
@@ -18,7 +18,7 @@
      params.startup_id =
          command_line_->GetSwitchValueASCII("desktop-startup-id");
  #endif
-@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
        continue;
      }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index ab0441c407aa..c7af8feb9e8d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -216,7 +216,7 @@
+@@ -218,7 +218,7 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -687,12 +687,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -697,12 +697,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
    webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents);
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc b/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc
index d63c725a903c..60d340d8fb6c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tabs/features.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/tabs/features.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/tabs/features.cc
-@@ -48,7 +48,7 @@ bool CanShowTabSearchPositionSetting() {
+@@ -47,7 +47,7 @@ bool CanShowTabSearchPositionSetting() {
    }
  // Mac and other platforms will always have the tab search position in the
  // correct location, cros/linux/win git the user the option to change.
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index 5c464c4e2efb..5707a0a44484 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,15 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -530,7 +530,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
+@@ -419,7 +419,7 @@ TaskManagerTableModel::~TaskManagerTableModel() {
+   // Note: system_total_time_ is used for both since there is no functional
+   // difference between browser & system (they are essentially the same tab).
+   // Instead, the data is routed to the platform appropriate bucket.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser,
+                                      system_total_time_);
+ #elif BUILDFLAG(IS_CHROMEOS)
+@@ -560,7 +560,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
                   ? stringifier_->backgrounded_string()
                   : stringifier_->foregrounded_string();
  
@@ -9,7 +18,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
        return fd_count >= 0 ? base::FormatNumber(fd_count)
-@@ -693,7 +693,7 @@ int TaskManagerTableModel::CompareValues(size_t row1,
+@@ -723,7 +723,7 @@ int TaskManagerTableModel::CompareValues(size_t row1,
        return BooleanCompare(is_proc1_bg, is_proc2_bg);
      }
  
@@ -18,7 +27,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -935,7 +935,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -1030,7 +1030,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
index ad4d88d4163e..04c9f6597707 100644
--- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/ui_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/ui_features.cc
-@@ -67,7 +67,7 @@ bool IsExtensionMenuInRootAppMenu() {
+@@ -45,7 +45,7 @@ bool IsExtensionMenuInRootAppMenu() {
    return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu);
  }
  
@@ -9,7 +9,7 @@
  // Enables the feature to remove the last confirmation dialog when relaunching
  // to update Chrome.
  BASE_FEATURE(kFewerUpdateConfirmations,
-@@ -333,7 +333,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
+@@ -326,7 +326,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
index a5cb417561be..7e36f6aa8003 100644
--- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/ui_features.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/ui_features.h
-@@ -47,7 +47,7 @@ extern const base::FeatureParam<int> kMaxPromptCount;
+@@ -31,7 +31,7 @@ BASE_DECLARE_FEATURE(kCloseOmniboxPopupOnInactiveAreaC
  BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu);
  bool IsExtensionMenuInRootAppMenu();
  
@@ -9,7 +9,7 @@
  BASE_DECLARE_FEATURE(kFewerUpdateConfirmations);
  #endif
  
-@@ -211,7 +211,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog);
+@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog);
  BASE_DECLARE_FEATURE(kViewsJSAppModalDialog);
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 3877c0f4eb56..e71b06aa211e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/accelerator_table.cc
-@@ -67,11 +67,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -70,11 +70,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
      {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
      {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
@@ -14,7 +14,7 @@
      {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
      {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
       IDC_MOVE_TAB_PREVIOUS},
-@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -102,7 +102,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
      {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
      {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
@@ -23,7 +23,7 @@
      {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -151,7 +151,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
       IDC_SHOW_AVATAR_MENU},
  
  // Platform-specific key maps.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index e1c8ba037fe5..5c1902813db9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
 @@ -52,7 +52,7 @@
  #include "ui/aura/window.h"
@@ -18,7 +18,7 @@
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -182,7 +182,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() {
  
    Init(std::move(params));
  
@@ -27,7 +27,7 @@
    SelectNativeTheme();
  #else
    SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi());
-@@ -368,7 +368,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
    chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
    chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
                                             IsVisibleOnAllWorkspaces());
@@ -36,7 +36,7 @@
    // If the window was sent to a different workspace, prioritize it if
    // it was sent to the current workspace and deprioritize it
    // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()
-@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() {
+@@ -568,7 +568,7 @@ void BrowserFrame::OnMenuClosed() {
  }
  
  void BrowserFrame::SelectNativeTheme() {
@@ -45,7 +45,7 @@
    // Use the regular NativeTheme instance if running incognito mode, regardless
    // of system theme (gtk, qt etc).
    ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
-@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() {
+@@ -609,7 +609,7 @@ void BrowserFrame::OnTouchUiChanged() {
  bool BrowserFrame::RegenerateFrameOnThemeChange(
      BrowserThemeChangeType theme_change_type) {
    bool need_regenerate = false;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index 057bf0c7e207..d41c8408c6aa 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2519,7 +2519,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
+@@ -2581,7 +2581,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
  }
  
  void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
@@ -9,7 +9,7 @@
    GetContentsWebView()->SetFastResize(is_dragging);
    if (multi_contents_view_) {
      multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging);
-@@ -5559,7 +5559,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() {
+@@ -5825,7 +5825,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() {
  }
  
  void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index 67b1d652fa2d..8ebaff8abe45 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
 @@ -62,7 +62,7 @@
  #include "ui/aura/window.h"
@@ -9,7 +9,16 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
-@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16;
+@@ -76,7 +76,7 @@
+ 
+ // Windows, Mac and CrOS do not clip child widgets to their parents, so we
+ // don't have to worry about resizing quite as much.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define PLATFORM_CLIPS_CHILD_WINDOWS
+ #endif
+ 
+@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 16;
  // The height of the controls bar at the top of the window.
  constexpr int kTopControlsHeight = 34;
  
@@ -18,7 +27,7 @@
  // Frame border when window shadow is not drawn.
  constexpr int kFrameBorderThickness = 4;
  #endif
-@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::EventObserver {
  
      gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
  
@@ -27,7 +36,7 @@
      // Calculate input bounds for Linux. This is needed because the input bounds
      // is not necessary the same as the local bounds on Linux.
      if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -618,7 +618,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -630,7 +630,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
          AddChildView(std::move(auto_pip_setting_overlay));
    }
  
@@ -36,7 +45,7 @@
    auto* profile = browser_view->browser()->profile();
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -843,7 +843,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -855,7 +855,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
      view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
    }
  
@@ -45,7 +54,7 @@
    // On Linux the top bar background will be drawn in OnPaint().
    top_bar_container_view_->SetBackground(views::CreateSolidBackground(
        color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -932,7 +932,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -944,7 +944,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
    BrowserNonClientFrameView::RemovedFromWidget();
  }
  
@@ -54,7 +63,7 @@
  gfx::Insets
  PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const {
    auto border = FrameBorderInsets();
-@@ -1223,7 +1223,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -1235,7 +1235,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
  // views::View implementations:
  
  void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +72,7 @@
    // Draw the PiP window frame borders and shadows, including the top bar
    // background.
    if (window_frame_provider_) {
-@@ -1378,7 +1378,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -1390,7 +1390,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,7 +81,7 @@
    if (window_frame_provider_) {
      const auto insets = window_frame_provider_->GetFrameThicknessDip();
      const bool tiled = frame()->tiled();
-@@ -1396,7 +1396,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+@@ -1408,7 +1408,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -81,7 +90,7 @@
    return FrameBorderInsets();
  #elif !BUILDFLAG(IS_CHROMEOS)
    return gfx::Insets(kResizeBorder);
-@@ -1417,7 +1417,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+@@ -1429,7 +1429,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
                     top_height + border_thickness.bottom());
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
index 5cf5eb1c7d60..eb34af47f3dc 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
 @@ -30,7 +30,7 @@
  #include "ui/views/layout/flex_layout_view.h"
@@ -9,7 +9,7 @@
  #include "ui/linux/window_frame_provider.h"
  #endif
  
-@@ -90,7 +90,7 @@ class PictureInPictureBrowserFrameView
+@@ -87,7 +87,7 @@ class PictureInPictureBrowserFrameView
    void Layout(PassKey) override;
    void AddedToWidget() override;
    void RemovedFromWidget() override;
@@ -18,7 +18,7 @@
    gfx::Insets RestoredMirroredFrameBorderInsets() const override;
    gfx::Insets GetInputInsets() const override;
    SkRRect GetRestoredClipRegion() const override;
-@@ -182,7 +182,7 @@ class PictureInPictureBrowserFrameView
+@@ -179,7 +179,7 @@ class PictureInPictureBrowserFrameView
    // Returns true if there's an overlay view that's currently shown.
    bool IsOverlayViewVisible() const;
  
@@ -27,7 +27,7 @@
    // Returns whether a client-side shadow should be drawn for the window.
    bool ShouldDrawFrameShadow() const;
  
-@@ -391,7 +391,7 @@ class PictureInPictureBrowserFrameView
+@@ -388,7 +388,7 @@ class PictureInPictureBrowserFrameView
    // `top_bar_color_animation_`.
    std::optional<SkColor> current_foreground_color_;
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index 1a403a6e4681..ecb6392296d2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-02-19 07:43:18 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -419,7 +419,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
+@@ -452,7 +452,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
index 57a414686282..e6daffd22553 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc
-@@ -2064,7 +2064,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem(
+@@ -2089,7 +2089,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem(
  }
  
  void OmniboxViewViews::OnPopupOpened() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
index 2ec1dafba009..a74abe948939 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -91,7 +91,7 @@
+@@ -92,7 +92,7 @@
  #include "ui/strings/grit/ui_strings.h"
  #include "ui/views/accessibility/view_accessibility.h"
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
  
-@@ -549,7 +549,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() {
+@@ -550,7 +550,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() {
      case signin_util::SignedInState::kSignedOut:
      case signin_util::SignedInState::kWebOnlySignedIn: {
        std::string profile_user_display_name, profile_user_email;
@@ -18,7 +18,7 @@
        profile_user_display_name = profile->GetPrefs()->GetString(
            enterprise_signin::prefs::kProfileUserDisplayName);
        profile_user_email = profile->GetPrefs()->GetString(
-@@ -646,7 +646,7 @@ void ProfileMenuView::BuildIdentity() {
+@@ -647,7 +647,7 @@ void ProfileMenuView::BuildIdentity() {
          badge_image_model, menu_title_, menu_subtitle_, management_label);
    } else {
      std::string profile_user_display_name, profile_user_email;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
index 17d743ee8998..4f8285766afe 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
-@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
  
  void UpdateSystemDnDDragImage(TabDragContext* attached_context,
                                const gfx::ImageSkia& image) {
@@ -9,7 +9,7 @@
    VLOG(1) << __func__ << " image size=" << image.size().ToString();
    aura::Window* root_window =
        attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
-@@ -392,7 +392,7 @@ TabDragController::Liveness TabDragController::Init(
+@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragController::Init(
    //     synchronous on desktop Linux, so use that.
    // - ChromeOS Ash
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -18,7 +18,7 @@
    ref->can_release_capture_ = false;
  #endif
    ref->start_point_in_screen_ =
-@@ -954,7 +954,7 @@ TabDragController::Liveness TabDragController::DragBro
+@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragController::DragBro
        CHECK_EQ(SetCapture(target_context), Liveness::ALIVE);
      }
  
@@ -27,7 +27,7 @@
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() {
+@@ -1914,7 +1914,7 @@ void TabDragController::CompleteDrag() {
      }
  
      // If source window was maximized - maximize the new window as well.
@@ -36,7 +36,7 @@
      // Keeping maximized state breaks snap to Grid on Windows when dragging
      // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
      // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2527,7 +2527,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2331,7 +2331,7 @@ TabDragController::Liveness TabDragController::GetLoca
      }
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index 48e34927e220..d1768ffe74ee 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -643,7 +643,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -642,7 +642,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
      return;
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
index f32c6f896605..3137975c2d68 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -379,7 +379,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+@@ -380,7 +380,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
    // not become active. Setting this to false creates the need to explicitly
    // hide the hovercard on press, touch, and keyboard events.
    SetCanActivate(false);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
index 7e4ffe10adf9..8a65774ab1eb 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc
-@@ -96,7 +96,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow
+@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow
        base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged,
                            base::Unretained(this))));
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
index 449e3ef0b2f8..7c643ce9f7b4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/tabs/tab_style_views.cc
-@@ -511,7 +511,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con
+@@ -545,7 +545,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con
    if (!IsHoverAnimationActive()) {
      return base_opacity;
    }
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
index 3e0dbd0ac4ae..4ab33fef9a78 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -917,7 +917,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -930,7 +930,7 @@ void MaybeRegisterChromeFeaturePromos(
                  "Triggered when a shared tab becomes the active tab.")));
    }
  
@@ -9,7 +9,7 @@
    // kIPHSupervisedUserProfileSigninFeature
    registry.RegisterFeature(std::move(
        FeaturePromoSpecification::CreateForCustomAction(
-@@ -1171,7 +1171,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -1209,7 +1209,7 @@ void MaybeRegisterChromeFeaturePromos(
                         "Triggered to inform users of the availability of the "
                         "new translate screen feature on the Lens Overlay.")));
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
index 4b06ec5d241b..d242a4b372e9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-02-19 07:43:18 UTC
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
-@@ -518,7 +518,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
+@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
      Browser* browser,
      Profile* profile,
      const std::string& app_id) {
@@ -9,7 +9,7 @@
    WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
    CHECK(provider);
  
-@@ -747,7 +747,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
+@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
    }
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index 4dd5b5a69d8f..b14565ab2fb9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2024-09-30 07:45:04 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -62,7 +62,7 @@
+@@ -61,7 +61,7 @@
  #include "ui/base/window_open_disposition_utils.h"
  #include "url/gurl.h"
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
index 91334a38941c..b25a2bc1fe0e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc
 @@ -54,7 +54,7 @@
  #include "net/ssl/client_cert_store_mac.h"
@@ -6,10 +6,10 @@
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -174,7 +174,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto
  };
  #endif
  
@@ -18,7 +18,7 @@
  std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader(
      Profile* profile) {
  #if BUILDFLAG(IS_WIN)
-@@ -189,7 +189,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC
+@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC
  }
  #endif
  
@@ -27,7 +27,7 @@
  // ClientCertStore implementation that always returns an empty list. The
  // CertificateProvisioningService implementation expects to wrap a platform
  // cert store, but here we only want to get results from the provisioning
-@@ -347,7 +347,7 @@ class ClientCertSource : public CertificateManagerPage
+@@ -368,7 +368,7 @@ class ClientCertSource : public CertificateManagerPage
    std::optional<net::CertificateList> certs_;
  };
  
@@ -36,7 +36,7 @@
  // ChromeOS currently can use either Kcer or NSS for listing client certs, and
  // Linux uses NSS only. This interface provides an abstraction to hide that
  // from WritableClientCertSource. Currently this class only handles reading
-@@ -1078,7 +1078,7 @@ CreatePlatformClientCertSource(
+@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource(
      mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>*
          remote_client,
      Profile* profile) {
@@ -45,7 +45,7 @@
    return std::make_unique<WritableClientCertSource>(remote_client, profile);
  #else
    return std::make_unique<ClientCertSource>(
-@@ -1086,7 +1086,7 @@ CreatePlatformClientCertSource(
+@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource(
  #endif
  }
  
@@ -54,7 +54,7 @@
  std::unique_ptr<CertificateManagerPageHandler::CertSource>
  CreateProvisionedClientCertSource(Profile* profile) {
    return std::make_unique<ClientCertSource>(
-@@ -1135,7 +1135,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow
+@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow
  
    return client_cert_policy_ == ClientCertificateManagementPermission::kAll;
  }
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
index 19d2ffd1f539..d1b1632e0045 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -136,26 +136,26 @@
+@@ -137,7 +137,7 @@
  #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -8,7 +8,8 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h"
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h"
+@@ -145,19 +145,19 @@
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -31,7 +32,7 @@
  #include "chrome/browser/ui/webui/discards/discards_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -183,7 +183,7 @@
+@@ -185,7 +185,7 @@
  #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
  #endif  //  !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
  
@@ -40,7 +41,7 @@
  #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -320,7 +320,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -323,7 +323,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>());
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -49,16 +50,16 @@
    map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
          // BUILDFLAG(IS_OPENBSD)
-@@ -345,7 +345,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>());
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>());
-@@ -353,13 +353,13 @@ void RegisterChromeWebUIConfigs() {
+   map.AddWebUIConfig(std::make_unique<HistorySyncOptinUIConfig>());
+   map.AddWebUIConfig(std::make_unique<OnDeviceTranslationInternalsUIConfig>());
+@@ -357,13 +357,13 @@ void RegisterChromeWebUIConfigs() {
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index ce5e8dd5c8ab..0bd7ffa0c2cf 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-02-19 07:43:18 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -114,16 +114,16 @@
+@@ -118,16 +118,16 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -20,7 +20,7 @@
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -404,7 +404,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
+@@ -408,7 +408,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
      return NewTabPageUI::GetFaviconResourceBytes(scale_factor);
    }
  
@@ -29,7 +29,7 @@
    if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) {
      return WhatsNewUI::GetFaviconResourceBytes(scale_factor);
    }
-@@ -438,7 +438,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
+@@ -442,7 +442,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
    }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
index d29a2853387e..b03d128657ac 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -74,7 +74,7 @@
+@@ -77,7 +77,7 @@
  #include "components/security_interstitials/content/captive_portal_blocking_page.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
-@@ -420,7 +420,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa
+@@ -424,7 +424,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa
  }
  #endif
  
@@ -18,7 +18,7 @@
  std::unique_ptr<SupervisedUserVerificationPageForYouTube>
  CreateSupervisedUserVerificationPageForYouTube(
      content::WebContents* web_contents,
-@@ -647,7 +647,7 @@ void InterstitialHTMLSource::StartDataRequest(
+@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRequest(
      interstitial_delegate = CreateInsecureFormPage(web_contents);
    } else if (path_without_query == "/https_only") {
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 7859999dd482..9e012a3af6be 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -138,7 +138,7 @@
+@@ -140,7 +140,7 @@
  #include "chrome/browser/ui/webui/settings/system_handler.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/display/screen.h"
  #endif
  
-@@ -157,7 +157,7 @@
+@@ -159,7 +159,7 @@
  #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
  #endif
  
@@ -18,16 +18,16 @@
  #include "ui/linux/linux_ui_factory.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -282,7 +282,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
-       {"focusHighlightLabel",
-        IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+@@ -288,7 +288,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
+       {"toastAlertLevelDescription",
+        IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION},
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
        {"overscrollHistoryNavigationTitle",
         IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
        {"overscrollHistoryNavigationSubtitle",
-@@ -571,7 +571,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -577,7 +577,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
        {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT},
        {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT},
        {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT},
@@ -36,7 +36,7 @@
        {"gtkTheme", IDS_SETTINGS_GTK_THEME},
        {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
        {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -579,7 +579,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
        {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
        {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME},
  #endif
@@ -45,7 +45,7 @@
        {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -601,7 +601,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -607,7 +607,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
    html_source->AddBoolean("tabSearchIsRightAlignedAtStartup",
                            tabs::GetTabSearchTrailingTabstrip(profile));
  
@@ -54,7 +54,7 @@
    bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
                                        ->GetPlatformRuntimeProperties()
                                        .supports_server_side_window_decorations;
-@@ -1504,7 +1504,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource*
+@@ -1495,7 +1495,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource*
            g_browser_process->GetApplicationLocale())
            .spec();
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
index fc265a94a542..a5d7e4950cde 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc
-@@ -164,7 +164,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr
+@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr
        IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name);
    if (AccountInfo::IsManaged(entry->GetHostedDomain())) {
      profile_entry.Set("avatarBadge", "cr:domain");
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
index d0e6ece9250f..29eabee16859 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc
 @@ -50,7 +50,7 @@
  #include "ui/base/l10n/l10n_util.h"
@@ -18,7 +18,7 @@
    return g_browser_process->GetFeatures()->whats_new_registry();
  #else
    return nullptr;
-@@ -794,7 +794,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats
+@@ -828,7 +828,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats
  }
  
  void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() {
diff --git a/www/chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc b/www/chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
index 401118140960..6f46683174aa 100644
--- a/www/chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
+++ b/www/chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/upgrade_detector/version_history_client.cc
-@@ -50,7 +50,7 @@ GURL GetVersionReleasesUrl(base::Version version) {
+@@ -175,7 +175,7 @@ GURL GetVersionReleasesUrl(base::Version version) {
  #define CURRENT_PLATFORM "win"
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
index 9c949d8e633d..31b5b76c76ca 100644
--- a/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2024-10-22 08:31:56 UTC
+--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  #include "components/visited_url_ranking/public/visited_url_ranking_service.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h"
  #elif BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h"
-@@ -118,7 +118,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF
+@@ -119,7 +119,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF
  
    std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
index 29b450d4c67a..f587fdcba7b4 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2024-09-30 07:45:04 UTC
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/web_applications/extensions/extension_status_utils.cc
-@@ -25,7 +25,7 @@ namespace {
+@@ -26,7 +26,7 @@ namespace {
  
  const char* g_preinstalled_app_for_testing = nullptr;
  
@@ -9,7 +9,7 @@
  // TODO(b/268221237): Remove this allow-list.
  const char kDefaultAllowedExtensionIds[] =
      "alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -107,7 +107,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
+@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
    return prefs && prefs->IsExternalExtensionUninstalled(extension_id);
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
index 029dd0d30317..5c54ea96019d 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc
-@@ -660,7 +660,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu
+@@ -662,7 +662,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu
      }
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
index cbb89ec1b21f..f15b08428f30 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2023-09-13 12:11:42 UTC
+--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc
-@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT
+@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode ConvertWebAppRunOn
  // different from other platforms, see web_app_run_on_os_login_manager.h for
  // more info.
  bool DoesRunOnOsLoginRequireExecution() {
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
index 0e5f4e804f69..e5f9174dad34 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-02-19 07:43:18 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
 @@ -22,7 +22,7 @@
  #include "ui/gfx/image/image_family.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -75,7 +75,7 @@ struct ShortcutInfo {
+@@ -77,7 +77,7 @@ struct ShortcutInfo {
    // the installed PWA experience and thus the icons are not designed to be
    // displayed on an OS dock.
    bool is_diy_app = false;
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index 2fad595dc333..2843a84402be 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -574,7 +574,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
+@@ -577,7 +577,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
      g_observer->ConfiguringCable(request_type);
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
index 1bd5189fbe1a..db3008c3cbbb 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
@@ -1,20 +1,20 @@
---- chrome/browser/webauthn/enclave_manager.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/webauthn/enclave_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/webauthn/enclave_manager.cc
-@@ -711,7 +711,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
+@@ -689,7 +689,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
  
  std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return label;
  #else
    return std::string("placeholder");
-@@ -721,7 +721,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
+@@ -699,7 +699,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
  std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString(
      std::string saved_label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return saved_label;
  #else
    return std::nullopt;
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc b/www/chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc
new file mode 100644
index 000000000000..4b32bb40e936
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/webauthn/password_credential_controller.cc.orig	2025-05-05 10:57:53 UTC
++++ chrome/browser/webauthn/password_credential_controller.cc
+@@ -46,7 +46,7 @@ password_manager::PasswordManagerClient* GetPasswordMa
+ }
+ 
+ std::u16string GetAuthenticationMessage(std::string_view rp_id) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return u"";
+ #else
+   return l10n_util::GetStringFUTF16(IDS_PASSWORD_MANAGER_FILLING_REAUTH,
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/www/chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
index b62e9763071c..8a6c0b6258fd 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
@@ -1,11 +1,11 @@
---- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/browser/webauthn/unexportable_key_utils.cc
-@@ -34,7 +34,7 @@ GetWebAuthnUnexportableKeyProvider() {
+@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() {
    // If there is a scoped UnexportableKeyProvider configured, we always use
    // that so that tests can still override the key provider.
    const bool use_software_provider =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        !crypto::internal::HasScopedUnexportableKeyProvider();
  #else
        false;
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 010980dda058..37d7252582df 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/chrome_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/chrome_features.cc
 @@ -80,7 +80,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims,
  #endif  // BUILDFLAG(IS_MAC)
@@ -36,7 +36,7 @@
  // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
  // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
  // Apps will not launch and will be marked in the UI as deprecated.
-@@ -834,7 +834,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+@@ -898,7 +898,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
               "KAnonymityServiceStorage",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -45,7 +45,7 @@
  BASE_FEATURE(kLinuxLowMemoryMonitor,
               "LinuxLowMemoryMonitor",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -847,7 +847,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -911,7 +911,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
      &kLinuxLowMemoryMonitor, "critical_level", 255};
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 2d083f650aff..6717e885647b 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/chrome_features.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/chrome_features.h
 @@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims);
  #endif  // BUILDFLAG(IS_MAC)
@@ -25,7 +25,7 @@
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kShortcutsNotApps);
-@@ -494,7 +494,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
+@@ -521,7 +521,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
  
@@ -34,7 +34,7 @@
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -502,7 +502,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -529,7 +529,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index 57a467051efb..a26f97e94a41 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/chrome_paths.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/chrome_paths.cc
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
  #include "base/apple/foundation_util.h"
  #endif
  
@@ -9,9 +9,9 @@
  #include "components/policy/core/common/policy_paths.h"
  #endif
  
-@@ -44,14 +44,14 @@
+@@ -48,14 +48,14 @@ namespace {
  
- namespace {
+ std::optional<bool> g_override_using_default_data_directory_for_testing;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -27,7 +27,7 @@
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -208,7 +208,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePath* result) {
        }
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -36,7 +36,7 @@
        if (!GetUserDownloadsDirectorySafe(&cur)) {
          return false;
        }
-@@ -500,13 +500,13 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -52,7 +52,7 @@
      (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
-@@ -516,7 +516,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -61,7 +61,7 @@
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -554,7 +554,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
  
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
@@ -70,7 +70,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if BUILDFLAG(IS_MAC)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -568,6 +568,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -572,6 +572,9 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(
            FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
index 4e039448a59a..ad5a1cfe0f26 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths_internal.h.orig	2023-05-31 08:12:17 UTC
+--- chrome/common/chrome_paths_internal.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/chrome_paths_internal.h
-@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
+@@ -53,7 +53,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
  // Get the path to the user's documents directory.
  bool GetUserDocumentsDirectory(base::FilePath* result);
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index 55ddcc30c9ac..eb5cf4957763 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/chrome_switches.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -874,7 +874,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -883,7 +883,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -9,8 +9,8 @@
  const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
  
  // Causes the browser to launch directly in guest mode.
-@@ -897,7 +897,7 @@ const char kGlicAllowedOrigins[] = "glic-webui-allowed
- const char kGlicDev[] = "glic-dev";
+@@ -911,7 +911,7 @@ const char kGlicDev[] = "glic-dev";
+ const char kGlicHostLogging[] = "glic-host-logging";
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index a0ee64667f09..96c8c6c9c563 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/chrome_switches.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/chrome_switches.h
-@@ -271,7 +271,7 @@ extern const char kAllowNaClSocketAPI[];
+@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[];
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -9,8 +9,8 @@
  extern const char kEnableNewAppMenuIcon[];
  extern const char kGuest[];
  extern const char kForceNtpMobilePromo[];
-@@ -286,7 +286,7 @@ extern const char kGlicAllowedOrigins[];
- extern const char kGlicDev[];
+@@ -290,7 +290,7 @@ extern const char kGlicDev[];
+ extern const char kGlicHostLogging[];
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index f7eea785a6c8..f82244e3062e 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,4 +1,4 @@
---- chrome/common/pref_names.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/pref_names.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/pref_names.h
 @@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem
  inline constexpr char kAllowedDomainsForApps[] =
@@ -18,7 +18,7 @@
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -2120,7 +2120,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
+@@ -2129,7 +2129,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
  inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
  inline constexpr char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
  #endif
-@@ -2613,14 +2613,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
+@@ -2622,14 +2622,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
  inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -44,7 +44,7 @@
  // Records whether the user has seen an HTTP auth "negotiate" header.
  inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
      "net.received_http_auth_negotiate_headers";
-@@ -2712,7 +2712,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[
+@@ -2721,7 +2721,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[
  inline constexpr char kIsolatedWebAppPendingInitializationCount[] =
      "profile.isolated_web_app.install.pending_initialization_count";
  
@@ -53,7 +53,7 @@
  // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
  // along with kAuthNegotiateDelegateAllowlist.
  inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] 
+@@ -3240,7 +3240,7 @@ inline constexpr char kKioskChromeAppsForceAllowed[] =
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -62,7 +62,7 @@
  // Defines administrator-set availability of Chrome for Testing.
  inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed";
  #endif
-@@ -3764,7 +3764,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo
+@@ -3763,7 +3763,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo
  inline constexpr char kSandboxExternalProtocolBlocked[] =
      "profile.sandbox_external_protocol_blocked";
  
@@ -71,7 +71,7 @@
  // Boolean that indicates if system notifications are allowed to be used in
  // place of Chrome notifications.
  inline constexpr char kAllowSystemNotifications[] =
-@@ -3960,7 +3960,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] =
+@@ -3959,7 +3959,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] =
      "policy.lens_desktop_ntp_search_enabled";
  #endif
  
@@ -80,7 +80,7 @@
  // A dict mapping the edition name with the major version it was shown.
  inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used";
  // A list containing the features of each module in order of when they
-@@ -4057,7 +4057,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
+@@ -4056,7 +4056,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
      "printing.oauth2_authorization_servers";
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h
index 6a5d9d714a0f..f3d1a40483f1 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.h
+++ b/www/chromium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/url_constants.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/url_constants.h
-@@ -981,7 +981,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] =
+@@ -983,7 +983,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] =
  inline constexpr char kPhoneHubPermissionLearnMoreURL[] =
      "https://support.google.com/chromebook?p=multidevice";
  
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index 7c71f25ca706..60e46dfd1cff 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig	2025-04-04 08:52:13 UTC
+--- chrome/common/webui_url_constants.h.orig	2025-05-05 10:57:53 UTC
 +++ chrome/common/webui_url_constants.h
-@@ -509,18 +509,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome
+@@ -513,18 +513,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -22,7 +22,7 @@
  inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings";
  inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
  inline constexpr char kChromeUIWhatsNewHost[] = "whats-new";
-@@ -532,11 +532,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] 
+@@ -536,11 +536,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] 
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -36,8 +36,8 @@
  inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch";
  inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
  inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser";
-@@ -558,7 +558,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[
- inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/";
+@@ -565,7 +565,7 @@ inline constexpr char kChromeUIHistorySyncOptinURL[] =
+     "chrome://history-sync-optin/";
  #endif
  
 -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
diff --git a/www/chromium/files/patch-chrome_enterprise__companion_event__logger.cc b/www/chromium/files/patch-chrome_enterprise__companion_event__logger.cc
index 7310d42bf2af..6ba96cbb251f 100644
--- a/www/chromium/files/patch-chrome_enterprise__companion_event__logger.cc
+++ b/www/chromium/files/patch-chrome_enterprise__companion_event__logger.cc
@@ -1,6 +1,6 @@
---- chrome/enterprise_companion/event_logger.cc.orig	2025-03-05 08:14:56 UTC
+--- chrome/enterprise_companion/event_logger.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/enterprise_companion/event_logger.cc
-@@ -124,7 +124,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() {
+@@ -126,7 +126,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() {
    metadata.set_application_arch(proto::ARM64);
  #endif
  
diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index 395917727e44..47dbb5122d44 100644
--- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig	2025-01-15 09:18:26 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/services/printing/print_backend_service_impl.cc
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
  #include "printing/backend/cups_connection_pool.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/no_destructor.h"
  #include "ui/linux/linux_ui.h"
  #include "ui/linux/linux_ui_delegate_stub.h"
-@@ -77,7 +77,7 @@ namespace printing {
+@@ -76,7 +76,7 @@ namespace printing {
  
  namespace {
  
@@ -18,7 +18,7 @@
  void InstantiateLinuxUiDelegate() {
    // TODO(crbug.com/40561724)  Until a real UI can be used in a utility process,
    // need to use the stub version.
-@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() {
+@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
  #endif
  
  scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() {
@@ -27,7 +27,7 @@
    // Use task runner associated with equivalent of UI thread.  Needed for calls
    // made through `PrintDialogLinuxInterface` to properly execute.
    CHECK(base::SequencedTaskRunner::HasCurrentDefault());
-@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init(
+@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init(
    // `InitCommon()`.
    InitializeProcessForPrinting();
    print_backend_ = PrintBackend::CreateInstance(locale);
@@ -36,7 +36,7 @@
    // Test framework already initializes the UI, so this should not go in
    // `InitCommon()`.  Additionally, low-level Linux UI is not needed when tests
    // are using `TestPrintingContext`.
-@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
    crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
        *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name));
  
diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc
index 66c0db104326..35e58e5cfdc3 100644
--- a/www/chromium/files/patch-chrome_utility_services.cc
+++ b/www/chromium/files/patch-chrome_utility_services.cc
@@ -1,6 +1,6 @@
---- chrome/utility/services.cc.orig	2025-04-04 08:52:13 UTC
+--- chrome/utility/services.cc.orig	2025-05-05 10:57:53 UTC
 +++ chrome/utility/services.cc
-@@ -49,7 +49,7 @@
+@@ -48,7 +48,7 @@
  #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -9,7 +9,7 @@
  #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -209,7 +209,7 @@ auto RunMacNotificationService(
+@@ -205,7 +205,7 @@ auto RunMacNotificationService(
  }
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -18,7 +18,7 @@
  auto RunSystemSignalsService(
      mojo::PendingReceiver<device_signals::mojom::SystemSignalsService>
          receiver) {
-@@ -485,7 +485,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
    services.Add(RunWindowsIconReader);
  #endif  // BUILDFLAG(IS_WIN)
  
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index a261abc768df..16e8ab044f38 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig	2025-01-15 09:18:26 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2025-05-05 10:57:53 UTC
 +++ chromecast/browser/cast_browser_main_parts.cc
-@@ -95,7 +95,7 @@
+@@ -100,7 +100,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -9,7 +9,7 @@
  #include <fontconfig/fontconfig.h>
  #include <signal.h>
  #include <sys/prctl.h>
-@@ -268,7 +268,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
+@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
  
  #endif  // defined(USE_AURA)
  
@@ -18,7 +18,7 @@
  
  base::FilePath GetApplicationFontsDir() {
    std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -314,7 +314,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {switches::kDisableThreadedAnimation, ""},
  #endif  // BUILDFLAG(IS_ANDROID)
  #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -27,7 +27,7 @@
  #if defined(ARCH_CPU_X86_FAMILY)
      // This is needed for now to enable the x11 Ozone platform to work with
      // current Linux/NVidia OpenGL drivers.
-@@ -491,7 +491,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -496,7 +496,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
      views_delegate_ = std::make_unique<CastViewsDelegate>();
  #endif  // defined(USE_AURA)
  
diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn
index 5e64daa75c5f..7bc0278bdfb7 100644
--- a/www/chromium/files/patch-components_BUILD.gn
+++ b/www/chromium/files/patch-components_BUILD.gn
@@ -1,4 +1,4 @@
---- components/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- components/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ components/BUILD.gn
 @@ -208,7 +208,6 @@ test("components_unittests") {
      "//components/content_settings/core/browser:unit_tests",
@@ -8,7 +8,7 @@
      "//components/cross_device/logging:unit_tests",
      "//components/crx_file:unit_tests",
      "//components/data_sharing:unit_tests",
-@@ -607,7 +606,7 @@ test("components_unittests") {
+@@ -610,7 +609,7 @@ test("components_unittests") {
        deps += [ "//components/cast:unit_tests" ]
      }
  
@@ -17,7 +17,7 @@
        deps += [
          "//components/crash/content/browser:unit_tests",
          "//components/crash/core/app:unit_tests",
-@@ -765,7 +764,7 @@ test("components_unittests") {
+@@ -771,7 +770,7 @@ test("components_unittests") {
      deps += [ "//components/constrained_window:unit_tests" ]
    }
  
diff --git a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
index 78298c2d09b4..06d85a022c99 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
@@ -1,6 +1,15 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-04-04 08:52:13 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
-@@ -1003,7 +1003,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
+@@ -950,7 +950,7 @@ void PaymentsDataManager::SetPrefService(PrefService* 
+           &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
+           base::Unretained(this)));
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   pref_registrar_.Add(
+       prefs::kAutofillBnplEnabled,
+       base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
+@@ -1026,7 +1026,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,21 +18,21 @@
  bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
    return prefs::HasSeenBnpl(pref_service_);
  }
-@@ -1172,7 +1172,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar
- bool PaymentsDataManager::ShouldShowCardsFromAccountOption() const {
- // The feature is only for Linux, Windows, Mac, and Fuchsia.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // This option should only be shown for users that have not enabled the Sync
-   // Feature and that have server credit cards available.
-   // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and
-@@ -2026,7 +2026,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
+@@ -2022,7 +2022,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
  
  bool PaymentsDataManager::AreBnplIssuersSupported() const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return app_locale_ == "en-US" &&
+   return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" &&
           base::FeatureList::IsEnabled(
               features::kAutofillEnableBuyNowPayLaterSyncing);
+@@ -2055,7 +2055,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void PaymentsDataManager::OnBnplEnabledPrefChange() {
+   // On pref change to `false`, clearing BNPL issuers is implicitly handled by
+   // `GetBnplIssuers()`, since it returns an empty vector when
diff --git a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
index f80ab10e0f13..0c93b83b46b1 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
+++ b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
@@ -1,4 +1,4 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-04-04 08:52:13 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-05-05 10:57:53 UTC
 +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
 @@ -354,7 +354,7 @@ class PaymentsDataManager : public AutofillWebDataServ
    void SetAutofillHasSeenIban();
@@ -9,3 +9,12 @@
    // Returns the value of the kAutofillHasSeenBnpl pref.
    bool IsAutofillHasSeenBnplPrefEnabled() const;
  
+@@ -683,7 +683,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+   void ClearAllCreditCardBenefits();
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Monitors the `kAutofillBnplEnabled` preference for changes and controls the
+   // clearing/loading of payment instruments accordingly. Will also log the
+   // `Autofill.SettingsPage.BnplToggled` metric.
diff --git a/www/chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
index f51316fdb6d3..ee38c05e2e23 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-04-04 08:52:13 UTC
+--- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/autofill/core/browser/payments/bnpl_manager.cc
-@@ -109,7 +109,7 @@ void BnplManager::OnAmountExtractionReturned(
+@@ -114,7 +114,7 @@ void BnplManager::OnAmountExtractionReturned(
  
  bool BnplManager::ShouldShowBnplSettings() const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
    const PaymentsDataManager& payments_data_manager =
        payments_autofill_client().GetPaymentsDataManager();
  
-@@ -223,7 +223,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl(
+@@ -431,7 +431,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl(
        .Run(update_suggestions_result.suggestions, trigger_source);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index 7438692faa37..8dbe2e71a019 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig	2025-04-04 08:52:13 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -269,7 +269,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts,
+@@ -267,7 +267,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts,
  #endif  // BUILDFLAG(IS_ANDROID)
  
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc
index bb972e6ea167..77ff8204c78b 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc
@@ -1,15 +1,15 @@
---- components/autofill/core/common/autofill_prefs.cc.orig	2025-04-04 08:52:13 UTC
+--- components/autofill/core/common/autofill_prefs.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/autofill/core/common/autofill_prefs.cc
-@@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -98,7 +98,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled,
-                                 false);
    registry->RegisterBooleanPref(
-@@ -297,7 +297,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer
+       kAutofillBnplEnabled, true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+@@ -277,7 +277,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  void SetAutofillBnplEnabled(PrefService* prefs, bool value) {
    prefs->SetBoolean(kAutofillBnplEnabled, value);
  }
-@@ -306,7 +306,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
+@@ -286,7 +286,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
  
  bool IsAutofillBnplEnabled(const PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
    return prefs->GetBoolean(kAutofillBnplEnabled);
  #else
    return false;
-@@ -315,7 +315,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) {
+@@ -295,7 +295,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) {
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h
index 546d07d9296a..998c79c1625c 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h
@@ -1,24 +1,15 @@
---- components/autofill/core/common/autofill_prefs.h.orig	2025-04-04 08:52:13 UTC
+--- components/autofill/core/common/autofill_prefs.h.orig	2025-05-05 10:57:53 UTC
 +++ components/autofill/core/common/autofill_prefs.h
-@@ -26,7 +26,7 @@ namespace autofill::prefs {
- inline constexpr std::string_view kAutofillAblationSeedPref =
-     "autofill.ablation_seed";
+@@ -32,7 +32,7 @@ inline constexpr std::string_view kAutofillAblationSee
+ inline constexpr char kAutofillAiOptInStatus[] =
+     "autofill.autofill_ai.opt_in_status";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Boolean that is true if BNPL on Autofill is enabled.
  inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled";
  // Boolean that is true if the user has ever seen a BNPL suggestion.
-@@ -82,7 +82,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] =
- inline constexpr char kAutofillPaymentCardBenefits[] =
-     "autofill.payment_card_benefits";
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Boolean that controls improved autofill filling predictions. When enabled,
- // the autofill functionality is enhanced with adopting user data to
- // the form being filled in, which is triggered by the user via an extra
-@@ -237,7 +237,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs,
+@@ -208,7 +208,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs,
  bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +18,7 @@
  void SetAutofillBnplEnabled(PrefService* prefs, bool value);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -245,7 +245,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
+@@ -216,7 +216,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
  bool IsAutofillBnplEnabled(const PrefService* prefs);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
index cc9d2e8aa172..3ba6b67a728e 100644
--- a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
+++ b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
@@ -1,24 +1,25 @@
---- components/commerce/core/commerce_feature_list.cc.orig	2025-04-04 08:52:13 UTC
+--- components/commerce/core/commerce_feature_list.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/commerce/core/commerce_feature_list.cc
-@@ -156,7 +156,7 @@ BASE_FEATURE(kPriceAnnotationsRegionLaunched,
- BASE_FEATURE(kPriceInsights,
+@@ -156,7 +156,8 @@ BASE_FEATURE(kPriceInsights,
               "PriceInsights",
               base::FEATURE_DISABLED_BY_DEFAULT);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \
++    BUILDFLAG(IS_BSD)
  BASE_FEATURE(kPriceInsightsRegionLaunched,
               "PriceInsightsRegionLaunched",
-@@ -222,7 +222,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
  const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  const base::FeatureParam<bool> kDiscountOnShoppyPage{
      &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true};
  #else
-@@ -231,7 +231,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{
+@@ -236,7 +237,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +28,7 @@
  BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched,
               "EnableDiscountInfoApiRegionLaunched",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -246,7 +246,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi
+@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi
  const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,13 +37,3 @@
  BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting,
               "DiscountDialogAutoPopupBehaviorSetting",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -287,7 +287,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl
- 
- BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || \
-+    BUILDFLAG(IS_BSD)
- BASE_FEATURE(kShoppingListRegionLaunched,
-              "ShoppingListRegionLaunched",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc
index faa88c6fe635..1228b8f4db19 100644
--- a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc
+++ b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc
@@ -1,6 +1,6 @@
---- components/constrained_window/constrained_window_views.cc.orig	2025-03-05 08:14:56 UTC
+--- components/constrained_window/constrained_window_views.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/constrained_window/constrained_window_views.cc
-@@ -375,7 +375,7 @@ bool SupportsGlobalScreenCoordinates() {
+@@ -377,7 +377,7 @@ bool SupportsGlobalScreenCoordinates() {
  }
  
  bool PlatformClipsChildrenToViewport() {
diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
index 48310347cdcd..3424a92d29d0 100644
--- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/app/BUILD.gn.orig	2025-02-19 07:43:18 UTC
+--- components/crash/core/app/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ components/crash/core/app/BUILD.gn
 @@ -70,6 +70,10 @@ static_library("app") {
      ]
@@ -20,7 +20,7 @@
      sources += [ "crashpad_linux.cc" ]
      data_deps = [ ":chrome_crashpad_handler" ]
    }
-@@ -103,7 +107,7 @@ static_library("app") {
+@@ -105,7 +109,7 @@ static_library("app") {
      libs = [ "log" ]
    }
  
@@ -29,7 +29,7 @@
      deps += [
        "//base:base_static",
        "//components/crash/core/common",
-@@ -235,11 +239,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -237,11 +241,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
    # define custom UserStreamDataSources.
    executable("chrome_crashpad_handler") {
      sources = [ "chrome_crashpad_handler.cc" ]
diff --git a/www/chromium/files/patch-components_device__signals_core_browser_browser__utils.h b/www/chromium/files/patch-components_device__signals_core_browser_browser__utils.h
new file mode 100644
index 000000000000..ad7887a223e2
--- /dev/null
+++ b/www/chromium/files/patch-components_device__signals_core_browser_browser__utils.h
@@ -0,0 +1,20 @@
+--- components/device_signals/core/browser/browser_utils.h.orig	2025-05-05 10:57:53 UTC
++++ components/device_signals/core/browser/browser_utils.h
+@@ -15,7 +15,7 @@ namespace device_signals {
+ // Returns the hostname of the current machine.
+ std::string GetHostName();
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the hostname of the current machine.
+ std::vector<std::string> GetSystemDnsServers();
+ 
+@@ -23,7 +23,7 @@ std::vector<std::string> GetSystemDnsServers();
+ SettingValue GetOSFirewall();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the path to the ufw configuration file.
+ const char** GetUfwConfigPath();
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
index acbdca1cffb5..c58d87c76ae5 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc
+++ b/www/chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
@@ -1,8 +1,8 @@
---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig	2025-03-18 16:46:04 UTC
-+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc
+--- components/device_signals/core/common/linux/platform_utils_linux.cc.orig	2025-05-05 10:57:53 UTC
++++ components/device_signals/core/common/linux/platform_utils_linux.cc
 @@ -4,12 +4,23 @@
  
- #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
+ #include "components/device_signals/core/common/platform_utils.h"
  
 +#include "build/build_config.h"
 +
@@ -22,17 +22,17 @@
 +#endif
 +
  #include <algorithm>
+ #include <optional>
  #include <string>
- 
-@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() {
+@@ -100,6 +111,7 @@ SettingValue GetScreenlockSecured() {
  // Implements the logic from the native host installation script. First find the
  // root device identifier, then locate its parent and get its type.
  SettingValue GetDiskEncrypted() {
 +#if !BUILDFLAG(IS_BSD)
    struct stat info;
    // First figure out the device identifier. Fail fast if this fails.
-   if (stat("/", &info) != 0)
-@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() {
+   if (stat("/", &info) != 0) {
+@@ -122,11 +134,35 @@ SettingValue GetDiskEncrypted() {
      }
      return SettingValue::UNKNOWN;
    }
@@ -66,9 +66,9 @@
 +  }
 +#else
    base::DirReaderPosix reader("/sys/class/net");
-   if (!reader.IsValid())
+   if (!reader.IsValid()) {
      return result;
-@@ -165,6 +201,7 @@ std::vector<std::string> GetMacAddresses() {
+@@ -151,6 +187,7 @@ std::vector<std::string> GetMacAddresses() {
                                &address);
      result.push_back(address);
    }
diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc
index 05b4ef6a8244..8988fcebbc39 100644
--- a/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc
+++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc
@@ -1,12 +1,47 @@
---- components/embedder_support/user_agent_utils.cc.orig	2025-04-04 08:52:13 UTC
+--- components/embedder_support/user_agent_utils.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/embedder_support/user_agent_utils.cc
-@@ -435,6 +435,9 @@ std::string GetPlatformForUAMetadata() {
- # else
+@@ -318,7 +318,7 @@ std::string GetUserAgentPlatform() {
+   return "";
+ #elif BUILDFLAG(IS_MAC)
+   return "Macintosh; ";
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return "X11; ";  // strange, but that's what Firefox uses
+ #elif BUILDFLAG(IS_ANDROID)
+   return "Linux; ";
+@@ -344,7 +344,7 @@ std::string GetUnifiedPlatform() {
+   return "Windows NT 10.0; Win64; x64";
+ #elif BUILDFLAG(IS_FUCHSIA)
+   return "Fuchsia";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return "X11; Linux x86_64";
+ #elif BUILDFLAG(IS_IOS)
+   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
+@@ -601,6 +601,9 @@ std::string GetPlatformForUAMetadata() {
+ #else
    return "Chromium OS";
- # endif
+ #endif
 +#elif BUILDFLAG(IS_BSD)
 +  // The internet is weird...
 +  return "Linux";
  #else
    return std::string(version_info::GetOSType());
  #endif
+@@ -813,6 +816,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
+                       "Android %s", os_version.c_str()
+ #elif BUILDFLAG(IS_FUCHSIA)
+                       "Fuchsia"
++#elif BUILDFLAG(IS_BSD)
++#if defined(__x86_64__)
++                      "Linux x86_64; %s %s",
++#elif defined(__aarch64__)
++                      "Linux aarch64; %s %s",
++#else 
++                      "Linux i686; %s %s",
++#endif
++                      unixinfo.sysname,  // e.g. Linux
++                      cpu_type.c_str()   // e.g. i686
+ #elif BUILDFLAG(IS_IOS)
+                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
+                       os_version.c_str()
diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
index 177deae74e7f..670760b5e76b 100644
--- a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
@@ -1,6 +1,6 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-04-04 08:52:13 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -151,7 +151,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
+@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
    ASSERT_EQ("CrOS", pieces[0]);
    ASSERT_EQ("x86_64", pieces[1]);
    ASSERT_EQ("14541.0.0", pieces[2]);
@@ -9,7 +9,7 @@
    // Post-UA Reduction there is a single <unifiedPlatform> value for Linux:
    // X11; Linux x86_64
    ASSERT_EQ(2u, pieces.size());
-@@ -339,7 +339,7 @@ class UserAgentUtilsTest : public testing::Test,
+@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testing::Test,
          "X11; CrOS x86_64 14541.0.0";
  #elif BUILDFLAG(IS_FUCHSIA)
          "Fuchsia";
@@ -18,7 +18,7 @@
          "X11; Linux x86_64";
  #elif BUILDFLAG(IS_MAC)
          "Macintosh; Intel Mac OS X 10_15_7";
-@@ -699,7 +699,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) {
+@@ -696,7 +696,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) {
  #endif
  #elif BUILDFLAG(IS_ANDROID)
    EXPECT_EQ(metadata.platform, "Android");
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index dd5757ac81a1..dc9051075baa 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig	2025-04-04 08:52:13 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/feature_engagement/public/feature_configurations.cc
 @@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro
  
@@ -18,7 +18,7 @@
    if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) {
      FeatureConfig config;
      config.valid = true;
-@@ -1722,7 +1722,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
+@@ -1740,7 +1740,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -27,4 +27,4 @@
 +    BUILDFLAG(IS_BSD)
  
    if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) {
-     // Credit card benefit IPH is shown:
+     // The credit card benefit IPH appears up to three times over 10 years and
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index 42c7773c46ec..e5fac3d89083 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig	2025-04-04 08:52:13 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/feature_engagement/public/feature_constants.cc
 @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU
  BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  BASE_FEATURE(kEsbDownloadRowPromoFeature,
               "EsbDownloadRowPromo",
-@@ -682,7 +682,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
+@@ -710,7 +710,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
  
  #endif  // BUILDFLAG(IS_IOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
- BASE_FEATURE(kIPHAutofillCardInfoRetrievalSuggestionFeature,
-              "IPH_AutofillCardInfoRetrievalSuggestion",
-@@ -823,7 +823,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
+ BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+              "IPH_AutofillBnplAffirmOrZipSuggestion",
+@@ -857,7 +857,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
index 445e98b5d4f1..494d10f2f6a4 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig	2025-04-04 08:52:13 UTC
+--- components/feature_engagement/public/feature_constants.h.orig	2025-05-05 10:57:53 UTC
 +++ components/feature_engagement/public/feature_constants.h
 @@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode);
  FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature);
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature);
  #endif
-@@ -303,7 +303,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg
+@@ -316,7 +316,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg
  
  #endif  // BUILDFLAG(IS_IOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature);
  FEATURE_CONSTANTS_DECLARE_FEATURE(
-     kIPHAutofillCardInfoRetrievalSuggestionFeature);
-@@ -359,7 +359,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA
+@@ -374,7 +374,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA
  FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
  #endif
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
index 0d16d0029d6b..9edab613dd26 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_list.cc.orig	2025-04-04 08:52:13 UTC
+--- components/feature_engagement/public/feature_list.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/feature_engagement/public/feature_list.cc
-@@ -170,7 +170,7 @@ const base::Feature* const kAllFeatures[] = {
-     &kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature,
+@@ -175,7 +175,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHiOSSettingsInOverflowMenuBubbleFeature,
  #endif  // BUILDFLAG(IS_IOS)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
      &kEsbDownloadRowPromoFeature,
  #endif
-@@ -241,7 +241,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -247,7 +247,7 @@ const base::Feature* const kAllFeatures[] = {
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-     &kIPHAutofillCardInfoRetrievalSuggestionFeature,
-     &kIPHAutofillCreditCardBenefitFeature,
-@@ -294,7 +294,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHAutofillAiOptInFeature,
+     &kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+@@ -302,7 +302,7 @@ const base::Feature* const kAllFeatures[] = {
      &kIPHScalableIphGamingFeature,
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index c2b4e7ae43c5..6bf1c6c4c578 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig	2025-04-04 08:52:13 UTC
+--- components/feature_engagement/public/feature_list.h.orig	2025-05-05 10:57:53 UTC
 +++ components/feature_engagement/public/feature_list.h
-@@ -302,7 +302,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDownloadAutoDeletionFeat
+@@ -312,7 +312,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSettingsInOverflowMenuBu
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,17 +9,17 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo");
  #endif
-@@ -415,7 +415,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF
+@@ -427,7 +427,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
- DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature,
-                        "IPH_AutofillCreditCardBenefit");
- 
-@@ -509,7 +510,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
+ DEFINE_VARIATION_PARAM(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn");
+ DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+                        "IPH_AutofillBnplAffirmOrZipSuggestion");
+@@ -523,7 +524,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
  DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -28,7 +28,7 @@
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
                         "IPH_DesktopPWAsLinkCapturingLaunch");
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab,
-@@ -682,7 +683,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -697,7 +698,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
              kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature),
          VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature),
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -37,17 +37,17 @@
          VARIATION_ENTRY(kIPHBatterySaverModeFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
-@@ -743,7 +744,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -759,7 +760,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHAutofillAiOptInFeature),
          VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature),
          VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature),
-         VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature),
-@@ -795,7 +797,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -812,7 +814,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
          VARIATION_ENTRY(kIPHScalableIphGamingFeature),
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-components_gwp__asan_BUILD.gn b/www/chromium/files/patch-components_gwp__asan_BUILD.gn
index 416067b4053b..c1d3ccf17770 100644
--- a/www/chromium/files/patch-components_gwp__asan_BUILD.gn
+++ b/www/chromium/files/patch-components_gwp__asan_BUILD.gn
@@ -1,11 +1,11 @@
---- components/gwp_asan/BUILD.gn.orig	2022-11-30 08:12:58 UTC
+--- components/gwp_asan/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ components/gwp_asan/BUILD.gn
 @@ -15,7 +15,7 @@ test("gwp_asan_unittests") {
      "//testing/gtest",
      "//third_party/boringssl",
    ]
--  if (is_win || is_mac || is_linux || is_chromeos || is_android) {
-+  if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) {
+-  if (is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) {
++  if ((is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) && !is_bsd) {
      deps += [
        "//components/gwp_asan/client:unit_tests",
        "//components/gwp_asan/crash_handler:unit_tests",
diff --git a/www/chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni b/www/chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni
index fe1f53b279d9..b75aa63b069e 100644
--- a/www/chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni
+++ b/www/chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni
@@ -1,11 +1,11 @@
---- components/gwp_asan/buildflags/buildflags.gni.orig	2025-04-04 08:52:13 UTC
+--- components/gwp_asan/buildflags/buildflags.gni.orig	2025-05-05 10:57:53 UTC
 +++ components/gwp_asan/buildflags/buildflags.gni
 @@ -10,10 +10,7 @@ import("//build/config/compiler/compiler.gni")
  # Android component builds are disabled due to https://crbug.com/976399
  # Android requires frame pointers for unwinding, unwind tables aren't shipped in
  # official builds.
 -supported_platform =
--    is_linux || is_chromeos || is_mac ||
+-    is_linux || is_chromeos || is_mac || is_ios ||
 -    (is_win && (current_cpu == "x64" || current_cpu == "arm64")) ||
 -    (is_android && !is_component_build && enable_frame_pointers)
 +supported_platform = false
diff --git a/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
index 8d32c7b421af..e733ef46f884 100644
--- a/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
+++ b/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
@@ -1,6 +1,6 @@
---- components/gwp_asan/client/gwp_asan.cc.orig	2024-06-17 12:56:06 UTC
+--- components/gwp_asan/client/gwp_asan.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/gwp_asan/client/gwp_asan.cc
-@@ -75,7 +75,7 @@ namespace {
+@@ -76,7 +76,7 @@ namespace {
  // ProcessSamplingBoost is the multiplier to increase the
  // ProcessSamplingProbability in scenarios where we want to perform additional
  // testing (e.g., on canary/dev builds).
diff --git a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
index 57c257acf1aa..83f9da6b0bf5 100644
--- a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
+++ b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
@@ -1,4 +1,4 @@
---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2024-09-30 07:45:04 UTC
+--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/gwp_asan/crash_handler/crash_analyzer.cc
 @@ -35,7 +35,7 @@
  #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
@@ -9,7 +9,7 @@
  #include <signal.h>
  #elif BUILDFLAG(IS_APPLE)
  #include <mach/exception_types.h>
-@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo(
+@@ -113,7 +113,7 @@ bool CrashAnalyzer::GetExceptionInfo(
  
  crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
      const crashpad::ExceptionSnapshot& exception) {
diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider.cc
index 424ac1c72a2b..853a28804499 100644
--- a/www/chromium/files/patch-components_metrics_drive__metrics__provider.cc
+++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider.cc
@@ -1,9 +1,18 @@
---- components/metrics/drive_metrics_provider.cc.orig	2025-03-05 08:14:56 UTC
+--- components/metrics/drive_metrics_provider.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/metrics/drive_metrics_provider.cc
-@@ -113,7 +113,7 @@ void DriveMetricsProvider::FillDriveMetrics(
-                        response.has_seek_penalty);
-   RecordTriStateMetric("UMA.SeekPenaltyResult.Base",
-                        response.has_seek_penalty_base);
+@@ -21,7 +21,7 @@
+ namespace metrics {
+ 
+ namespace {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void RecordTriStateMetric(const char* name, std::optional<bool> sample) {
+   base::UmaHistogramEnumeration(
+       name, !sample.has_value()
+@@ -106,7 +106,7 @@ void DriveMetricsProvider::FillDriveMetrics(
+     drive->set_has_seek_penalty(*response.has_seek_penalty);
+   }
+ 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable);
diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
deleted file mode 100644
index 0bfcf36cc857..000000000000
--- a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- components/metrics/drive_metrics_provider_linux.cc.orig	2023-09-13 12:11:42 UTC
-+++ components/metrics/drive_metrics_provider_linux.cc
-@@ -4,7 +4,13 @@
- 
- #include "components/metrics/drive_metrics_provider.h"
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/types.h>
-+#define MAJOR(dev) major(dev)
-+#define MINOR(dev) minor(dev)
-+#else
- #include <linux/kdev_t.h>  // For MAJOR()/MINOR().
-+#endif
- #include <sys/stat.h>
- #include <string>
- 
diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc
index da80e9a42863..b7473a13c23d 100644
--- a/www/chromium/files/patch-components_metrics_metrics__log.cc
+++ b/www/chromium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig	2025-04-04 08:52:13 UTC
+--- components/metrics/metrics_log.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/metrics/metrics_log.cc
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
  #include "base/win/current_module.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -157,7 +157,7 @@ void RecordCurrentTime(
+@@ -158,7 +158,7 @@ void RecordCurrentTime(
    }
  }
  
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
index db80a6680d6d..7d987e3f8dcd 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_form_manager.cc.orig	2025-04-04 08:52:13 UTC
+--- components/password_manager/core/browser/password_form_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/browser/password_form_manager.cc
-@@ -63,7 +63,7 @@
+@@ -64,7 +64,7 @@
  #include "components/webauthn/android/webauthn_cred_man_delegate.h"
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -9,7 +9,7 @@
  #include "components/os_crypt/sync/os_crypt.h"
  #endif
  
-@@ -239,7 +239,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
+@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
    return false;
  }
  
@@ -18,7 +18,7 @@
  bool ShouldShowKeychainErrorBubble(
      std::optional<PasswordStoreBackendError> backend_error) {
    if (!backend_error.has_value()) {
-@@ -898,7 +898,7 @@ void PasswordFormManager::OnFetchCompleted() {
+@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchCompleted() {
          error.value().type);
    }
  
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
index 6a9423c16640..69b283a5168f 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
@@ -1,15 +1,15 @@
---- components/password_manager/core/browser/password_manager.cc.orig	2025-04-04 08:52:13 UTC
+--- components/password_manager/core/browser/password_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/browser/password_manager.cc
-@@ -492,7 +492,7 @@ void PasswordManager::RegisterProfilePrefs(
-                                 false);
- #endif
+@@ -511,7 +511,7 @@ void PasswordManager::RegisterProfilePrefs(
+       prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false);
+ #endif  // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
    registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter,
                                  0);
  #endif
-@@ -505,7 +505,7 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -524,7 +524,7 @@ void PasswordManager::RegisterProfilePrefs(
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
index 157ed16cfae1..e5751d75dc97 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_manager_client.h.orig	2025-04-04 08:52:13 UTC
+--- components/password_manager/core/browser/password_manager_client.h.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/browser/password_manager_client.h
 @@ -31,7 +31,7 @@
  #include "net/cert/cert_status_flags.h"
@@ -9,8 +9,8 @@
  #include "base/i18n/rtl.h"
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #include "ui/gfx/geometry/rect_f.h"
-@@ -550,7 +550,7 @@ class PasswordManagerClient {
-       CredentialsCallback callback);
+@@ -533,7 +533,7 @@ class PasswordManagerClient {
+   virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
index 90ec0a3d108d..f6b61a094142 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-03-05 08:14:56 UTC
+--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/browser/password_manual_fallback_flow.cc
-@@ -45,7 +45,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri
+@@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  // Returns the password form corresponding to the `payload` data. In most
  // cases there is only one such form stored, but having more than one or no
  // forms is also possible. If there is more than one form, showing any of them
-@@ -294,7 +294,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion(
+@@ -295,7 +295,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion(
      }
      case autofill::SuggestionType::kViewPasswordDetails: {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
        std::optional<password_manager::PasswordForm> credentials =
            GetCorrespondingPasswordForm(
                suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(),
-@@ -429,7 +429,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass
+@@ -425,7 +425,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass
      const Suggestion::PasswordSuggestionDetails& payload,
      base::OnceClosure on_allowed) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
index 65376b3935fc..504ccff1fbd8 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2024-10-22 08:31:56 UTC
+--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/browser/password_manual_fallback_flow.h
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@
  #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : public autofill::Au
+@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : public autofill::Au
    std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
index a5b5a858ed4d..c750c21cb26a 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_store/login_database.cc.orig	2024-10-22 08:31:56 UTC
+--- components/password_manager/core/browser/password_store/login_database.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/browser/password_store/login_database.cc
 @@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords(
      bool is_user_data_dir_policy_set,
@@ -6,10 +6,10 @@
      IsAccountStore is_account_store) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string user_data_dir_string;
    std::unique_ptr<base::Environment> environment(base::Environment::Create());
    // On Linux user data directory ca be specified using an env variable. If it
-@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords(
+   // exists, passwords shouldn't be deleted.
+@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords(
      return false;
    }
  
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
index 9e1faecfc82e..103603d9b45e 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-04-04 08:52:13 UTC
+--- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/browser/stub_password_manager_client.cc
-@@ -201,7 +201,7 @@ version_info::Channel StubPasswordManagerClient::GetCh
+@@ -206,7 +206,7 @@ version_info::Channel StubPasswordManagerClient::GetCh
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
index bf48a91a9cea..2ad042a46863 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-04-04 08:52:13 UTC
+--- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-05-05 10:57:53 UTC
 +++ components/password_manager/core/common/password_manager_pref_names.h
 @@ -59,7 +59,7 @@ inline constexpr char kCredentialProviderEnabledOnStar
  #endif
@@ -9,7 +9,7 @@
  // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy.
  // If set to false it blocks deleting undecryptable passwords, otherwise the
  // deletion can happen.
-@@ -357,7 +357,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme
+@@ -356,7 +356,7 @@ inline constexpr char kAutofillableCredentialsAccountS
  inline constexpr char kPasswordSharingEnabled[] =
      "password_manager.password_sharing_enabled";
  
diff --git a/www/chromium/files/patch-components_performance__manager_public_features.h b/www/chromium/files/patch-components_performance__manager_public_features.h
index f0d33dd27a8a..26b46028bcb5 100644
--- a/www/chromium/files/patch-components_performance__manager_public_features.h
+++ b/www/chromium/files/patch-components_performance__manager_public_features.h
@@ -1,6 +1,6 @@
---- components/performance_manager/public/features.h.orig	2025-03-05 08:14:56 UTC
+--- components/performance_manager/public/features.h.orig	2025-05-05 10:57:53 UTC
 +++ components/performance_manager/public/features.h
-@@ -17,7 +17,7 @@ namespace performance_manager::features {
+@@ -19,7 +19,7 @@ namespace performance_manager::features {
  
  #if !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
index 8362908e41a5..c22147a09fcc 100644
--- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
@@ -1,7 +1,7 @@
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-04-04 08:52:13 UTC
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -413,7 +413,7 @@ class PolicyTestCase {
-     const std::string os("chromeos_ash");
+@@ -432,7 +432,7 @@ class PolicyTestCase {
+     const std::string os("chromeos");
  #elif BUILDFLAG(IS_IOS)
      const std::string os("ios");
 -#elif BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index 2d591d78c154..60f2af30117f 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-04-04 08:52:13 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -741,7 +741,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
+@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
          fetch_request->set_invalidation_payload(invalidation_payload_);
        }
      }
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index a9c2127eea79..9a6914c32190 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-02-19 07:43:18 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include "base/win/wincred_shim.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <pwd.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -35,10 +35,15 @@
+@@ -36,10 +36,15 @@
  #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
  #endif
  
@@ -26,7 +26,7 @@
  #include <algorithm>
  #include <utility>
  
-@@ -83,7 +88,7 @@ namespace policy {
+@@ -84,7 +89,7 @@ namespace policy {
  namespace em = enterprise_management;
  
  std::string GetMachineName() {
@@ -35,7 +35,7 @@
    char hostname[HOST_NAME_MAX];
    if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
      return hostname;
-@@ -139,7 +144,7 @@ std::string GetMachineName() {
+@@ -140,7 +145,7 @@ std::string GetMachineName() {
  
  std::string GetOSVersion() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -44,7 +44,7 @@
    return base::SysInfo::OperatingSystemVersion();
  #elif BUILDFLAG(IS_WIN)
    base::win::OSInfo::VersionNumber version_number =
-@@ -161,7 +166,7 @@ std::string GetOSArchitecture() {
+@@ -162,7 +167,7 @@ std::string GetOSArchitecture() {
  }
  
  std::string GetOSUsername() {
diff --git a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
index 3b841504c64a..edd342cc2f95 100644
--- a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
+++ b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
@@ -1,11 +1,11 @@
---- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-03-05 08:14:56 UTC
+--- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/regional_capabilities/regional_capabilities_service.cc
-@@ -85,7 +85,7 @@ void RegionalCapabilitiesService::InitializeCountryIdC
-       base::UmaHistogramEnumeration(kUnknownCountryIdStored,
-                                     UnknownCountryIdStored::kValidCountryId);
-     } else {
+@@ -216,7 +216,7 @@ std::optional<CountryId> RegionalCapabilitiesService::
+     return persisted_country_id;
+   }
+ 
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
-         profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
-         country_id.reset();
+   if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
+     profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
+     base::UmaHistogramEnumeration(kUnknownCountryIdStored,
diff --git a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
index e81f7e4e3f76..14ed09484399 100644
--- a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
+++ b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
@@ -1,4 +1,4 @@
---- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-03-05 08:14:56 UTC
+--- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/regional_capabilities/regional_capabilities_switches.cc
 @@ -6,7 +6,7 @@
  
@@ -8,4 +8,4 @@
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_FEATURE(kClearPrefForUnknownCountry,
               "ClearCountryPrefForStoredUnknownCountry",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
index 4a51372f6b6d..f29cd663c85b 100644
--- a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
+++ b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
@@ -1,4 +1,4 @@
---- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-03-05 08:14:56 UTC
+--- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-05-05 10:57:53 UTC
 +++ components/regional_capabilities/regional_capabilities_switches.h
 @@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoiceCountry[] =
  inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA";
@@ -6,6 +6,6 @@
  
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // When the `country_codes::kCountryIDUnknown` is stored in prefs and this
+ // When an invalid `country_codes::CountryId` is stored in prefs and this
  // feature is enabled the pref will be cleared allowing a valid country to be
  // set again.
diff --git a/www/chromium/files/patch-components_search__engines_template__url__service.cc b/www/chromium/files/patch-components_search__engines_template__url__service.cc
index be57ca4275b0..5429a343781c 100644
--- a/www/chromium/files/patch-components_search__engines_template__url__service.cc
+++ b/www/chromium/files/patch-components_search__engines_template__url__service.cc
@@ -1,6 +1,6 @@
---- components/search_engines/template_url_service.cc.orig	2025-04-04 08:52:13 UTC
+--- components/search_engines/template_url_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/search_engines/template_url_service.cc
-@@ -3411,7 +3411,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
+@@ -3435,7 +3435,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
  std::unique_ptr<EnterpriseSearchManager>
  TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc
new file mode 100644
index 000000000000..4ca6798c613c
--- /dev/null
+++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.cc.orig	2025-05-05 10:57:53 UTC
++++ components/signin/public/base/signin_switches.cc
+@@ -55,7 +55,7 @@ BASE_FEATURE(kUseHostedDomainForManagementCheckOnSigni
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables the History Sync Opt-in on Desktop.
+ BASE_FEATURE(kEnableHistorySyncOptin,
+              "EnableHistorySyncOptin",
diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.h b/www/chromium/files/patch-components_signin_public_base_signin__switches.h
new file mode 100644
index 000000000000..4512bec8ba8b
--- /dev/null
+++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.h
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.h.orig	2025-05-05 10:57:53 UTC
++++ components/signin/public/base/signin_switches.h
+@@ -52,7 +52,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kEnableHistorySyncOptin);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-components_soda_soda__util.cc b/www/chromium/files/patch-components_soda_soda__util.cc
index dab4249cb365..bf98e7eeae7d 100644
--- a/www/chromium/files/patch-components_soda_soda__util.cc
+++ b/www/chromium/files/patch-components_soda_soda__util.cc
@@ -1,6 +1,6 @@
---- components/soda/soda_util.cc.orig	2025-02-19 07:43:18 UTC
+--- components/soda/soda_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/soda/soda_util.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  #include "base/win/windows_version.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/cpu.h"
  #endif
  
-@@ -38,7 +38,7 @@ bool IsSupportedChromeOS() {
+@@ -39,7 +39,7 @@ bool IsSupportedChromeOS() {
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -18,7 +18,7 @@
  bool IsSupportedLinux() {
  #if defined(ARCH_CPU_X86_FAMILY)
    // Check if the CPU has the required instruction set to run the Speech
-@@ -69,7 +69,7 @@ bool IsSupportedWin() {
+@@ -70,7 +70,7 @@ bool IsSupportedWin() {
  bool IsOnDeviceSpeechRecognitionSupported() {
  #if BUILDFLAG(IS_CHROMEOS)
    return IsSupportedChromeOS();
diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
index 017281063146..e4aacc3f46c0 100644
--- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn
+++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
@@ -1,6 +1,6 @@
---- components/storage_monitor/BUILD.gn.orig	2025-02-19 07:43:18 UTC
+--- components/storage_monitor/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ components/storage_monitor/BUILD.gn
-@@ -71,7 +71,7 @@ static_library("storage_monitor") {
+@@ -73,7 +73,7 @@ component("storage_monitor") {
        deps += [ "//services/device/public/mojom" ]
      }
    } else if (is_linux) {
@@ -9,7 +9,7 @@
        sources += [
          "mtab_watcher_linux.cc",
          "mtab_watcher_linux.h",
-@@ -177,7 +177,7 @@ source_set("unit_tests") {
+@@ -182,7 +182,7 @@ source_set("unit_tests") {
          "storage_monitor_chromeos_unittest.cc",
        ]
      }
diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h
index 71ac1f80d945..0b6652c591c0 100644
--- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h
+++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h
@@ -1,11 +1,11 @@
---- components/storage_monitor/removable_device_constants.h.orig	2022-02-28 16:54:41 UTC
+--- components/storage_monitor/removable_device_constants.h.orig	2025-05-05 10:57:53 UTC
 +++ components/storage_monitor/removable_device_constants.h
-@@ -14,7 +14,7 @@ namespace storage_monitor {
- extern const char kFSUniqueIdPrefix[];
- extern const char kVendorModelSerialPrefix[];
+@@ -15,7 +15,7 @@ namespace storage_monitor {
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kFSUniqueIdPrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kVendorModelSerialPrefix[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kVendorModelVolumeStoragePrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const
+     char kVendorModelVolumeStoragePrefix[];
  #endif
- 
diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
index 4381ea8cba4c..03bf2e31cfca 100644
--- a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
+++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
@@ -1,6 +1,6 @@
---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-02-19 07:43:18 UTC
+--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/supervised_user/core/browser/supervised_user_preferences.cc
-@@ -144,7 +144,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
+@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
    registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false);
    registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string());
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.cc b/www/chromium/files/patch-components_supervised__user_core_common_features.cc
index 6098465a0974..0b8daeb42f9d 100644
--- a/www/chromium/files/patch-components_supervised__user_core_common_features.cc
+++ b/www/chromium/files/patch-components_supervised__user_core_common_features.cc
@@ -1,4 +1,4 @@
---- components/supervised_user/core/common/features.cc.orig	2025-04-04 08:52:13 UTC
+--- components/supervised_user/core/common/features.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/supervised_user/core/common/features.cc
 @@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
  #endif
@@ -9,7 +9,16 @@
  const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
  
  const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{
-@@ -83,7 +83,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt
+@@ -45,7 +45,7 @@ const base::FeatureParam<int> kLocalWebApprovalBottomS
+ #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kEnableLocalWebApprovalErrorDialog,
+              "EnableLocalWebApprovalErrorDialog",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -97,7 +97,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt
               "UpdatedSupervisedUserExtensionApprovalStrings",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -18,7 +27,7 @@
  BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
               "EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -98,7 +98,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+@@ -112,7 +112,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
  #if BUILDFLAG(IS_CHROMEOS)
    return base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
@@ -27,7 +36,7 @@
    bool skipParentApprovalEnabled = base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
    bool permissionExtensionsForSupervisedUsersEnabled =
-@@ -115,7 +115,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+@@ -129,7 +129,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
  }
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -36,7 +45,7 @@
  BASE_FEATURE(kCustomProfileStringsForSupervisedUsers,
               "CustomProfileStringsForSupervisedUsers",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -127,13 +127,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers,
+@@ -141,13 +141,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers,
  
  BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers,
               "ForceSafeSearchForUnauthenticatedSupervisedUsers",
@@ -52,7 +61,7 @@
  BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog,
               "EnableSupervisedUserVersionSignOutDialog",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -155,7 +155,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking,
+@@ -169,7 +169,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking,
  // platform #defines.
  BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers,
               "UncredentialedFilteringFallbackForSupervisedUsers",
diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.h b/www/chromium/files/patch-components_supervised__user_core_common_features.h
index 536eb15d1d12..fdbbb07cfde7 100644
--- a/www/chromium/files/patch-components_supervised__user_core_common_features.h
+++ b/www/chromium/files/patch-components_supervised__user_core_common_features.h
@@ -1,6 +1,6 @@
---- components/supervised_user/core/common/features.h.orig	2025-04-04 08:52:13 UTC
+--- components/supervised_user/core/common/features.h.orig	2025-05-05 10:57:53 UTC
 +++ components/supervised_user/core/common/features.h
-@@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
+@@ -19,12 +19,12 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
  BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals);
  
  #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,13 @@
  extern const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs;
  #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_WIN)
-@@ -36,7 +36,7 @@ BASE_DECLARE_FEATURE(
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Whether we show an error screen in case of failure of a local web approval.
+ BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog);
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(
  // Applies new informative strings during the parental extension approval flow.
  BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings);
  
@@ -18,7 +24,7 @@
  BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
  #endif
  
-@@ -54,7 +54,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE
+@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE
  bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled();
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -27,7 +33,7 @@
  // Enable different web sign in interception behaviour for supervised users:
  //
  // 1. Supervised user signs in to existing signed out Profile: show modal
-@@ -72,7 +72,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers);
+@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers);
  // unauthenticated (e.g. signed out of the content area) account.
  BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers);
  
diff --git a/www/chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc b/www/chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
index a789c2ef68dc..9d25e253ce23 100644
--- a/www/chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
+++ b/www/chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
@@ -1,6 +1,6 @@
---- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-04-04 08:52:13 UTC
+--- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/sync_preferences/common_syncable_prefs_database.cc
-@@ -332,7 +332,7 @@ constexpr auto kCommonSyncablePrefsAllowlist =
+@@ -334,7 +334,7 @@ constexpr auto kCommonSyncablePrefsAllowlist =
            PrefSensitivity::kNone, MergeBehavior::kNone}},
  #endif  // BUILDFLAG(IS_ANDROID)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
index 1456bed34486..072d543f52bf 100644
--- a/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
+++ b/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
@@ -1,6 +1,6 @@
---- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2024-10-22 08:31:56 UTC
+--- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/trusted_vault/trusted_vault_connection_impl.cc
-@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() {
+@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() {
    // currently used or even built on all platforms.
  #if BUILDFLAG(IS_CHROMEOS)
    return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS;
diff --git a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc
index 2d964c68c90c..0f4a2f09738d 100644
--- a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc
+++ b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc
@@ -1,6 +1,6 @@
---- components/user_education/views/help_bubble_view.cc.orig	2025-04-04 08:52:13 UTC
+--- components/user_education/views/help_bubble_view.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/user_education/views/help_bubble_view.cc
-@@ -299,7 +299,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, 
+@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, 
  // TODO(https://crbug.com/382611284): Temporarily handle the case when the
  // primary window is minimized by closing the help bubble. Remove this code when
  // the issue is solved at the Views framework level.
@@ -9,7 +9,7 @@
  class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver {
   public:
    explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble)
-@@ -774,7 +774,7 @@ HelpBubbleView::HelpBubbleView(
+@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView(
      event_relay_->Init(this);
    }
  
@@ -18,7 +18,7 @@
    primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this);
  #endif
  
-@@ -886,7 +886,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
+@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
  void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
                                                views::Widget* widget) const {
    BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
diff --git a/www/chromium/files/patch-components_user__education_views_help__bubble__view.h b/www/chromium/files/patch-components_user__education_views_help__bubble__view.h
index d2fb99f1b6c5..09b011f9c647 100644
--- a/www/chromium/files/patch-components_user__education_views_help__bubble__view.h
+++ b/www/chromium/files/patch-components_user__education_views_help__bubble__view.h
@@ -1,6 +1,6 @@
---- components/user_education/views/help_bubble_view.h.orig	2025-02-19 07:43:18 UTC
+--- components/user_education/views/help_bubble_view.h.orig	2025-05-05 10:57:53 UTC
 +++ components/user_education/views/help_bubble_view.h
-@@ -162,7 +162,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg
+@@ -160,7 +160,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg
  // work around this problem by closing the bubble if the widget is minimized.
  // When the underlying issue is fixed at the framework level, this can be
  // removed.
diff --git a/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
index 640f5b1879fd..f5df51f7a35e 100644
--- a/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
+++ b/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
@@ -1,6 +1,6 @@
---- components/visited_url_ranking/public/url_visit_util.cc.orig	2024-10-22 08:31:56 UTC
+--- components/visited_url_ranking/public/url_visit_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/visited_url_ranking/public/url_visit_util.cc
-@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() {
+@@ -67,7 +67,7 @@ PlatformType GetPlatformInput() {
    return PlatformType::kWindows;
  #elif BUILDFLAG(IS_MAC)
    return PlatformType::kMac;
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index e274d188c548..aa9142bebccd 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-03-05 08:14:56 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1505,7 +1505,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1510,7 +1510,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
                                              ->GetVulkanPhysicalDevice(),
                                          VK_IMAGE_TILING_OPTIMAL, vk_format,
                                          si_format, yuv_color_space, ycbcr_info);
diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
index d2c4d2006942..715eacbb9b50 100644
--- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
+++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display/skia_renderer.cc.orig	2025-04-04 08:52:13 UTC
+--- components/viz/service/display/skia_renderer.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/viz/service/display/skia_renderer.cc
-@@ -1383,7 +1383,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1391,7 +1391,7 @@ void SkiaRenderer::ClearFramebuffer() {
    if (current_frame()->current_render_pass->has_transparent_background) {
      ClearCanvas(SkColors::kTransparent);
    } else {
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index 2e601a47d315..dc9b53682eed 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -123,7 +123,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -126,7 +126,7 @@ RootCompositorFrameSinkImpl::Create(
    output_surface->SetNeedsSwapSizeNotifications(
        params->send_swap_size_notifications);
  
@@ -9,7 +9,7 @@
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -858,7 +858,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -884,7 +884,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
    if (display_client_ && enable_swap_completion_callback_) {
      display_client_->DidCompleteSwapWithSize(pixel_size);
    }
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 7546d00deae2..4832e8d604b0 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,8 +1,8 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-03-05 08:14:56 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-05-05 10:57:53 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -228,7 +228,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
-   // See comments on `EvictionHandler`.
-   EvictionHandler eviction_handler_;
+@@ -229,7 +229,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+   base::TimeDelta preferred_frame_interval_ =
+       FrameRateDecider::UnspecifiedFrameInterval();
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
diff --git a/www/chromium/files/patch-components_webui_flags_flags__state.cc b/www/chromium/files/patch-components_webui_flags_flags__state.cc
index dd19eed739ad..d5a4ef72d31e 100644
--- a/www/chromium/files/patch-components_webui_flags_flags__state.cc
+++ b/www/chromium/files/patch-components_webui_flags_flags__state.cc
@@ -1,6 +1,6 @@
---- components/webui/flags/flags_state.cc.orig	2025-04-04 08:52:13 UTC
+--- components/webui/flags/flags_state.cc.orig	2025-05-05 10:57:53 UTC
 +++ components/webui/flags/flags_state.cc
-@@ -777,7 +777,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -782,7 +782,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
    return kOsWin;
  #elif BUILDFLAG(IS_CHROMEOS)
    return kOsCrOS;
diff --git a/www/chromium/files/patch-content_app_BUILD.gn b/www/chromium/files/patch-content_app_BUILD.gn
index 45647fcd602f..e2919490114d 100644
--- a/www/chromium/files/patch-content_app_BUILD.gn
+++ b/www/chromium/files/patch-content_app_BUILD.gn
@@ -1,6 +1,6 @@
---- content/app/BUILD.gn.orig	2025-02-19 07:43:18 UTC
+--- content/app/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ content/app/BUILD.gn
-@@ -89,9 +89,9 @@ source_set("content_main_runner_app") {
+@@ -90,9 +90,9 @@ source_set("content_main_runner_app") {
             "//third_party/tflite:buildflags",
             "//tools/v8_context_snapshot:buildflags",
           ]
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index 84bffe3c7e62..30c3c3901dc5 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- content/app/content_main_runner_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/app/content_main_runner_impl.cc
-@@ -144,18 +144,20 @@
+@@ -146,18 +146,20 @@
  #include "content/browser/posix_file_descriptor_info_impl.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -23,7 +23,7 @@
  #include "third_party/boringssl/src/include/openssl/crypto.h"
  #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
  
-@@ -184,6 +186,10 @@
+@@ -186,6 +188,10 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -34,7 +34,7 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "content/browser/android/battery_metrics.h"
-@@ -382,7 +388,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE)
  
@@ -43,7 +43,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -420,7 +426,10 @@ void PreloadLibraryCdms() {
+@@ -422,7 +428,10 @@ void PreloadLibraryCdms() {
  
  void PreSandboxInit() {
    // Ensure the /dev/urandom is opened.
@@ -54,7 +54,7 @@
  
    // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
    // files.
-@@ -432,9 +441,16 @@ void PreSandboxInit() {
+@@ -434,9 +443,16 @@ void PreSandboxInit() {
    // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
    CRYPTO_pre_sandbox_init();
  
@@ -71,7 +71,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
    // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -748,7 +764,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain(
+@@ -750,7 +766,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain(
      unregister_thread_closure = base::HangWatcher::RegisterThread(
          base::HangWatcher::ThreadType::kMainThread);
      bool start_hang_watcher_now;
@@ -80,7 +80,7 @@
      // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is
      // initialized, because the sandbox can't be started with multiple threads.
      // TODO(mpdenton): start the HangWatcher after the sandbox is initialized.
-@@ -861,11 +877,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -863,11 +879,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
                   base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -94,7 +94,7 @@
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -1046,10 +1061,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1048,10 +1063,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
        process_type == switches::kZygoteProcess) {
      PreSandboxInit();
    }
@@ -117,7 +117,7 @@
    delegate_->SandboxInitialized(process_type);
  
  #if BUILDFLAG(USE_ZYGOTE)
-@@ -1146,6 +1173,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() {
+@@ -1148,6 +1175,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() {
    content_main_params_.reset();
  
    RegisterMainThreadFactories();
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 6aeaa7083d2e..a32303bdfe98 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- content/browser/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/BUILD.gn
-@@ -2542,6 +2542,14 @@ source_set("browser") {
+@@ -2560,6 +2560,14 @@ source_set("browser") {
      ]
    }
  
@@ -15,10 +15,10 @@
    if (is_linux || is_chromeos) {
      sources -=
          [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
-@@ -2587,6 +2595,15 @@ source_set("browser") {
+@@ -2605,6 +2613,15 @@ source_set("browser") {
    if (allow_oop_video_decoder) {
-     sources += [ "media/stable_video_decoder_factory.cc" ]
-     deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
+     sources += [ "media/oop_video_decoder_factory.cc" ]
+     deps += [ "//media/mojo/mojom" ]
 +  }
 +
 +  if (is_bsd) {
diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
index 8dab57cdaa21..82c8efba08a0 100644
--- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
+++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/accessibility/browser_accessibility_state_impl.cc
-@@ -192,7 +192,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta
+@@ -180,7 +180,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta
  
  // On Android, Mac, Windows and Linux there are platform-specific subclasses.
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \
diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
index a9d96ca69c5e..06fd1952e3e4 100644
--- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
+++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
@@ -1,6 +1,6 @@
---- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-04-04 08:52:13 UTC
+--- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc
-@@ -31,7 +31,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
+@@ -32,7 +32,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
    std::string cmdline;
    std::stringstream ss(cmdline_all);
    while (std::getline(ss, cmdline, '\0')) {
@@ -12,22 +12,22 @@
      if (re2::RE2::PartialMatch(cmdline, orca_regex)) {
        return true;  // Orca was found
      }
-@@ -57,7 +61,9 @@ class BrowserAccessibilityStateImplAuralinux
+@@ -42,6 +46,10 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
  
- void BrowserAccessibilityStateImplAuralinux::UpdateHistogramsOnOtherThread() {
-   BrowserAccessibilityStateImpl::UpdateHistogramsOnOtherThread();
--
+ // Returns true if Orca is active.
+ bool DiscoverOrca() {
 +#if BUILDFLAG(IS_BSD)
 +  NOTIMPLEMENTED();
++  return false;
 +#else
    // NOTE: this method is run from another thread to reduce jank, since
-   // there's no guarantee these system calls will return quickly. Code that
-   // needs to run in the UI thread can be run in
-@@ -105,6 +111,7 @@ void BrowserAccessibilityStateImplAuralinux::UpdateHis
-   } else {
-     base::debug::ClearCrashKeyString(ax_orca_crash_key);
+   // there's no guarantee these system calls will return quickly.
+   std::unique_ptr<DIR, decltype(&CloseDir)> proc_dir(opendir("/proc"),
+@@ -79,6 +87,7 @@ bool DiscoverOrca() {
    }
+ 
+   return is_orca_active;
 +#endif
  }
  
- void BrowserAccessibilityStateImplAuralinux::UpdateUniqueUserHistograms() {
+ }  // namespace
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index d3b1ff3a7e42..d282cb37b42f 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig	2025-02-19 07:43:18 UTC
+--- content/browser/browser_main_loop.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/browser_main_loop.cc
-@@ -247,6 +247,12 @@
+@@ -249,6 +249,12 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
  #endif
  
@@ -13,7 +13,7 @@
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -541,6 +547,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() {
    // by now since a thread to start the ServiceManager has been created
    // before the browser main loop starts.
    DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,7 +26,7 @@
  #endif
  
    // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() {
        base::ThreadType::kDisplayCritical);
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
index 5d48aef78c30..e0e7c87d1bc2 100644
--- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
+++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
@@ -1,6 +1,6 @@
---- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-03-05 08:14:56 UTC
+--- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien
+@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien
    HostDisplayClient& operator=(const HostDisplayClient&) = delete;
  
    // viz::HostDisplayClient:
diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
index 976e8bb31611..70d79ed32a1b 100644
--- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
+++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/compositor_util.cc.orig	2025-04-04 08:52:13 UTC
+--- content/browser/gpu/compositor_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/gpu/compositor_util.cc
-@@ -147,7 +147,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+@@ -142,7 +142,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
        "video_decode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
@@ -9,7 +9,7 @@
            !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) ||
  #endif  // BUILDFLAG(IS_LINUX)
                command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)),
-@@ -159,7 +159,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
        "video_encode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE,
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
index 1c397bd7f66d..f31c238f49f0 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.cc.orig	2024-08-26 12:06:38 UTC
+--- content/browser/gpu/gpu_data_manager_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.cc
-@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
+@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
    private_->OnDisplayMetricsChanged(display, changed_metrics);
  }
  
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
index 7d0d9ff5c919..4de2e60c1a58 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.h.orig	2024-08-26 12:06:38 UTC
+--- content/browser/gpu/gpu_data_manager_impl.h.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.h
-@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
+@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics) override;
  
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index 0514d0ef1ca7..3a6f2325c68c 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-04-04 08:52:13 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1667,7 +1667,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
    UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
  }
  
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
index 951077472009..912b99f74c70 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2024-11-14 07:57:23 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics);
  
@@ -9,7 +9,7 @@
    bool IsGpuMemoryBufferNV12Supported();
    void SetGpuMemoryBufferNV12Supported(bool supported);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    bool application_is_visible_ = true;
  
    bool disable_gpu_compositing_ = false;
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool is_gpu_memory_buffer_NV12_supported_ = false;
  #endif  // BUILDFLAG(IS_LINUX)
- };
+ 
diff --git a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
index d056bbc8021a..80a13225b817 100644
--- a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
+++ b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
@@ -1,4 +1,4 @@
---- content/browser/media/frameless_media_interface_proxy.h.orig	2024-05-21 18:07:39 UTC
+--- content/browser/media/frameless_media_interface_proxy.h.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/media/frameless_media_interface_proxy.h
 @@ -19,7 +19,7 @@
  #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -6,15 +6,15 @@
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
+ #include "media/mojo/mojom/video_decoder.mojom.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final
+@@ -104,7 +104,7 @@ class FramelessMediaInterfaceProxy final
    // Connections to the renderer.
    mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Connection to the StableVideoDecoderFactory that lives in a utility
-   // process. This is only used for out-of-process video decoding and only when
-   // the FramelessMediaInterfaceProxy is created without a RenderProcessHost
+   // Connection to the InterfaceFactory that lives in a utility process.
+   // This is only used for out-of-process video decoding and only when the
+   // FramelessMediaInterfaceProxy is created without a RenderProcessHost
diff --git a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
index 91dddc5dc35b..7a93ef8f6709 100644
--- a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
+++ b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/network_service_instance_impl.cc.orig	2025-02-19 07:43:18 UTC
+--- content/browser/network_service_instance_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/network_service_instance_impl.cc
-@@ -84,7 +84,7 @@
+@@ -83,7 +83,7 @@
  #include "content/browser/network/network_service_process_tracker_win.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/browser/system_dns_resolution/system_dns_resolver.h"
  #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
  #endif
-@@ -367,7 +367,7 @@ void CreateInProcessNetworkService(
+@@ -341,7 +341,7 @@ void CreateInProcessNetworkService(
                                  std::move(receiver)));
  }
  
@@ -18,7 +18,7 @@
  // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
  // high-priority thread pool.
  void RunSystemDnsResolverOnThreadPool(
-@@ -436,7 +436,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -410,7 +410,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
    }
  #endif  // BUILDFLAG(IS_POSIX)
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
index f55ff99c226b..8acfad0fb7eb 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-03-05 08:14:56 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -334,7 +334,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface(
  
    if (!primary_surface_id ||
        primary_surface_id->local_surface_id() != local_surface_id_) {
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 425368a5368f..b7d7319aa034 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -224,7 +224,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
@@ -9,7 +9,7 @@
  #include <sys/resource.h>
  
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -1089,7 +1089,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1122,7 +1122,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1257,7 +1257,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost
+@@ -1317,7 +1317,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost
  
  void RenderProcessHostImpl::IOThreadHostImpl::SetPid(
      base::ProcessId child_pid) {
@@ -27,7 +27,7 @@
    child_thread_type_switcher_.SetPid(child_pid);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -3328,7 +3328,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3410,7 +3410,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
              base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
    }
  
@@ -36,7 +36,7 @@
    // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
    // for NV12 GPU memory buffer.
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3384,6 +3384,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3465,6 +3465,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
        switches::kDisableSpeechAPI,
        switches::kDisableThreadedCompositing,
        switches::kDisableTouchDragDrop,
@@ -44,7 +44,7 @@
        switches::kDisableV8IdleTasks,
        switches::kDisableVideoCaptureUseGpuMemoryBuffer,
        switches::kDisableWebGLImageChromium,
-@@ -5220,7 +5221,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr
+@@ -5310,7 +5311,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr
    // - Win: https://crbug.com/707022 .
    uint64_t total_size = 0;
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index 928de11e1ad8..d4b9f2836990 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig	2025-04-04 08:52:13 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/renderer_host/render_process_host_impl.h
 @@ -102,7 +102,7 @@
  #include "media/fuchsia_media_codec_provider_impl.h"
@@ -9,7 +9,7 @@
  #include "content/browser/child_thread_type_switcher_linux.h"
  #include "media/mojo/mojom/video_encode_accelerator.mojom.h"
  #endif
-@@ -988,7 +988,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -986,7 +986,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
      std::unique_ptr<service_manager::BinderRegistry> binders_;
      mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
  
@@ -18,7 +18,7 @@
      mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
          video_encode_accelerator_factory_remote_;
      ChildThreadTypeSwitcher child_thread_type_switcher_;
-@@ -1237,7 +1237,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -1235,7 +1235,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // if the request isn't handled on the IO thread.
    void OnBindHostReceiver(mojo::GenericPendingReceiver receiver);
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index be65e1fb5cc7..1b7d1a082985 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-03-05 08:14:56 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -121,7 +121,7 @@
  #include "ui/gfx/gdi_util.h"
@@ -18,7 +18,7 @@
    ui::BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1867,7 +1867,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
    return host() && host()->delegate() && host()->delegate()->ShouldDoLearning();
  }
  
@@ -27,7 +27,7 @@
  bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
      const gfx::Range& range,
      const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2843,7 +2843,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,12 +36,12 @@
    return NeedsInputGrab();
  #else
    return false;
-@@ -3027,7 +3027,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!event.skip_if_unhandled && linux_ui && event.os_event &&
+   if (!event.skip_if_unhandled && linux_ui && event.os_event) {
+     const auto command = linux_ui->GetTextEditCommandForEvent(
diff --git a/www/chromium/files/patch-content_browser_service__host_utility__process__host.cc b/www/chromium/files/patch-content_browser_service__host_utility__process__host.cc
index 964e2af1755a..1067df3a7afc 100644
--- a/www/chromium/files/patch-content_browser_service__host_utility__process__host.cc
+++ b/www/chromium/files/patch-content_browser_service__host_utility__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/service_host/utility_process_host.cc.orig	2025-04-04 08:52:13 UTC
+--- content/browser/service_host/utility_process_host.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/service_host/utility_process_host.cc
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
  #include "content/browser/v8_snapshot_files.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/files/file_util.h"
  #include "base/files/scoped_file.h"
  #include "base/pickle.h"
-@@ -95,7 +95,7 @@ namespace content {
+@@ -96,7 +96,7 @@ namespace content {
  
  namespace {
  
@@ -18,7 +18,7 @@
  base::ScopedFD PassNetworkContextParentDirs(
      std::vector<base::FilePath> network_context_parent_dirs) {
    base::Pickle pickle;
-@@ -425,7 +425,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() {
      file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line));
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -27,7 +27,7 @@
      // The network service should have access to the parent directories
      // necessary for its usage.
      if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -442,7 +442,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() {
      if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
        bool pass_gpu_buffer_flag =
            switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
index 2cfe90acfeec..3c2290a9ecae 100644
--- a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
+++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
@@ -1,9 +1,9 @@
---- content/browser/v8_snapshot_files.cc.orig	2024-06-17 12:56:06 UTC
+--- content/browser/v8_snapshot_files.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/browser/v8_snapshot_files.cc
-@@ -17,7 +17,7 @@ namespace content {
- std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>>
+@@ -19,7 +19,7 @@ namespace content {
+ std::map<std::string, std::variant<base::FilePath, base::ScopedFD>>
  GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) {
-   std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files;
+   std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> files;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT)
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index 37c657e6f2ac..f81cb7852507 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig	2025-02-19 07:43:18 UTC
+--- content/common/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ content/common/BUILD.gn
-@@ -384,19 +384,28 @@ source_set("common") {
+@@ -382,19 +382,28 @@ source_set("common") {
    }
  
    if (is_linux || is_chromeos) {
diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc
index 2e4551e6eb1e..ee3dedc8abfa 100644
--- a/www/chromium/files/patch-content_common_features.cc
+++ b/www/chromium/files/patch-content_common_features.cc
@@ -1,6 +1,6 @@
---- content/common/features.cc.orig	2025-03-05 08:14:56 UTC
+--- content/common/features.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/common/features.cc
-@@ -125,7 +125,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
+@@ -124,7 +124,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  // Enables error reporting for JS errors inside DevTools frontend host
diff --git a/www/chromium/files/patch-content_common_features.h b/www/chromium/files/patch-content_common_features.h
index 911c15ef8e47..14decbbdba02 100644
--- a/www/chromium/files/patch-content_common_features.h
+++ b/www/chromium/files/patch-content_common_features.h
@@ -1,6 +1,6 @@
---- content/common/features.h.orig	2025-03-05 08:14:56 UTC
+--- content/common/features.h.orig	2025-05-05 10:57:53 UTC
 +++ content/common/features.h
-@@ -28,7 +28,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn
+@@ -27,7 +27,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation);
diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc
deleted file mode 100644
index cab9f3efa2e1..000000000000
--- a/www/chromium/files/patch-content_common_user__agent.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- content/common/user_agent.cc.orig	2025-04-04 08:52:13 UTC
-+++ content/common/user_agent.cc
-@@ -50,7 +50,7 @@ std::string GetUserAgentPlatform() {
-   return "";
- #elif BUILDFLAG(IS_MAC)
-   return "Macintosh; ";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return "X11; ";  // strange, but that's what Firefox uses
- #elif BUILDFLAG(IS_ANDROID)
-   return "Linux; ";
-@@ -76,7 +76,7 @@ std::string GetUnifiedPlatform() {
-   return "Windows NT 10.0; Win64; x64";
- #elif BUILDFLAG(IS_FUCHSIA)
-   return "Fuchsia";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "X11; Linux x86_64";
- #elif BUILDFLAG(IS_IOS)
-   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
-@@ -305,6 +305,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
-                       "Android %s", os_version.c_str()
- #elif BUILDFLAG(IS_FUCHSIA)
-                       "Fuchsia"
-+#elif BUILDFLAG(IS_BSD)
-+#if defined(__x86_64__)
-+                      "Linux x86_64; %s %s",
-+#elif defined(__aarch64__)
-+                      "Linux aarch64; %s %s",
-+#else
-+                      "Linux i686; %s %s",
-+#endif
-+                      unixinfo.sysname,  // e.g. Linux
-+                      cpu_type.c_str()   // e.g. i686
- #elif BUILDFLAG(IS_IOS)
-                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
-                       os_version.c_str()
diff --git a/www/chromium/files/patch-content_public_browser_content__browser__client.cc b/www/chromium/files/patch-content_public_browser_content__browser__client.cc
index f717e1ce5bc7..d1ea5e036a88 100644
--- a/www/chromium/files/patch-content_public_browser_content__browser__client.cc
+++ b/www/chromium/files/patch-content_public_browser_content__browser__client.cc
@@ -1,6 +1,6 @@
---- content/public/browser/content_browser_client.cc.orig	2025-04-04 08:52:13 UTC
+--- content/public/browser/content_browser_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/public/browser/content_browser_client.cc
-@@ -1376,7 +1376,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
+@@ -1395,7 +1395,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
  // that can be adequately sandboxed.
  // Currently Android's network service will not run out of process or sandboxed,
  // so OutOfProcessSystemDnsResolution is not currently enabled on Android.
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index 53f4eba41517..2a5817d18f9b 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig	2025-04-04 08:52:13 UTC
+--- content/public/common/content_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/public/common/content_features.cc
 @@ -75,7 +75,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup,
  // Runs the audio service in a separate process.
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1274,9 +1274,9 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1271,9 +1271,9 @@ BASE_FEATURE(kWebAssemblyTiering,
  BASE_FEATURE(kWebAssemblyTrapHandler,
               "WebAssemblyTrapHandler",
  #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ||  \
@@ -21,7 +21,7 @@
       defined(ARCH_CPU_ARM64))
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
-@@ -1329,7 +1329,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended,
+@@ -1330,7 +1330,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended,
  
  // Controls whether the WebUSB API is enabled:
  // https://wicg.github.io/webusb
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index c28a64b21363..ef96d4825942 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig	2025-04-04 08:52:13 UTC
+--- content/public/common/content_switches.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/public/common/content_switches.cc
-@@ -342,6 +342,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -339,6 +339,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
  // builds.
  const char kEnableLogging[]                 = "enable-logging";
  
@@ -9,7 +9,7 @@
  // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
  // triggering of change attribute of the NetInfo API when there is a change in
  // the connection type.
-@@ -949,7 +951,7 @@ const char kPreventResizingContentsForTesting[] =
+@@ -946,7 +948,7 @@ const char kPreventResizingContentsForTesting[] =
      "prevent-resizing-contents-for-testing";
  #endif
  
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index c3b263224482..d1a91a5ddd64 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig	2025-04-04 08:52:13 UTC
+--- content/public/common/content_switches.h.orig	2025-05-05 10:57:53 UTC
 +++ content/public/common/content_switches.h
-@@ -108,6 +108,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+@@ -107,6 +107,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
  CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
  CONTENT_EXPORT extern const char kEnableLCDText[];
  CONTENT_EXPORT extern const char kEnableLogging[];
@@ -8,7 +8,7 @@
  CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
  CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
  CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -259,7 +260,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -258,7 +259,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
  CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[];
  #endif
  
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index 8761a0ed53f2..fb3000764db5 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- content/renderer/render_thread_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/renderer/render_thread_impl.cc
-@@ -212,6 +212,8 @@
+@@ -207,6 +207,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -9,7 +9,7 @@
  #else
  #include <malloc.h>
  #endif
-@@ -1050,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
                               kGpuStreamIdMedia, kGpuStreamPriorityMedia);
  
    const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
        base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) &&
  #endif  // BUILDFLAG(IS_LINUX)
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1059,7 +1061,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
         gpu::kGpuFeatureStatusEnabled);
  
    const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
        base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1855,7 +1857,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory(
+@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory(
      bool enable_video_encode_accelerator) {
    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
        vea_provider;
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index 243e827a746f..15b6b6d5dc80 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -129,7 +129,7 @@
+@@ -124,7 +124,7 @@
  
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
-@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -25,7 +25,7 @@
      mojo::PendingRemote<font_service::mojom::FontService> font_service;
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
-@@ -228,7 +228,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
    }
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -34,7 +34,7 @@
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -292,7 +292,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundledCodeCacheRes
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 9f632a10651e..75f5dc0feb9e 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2025-03-05 08:14:56 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2025-05-05 10:57:53 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
                                     const gpu::GPUInfo& gpu_info) const;
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index c2a327fe1a0e..634ba56f66c1 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- content/shell/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ content/shell/BUILD.gn
-@@ -1093,7 +1093,7 @@ group("content_shell_crash_test") {
+@@ -1099,7 +1099,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc b/www/chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc
new file mode 100644
index 000000000000..4547857015b5
--- /dev/null
+++ b/www/chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc
@@ -0,0 +1,11 @@
+--- content/shell/browser/shell_platform_delegate_views.cc.orig	2025-05-05 10:57:53 UTC
++++ content/shell/browser/shell_platform_delegate_views.cc
+@@ -373,7 +373,7 @@ void ShellPlatformDelegate::CreatePlatformWindow(
+       views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
+   params.bounds = gfx::Rect(initial_size);
+   params.delegate = delegate.release();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   params.wm_class_class = "chromium-content_shell";
+   params.wm_class_name = params.wm_class_class;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc
index 5c78277b2721..8df3e47d4b6f 100644
--- a/www/chromium/files/patch-content_utility_services.cc
+++ b/www/chromium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig	2025-02-19 07:43:18 UTC
+--- content/utility/services.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/utility/services.cc
 @@ -73,7 +73,7 @@
  extern sandbox::TargetServices* g_utility_target_services;
@@ -17,7 +17,7 @@
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  #include "content/common/features.h"
- #include "media/mojo/services/stable_video_decoder_factory_process_service.h"  // nogncheck
+ #include "media/mojo/services/oop_video_decoder_factory_process_service.h"  // nogncheck
 @@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
        << "task_policy_set TASK_QOS_POLICY";
  #endif
@@ -34,9 +34,9 @@
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- auto RunStableVideoDecoderFactoryProcessService(
-     mojo::PendingReceiver<
-@@ -392,7 +392,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+ auto RunOOPVideoDecoderFactoryProcessService(
+     mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) {
+@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessService(
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
@@ -45,16 +45,16 @@
  auto RunVideoEncodeAcceleratorProviderFactory(
      mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
          receiver) {
-@@ -415,7 +415,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
+@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
    // loop of type IO that can get notified when pipes have data.
    services.Add(RunNetworkService);
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
-   services.Add(RunStableVideoDecoderFactoryProcessService);
+   services.Add(RunOOPVideoDecoderFactoryProcessService);
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
-@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // BUILDFLAG(IS_CHROMEOS) && \
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc
index f33a098d2120..aef51005fa6f 100644
--- a/www/chromium/files/patch-content_utility_utility__main.cc
+++ b/www/chromium/files/patch-content_utility_utility__main.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_main.cc.orig	2025-02-19 07:43:18 UTC
+--- content/utility/utility_main.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/utility/utility_main.cc
 @@ -36,18 +36,22 @@
  #include "services/tracing/public/cpp/trace_startup.h"
@@ -28,15 +28,15 @@
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
--#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_BSD)
 +#include "sandbox/policy/sandbox.h"
 +#include "content/common/gpu_pre_sandbox_hook_bsd.h"
 +#endif
 +
-+#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "services/video_effects/video_effects_sandbox_hook_linux.h"  // nogncheck
- #endif  // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
+ #endif  // BUILDFLAG(IS_LINUX)
  
 @@ -101,7 +110,7 @@
  sandbox::TargetServices* g_utility_target_services = nullptr;
diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc
index a9f1f7a1227d..4cb3060a4e99 100644
--- a/www/chromium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig	2025-02-19 07:43:18 UTC
+--- content/zygote/zygote_linux.cc.orig	2025-05-05 10:57:53 UTC
 +++ content/zygote/zygote_linux.cc
 @@ -1,6 +1,7 @@
  // Copyright 2012 The Chromium Authors
@@ -6,9 +6,9 @@
  // found in the LICENSE file.
 +#if 0
  
- #ifdef UNSAFE_BUFFERS_BUILD
- // TODO(crbug.com/342213636): Remove this and spanify to fix the errors.
-@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
+ #include "content/zygote/zygote_linux.h"
+ 
+@@ -705,3 +706,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
  }
  
  }  // namespace content
diff --git a/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
index f0e21103b216..9f09f76f4a1b 100644
--- a/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
@@ -1,8 +1,8 @@
---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-02-19 07:43:18 UTC
+--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-05-05 10:57:53 UTC
 +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
 @@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+   MediaPerceptionAPIManager::GetFactoryInstance();
  #endif
-   MessageService::GetFactoryInstance();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-extensions_browser_api_management_management__api.cc b/www/chromium/files/patch-extensions_browser_api_management_management__api.cc
index 45f699c74443..1dfae9e8552a 100644
--- a/www/chromium/files/patch-extensions_browser_api_management_management__api.cc
+++ b/www/chromium/files/patch-extensions_browser_api_management_management__api.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/management/management_api.cc.orig	2024-08-26 12:06:38 UTC
+--- extensions/browser/api/management/management_api.cc.orig	2025-05-05 10:57:53 UTC
 +++ extensions/browser/api/management/management_api.cc
-@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
+@@ -286,7 +286,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
  #if BUILDFLAG(IS_CHROMEOS)
    // ChromeOS devices have this feature already shipped.
    return true;
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index 7f5a8eb7efd5..779ec03bb8a8 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/messaging/message_service.cc.orig	2025-04-04 08:52:13 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ extensions/browser/api/messaging/message_service.cc
-@@ -77,7 +77,7 @@ namespace {
+@@ -81,7 +81,7 @@ namespace {
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -667,7 +667,7 @@ void MessageService::OpenChannelToNativeAppImpl(
+@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNativeAppImpl(
      return;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
index 23045e696b86..dadf9f5403de 100644
--- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
@@ -1,4 +1,4 @@
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-01-15 09:18:26 UTC
+--- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-05-05 10:57:53 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.cc
 @@ -18,7 +18,7 @@
  #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
@@ -9,7 +9,7 @@
  #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
  #endif
  
-@@ -54,7 +54,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
+@@ -56,7 +56,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
    return std::make_unique<ShellDisplayInfoProvider>();
  }
  
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
index f18992355154..ac8913763cb2 100644
--- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
@@ -1,6 +1,6 @@
---- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-01-15 09:18:26 UTC
+--- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-05-05 10:57:53 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.h
-@@ -34,14 +34,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
+@@ -36,14 +36,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
        content::BrowserContext* browser_context) const override;
    std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider()
        const override;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
index b7194a52cf5c..4f7ff5cfcc7b 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-03-05 08:14:56 UTC
+--- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-05-05 10:57:53 UTC
 +++ gpu/command_buffer/service/dawn_context_provider.cc
-@@ -341,7 +341,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
+@@ -377,7 +377,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
    return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
               ? wgpu::BackendType::D3D12
               : wgpu::BackendType::D3D11;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc
index 6449367abfae..e2899d33add9 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_context_state.cc.orig	2025-04-04 08:52:13 UTC
+--- gpu/command_buffer/service/shared_context_state.cc.orig	2025-05-05 10:57:53 UTC
 +++ gpu/command_buffer/service/shared_context_state.cc
-@@ -65,7 +65,7 @@
+@@ -64,7 +64,7 @@
  #include "gpu/vulkan/vulkan_implementation.h"
  #include "gpu/vulkan/vulkan_util.h"
  
@@ -9,7 +9,7 @@
  #include "gpu/command_buffer/service/external_semaphore_pool.h"
  #endif
  
-@@ -334,7 +334,7 @@ SharedContextState::SharedContextState(
+@@ -322,7 +322,7 @@ SharedContextState::SharedContextState(
    if (gr_context_type_ == GrContextType::kVulkan) {
      if (vk_context_provider_) {
  #if BUILDFLAG(ENABLE_VULKAN) && \
@@ -18,7 +18,7 @@
        external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this);
  #endif
        use_virtualized_gl_contexts_ = false;
-@@ -371,7 +371,7 @@ SharedContextState::~SharedContextState() {
+@@ -359,7 +359,7 @@ SharedContextState::~SharedContextState() {
    }
  
  #if BUILDFLAG(ENABLE_VULKAN) && \
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index 6c610e2e30ca..8bdd24b1dd24 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2024-08-26 12:06:38 UTC
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
 @@ -20,7 +20,7 @@ namespace {
  // TODO(penghuang): verify the scanout is the right usage for video playback.
@@ -9,3 +9,12 @@
      SHARED_IMAGE_USAGE_SCANOUT |
  #endif
      SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE |
+@@ -121,7 +121,7 @@ bool AngleVulkanImageBackingFactory::IsGMBSupported(
+   switch (gmb_type) {
+     case gfx::EMPTY_BUFFER:
+       return true;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP: {
+       auto* vulkan_implementation =
+           context_state_->vk_context_provider()->GetVulkanImplementation();
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
index d8469992df9d..a5473bf1296f 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-04-04 08:52:13 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
 @@ -48,7 +48,7 @@
  #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h"
@@ -9,7 +9,16 @@
  #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h"
  #endif
  
-@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
+@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t
+     case gfx::IO_SURFACE_BUFFER:
+       return "platform";
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
+       return "platform";
+ #endif
+@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
    return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
  #elif BUILDFLAG(IS_ANDROID)
    return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
@@ -18,7 +27,7 @@
    return gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
  #elif BUILDFLAG(IS_WIN)
    return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE;
-@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory(
+@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory(
          context_state_, workarounds_);
      factories_.push_back(std::move(ozone_factory));
    }
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index 06bbf8fc5441..9cb37e42a5f7 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-03-05 08:14:56 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1752,7 +1752,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte
+@@ -1754,7 +1754,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte
        backend_types = {wgpu::BackendType::D3D12};
  #elif BUILDFLAG(IS_MAC)
        backend_types = {wgpu::BackendType::Metal};
@@ -9,7 +9,7 @@
        if (shared_context_state_->GrContextIsVulkan() ||
            shared_context_state_->IsGraphiteDawnVulkan()) {
          backend_types = {wgpu::BackendType::Vulkan};
-@@ -1994,7 +1994,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+@@ -1996,7 +1996,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
    }
  
  #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
index e9c1a27610f7..3d05e499f48e 100644
--- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_info_collector.cc.orig	2025-04-04 08:52:13 UTC
+--- gpu/config/gpu_info_collector.cc.orig	2025-05-05 10:57:53 UTC
 +++ gpu/config/gpu_info_collector.cc
-@@ -347,7 +347,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
+@@ -349,7 +349,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
  void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) {
    static BASE_FEATURE(kCollectWebGPUSupportMetrics,
                        "CollectWebGPUSupportMetrics",
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index d7de07a4bac5..b946965f7447 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_init.cc.orig	2025-04-04 08:52:13 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2025-05-05 10:57:53 UTC
 +++ gpu/ipc/service/gpu_init.cc
 @@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
  
@@ -9,7 +9,7 @@
    if (gpu_info.gpu.vendor_id != 0x10de ||  // NVIDIA
        gpu_info.gpu.driver_vendor != "NVIDIA")
      return true;
-@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    enable_watchdog = false;
  #endif
  
@@ -18,7 +18,7 @@
    bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
  #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
    // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -431,7 +431,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -27,7 +27,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      gpu_preferences_.gr_context_type = GrContextType::kGL;
    }
  
@@ -36,7 +36,7 @@
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -590,7 +590,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -586,7 +586,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -45,7 +45,7 @@
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -758,7 +758,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -754,7 +754,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
                ->GetSupportedFormatsForGLNativePixmapImport();
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -54,7 +54,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -810,7 +810,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -806,7 +806,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        }
      }
    }
@@ -63,7 +63,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1014,7 +1014,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1008,7 +1008,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
    }
    bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
  
@@ -72,7 +72,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1069,7 +1069,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1063,7 +1063,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
      }
    }
  
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
index 7503dbbd29e3..439114d13b50 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig	2024-06-17 12:56:06 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2025-05-05 10:57:53 UTC
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -391,7 +391,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
    VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
    VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
  
@@ -9,7 +9,7 @@
    VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
        vkGetImageDrmFormatModifierPropertiesEXT;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1405,7 +1405,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
                                                               pPresentInfo);
  }
  
@@ -18,7 +18,7 @@
  ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
      VkDevice device,
      VkImage image,
-@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+@@ -1415,4 +1415,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn
index 012a9590dd78..8423aea0c8a9 100644
--- a/www/chromium/files/patch-headless_BUILD.gn
+++ b/www/chromium/files/patch-headless_BUILD.gn
@@ -1,6 +1,6 @@
---- headless/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- headless/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ headless/BUILD.gn
-@@ -474,7 +474,7 @@ component("headless_non_renderer") {
+@@ -475,7 +475,7 @@ component("headless_non_renderer") {
      }
    }
  
diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
index ceb38bf70203..735b1b5ee409 100644
--- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- headless/lib/headless_content_main_delegate.cc.orig	2025-03-05 08:14:56 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig	2025-05-05 10:57:53 UTC
 +++ headless/lib/headless_content_main_delegate.cc
-@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
    if (process_type != ::switches::kZygoteProcess) {
      g_headless_crash_client.Pointer()->set_crash_dumps_dir(
          command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h
index 9a3ebb3f7733..4618c63ee766 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.h
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.h
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.h.orig	2025-03-05 08:14:56 UTC
+--- ipc/ipc_message_utils.h.orig	2025-05-05 10:57:53 UTC
 +++ ipc/ipc_message_utils.h
-@@ -215,7 +215,7 @@ struct ParamTraits<unsigned int> {
+@@ -216,7 +216,7 @@ struct ParamTraits<unsigned int> {
  // Since we want to support Android 32<>64 bit IPC, as long as we don't have
  // these traits for 32 bit ARM then that'll catch any errors.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 86410c13e4d1..ae5427149201 100644
--- a/www/chromium/files/patch-media_BUILD.gn
+++ b/www/chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig	2025-03-05 08:14:56 UTC
+--- media/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ media/BUILD.gn
-@@ -100,6 +100,9 @@ config("media_config") {
+@@ -105,6 +105,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
      }
    }
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index d9e082c25d04..77078fca9562 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- media/audio/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ media/audio/BUILD.gn
-@@ -271,9 +271,23 @@ source_set("audio") {
+@@ -275,9 +275,23 @@ source_set("audio") {
      deps += [ "//media/base/android:media_jni_headers" ]
    }
  
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index 76c4b674884b..fcbef7ae19df 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig	2025-04-04 08:52:13 UTC
+--- media/base/media_switches.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/base/media_switches.cc
 @@ -19,7 +19,7 @@
  #include "ui/gl/gl_features.h"
@@ -49,7 +49,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // When enabled, MediaCapabilities will check with GPU Video Accelerator
-@@ -611,7 +633,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture,
+@@ -636,7 +658,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture,
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
               "GlobalMediaControls",
@@ -58,7 +58,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -634,7 +656,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
+@@ -659,7 +681,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
               "MediaRemotingWithoutFullscreen",
@@ -67,7 +67,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -646,7 +668,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+@@ -671,7 +693,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -76,7 +76,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -675,7 +697,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -700,7 +722,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -85,7 +85,7 @@
  // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default
  // on chromeos, but needs an experiment on linux.
  BASE_FEATURE(kAcceleratedVideoDecodeLinux,
-@@ -775,7 +797,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
+@@ -800,7 +822,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
               "VSyncMjpegDecoding",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -94,8 +94,8 @@
  // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS.
  BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding,
               "V4L2H264TemporalLayerHWEncoding",
-@@ -1347,7 +1369,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1361,7 +1383,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
+ );
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -103,7 +103,7 @@
  // Spawn utility processes to perform hardware encode acceleration instead of
  // using the GPU process.
  BASE_FEATURE(kUseOutOfProcessVideoEncoding,
-@@ -1429,7 +1451,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
+@@ -1443,7 +1465,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
               "RecordWebAudioEngagement",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index 78de493db092..4ab453075200 100644
--- a/www/chromium/files/patch-media_base_media__switches.h
+++ b/www/chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,6 @@
---- media/base/media_switches.h.orig	2025-04-04 08:52:13 UTC
+--- media/base/media_switches.h.orig	2025-05-05 10:57:53 UTC
 +++ media/base/media_switches.h
-@@ -321,13 +321,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu
+@@ -329,13 +329,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
@@ -28,7 +28,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo);
-@@ -341,7 +353,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio);
+@@ -349,7 +361,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
@@ -37,7 +37,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux);
-@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
+@@ -371,7 +383,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -46,8 +46,8 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
-@@ -493,7 +505,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding);
+@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h
index cbba776523a9..5158a7d01c39 100644
--- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h
+++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h
@@ -1,7 +1,7 @@
---- media/capture/video/linux/v4l2_capture_device.h.orig	2022-02-07 13:39:41 UTC
+--- media/capture/video/linux/v4l2_capture_device.h.orig	2025-05-05 10:57:53 UTC
 +++ media/capture/video/linux/v4l2_capture_device.h
-@@ -21,7 +21,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
-  public:
+@@ -23,7 +23,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
+ 
    virtual int open(const char* device_name, int flags) = 0;
    virtual int close(int fd) = 0;
 -  virtual int ioctl(int fd, int request, void* argp) = 0;
diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc
deleted file mode 100644
index b1a6e38fe556..000000000000
--- a/www/chromium/files/patch-media_gpu_buffer__validation.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- media/gpu/buffer_validation.cc.orig	2024-11-14 07:57:23 UTC
-+++ media/gpu/buffer_validation.cc
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/gpu_memory_buffer.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <sys/types.h>
- #include <unistd.h>
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -23,7 +23,7 @@
- namespace media {
- 
- bool GetFileSize(const int fd, size_t* size) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (fd < 0) {
-     VLOG(1) << "Invalid file descriptor";
-     return false;
-@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle(
-     VLOG(1) << "Unsupported: " << pixel_format;
-     return false;
-   }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
-   if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
-       num_planes == 0) {
diff --git a/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
index 491cdb913a69..c103c07306e8 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2024-09-30 07:45:04 UTC
+--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/gpu/chromeos/mailbox_video_frame_converter.cc
-@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
+@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
                      << static_cast<int>(buffer_format);
        NOTREACHED();
    }
diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index 0ed1afbb7c39..7b36dc5acc35 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-04-04 08:52:13 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -1121,7 +1121,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1122,7 +1122,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    }
  #endif
  
@@ -9,7 +9,7 @@
    // Linux should always use a custom allocator (to allocate buffers using
    // libva) and a PlatformVideoFramePool.
    CHECK(allocator.has_value());
-@@ -1130,7 +1130,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1131,7 +1131,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
    main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
        *allocator, VideoFrame::STORAGE_DMABUFS);
@@ -18,7 +18,7 @@
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1304,7 +1304,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1305,7 +1305,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  
diff --git a/www/chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
index 79ac13120e79..8d7b9f6651ef 100644
--- a/www/chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
+++ b/www/chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
@@ -1,6 +1,6 @@
---- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-04-04 08:52:13 UTC
+--- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/gpu/gpu_video_decode_accelerator_factory.cc
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
  #include "media/gpu/media_gpu_export.h"
  #include "media/media_buildflags.h"
  
@@ -9,7 +9,7 @@
  #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h"
  #include "media/gpu/v4l2/v4l2_device.h"
  #endif
-@@ -28,7 +28,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA(
+@@ -29,7 +29,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA(
    if (gpu_preferences.disable_accelerated_video_decode)
      return nullptr;
  
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  
    std::unique_ptr<VideoDecodeAccelerator> vda;
-   vda.reset(new V4L2VideoDecodeAccelerator(new V4L2Device()));
+   vda.reset(new V4L2VideoDecodeAccelerator(base::MakeRefCounted<V4L2Device>()));
diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
index 3ff3f2d4136a..5401fc494c18 100644
--- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
+++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
@@ -1,20 +1,20 @@
---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-04-04 08:52:13 UTC
+--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -150,7 +150,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
-     return vea_factory_functions;
+@@ -160,7 +160,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+   }
  
  #if BUILDFLAG(USE_VAAPI)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
    }
-@@ -158,7 +158,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
-   vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+@@ -168,7 +168,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+   vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
  #endif
  #elif BUILDFLAG(USE_V4L2_CODEC)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateV4L2VEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA));
    }
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
index 9577ef9181bd..0e34b0e5015c 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-04-04 08:52:13 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
    const gfx::Size decoder_natural_size =
        aspect_ratio_.GetNaturalSize(decoder_visible_rect);
  
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
index 25a1df1814c0..c4193ff10fc7 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-04-04 08:52:13 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -79,7 +79,7 @@
+@@ -81,7 +81,7 @@
  using media_gpu_vaapi::kModuleVa_prot;
  #endif
  
diff --git a/www/chromium/files/patch-media_mojo_mojom_BUILD.gn b/www/chromium/files/patch-media_mojo_mojom_BUILD.gn
new file mode 100644
index 000000000000..b71bc8d98d33
--- /dev/null
+++ b/www/chromium/files/patch-media_mojo_mojom_BUILD.gn
@@ -0,0 +1,11 @@
+--- media/mojo/mojom/BUILD.gn.orig	2025-05-05 10:57:53 UTC
++++ media/mojo/mojom/BUILD.gn
+@@ -959,7 +959,7 @@ source_set("test_support") {
+   sources = []
+   deps = []
+ 
+-  if (is_linux || is_chromeos) {
++  if (!is_bsd && (is_linux || is_chromeos)) {
+     sources += [
+       "buffer_handle_test_util.cc",
+       "buffer_handle_test_util.h",
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_BUILD.gn b/www/chromium/files/patch-media_mojo_mojom_stable_BUILD.gn
deleted file mode 100644
index 2a895cdbc573..000000000000
--- a/www/chromium/files/patch-media_mojo_mojom_stable_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/mojo/mojom/stable/BUILD.gn.orig	2025-04-04 08:52:13 UTC
-+++ media/mojo/mojom/stable/BUILD.gn
-@@ -191,7 +191,7 @@ source_set("unit_tests") {
-   } else if (use_v4l2_codec) {
-     deps += [ "//media/gpu/v4l2:v4l2_status" ]
-   }
--  if (is_linux || is_chromeos) {
-+  if (!is_bsd && (is_linux || is_chromeos)) {
-     sources += [
-       "mojom_traits_test_util.cc",
-       "mojom_traits_test_util.h",
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
deleted file mode 100644
index afcd036344c5..000000000000
--- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig	2025-03-05 08:14:56 UTC
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -861,7 +861,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
-   return input.id;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- gfx::NativePixmapHandle StructTraits<
-     media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -882,7 +882,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
- 
-   output->type = gfx::NATIVE_PIXMAP;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!data.ReadPlatformHandle(&output->native_pixmap_handle))
-     return false;
-   return true;
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
deleted file mode 100644
index 5f29ae7963c5..000000000000
--- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2025-02-19 07:43:18 UTC
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -704,7 +704,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
-   static const gfx::GpuMemoryBufferId& id(
-       const gfx::GpuMemoryBufferHandle& input);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static gfx::NativePixmapHandle platform_handle(
-       gfx::GpuMemoryBufferHandle& input);
- #else
diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
index c84cef7414cb..c0064aa6c407 100644
--- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,4 +1,4 @@
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-04-04 08:52:13 UTC
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/mojo/mojom/video_frame_mojom_traits.cc
 @@ -24,7 +24,7 @@
  #include "ui/gfx/mojom/color_space_mojom_traits.h"
@@ -7,5 +7,32 @@
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/posix/eintr_wrapper.h"
+ #include "media/gpu/buffer_validation.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -166,7 +166,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+         media::mojom::OpaqueVideoFrameData::New());
+   }
  
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
+     // Duplicates the DMA buffer FDs to a new vector since this cannot take
+     // ownership of the FDs in |input| due to constness.
+@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+ 
+ }  // namespace
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // static
+ bool StructTraits<
+     media::mojom::ColorPlaneLayoutDataView,
+@@ -436,7 +436,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
+     frame = media::VideoFrame::WrapTrackingToken(
+         format, *metadata.tracking_token, coded_size, visible_rect,
+         natural_size, timestamp);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   } else if (data.is_dmabuf_data()) {
+     media::mojom::DmabufVideoFrameDataDataView dmabuf_data;
+     data.GetDmabufDataDataView(&dmabuf_data);
diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h
new file mode 100644
index 000000000000..d4e92c246aac
--- /dev/null
+++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h
@@ -0,0 +1,11 @@
+--- media/mojo/mojom/video_frame_mojom_traits.h.orig	2025-05-05 10:57:53 UTC
++++ media/mojo/mojom/video_frame_mojom_traits.h
+@@ -21,7 +21,7 @@
+ 
+ namespace mojo {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ template <>
+ struct StructTraits<media::mojom::ColorPlaneLayoutDataView,
+                     media::ColorPlaneLayout> {
diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
index ceef92797df1..f3aa96fb29ec 100644
--- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
+++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
@@ -1,4 +1,4 @@
---- media/video/fake_gpu_memory_buffer.cc.orig	2025-04-04 08:52:13 UTC
+--- media/video/fake_gpu_memory_buffer.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/video/fake_gpu_memory_buffer.cc
 @@ -14,7 +14,7 @@
  #include "media/base/format_utils.h"
@@ -18,21 +18,12 @@
  base::ScopedFD GetDummyFD() {
    base::ScopedFD fd(open("/dev/zero", O_RDWR));
    DCHECK(fd.is_valid());
-@@ -84,7 +84,7 @@ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTestin
-   static base::AtomicSequenceNumber buffer_id_generator;
-   handle.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext());
+@@ -73,7 +73,7 @@ static base::AtomicSequenceNumber buffer_id_generator;
+ 
+ }  // namespace
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   for (size_t i = 0; i < VideoFrame::NumPlanes(*video_pixel_format); i++) {
-     const gfx::Size plane_size_in_bytes =
-         VideoFrame::PlaneSize(*video_pixel_format, i, size);
-@@ -187,7 +187,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH
-   gfx::GpuMemoryBufferHandle handle;
-   handle.type = gfx::NATIVE_PIXMAP;
-   handle.id = handle_.id;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   handle.native_pixmap_handle =
-       gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
- #endif
+ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting(
+     const gfx::Size& size,
+     gfx::BufferFormat format,
diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index 45c152ea8687..6246933db5ce 100644
--- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-03-05 08:14:56 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -644,7 +644,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
  
    bool is_software_backed_video_frame = !video_frame->HasSharedImage();
@@ -9,7 +9,7 @@
    is_software_backed_video_frame &= !video_frame->HasDmaBufs();
  #endif
  
-@@ -1054,7 +1054,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1057,7 +1057,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
        media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get());
  #endif
  
@@ -18,7 +18,7 @@
    is_webgpu_compatible =
        handle.native_pixmap_handle.supports_zero_copy_webgpu_import;
  #endif
-@@ -1225,7 +1225,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr
+@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr
        si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
      }
  
diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
index 52b0f88b1a01..b5e49e7fa857 100644
--- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter.cc.orig	2025-03-05 08:14:56 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/video/video_encode_accelerator_adapter.cc
-@@ -463,7 +463,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele
+@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele
  
    auto format = PIXEL_FORMAT_I420;
    auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem;
diff --git a/www/chromium/files/patch-media_webrtc_audio__processor.cc b/www/chromium/files/patch-media_webrtc_audio__processor.cc
index f76533384e9d..b3098b79caa4 100644
--- a/www/chromium/files/patch-media_webrtc_audio__processor.cc
+++ b/www/chromium/files/patch-media_webrtc_audio__processor.cc
@@ -1,6 +1,6 @@
---- media/webrtc/audio_processor.cc.orig	2025-04-04 08:52:13 UTC
+--- media/webrtc/audio_processor.cc.orig	2025-05-05 10:57:53 UTC
 +++ media/webrtc/audio_processor.cc
-@@ -507,7 +507,7 @@ std::optional<double> AudioProcessor::ProcessData(
+@@ -509,7 +509,7 @@ std::optional<double> AudioProcessor::ProcessData(
    // controller.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    DCHECK_LE(volume, 1.0);
diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
index dc8437c63876..69e69e009bda 100644
--- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- mojo/public/tools/bindings/mojom.gni.orig	2025-04-04 08:52:13 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig	2025-05-05 10:57:53 UTC
 +++ mojo/public/tools/bindings/mojom.gni
-@@ -782,6 +782,16 @@ template("mojom") {
+@@ -774,6 +774,16 @@ template("mojom") {
        enabled_features += [ "is_apple" ]
      }
  
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index cda427f51991..dae5eaa2865b 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- net/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ net/BUILD.gn
 @@ -125,7 +125,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1312,6 +1312,19 @@ component("net") {
+@@ -1320,6 +1320,19 @@ component("net") {
      ]
    }
  
@@ -29,7 +29,7 @@
    if (is_mac) {
      sources += [
        "base/network_notification_thread_mac.cc",
-@@ -1475,7 +1488,7 @@ component("net") {
+@@ -1483,7 +1496,7 @@ component("net") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
@@ -38,7 +38,7 @@
      sources += [
        "base/network_interfaces_getifaddrs.cc",
        "base/network_interfaces_getifaddrs.h",
-@@ -2174,7 +2187,7 @@ static_library("test_support") {
+@@ -2182,7 +2195,7 @@ static_library("test_support") {
      ]
    }
  
@@ -47,7 +47,7 @@
      sources += [
        "base/address_tracker_linux_test_util.cc",
        "base/address_tracker_linux_test_util.h",
-@@ -2985,14 +2998,14 @@ target(_test_target_type, "net_unittests") {
+@@ -3001,14 +3014,14 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -64,7 +64,7 @@
      sources += [
        "base/address_tracker_linux_unittest.cc",
        "base/network_interfaces_linux_unittest.cc",
-@@ -3086,6 +3099,10 @@ target(_test_target_type, "net_unittests") {
+@@ -3104,6 +3117,10 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -75,7 +75,7 @@
    if (enable_websockets) {
      sources += [
        "server/http_connection_unittest.cc",
-@@ -3152,7 +3169,7 @@ target(_test_target_type, "net_unittests") {
+@@ -3170,7 +3187,7 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -84,7 +84,7 @@
      sources += [ "tools/quic/quic_simple_server_test.cc" ]
    }
  
-@@ -3291,7 +3308,7 @@ target(_test_target_type, "net_unittests") {
+@@ -3309,7 +3326,7 @@ target(_test_target_type, "net_unittests") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/chromium/files/patch-net_base_features.cc b/www/chromium/files/patch-net_base_features.cc
index c14b200ca11a..98ce72ef00fa 100644
--- a/www/chromium/files/patch-net_base_features.cc
+++ b/www/chromium/files/patch-net_base_features.cc
@@ -1,4 +1,4 @@
---- net/base/features.cc.orig	2025-03-05 08:14:56 UTC
+--- net/base/features.cc.orig	2025-05-05 10:57:53 UTC
 +++ net/base/features.cc
 @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin,
  BASE_FEATURE(kAsyncDns,
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -549,7 +549,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
+@@ -548,7 +548,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
               "SpdyHeadersToHttpResponseUseBuilder",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h
index 60b5536f1659..1dfa4ddd1ad7 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.h.orig	2024-11-14 07:57:23 UTC
+--- net/cert/cert_verify_proc.h.orig	2025-05-05 10:57:53 UTC
 +++ net/cert/cert_verify_proc.h
-@@ -186,7 +186,7 @@ class NET_EXPORT CertVerifyProc
+@@ -182,7 +182,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
    };
  
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
index 9da5491ded69..cfdeaa5e181a 100644
--- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,14 +1,13 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2024-07-30 11:12:21 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig	2025-05-05 10:57:53 UTC
 +++ net/http/http_auth_gssapi_posix.cc
-@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
-     static const char* const kDefaultLibraryNames[] = {
+@@ -366,7 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+   } else {
  #if BUILDFLAG(IS_APPLE)
-       "/System/Library/Frameworks/GSS.framework/GSS"
+     library_names.emplace_back("/System/Library/Frameworks/GSS.framework/GSS");
 -#elif BUILDFLAG(IS_OPENBSD)
--      "libgssapi.so"  // Heimdal - OpenBSD
 +#elif BUILDFLAG(IS_BSD)
-+      "libgssapi_krb5.so.2",  // MIT Kerberos - FreeBSD
-+      "libgssapi.so"          // Heimdal - OpenBSD, FreeBSD
++    // MIT Kerberos - FreeBSD
++    library_names.emplace_back("libgssapi_krb5.so.2");
+     // Heimdal - OpenBSD
+     library_names.emplace_back("libgssapi.so");
  #else
-       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
-       "libgssapi.so.4",       // Heimdal - Suse10, MDK
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index b5bfecaefcd0..b35bb0562443 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2024-07-30 11:12:21 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2025-05-05 10:57:53 UTC
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -11,7 +11,9 @@
  
@@ -18,7 +18,7 @@
  // Converts |value| from a decimal string to an int. If there was a failure
  // parsing, returns |default_value|.
  int StringToIntOrDefault(std::string_view value, int default_value) {
-@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1048,6 +1051,7 @@ class SettingGetterImplKDE : public ProxyConfigService
    // events on.
    scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
  };
@@ -26,7 +26,7 @@
  
  }  // namespace
  
-@@ -1256,9 +1260,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1266,9 +1270,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
      case base::nix::DESKTOP_ENVIRONMENT_KDE6:
diff --git a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
index 1a2fa1a664e9..ab99f2b09a95 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
@@ -1,4 +1,4 @@
---- net/socket/udp_socket_unittest.cc.orig	2025-04-04 08:52:13 UTC
+--- net/socket/udp_socket_unittest.cc.orig	2025-05-05 10:57:53 UTC
 +++ net/socket/udp_socket_unittest.cc
 @@ -371,7 +371,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
    EXPECT_EQ(second_packet, received);
@@ -27,7 +27,7 @@
      // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #else
-@@ -763,7 +763,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
+@@ -770,7 +770,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
  
  // TODO(crbug.com/40620614): failing on device on iOS 12.2.
  // TODO(crbug.com/40189274): flaky on Mac 11.
@@ -36,7 +36,7 @@
  #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
  #else
  #define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -817,7 +817,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
+@@ -824,7 +824,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
                                  NetLogSource());
    ASSERT_THAT(client_socket.Connect(send_address), IsOk());
  
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index bb123e4d2b87..5f536dc3ae13 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,4 +1,4 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2024-10-22 08:31:56 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2025-05-05 10:57:53 UTC
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
 @@ -35,7 +35,7 @@
  #include "third_party/boringssl/src/pki/trust_store.h"
@@ -18,7 +18,7 @@
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -580,7 +580,7 @@ int main(int argc, char** argv) {
+@@ -582,7 +582,7 @@ int main(int argc, char** argv) {
    std::string impls_str = command_line.GetSwitchValueASCII("impls");
    if (impls_str.empty()) {
      // Default value.
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index f8478f265f09..ff40ab053de7 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig	2025-04-04 08:52:13 UTC
+--- net/url_request/url_request_context_builder.cc.orig	2025-05-05 10:57:53 UTC
 +++ net/url_request/url_request_context_builder.cc
-@@ -440,7 +440,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index 15c41e8c2a32..40a488d22741 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2025-04-04 08:52:13 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2025-05-05 10:57:53 UTC
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -109,7 +109,7 @@
+@@ -111,7 +111,7 @@
  #include "ui/accessibility/ax_features.mojom-features.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -565,7 +565,7 @@ void InitializeSDK(bool enable_v8,
+@@ -567,7 +567,7 @@ void InitializeSDK(bool enable_v8,
  
    FPDF_InitLibraryWithConfig(&config);
  
diff --git a/www/chromium/files/patch-printing_printing__features.cc b/www/chromium/files/patch-printing_printing__features.cc
index d4dd86071308..82bbeb4661c8 100644
--- a/www/chromium/files/patch-printing_printing__features.cc
+++ b/www/chromium/files/patch-printing_printing__features.cc
@@ -1,7 +1,7 @@
---- printing/printing_features.cc.orig	2025-02-19 07:43:18 UTC
+--- printing/printing_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ printing/printing_features.cc
-@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr,
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -15,7 +15,7 @@
               base::FEATURE_DISABLED_BY_DEFAULT
  #else
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -69,7 +69,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
+@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
  // out-of-process.
  BASE_FEATURE(kEnableOopPrintDrivers,
               "EnableOopPrintDrivers",
diff --git a/www/chromium/files/patch-printing_printing__features.h b/www/chromium/files/patch-printing_printing__features.h
index 5d412bcef048..e4d23f9607ce 100644
--- a/www/chromium/files/patch-printing_printing__features.h
+++ b/www/chromium/files/patch-printing_printing__features.h
@@ -1,7 +1,7 @@
---- printing/printing_features.h.orig	2024-07-30 11:12:21 UTC
+--- printing/printing_features.h.orig	2025-05-05 10:57:53 UTC
 +++ printing/printing_features.h
-@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
- BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr);
+@@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
+ BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc
index 1d5099c700fe..cd7cc2ce8002 100644
--- a/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc
+++ b/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc
@@ -1,6 +1,6 @@
---- remoting/host/base/desktop_environment_options.cc.orig	2024-10-22 08:31:56 UTC
+--- remoting/host/base/desktop_environment_options.cc.orig	2025-05-05 10:57:53 UTC
 +++ remoting/host/base/desktop_environment_options.cc
-@@ -99,7 +99,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
+@@ -109,7 +109,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
    // TODO(joedow): Determine whether we can migrate additional platforms to
    // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then
    // clean up DesktopCapturerProxy::Core::CreateCapturer().
diff --git a/www/chromium/files/patch-remoting_host_chromoting__host.cc b/www/chromium/files/patch-remoting_host_chromoting__host.cc
index 73d4e28508a3..4884693a6305 100644
--- a/www/chromium/files/patch-remoting_host_chromoting__host.cc
+++ b/www/chromium/files/patch-remoting_host_chromoting__host.cc
@@ -1,6 +1,6 @@
---- remoting/host/chromoting_host.cc.orig	2025-01-15 09:18:26 UTC
+--- remoting/host/chromoting_host.cc.orig	2025-05-05 10:57:53 UTC
 +++ remoting/host/chromoting_host.cc
-@@ -135,7 +135,7 @@ void ChromotingHost::Start(const std::string& host_own
+@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::string& host_own
        &ChromotingHost::OnIncomingSession, base::Unretained(this)));
  }
  
diff --git a/www/chromium/files/patch-remoting_host_chromoting__host.h b/www/chromium/files/patch-remoting_host_chromoting__host.h
index 13b2e15ab6fc..0384066d46a6 100644
--- a/www/chromium/files/patch-remoting_host_chromoting__host.h
+++ b/www/chromium/files/patch-remoting_host_chromoting__host.h
@@ -1,4 +1,4 @@
---- remoting/host/chromoting_host.h.orig	2025-01-15 09:18:26 UTC
+--- remoting/host/chromoting_host.h.orig	2025-05-05 10:57:53 UTC
 +++ remoting/host/chromoting_host.h
 @@ -36,7 +36,7 @@
  #include "remoting/protocol/session_manager.h"
@@ -18,7 +18,7 @@
    // Starts running the ChromotingHostServices server and listening for incoming
    // IPC binding requests.
    // Currently only Linux runs the ChromotingHostServices server on the host
-@@ -220,7 +220,7 @@ class ChromotingHost : public ClientSession::EventHand
+@@ -222,7 +222,7 @@ class ChromotingHost : public ClientSession::EventHand
    // List of host extensions.
    std::vector<std::unique_ptr<HostExtension>> extensions_;
  
diff --git a/www/chromium/files/patch-remoting_host_client__session.cc b/www/chromium/files/patch-remoting_host_client__session.cc
index 73017aba1fae..39bc7665a847 100644
--- a/www/chromium/files/patch-remoting_host_client__session.cc
+++ b/www/chromium/files/patch-remoting_host_client__session.cc
@@ -1,6 +1,6 @@
---- remoting/host/client_session.cc.orig	2025-04-04 08:52:13 UTC
+--- remoting/host/client_session.cc.orig	2025-05-05 10:57:53 UTC
 +++ remoting/host/client_session.cc
-@@ -187,7 +187,7 @@ void ClientSession::NotifyClientResolution(
+@@ -188,7 +188,7 @@ void ClientSession::NotifyClientResolution(
    if (effective_policies_.curtain_required.value_or(false)) {
      dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
    }
diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc
index 088c9fa186c5..2212d6af890c 100644
--- a/www/chromium/files/patch-remoting_host_host__attributes.cc
+++ b/www/chromium/files/patch-remoting_host_host__attributes.cc
@@ -1,6 +1,6 @@
---- remoting/host/host_attributes.cc.orig	2024-06-17 12:56:06 UTC
+--- remoting/host/host_attributes.cc.orig	2025-05-05 10:57:53 UTC
 +++ remoting/host/host_attributes.cc
-@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
+@@ -103,7 +103,7 @@ std::string GetHostAttributes() {
    if (media::InitializeMediaFoundation()) {
      result.push_back("HWEncoder");
    }
diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
index 91859eeb57d1..7a7477a16fb1 100644
--- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
+++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,4 +1,4 @@
---- remoting/host/remoting_me2me_host.cc.orig	2025-04-04 08:52:13 UTC
+--- remoting/host/remoting_me2me_host.cc.orig	2025-05-05 10:57:53 UTC
 +++ remoting/host/remoting_me2me_host.cc
 @@ -138,7 +138,7 @@
  #include "remoting/host/mac/permission_utils.h"
@@ -36,7 +36,7 @@
  // The command line switch used to pass name of the pipe to capture audio on
  // linux.
  const char kAudioPipeSwitchName[] = "audio-pipe-name";
-@@ -440,7 +440,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -441,7 +441,7 @@ class HostProcess : public ConfigWatcher::Delegate,
    std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_;
  #endif
  
@@ -45,7 +45,7 @@
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -505,7 +505,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -506,7 +506,7 @@ class HostProcess : public ConfigWatcher::Delegate,
    std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_;
  
    std::unique_ptr<HostEventLogger> host_event_logger_;
@@ -54,7 +54,7 @@
    std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
  #endif
    std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -824,7 +824,7 @@ void HostProcess::StartOnNetworkThread() {
+@@ -825,7 +825,7 @@ void HostProcess::StartOnNetworkThread() {
  void HostProcess::ShutdownOnNetworkThread() {
    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
    config_watcher_.reset();
@@ -63,7 +63,7 @@
    cert_watcher_.reset();
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -901,7 +901,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -902,7 +902,7 @@ void HostProcess::CreateAuthenticatorFactory() {
              context_->create_client_cert_store_callback(),
              service_account_email_, oauth_refresh_token_));
  
@@ -72,7 +72,7 @@
      if (!cert_watcher_) {
        cert_watcher_ = std::make_unique<CertificateWatcher>(
            base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -1043,7 +1043,7 @@ void HostProcess::StartOnUiThread() {
+@@ -1044,7 +1044,7 @@ void HostProcess::StartOnUiThread() {
        base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
  
@@ -81,7 +81,7 @@
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name =
-@@ -1122,7 +1122,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1123,7 +1123,7 @@ void HostProcess::ShutdownOnUiThread() {
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -90,7 +90,7 @@
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1131,7 +1131,7 @@ void HostProcess::ShutdownOnUiThread() {
    AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -99,16 +99,16 @@
    context_->input_task_runner()->PostTask(
        FROM_HERE,
        base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
-@@ -1864,7 +1864,7 @@ void HostProcess::StartHost() {
+@@ -1873,7 +1873,7 @@ void HostProcess::StartHost() {
      corp_host_status_logger_->StartObserving(*session_manager);
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_);
+   desktop_environment_options_.set_enable_remote_webauthn(true);
  #endif
  #if BUILDFLAG(IS_WIN)
-@@ -1891,7 +1891,7 @@ void HostProcess::StartHost() {
+@@ -1900,7 +1900,7 @@ void HostProcess::StartHost() {
  
    host_->AddExtension(std::make_unique<TestEchoExtension>());
  
@@ -117,7 +117,7 @@
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->HasSwitch(kEnableUtempter)) {
      host_utmp_logger_ =
-@@ -1927,7 +1927,7 @@ void HostProcess::StartHost() {
+@@ -1936,7 +1936,7 @@ void HostProcess::StartHost() {
    // addresses.
    host_->Start(*host_owner_emails_.begin());
  
@@ -126,7 +126,7 @@
    // For Windows, ChromotingHostServices connections are handled by the daemon
    // process, then the message pipe is forwarded to the network process.
    host_->StartChromotingHostServices();
-@@ -2072,7 +2072,7 @@ int HostProcessMain() {
+@@ -2081,7 +2081,7 @@ int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
  
@@ -135,7 +135,7 @@
  #if defined(REMOTING_USE_X11)
    // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
    // use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -2135,7 +2135,7 @@ int HostProcessMain() {
+@@ -2144,7 +2144,7 @@ int HostProcessMain() {
    std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
        net::NetworkChangeNotifier::CreateIfNeeded());
  
diff --git a/www/chromium/files/patch-remoting_host_session__policies__from__dict.cc b/www/chromium/files/patch-remoting_host_session__policies__from__dict.cc
index 6c2fc58a15c6..37bdc2cbc5a3 100644
--- a/www/chromium/files/patch-remoting_host_session__policies__from__dict.cc
+++ b/www/chromium/files/patch-remoting_host_session__policies__from__dict.cc
@@ -1,11 +1,11 @@
---- remoting/host/session_policies_from_dict.cc.orig	2025-01-15 09:18:26 UTC
+--- remoting/host/session_policies_from_dict.cc.orig	2025-05-05 10:57:53 UTC
 +++ remoting/host/session_policies_from_dict.cc
-@@ -76,7 +76,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict
-       .curtain_required =
-           dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain),
+@@ -75,7 +75,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict
+   session_policies.curtain_required =
+       dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain);
  #endif
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       .host_username_match_required =
-           dict.FindBool(policy::key::kRemoteAccessHostMatchUsername),
+   session_policies.host_username_match_required =
+       dict.FindBool(policy::key::kRemoteAccessHostMatchUsername);
  #endif
diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn
index 57ce91d4c850..6b3014a09e85 100644
--- a/www/chromium/files/patch-sandbox_linux_BUILD.gn
+++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/linux/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- sandbox/linux/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ sandbox/linux/BUILD.gn
 @@ -12,11 +12,11 @@ if (is_android) {
  }
@@ -15,7 +15,7 @@
  
    # On Android, use plain GTest.
    use_base_test_suite = is_linux || is_chromeos
-@@ -378,6 +378,17 @@ component("sandbox_services") {
+@@ -369,6 +369,17 @@ component("sandbox_services") {
        "services/libc_interceptor.h",
      ]
    }
diff --git a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
index 7d4a3492712e..00e026995def 100644
--- a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
+++ b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2024-11-14 07:57:23 UTC
+--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2025-05-05 10:57:53 UTC
 +++ sandbox/policy/openbsd/sandbox_openbsd.cc
 @@ -0,0 +1,392 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -333,7 +333,7 @@
 +      break;
 +    case sandbox::mojom::Sandbox::kGpu:
 +    case sandbox::mojom::Sandbox::kOnDeviceModelExecution:
-+      SetPledge("stdio drm rpath flock cpath wpath prot_exec recvfd sendfd tmppath", NULL);
++      SetPledge("stdio drm inet rpath flock cpath wpath prot_exec recvfd sendfd tmppath unix", NULL);
 +      break;
 +#if BUILDFLAG(ENABLE_PPAPI)
 +    case sandbox::mojom::Sandbox::kPpapi:
diff --git a/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc
index f9c2b524b500..975eac2132a6 100644
--- a/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc
+++ b/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc
@@ -1,8 +1,8 @@
---- services/device/geolocation/location_provider_manager.cc.orig	2025-02-19 07:43:18 UTC
+--- services/device/geolocation/location_provider_manager.cc.orig	2025-05-05 10:57:53 UTC
 +++ services/device/geolocation/location_provider_manager.cc
 @@ -91,7 +91,7 @@ LocationProviderManager::LocationProviderManager(
- #if BUILDFLAG(IS_ANDROID)
-   // On Android, default to using the platform location provider.
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+   // On Android and iOS, default to using the platform location provider.
    provider_manager_mode_ = kPlatformOnly;
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-services_device_public_cpp_device__features.cc b/www/chromium/files/patch-services_device_public_cpp_device__features.cc
index 5a54fa05145a..6edb82131f7e 100644
--- a/www/chromium/files/patch-services_device_public_cpp_device__features.cc
+++ b/www/chromium/files/patch-services_device_public_cpp_device__features.cc
@@ -1,6 +1,6 @@
---- services/device/public/cpp/device_features.cc.orig	2025-04-04 08:52:13 UTC
+--- services/device/public/cpp/device_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ services/device/public/cpp/device_features.cc
-@@ -120,7 +120,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
+@@ -135,7 +135,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
  
  // Controls whether Chrome will try to automatically detach kernel drivers when
  // a USB interface is busy.
diff --git a/www/chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc b/www/chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc
new file mode 100644
index 000000000000..4fc0bd434f3e
--- /dev/null
+++ b/www/chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc
@@ -0,0 +1,38 @@
+--- services/device/usb/usb_device_handle_usbfs.cc.orig	2025-05-05 10:57:53 UTC
++++ services/device/usb/usb_device_handle_usbfs.cc
+@@ -39,7 +39,7 @@
+ #include "chromeos/dbus/permission_broker/permission_broker_client.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/device/public/cpp/device_features.h"
+ #include "services/device/usb/usb_interface_detach_allowlist.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::R
+   return true;
+ }
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface(
+     int interface_number,
+     const CombinedInterfaceInfo& interface_info) {
+@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterface(int interfac
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     const mojom::UsbConfigurationInfo* config =
+         device_->GetActiveConfiguration();
+@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     helper_.AsyncCall(&BlockingTaskRunnerHelper::ReattachInterface)
+         .WithArgs(interface_number)
diff --git a/www/chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h b/www/chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h
new file mode 100644
index 000000000000..448537157c55
--- /dev/null
+++ b/www/chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h
@@ -0,0 +1,38 @@
+--- services/device/usb/usb_device_handle_usbfs.h.orig	2025-05-05 10:57:53 UTC
++++ services/device/usb/usb_device_handle_usbfs.h
+@@ -19,7 +19,7 @@
+ #include "base/threading/sequence_bound.h"
+ #include "services/device/usb/usb_device_handle.h"
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/containers/flat_set.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+ 
+@@ -215,7 +215,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   bool ClearHalt(uint8_t endpoint_address);
+   void DiscardUrb(Transfer* transfer);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Detach the interface from a kernel driver before ClaimInterface
+   virtual bool DetachInterface(int interface_number,
+                                const CombinedInterfaceInfo& interfaceInfo);
+@@ -228,7 +228,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   // Called when |fd_| is writable without blocking.
+   void OnFileCanWriteWithoutBlocking();
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Called from |DetachInterface|.
+   std::string GetKernelDriver(int interface_number) const;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -240,7 +240,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   std::unique_ptr<base::FileDescriptorWatcher::Controller> watch_controller_;
+   SEQUENCE_CHECKER(sequence_checker_);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // All interfaces that have been detached from kernel drivers
+   base::flat_set<int> detached_interfaces_;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index 940a0b08bf2e..799fabdf3758 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- services/network/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ services/network/BUILD.gn
-@@ -397,7 +397,6 @@ if (is_linux || is_chromeos) {
+@@ -400,7 +400,6 @@ if (is_linux || is_chromeos) {
      ]
      deps = [
        "//base:base",
diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc
index 8dc58d7afd18..5ddf2b018391 100644
--- a/www/chromium/files/patch-services_network_network__context.cc
+++ b/www/chromium/files/patch-services_network_network__context.cc
@@ -1,6 +1,6 @@
---- services/network/network_context.cc.orig	2025-04-04 08:52:13 UTC
+--- services/network/network_context.cc.orig	2025-05-05 10:57:53 UTC
 +++ services/network/network_context.cc
-@@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
+@@ -607,7 +607,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
  NetworkContext::NetworkContextHttpAuthPreferences::
      ~NetworkContextHttpAuthPreferences() = default;
  
@@ -9,7 +9,7 @@
  bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
      const {
    if (network_service_) {
-@@ -2552,7 +2552,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
+@@ -2557,7 +2557,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
        http_auth_dynamic_network_service_params->android_negotiate_account_type);
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/www/chromium/files/patch-services_network_network__context.h b/www/chromium/files/patch-services_network_network__context.h
index 0dd5d2227560..de9c1b761258 100644
--- a/www/chromium/files/patch-services_network_network__context.h
+++ b/www/chromium/files/patch-services_network_network__context.h
@@ -1,6 +1,6 @@
---- services/network/network_context.h.orig	2025-04-04 08:52:13 UTC
+--- services/network/network_context.h.orig	2025-05-05 10:57:53 UTC
 +++ services/network/network_context.h
-@@ -709,7 +709,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -715,7 +715,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
     public:
      explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
      ~NetworkContextHttpAuthPreferences() override;
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index 1ec70bf85e6b..fc0d65c275c2 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig	2025-04-04 08:52:13 UTC
+--- services/network/network_service.cc.orig	2025-05-05 10:57:53 UTC
 +++ services/network/network_service.cc
-@@ -102,11 +102,11 @@
+@@ -103,11 +103,11 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
@@ -14,7 +14,7 @@
  #include "services/network/network_change_notifier_passive_factory.h"
  #endif
  
-@@ -999,7 +999,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
+@@ -1016,7 +1016,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
    net::SetExplicitlyAllowedPorts(ports);
  }
  
@@ -23,7 +23,7 @@
  void NetworkService::SetGssapiLibraryLoadObserver(
      mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
          gssapi_library_load_observer) {
-@@ -1081,7 +1081,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
+@@ -1116,7 +1116,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
    );
  }
  
diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h
index 62b9c98a16c4..48283248dd93 100644
--- a/www/chromium/files/patch-services_network_network__service.h
+++ b/www/chromium/files/patch-services_network_network__service.h
@@ -1,6 +1,6 @@
---- services/network/network_service.h.orig	2025-04-04 08:52:13 UTC
+--- services/network/network_service.h.orig	2025-05-05 10:57:53 UTC
 +++ services/network/network_service.h
-@@ -249,7 +249,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -250,7 +250,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
        const std::vector<ContentSettingPatternSource>& settings) override;
  
    void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
@@ -9,7 +9,7 @@
    void SetGssapiLibraryLoadObserver(
        mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
            gssapi_library_load_observer) override;
-@@ -275,7 +275,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -291,7 +291,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
        NetworkContext* network_context);
  
@@ -18,7 +18,7 @@
    // This is called just before a GSSAPI library may be loaded.
    void OnBeforeGssapiLibraryLoad();
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -531,7 +531,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -547,7 +547,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    // leaking stale listeners between tests.
    std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
  
diff --git a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
index 448e0c3818da..521957f5716c 100644
--- a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
+++ b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/cpp/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- services/network/public/cpp/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ services/network/public/cpp/BUILD.gn
-@@ -570,7 +570,7 @@ component("cpp_base") {
+@@ -621,7 +621,7 @@ component("cpp_base") {
      sources += [ "transferable_directory_fuchsia.cc" ]
    }
  
diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
index 9a7cc591ffd0..1823ceeaaaec 100644
--- a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
+++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/mojom/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- services/network/public/mojom/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ services/network/public/mojom/BUILD.gn
-@@ -600,11 +600,11 @@ mojom("url_loader_base") {
+@@ -674,11 +674,11 @@ mojom("url_loader_base") {
    }
  
    enabled_features = []
@@ -14,7 +14,7 @@
      # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
      # not include lacros.
      enabled_features += [ "use_network_interface_change_listener" ]
-@@ -1672,7 +1672,7 @@ mojom("mojom") {
+@@ -1765,7 +1765,7 @@ mojom("mojom") {
      }
    }
  
diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
index 8a1758021cae..1345b08dac01 100644
--- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
@@ -1,4 +1,4 @@
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-03-05 08:14:56 UTC
+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-05-05 10:57:53 UTC
 +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
 @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
                                       uint32_t shared_resident_kb) {
@@ -18,7 +18,7 @@
    os_dump->private_footprint_swap_kb =
        internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
    os_dump->mappings_count = internal_os_dump.mappings_count;
-@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // On most platforms each process can dump data about their own process
  // so ask each process to do so Linux is special see below.
@@ -27,7 +27,7 @@
      request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
      client->RequestOSMemoryDump(request->memory_map_option(),
                                  {base::kNullProcessId},
-@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // In some cases, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -36,7 +36,7 @@
    std::vector<base::ProcessId> pids;
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
+@@ -283,7 +283,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
      const OsCallback& os_callback) {
  // On Linux, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -45,7 +45,7 @@
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = 0;
    for (const auto& client_info : clients) {
-@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
+@@ -333,7 +333,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
      // each client process provides 1 OS dump, % the case where the client is
      // disconnected mid dump.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
@@ -54,7 +54,7 @@
      for (auto& kv : extra_os_dumps) {
        auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
        DCHECK(results.find(pid) == results.end());
-@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
+@@ -394,7 +394,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
      // crash). In the latter case (OS_LINUX) we expect the full map to come
      // from the browser process response.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
diff --git a/www/chromium/files/patch-skia_ext_font__utils.cc b/www/chromium/files/patch-skia_ext_font__utils.cc
index 6afb4d058a17..ab91a0543b0e 100644
--- a/www/chromium/files/patch-skia_ext_font__utils.cc
+++ b/www/chromium/files/patch-skia_ext_font__utils.cc
@@ -1,6 +1,6 @@
---- skia/ext/font_utils.cc.orig	2025-04-04 08:52:13 UTC
+--- skia/ext/font_utils.cc.orig	2025-05-05 10:57:53 UTC
 +++ skia/ext/font_utils.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h"
  #endif
  
@@ -9,8 +9,8 @@
  #include "third_party/skia/include/ports/SkFontConfigInterface.h"
  #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
  #include "third_party/skia/include/ports/SkFontScanner_Fontations.h"
-@@ -62,7 +62,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() {
-   return SkFontMgr_New_Android(nullptr);
+@@ -67,7 +67,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() {
+   }
  #elif BUILDFLAG(IS_APPLE)
    return SkFontMgr_New_CoreText(nullptr);
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
index a727720e35af..7f72dc12f3ed 100644
--- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
+++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
@@ -1,6 +1,6 @@
---- third_party/abseil-cpp/absl/base/config.h.orig	2025-04-04 08:52:13 UTC
+--- third_party/abseil-cpp/absl/base/config.h.orig	2025-05-05 10:57:53 UTC
 +++ third_party/abseil-cpp/absl/base/config.h
-@@ -411,7 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -409,7 +409,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  #ifdef ABSL_HAVE_SCHED_YIELD
  #error ABSL_HAVE_SCHED_YIELD cannot be directly set
  #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
@@ -9,7 +9,7 @@
  #define ABSL_HAVE_SCHED_YIELD 1
  #endif
  
-@@ -426,7 +426,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -424,7 +424,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  // platforms.
  #ifdef ABSL_HAVE_SEMAPHORE_H
  #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
diff --git a/www/chromium/files/patch-third__party_angle_src_common_platform.h b/www/chromium/files/patch-third__party_angle_src_common_platform.h
index 19c34403d542..1669015e497a 100644
--- a/www/chromium/files/patch-third__party_angle_src_common_platform.h
+++ b/www/chromium/files/patch-third__party_angle_src_common_platform.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/common/platform.h.orig	2022-02-07 13:39:41 UTC
+--- third_party/angle/src/common/platform.h.orig	2025-05-05 10:57:53 UTC
 +++ third_party/angle/src/common/platform.h
-@@ -26,7 +26,15 @@
+@@ -23,7 +23,15 @@
  #elif defined(__linux__) || defined(EMSCRIPTEN)
  #    define ANGLE_PLATFORM_LINUX 1
  #    define ANGLE_PLATFORM_POSIX 1
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index 637fbd6c52b5..07016ad71d16 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig	2025-03-05 08:14:56 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2025-05-05 10:57:53 UTC
 +++ third_party/angle/src/libANGLE/Display.cpp
 @@ -58,7 +58,7 @@
  #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -36,7 +36,7 @@
  #        if defined(ANGLE_USE_GBM)
              if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
              {
-@@ -2139,7 +2139,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2133,7 +2133,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.platformWaylandEXT = true;
  #endif
  
@@ -45,7 +45,7 @@
      extensions.platformSurfacelessMESA = true;
  #endif
  
-@@ -2186,7 +2186,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2180,7 +2180,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.x11Visual = true;
  #endif
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/www/chromium/files/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 000000000000..53da5d93f0b8
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-05-05 18:35:31 UTC
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args
+         # https://savannah.gnu.org/bugs/index.php?53028
+         gperf_output = re.sub(r'\bregister ', '', gperf_output)
+         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
++        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++        if re.search(
++                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
++                gperf_output):
++            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
++                                                '  [[fallthrough]];')
+         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+         # Replace {(int)(long)&(foo), bar} with
+         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index 82707e231723..121c898cce70 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-04-04 08:52:13 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/controller/blink_initializer.cc
 @@ -82,12 +82,12 @@
  #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
@@ -24,8 +24,8 @@
    binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
        ConvertToBaseRepeatingCallback(
            CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -305,7 +305,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
- #endif
+@@ -304,7 +304,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
+   MemorySaverController::Initialize();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
 -    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index 8fcf2d984c3f..dbdb5a359075 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-04-04 08:52:13 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -427,7 +427,7 @@ void RecordPrerenderActivationSignalDelay(const String
+@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String
  #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN)
  SkFontHinting RendererPreferencesToSkiaHinting(
      const blink::RendererPreferences& prefs) {
@@ -9,7 +9,7 @@
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3426,7 +3426,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
        gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
    WebFontRenderStyle::SetSubpixelPositioning(
        renderer_preferences_.use_subpixel_positioning);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index 4914da26afe8..43625137dabe 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-04-04 08:52:13 UTC
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
  
  /* The value is based on user statistics on Nov 2017. */
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index 91be187952b0..2fc741d9aae6 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-02-19 07:43:18 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/core/layout/layout_view.cc
 @@ -74,7 +74,7 @@
  #include "ui/display/screen_info.h"
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -784,7 +784,7 @@ void LayoutView::LayoutRoot() {
+@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() {
      intrinsic_logical_widths_ = LogicalWidth();
    }
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
index f3135a831cac..cb2b5023d544 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-03-05 08:14:56 UTC
+--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/core/loader/mixed_content_checker.cc
-@@ -484,7 +484,7 @@ bool MixedContentChecker::ShouldBlockFetch(
+@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFetch(
    switch (context_type) {
      case mojom::blink::MixedContentContextType::kOptionallyBlockable:
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/www/chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
new file mode 100644
index 000000000000..e3fd416b3c03
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/page/context_menu_controller.cc.orig	2025-05-05 10:57:53 UTC
++++ third_party/blink/renderer/core/page/context_menu_controller.cc
+@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame
+     if (potential_image_node != nullptr &&
+         IsA<HTMLCanvasElement>(potential_image_node)) {
+       data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // TODO(crbug.com/40902474): Support reading from the WebGPU front buffer
+       // on Linux and remove the below code, which results in "Copy Image" and
+       // "Save Image To" being grayed out in the context menu.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
index 430887fc3be8..d55531d53a6e 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-02-19 07:43:18 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -123,7 +123,7 @@ namespace blink {
+@@ -124,7 +124,7 @@ namespace blink {
  
  namespace {
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
index 0ab8ed441bdc..a1e16069f938 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-01-15 09:18:26 UTC
+--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
-@@ -873,7 +873,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
+@@ -857,7 +857,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
              mixer->get_output_params_for_testing().sample_rate());
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index d28d8f8aa87e..c13648120948 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-04-16 07:51:27 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6343,7 +6343,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
    constexpr bool kAllowZeroCopyImages = true;
  #endif
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
new file mode 100644
index 000000000000..d09a6ed8a595
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig	2025-05-05 10:57:53 UTC
++++ third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc
+@@ -207,7 +207,7 @@ bool GPUCanvasContext::PaintRenderingResultsToCanvas(
+ 
+   scoped_refptr<WebGPUMailboxTexture> front_buffer_texture;
+   if (source_buffer == kFrontBuffer) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // By returning false here the canvas will show up as black in the scenarios
+     // that copy the front buffer, such as printing.
+     // TODO(crbug.com/40902474): Support concurrent SharedImage reads via Dawn
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index 893b88bc3a40..7bbca5c7ee89 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-03-05 08:14:56 UTC
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -815,7 +815,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+@@ -812,7 +812,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
  // on linux platform.
  // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
  // backend is failing for unknown reasons.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 634a77a6f9fe..f6cc2e7d047d 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -2034,7 +2034,7 @@ static_library("test_support") {
+@@ -2046,7 +2046,7 @@ static_library("test_support") {
    ]
  
    # fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index cc7e3a2415eb..45053d8e8fee 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-04-04 08:52:13 UTC
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/platform/fonts/font_description.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
  #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -279,7 +279,7 @@ FontCacheKey FontDescription::CacheKey(
+@@ -280,7 +280,7 @@ FontCacheKey FontDescription::CacheKey(
        static_cast<unsigned>(fields_.orientation_) << 1 |            // bit 2-3
        static_cast<unsigned>(fields_.subpixel_text_position_);       // bit 1
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
index d3b31bc52155..aafbf15e688a 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-02-19 07:43:18 UTC
+--- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-@@ -48,7 +48,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated(
+@@ -47,7 +47,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated(
  
    const auto paint_image = source->PaintImageForCurrentFrame();
    const auto image_info = paint_image.GetSkImageInfo();
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
index 6f12df5c0495..9cc3e05ffb4c 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-04-04 08:52:13 UTC
+--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -329,12 +329,12 @@ SupportedFormats GetSupportedFormatsInternal(
+@@ -324,12 +324,12 @@ SupportedFormats GetSupportedFormatsInternal(
        supported_formats.profiles.push_back(profile.profile);
        supported_formats.sdp_formats.push_back(std::move(*format));
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index 1c845c2c8472..a797353d5556 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-04-04 08:52:13 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-05-05 10:57:53 UTC
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -424,7 +424,7 @@
+@@ -434,7 +434,7 @@
        name: "AppTitle",
        status: "experimental",
        origin_trial_feature_name: "AppTitle",
@@ -9,7 +9,7 @@
        base_feature: "WebAppEnableAppTitle",
      },
      {
-@@ -1683,7 +1683,7 @@
+@@ -1698,7 +1698,7 @@
        name: "DocumentIsolationPolicy",
        status: "experimental",
        origin_trial_feature_name: "DocumentIsolationPolicy",
@@ -18,7 +18,7 @@
        base_feature: "none",
      },
      {
-@@ -1932,7 +1932,7 @@
+@@ -1943,7 +1943,7 @@
        base_feature: "none",
        public: true,
        origin_trial_feature_name: "FedCmMultipleIdentityProviders",
@@ -27,7 +27,7 @@
        origin_trial_allows_third_party: true,
      },
      {
-@@ -3335,7 +3335,7 @@
+@@ -3331,7 +3331,7 @@
        // Tracking bug for the implementation: https://crbug.com/1462930
        name: "PermissionElement",
        origin_trial_feature_name: "PermissionElement",
@@ -36,7 +36,7 @@
        status: "experimental",
        public: true,
        base_feature_status: "enabled",
-@@ -3459,7 +3459,7 @@
+@@ -3475,7 +3475,7 @@
      {
        name: "PrivateNetworkAccessPermissionPrompt",
        origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
@@ -45,7 +45,7 @@
        status: "stable",
        public: true,
        base_feature: "none",
-@@ -4580,7 +4580,7 @@
+@@ -4636,7 +4636,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -54,7 +54,7 @@
      },
      // Enables using policy-controlled feature "usb-unrestricted" to allow
      // isolated context to access protected USB interface classes and to
-@@ -4753,7 +4753,7 @@
+@@ -4811,7 +4811,7 @@
      {
        name: "WebAppScopeExtensions",
        origin_trial_feature_name: "WebAppScopeExtensions",
@@ -63,7 +63,7 @@
        status: "experimental",
        base_feature: "none",
      },
-@@ -5021,7 +5021,7 @@
+@@ -5086,7 +5086,7 @@
      {
        name: "WebIdentityDigitalCredentials",
        origin_trial_feature_name: "WebIdentityDigitalCredentials",
diff --git a/www/chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c b/www/chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c
index 65717a63b113..fc8c3b1b38a1 100644
--- a/www/chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c
+++ b/www/chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c
@@ -1,11 +1,11 @@
---- third_party/lzma_sdk/C/CpuArch.c.orig	2025-02-19 07:43:18 UTC
+--- third_party/lzma_sdk/C/CpuArch.c.orig	2025-05-05 10:57:53 UTC
 +++ third_party/lzma_sdk/C/CpuArch.c
-@@ -854,7 +854,35 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP
+@@ -854,6 +854,34 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP
  BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  
 +#elif defined(__OpenBSD__)
- 
++
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <machine/cpu.h>
@@ -32,20 +32,6 @@
 +MY_HWCAP_CHECK_FUNC (SHA1)
 +MY_HWCAP_CHECK_FUNC (SHA2)
 +MY_HWCAP_CHECK_FUNC (AES)
-+
- #else // __APPLE__
- 
- #if defined(__GLIBC__) && (__GLIBC__ * 100 + __GLIBC_MINOR__ >= 216)
-@@ -869,10 +897,12 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
-   #endif
- #endif
  
-+#if !defined(__FreeBSD__)
- #ifdef Z7_GETAUXV_AVAILABLE
- // #pragma message("=== Z7_GETAUXV_AVAILABLE === ")
- #include <sys/auxv.h>
- #define USE_HWCAP
-+#endif
- #endif
+ #else // __APPLE__
  
- #ifdef USE_HWCAP
diff --git a/www/chromium/files/patch-third__party_node_node.gni b/www/chromium/files/patch-third__party_node_node.gni
index 8574ecf0a7d6..7916feaf5b96 100644
--- a/www/chromium/files/patch-third__party_node_node.gni
+++ b/www/chromium/files/patch-third__party_node_node.gni
@@ -1,4 +1,4 @@
---- third_party/node/node.gni.orig	2024-08-26 12:06:38 UTC
+--- third_party/node/node.gni.orig	2025-05-05 10:57:53 UTC
 +++ third_party/node/node.gni
 @@ -22,7 +22,7 @@ template("node") {
  
@@ -9,3 +9,21 @@
        inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ]
      }
      if (is_win && host_os == "win") {
+@@ -34,17 +34,6 @@ template("node") {
+       } else {
+         inputs += [ "//third_party/node/mac/node-darwin-x64/bin/node" ]
+       }
+-    }
+-
+-    # Automatically add a dependency to ":check_version" to ensure NodeJS is
+-    # always running the expected version, except when the ':check_version'
+-    # target itself is running in which case it shouldn't depend on itself.
+-    if (get_label_info(":" + target_name, "label_no_toolchain") !=
+-        "//third_party/node:check_version") {
+-      if (!defined(deps)) {
+-        deps = []
+-      }
+-      deps += [ "//third_party/node:check_version" ]
+     }
+   }
+ }
diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
index f06f5422e1ff..e0b2c7479d0f 100644
--- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
+++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-02-19 07:43:18 UTC
+--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-05-07 06:38:02 UTC
 +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
index f023c39a6119..cb1981557e8f 100644
--- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-10-22 08:31:56 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2025-05-07 06:38:02 UTC
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
@@ -9,7 +9,7 @@
  #  define _XOPEN_SOURCE 600
  #endif
  
-@@ -45183,7 +45183,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45387,7 +45387,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -22,7 +22,7 @@
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
      if( fd<0 ){
-@@ -45198,6 +45203,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45402,6 +45407,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
        robust_close(0, fd, __LINE__);
      }
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
index 3606a669f405..f248da33adcc 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
+++ b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
@@ -1,18 +1,12 @@
---- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2023-08-23 11:41:11 UTC
+--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2025-05-05 18:35:31 UTC
 +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
-@@ -10,11 +10,15 @@
- 
+@@ -11,7 +11,9 @@
  #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
  
+ #include <EGL/eglext.h>
 +#if !defined(WEBRTC_BSD)
  #include <asm/ioctl.h>
 +#endif
  #include <dlfcn.h>
  #include <fcntl.h>
  #include <libdrm/drm_fourcc.h>
-+#if !defined(WEBRTC_BSD)
- #include <linux/types.h>
-+#endif
- #include <spa/param/video/format-utils.h>
- #include <unistd.h>
- #include <xf86drm.h>
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc
deleted file mode 100644
index 33afacfc84c5..000000000000
--- a/www/chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig	2025-03-24 05:49:20 UTC
-+++ third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-       .param = OnNodeParam,
-   };
- 
--  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
- }
- 
- // static
-@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod
-       uint32_t id = info->params[i].id;
-       if (id == SPA_PARAM_EnumFormat &&
-           info->params[i].flags & SPA_PARAM_INFO_READ) {
--        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-         break;
-       }
-     }
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
index 9a2df940fcc0..26b0838e8d0b 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,14 +1,14 @@
---- third_party/webrtc/rtc_base/network.cc.orig	2024-06-17 12:56:06 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/webrtc/rtc_base/network.cc
-@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
+@@ -314,7 +314,12 @@ webrtc::AdapterType GetAdapterTypeFromName(absl::strin
    }
  #endif
  
 +#if defined(WEBRTC_BSD)
 +  // Treat all other network interface names as ethernet on BSD
-+  return ADAPTER_TYPE_ETHERNET;
++  return webrtc::ADAPTER_TYPE_ETHERNET;
 +#else
-   return ADAPTER_TYPE_UNKNOWN;
+   return webrtc::ADAPTER_TYPE_UNKNOWN;
 +#endif
  }
  
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index 44f7f99f6d54..68f11a26aa1a 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-01-15 09:18:26 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-05-05 10:57:53 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
 @@ -55,7 +55,7 @@
  #include "rtc_base/time_utils.h"
@@ -18,7 +18,7 @@
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -330,7 +330,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
+@@ -331,7 +331,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
      return -1;
    }
    if (opt == OPT_DONTFRAGMENT) {
@@ -27,7 +27,7 @@
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -359,7 +359,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -360,7 +360,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -36,7 +36,7 @@
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -390,7 +390,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -391,7 +391,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
  int PhysicalSocket::Send(const void* pv, size_t cb) {
    int sent = DoSend(
        s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -45,7 +45,7 @@
        // Suppress SIGPIPE. Without this, attempting to send on a socket whose
        // other end is closed will result in a SIGPIPE signal being raised to
        // our process, which by default will terminate the process, which we
-@@ -419,7 +419,7 @@ int PhysicalSocket::SendTo(const void* buffer,
+@@ -420,7 +420,7 @@ int PhysicalSocket::SendTo(const void* buffer,
    size_t len = addr.ToSockAddrStorage(&saddr);
    int sent =
        DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -54,7 +54,7 @@
                 // Suppress SIGPIPE. See above for explanation.
                 MSG_NOSIGNAL,
  #else
-@@ -699,7 +699,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -698,7 +698,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
@@ -63,7 +63,7 @@
        RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
        return -1;
  #elif defined(WEBRTC_POSIX)
-@@ -748,7 +748,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -747,7 +747,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        return -1;
  #endif
      case OPT_RECV_ECN:
@@ -72,7 +72,7 @@
        if (family_ == AF_INET6) {
          *slevel = IPPROTO_IPV6;
          *sopt = IPV6_RECVTCLASS;
-@@ -768,10 +768,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -767,10 +767,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = SO_KEEPALIVE;
        break;
      case OPT_TCP_KEEPCNT:
@@ -92,7 +92,7 @@
        *slevel = IPPROTO_TCP;
  #if !defined(WEBRTC_MAC)
        *sopt = TCP_KEEPIDLE;
-@@ -779,12 +788,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -778,12 +787,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = TCP_KEEPALIVE;
  #endif
        break;
diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py
index 0d474b4eee9b..ed79f4e82543 100644
--- a/www/chromium/files/patch-tools_gn_build_gen.py
+++ b/www/chromium/files/patch-tools_gn_build_gen.py
@@ -1,4 +1,4 @@
---- tools/gn/build/gen.py.orig	2024-04-19 13:02:56 UTC
+--- tools/gn/build/gen.py.orig	2025-05-05 10:57:53 UTC
 +++ tools/gn/build/gen.py
 @@ -94,6 +94,12 @@ class Platform(object):
    def is_solaris(self):
@@ -22,7 +22,7 @@
        'haiku': 'build_haiku.ninja.template',
        'solaris': 'build_linux.ninja.template',
        'netbsd': 'build_linux.ninja.template',
-@@ -539,6 +545,9 @@ def WriteGNNinja(path, platform, host, options, args_l
+@@ -542,6 +548,9 @@ def WriteGNNinja(path, platform, host, options, args_l
  
      if platform.is_posix() and not platform.is_haiku():
        ldflags.append('-pthread')
diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index 27c2abfd9bfe..4bd7e01333d0 100644
--- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -61,7 +61,7 @@ group("telemetry_chrome_test") {
+@@ -56,7 +56,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
@@ -9,7 +9,7 @@
      data_deps += [ "//third_party/breakpad:dump_syms" ]
  
      # CrOS currently has issues with the locally compiled version of
-@@ -215,7 +215,7 @@ group("telemetry_chrome_test_without_chrome") {
+@@ -210,7 +210,7 @@ group("telemetry_chrome_test_without_chrome") {
    ]
  
    # Cr-Fuchsia doesn't support breakpad.
diff --git a/www/chromium/files/patch-ui_accessibility_accessibility__features.cc b/www/chromium/files/patch-ui_accessibility_accessibility__features.cc
index bf8704ff488c..e7cf92c0353a 100644
--- a/www/chromium/files/patch-ui_accessibility_accessibility__features.cc
+++ b/www/chromium/files/patch-ui_accessibility_accessibility__features.cc
@@ -1,6 +1,6 @@
---- ui/accessibility/accessibility_features.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/accessibility/accessibility_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/accessibility/accessibility_features.cc
-@@ -440,7 +440,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled
+@@ -472,7 +472,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled
  }
  #endif  // BUILDFLAG(IS_MAC)
  
diff --git a/www/chromium/files/patch-ui_accessibility_accessibility__features.h b/www/chromium/files/patch-ui_accessibility_accessibility__features.h
index 5b66344f0c4c..2cec64a0b8fe 100644
--- a/www/chromium/files/patch-ui_accessibility_accessibility__features.h
+++ b/www/chromium/files/patch-ui_accessibility_accessibility__features.h
@@ -1,6 +1,6 @@
---- ui/accessibility/accessibility_features.h.orig	2025-04-04 08:52:13 UTC
+--- ui/accessibility/accessibility_features.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/accessibility/accessibility_features.h
-@@ -306,7 +306,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc
+@@ -324,7 +324,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc
  AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled();
  #endif  // BUILDFLAG(IS_MAC)
  
diff --git a/www/chromium/files/patch-ui_accessibility_ax__node.cc b/www/chromium/files/patch-ui_accessibility_ax__node.cc
new file mode 100644
index 000000000000..f96f834ebb08
--- /dev/null
+++ b/www/chromium/files/patch-ui_accessibility_ax__node.cc
@@ -0,0 +1,20 @@
+--- ui/accessibility/ax_node.cc.orig	2025-05-05 10:57:53 UTC
++++ ui/accessibility/ax_node.cc
+@@ -1553,7 +1553,7 @@ AXNode::GetExtraMacNodes() const {
+   return &table_info->extra_mac_nodes;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ AXNode* AXNode::GetExtraAnnouncementNode(
+     ax::mojom::AriaNotificationPriority priority_property) const {
+   if (!tree_->extra_announcement_nodes()) {
+@@ -1581,7 +1581,7 @@ bool AXNode::IsGenerated() const {
+       GetRole() == ax::mojom::Role::kColumn ||
+       GetRole() == ax::mojom::Role::kTableHeaderContainer;
+   DCHECK_EQ(is_generated_node, is_extra_mac_node_role);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   //  On Linux, generated nodes are always children of the root.
+   if (GetParent() && GetParent()->GetManager()) {
+     DCHECK(GetParent()->GetManager()->IsRoot());
diff --git a/www/chromium/files/patch-ui_accessibility_ax__node.h b/www/chromium/files/patch-ui_accessibility_ax__node.h
new file mode 100644
index 000000000000..a5e2d1d70297
--- /dev/null
+++ b/www/chromium/files/patch-ui_accessibility_ax__node.h
@@ -0,0 +1,11 @@
+--- ui/accessibility/ax_node.h.orig	2025-05-05 10:57:53 UTC
++++ ui/accessibility/ax_node.h
+@@ -587,7 +587,7 @@ class AX_EXPORT AXNode final {
+   const std::vector<raw_ptr<AXNode, VectorExperimental>>* GetExtraMacNodes()
+       const;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   AXNode* GetExtraAnnouncementNode(
+       ax::mojom::AriaNotificationPriority priority_property) const;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-ui_accessibility_ax__tree.cc b/www/chromium/files/patch-ui_accessibility_ax__tree.cc
new file mode 100644
index 000000000000..df592f04c86d
--- /dev/null
+++ b/www/chromium/files/patch-ui_accessibility_ax__tree.cc
@@ -0,0 +1,38 @@
+--- ui/accessibility/ax_tree.cc.orig	2025-05-05 10:57:53 UTC
++++ ui/accessibility/ax_tree.cc
+@@ -824,7 +824,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged(
+   return old_node_is_ignored != new_node_is_ignored;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) {
+   assertive_node_ = CreateNode("assertive", root);
+   polite_node_ = CreateNode("polite", root);
+@@ -917,7 +917,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) const {
+ 
+ void AXTree::Destroy() {
+   base::ElapsedThreadTimer timer;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   ClearExtraAnnouncementNodes();
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -2104,7 +2104,7 @@ void AXTree::NotifyNodeAttributesWillChange(
+                     new_data);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void AXTree::ClearExtraAnnouncementNodes() {
+   if (!extra_announcement_nodes_) {
+     return;
+@@ -2493,7 +2493,7 @@ bool AXTree::CreateNewChildVector(
+     AXTreeUpdateState* update_state) {
+   DCHECK(GetTreeUpdateInProgressState());
+   bool success = true;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // If the root node has children added, clear the extra announcement nodes,
+   // which should always have their indices as the last two children of the root
+   // node. They will be recreated if needed, and given the correct indices.
diff --git a/www/chromium/files/patch-ui_accessibility_ax__tree.h b/www/chromium/files/patch-ui_accessibility_ax__tree.h
new file mode 100644
index 000000000000..d712d954801f
--- /dev/null
+++ b/www/chromium/files/patch-ui_accessibility_ax__tree.h
@@ -0,0 +1,29 @@
+--- ui/accessibility/ax_tree.h.orig	2025-05-05 10:57:53 UTC
++++ ui/accessibility/ax_tree.h
+@@ -62,7 +62,7 @@ enum class AXTreeUnserializeError {
+ };
+ // LINT.ThenChange(/tools/metrics/histograms/metadata/accessibility/enums.xml:AccessibilityTreeUnserializeError)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // To support AriaNotify on older versions of ATK, we need to use the ATK
+ // signal "Text::text-insert". This signal requires a node that is a
+ // text type, and it needs to have aria-live properties set in order for
+@@ -287,7 +287,7 @@ class AX_EXPORT AXTree {
+ 
+   void NotifyChildTreeConnectionChanged(AXNode* node, AXTree* child_tree);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void ClearExtraAnnouncementNodes();
+   void CreateExtraAnnouncementNodes();
+   ExtraAnnouncementNodes* extra_announcement_nodes() const {
+@@ -544,7 +544,7 @@ class AX_EXPORT AXTree {
+ 
+   std::unique_ptr<AXEvent> event_data_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<ExtraAnnouncementNodes> extra_announcement_nodes_ = nullptr;
+ #endif  // BUILDFLAG(IS_LINUX)
+ };
diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
index 82263a8493ea..ce1640183881 100644
--- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
+++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
@@ -1,6 +1,6 @@
---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
-@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
+@@ -101,7 +101,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
  
  std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString()
      const {
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
index 60d41d107199..26af6c98c47e 100644
--- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/base/resource/resource_bundle.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/base/resource/resource_bundle.cc
-@@ -930,7 +930,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -929,7 +929,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
diff --git a/www/chromium/files/patch-ui_base_test_ui__controls.h b/www/chromium/files/patch-ui_base_test_ui__controls.h
index 1c0ecdad71d3..2cd8ab9dd66f 100644
--- a/www/chromium/files/patch-ui_base_test_ui__controls.h
+++ b/www/chromium/files/patch-ui_base_test_ui__controls.h
@@ -1,6 +1,6 @@
---- ui/base/test/ui_controls.h.orig	2025-01-15 09:18:26 UTC
+--- ui/base/test/ui_controls.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/base/test/ui_controls.h
-@@ -184,7 +184,7 @@ bool SendTouchEventsNotifyWhenDone(int action,
+@@ -191,7 +191,7 @@ bool SendTouchEventsNotifyWhenDone(int action,
                                     base::OnceClosure task);
  #endif
  
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc
index f2c84a8789b8..cd374074c5b8 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,4 +1,4 @@
---- ui/base/ui_base_features.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/base/ui_base_features.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/base/ui_base_features.cc
 @@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj,
  // Controls whether support for Wayland's per-surface scaling is enabled.
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -138,7 +138,7 @@ BASE_FEATURE(kWaylandUiScale,
+@@ -143,7 +143,7 @@ BASE_FEATURE(kWaylandSessionManagement,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -18,7 +18,7 @@
  // If this feature is enabled, users not specify --ozone-platform-hint switch
  // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220.
  COMPONENT_EXPORT(UI_BASE_FEATURES)
-@@ -220,7 +220,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists,
+@@ -225,7 +225,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists,
  // native apps on Windows.
  BASE_FEATURE(kExperimentalFlingAnimation,
               "ExperimentalFlingAnimation",
@@ -27,7 +27,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -296,7 +296,7 @@ bool IsForcedColorsEnabled() {
+@@ -301,7 +301,7 @@ bool IsForcedColorsEnabled() {
  BASE_FEATURE(kEyeDropper,
               "EyeDropper",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h
index 314c4143841c..9f579ce401eb 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.h
+++ b/www/chromium/files/patch-ui_base_ui__base__features.h
@@ -1,7 +1,7 @@
---- ui/base/ui_base_features.h.orig	2025-02-19 07:43:18 UTC
+--- ui/base/ui_base_features.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/base/ui_base_features.h
-@@ -124,7 +124,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kWaylandUiScale);
+@@ -126,7 +126,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ BASE_DECLARE_FEATURE(kWaylandSessionManagement);
  #endif  // BUILDFLAG(IS_OZONE)
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
index 2b621a4ca9b0..2387cda468ff 100644
--- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
+++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,6 +1,6 @@
---- ui/base/webui/web_ui_util.cc.orig	2025-01-15 09:18:26 UTC
+--- ui/base/webui/web_ui_util.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/base/webui/web_ui_util.cc
-@@ -43,7 +43,7 @@ namespace {
+@@ -46,7 +46,7 @@ namespace {
  constexpr float kMaxScaleFactor = 1000.0f;
  
  std::string GetFontFamilyMd() {
@@ -9,7 +9,7 @@
    return "Roboto, " + GetFontFamily();
  #else
    return GetFontFamily();
-@@ -218,7 +218,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
+@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
  std::string GetFontFamily() {
    std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY);
  
diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h
index 780a04b68dd5..558b7166c8b0 100644
--- a/www/chromium/files/patch-ui_color_color__id.h
+++ b/www/chromium/files/patch-ui_color_color__id.h
@@ -1,6 +1,6 @@
---- ui/color/color_id.h.orig	2025-04-04 08:52:13 UTC
+--- ui/color/color_id.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/color/color_id.h
-@@ -622,7 +622,7 @@
+@@ -624,7 +624,7 @@
    E_CPONLY(kColorCrosSysPositive) \
    E_CPONLY(kColorCrosSysComplementVariant) \
    E_CPONLY(kColorCrosSysInputFieldOnBase)
diff --git a/www/chromium/files/patch-ui_color_color__provider__utils.cc b/www/chromium/files/patch-ui_color_color__provider__utils.cc
index 927b7ad2dba8..941d6fb356c2 100644
--- a/www/chromium/files/patch-ui_color_color__provider__utils.cc
+++ b/www/chromium/files/patch-ui_color_color__provider__utils.cc
@@ -1,6 +1,6 @@
---- ui/color/color_provider_utils.cc.orig	2025-01-15 09:18:26 UTC
+--- ui/color/color_provider_utils.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/color/color_provider_utils.cc
-@@ -189,7 +189,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste
+@@ -191,7 +191,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste
    switch (system_theme) {
      case ui::SystemTheme::kDefault:
        return "kDefault";
diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc
index d246779ff833..e509ba2714a5 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.cc
+++ b/www/chromium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/compositor/compositor.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/compositor/compositor.cc
-@@ -940,7 +940,7 @@ void Compositor::OnResume() {
+@@ -952,7 +952,7 @@ void Compositor::OnResume() {
      obs.ResetIfActive();
  }
  
diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h
index 50f57f335ce8..45784c46cc33 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.h
+++ b/www/chromium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig	2025-04-04 08:52:13 UTC
+--- ui/compositor/compositor.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/compositor/compositor.h
-@@ -467,7 +467,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -463,7 +463,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
    // base::PowerSuspendObserver:
    void OnResume() override;
  
diff --git a/www/chromium/files/patch-ui_display_screen.h b/www/chromium/files/patch-ui_display_screen.h
index 277ebcc07541..1bd4c187feb2 100644
--- a/www/chromium/files/patch-ui_display_screen.h
+++ b/www/chromium/files/patch-ui_display_screen.h
@@ -1,4 +1,4 @@
---- ui/display/screen.h.orig	2025-01-15 09:18:26 UTC
+--- ui/display/screen.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/display/screen.h
 @@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen {
    // (both of which may or may not be `nearest_id`).
@@ -9,7 +9,7 @@
    // Object which suspends the platform-specific screensaver for the duration of
    // its existence.
    class ScreenSaverSuspender {
-@@ -243,7 +243,7 @@ class DISPLAY_EXPORT Screen {
+@@ -246,7 +246,7 @@ class DISPLAY_EXPORT Screen {
    int64_t display_id_for_new_windows_;
    int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
  
diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index 11567dd40d45..4b0ab89885e0 100644
--- a/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- ui/gfx/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ ui/gfx/BUILD.gn
-@@ -658,7 +658,7 @@ source_set("memory_buffer_sources") {
+@@ -661,7 +661,7 @@ source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
index b48fe25aaa9e..64a29cb1a985 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.h.orig	2025-03-05 08:14:56 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/gfx/gpu_memory_buffer.h
 @@ -17,7 +17,7 @@
  #include "ui/gfx/generic_shared_memory_id.h"
@@ -9,7 +9,16 @@
  #include "ui/gfx/native_pixmap_handle.h"
  #elif BUILDFLAG(IS_APPLE)
  #include "ui/gfx/mac/io_surface.h"
-@@ -205,7 +205,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle {
+@@ -47,7 +47,7 @@ enum GpuMemoryBufferType {
+ #if BUILDFLAG(IS_APPLE)
+   IO_SURFACE_BUFFER,
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   NATIVE_PIXMAP,
+ #endif
+ #if BUILDFLAG(IS_WIN)
+@@ -212,7 +212,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle {
  
    uint32_t offset = 0;
    uint32_t stride = 0;
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
index 02121020a941..911284e04b32 100644
--- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
+++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-03-05 08:14:56 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
 @@ -14,7 +14,7 @@
  #include "ui/gfx/mac/io_surface.h"
@@ -41,16 +41,16 @@
    out->modifier = data.modifier();
    out->supports_zero_copy_webgpu_import =
        data.supports_zero_copy_webgpu_import();
-@@ -190,7 +190,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag
-       NOTREACHED();
+@@ -187,7 +187,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag
+     case gfx::IO_SURFACE_BUFFER:
+       return Tag::kMachPort;
  #endif  // BUILDFLAG(IS_APPLE)
-     case gfx::NATIVE_PIXMAP:
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
        return Tag::kNativePixmapHandle;
- #else
-       NOTREACHED();
-@@ -259,7 +259,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
+@@ -251,7 +251,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa
        }
        return true;
  #endif  // BUILDFLAG(IS_APPLE)
diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h
index a021d8890b5f..f45b015d74a0 100644
--- a/www/chromium/files/patch-ui_gfx_native__widget__types.h
+++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h
@@ -1,6 +1,6 @@
---- ui/gfx/native_widget_types.h.orig	2025-01-15 09:18:26 UTC
+--- ui/gfx/native_widget_types.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/gfx/native_widget_types.h
-@@ -101,7 +101,7 @@ class ViewAndroid;
+@@ -104,7 +104,7 @@ class ViewAndroid;
  #endif
  class SkBitmap;
  
@@ -9,7 +9,7 @@
  extern "C" {
  struct _AtkObject;
  using AtkObject = struct _AtkObject;
-@@ -214,7 +214,7 @@ using NativeViewAccessible = id;
+@@ -194,7 +194,7 @@ using NativeViewAccessible = id;
  #else
  using NativeViewAccessible = struct objc_object*;
  #endif
diff --git a/www/chromium/files/patch-ui_gfx_x_atom__cache.cc b/www/chromium/files/patch-ui_gfx_x_atom__cache.cc
index 74b3098c34a8..3496e0180705 100644
--- a/www/chromium/files/patch-ui_gfx_x_atom__cache.cc
+++ b/www/chromium/files/patch-ui_gfx_x_atom__cache.cc
@@ -1,6 +1,6 @@
---- ui/gfx/x/atom_cache.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/gfx/x/atom_cache.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/gfx/x/atom_cache.cc
-@@ -156,6 +156,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
+@@ -157,6 +157,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
      "application/octet-stream",
      "application/vnd.chromium.test",
      "chromium/filename",
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index aae72fec4c93..fedfe56b268e 100644
--- a/www/chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gl/BUILD.gn.orig	2025-03-05 08:14:56 UTC
+--- ui/gl/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ ui/gl/BUILD.gn
-@@ -169,7 +169,6 @@ component("gl") {
+@@ -174,7 +174,6 @@ component("gl") {
    public_deps = [
      ":gl_enums",
      "//base",
@@ -8,7 +8,7 @@
      "//ui/events/platform",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -323,7 +322,6 @@ component("gl") {
+@@ -328,7 +327,6 @@ component("gl") {
      data_deps += [
        "//third_party/angle:libEGL",
        "//third_party/angle:libGLESv2",
@@ -16,7 +16,7 @@
      ]
      if (enable_swiftshader) {
        data_deps += [
-@@ -548,7 +546,6 @@ test("gl_unittests") {
+@@ -554,7 +552,6 @@ test("gl_unittests") {
  
    data_deps = [
      "//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/chromium/files/patch-ui_gl_gl__implementation.cc b/www/chromium/files/patch-ui_gl_gl__implementation.cc
index a01663337a61..ae2164d2dcd1 100644
--- a/www/chromium/files/patch-ui_gl_gl__implementation.cc
+++ b/www/chromium/files/patch-ui_gl_gl__implementation.cc
@@ -1,6 +1,6 @@
---- ui/gl/gl_implementation.cc.orig	2025-01-15 09:18:26 UTC
+--- ui/gl/gl_implementation.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/gl/gl_implementation.cc
-@@ -252,7 +252,7 @@ GetRequestedGLImplementationFromCommandLine(
+@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandLine(
      const base::CommandLine* command_line) {
    bool overrideUseSoftwareGL =
        command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/www/chromium/files/patch-ui_gl_gl__switches.cc b/www/chromium/files/patch-ui_gl_gl__switches.cc
index 3555e18ee9cc..6ba988ab0b17 100644
--- a/www/chromium/files/patch-ui_gl_gl__switches.cc
+++ b/www/chromium/files/patch-ui_gl_gl__switches.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_switches.cc.orig	2025-03-05 08:14:56 UTC
+--- ui/gl/gl_switches.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/gl/gl_switches.cc
 @@ -13,7 +13,7 @@
  #include "base/android/build_info.h"
@@ -9,7 +9,7 @@
  #include <vulkan/vulkan_core.h>
  #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
  #endif
-@@ -314,7 +314,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -319,7 +319,7 @@ bool IsDefaultANGLEVulkan() {
      return false;
    }
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -18,7 +18,7 @@
    angle::SystemInfo system_info;
    {
      GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan");
-@@ -367,7 +367,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -372,7 +372,7 @@ bool IsDefaultANGLEVulkan() {
    }
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/www/chromium/files/patch-ui_gtk_gtk__compat.cc b/www/chromium/files/patch-ui_gtk_gtk__compat.cc
index b085cbba7f5d..ab6b71868865 100644
--- a/www/chromium/files/patch-ui_gtk_gtk__compat.cc
+++ b/www/chromium/files/patch-ui_gtk_gtk__compat.cc
@@ -1,6 +1,6 @@
---- ui/gtk/gtk_compat.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/gtk/gtk_compat.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/gtk/gtk_compat.cc
-@@ -64,27 +64,47 @@ auto DlCast(void* symbol) {
+@@ -65,27 +65,47 @@ auto DlCast(void* symbol) {
  }
  
  void* GetLibGio() {
diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__features.cc b/www/chromium/files/patch-ui_native__theme_features_native__theme__features.cc
index 97c4b1d1e077..2dac52433c24 100644
--- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__features.cc
+++ b/www/chromium/files/patch-ui_native__theme_features_native__theme__features.cc
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme_features.cc.orig	2025-03-09 21:38:10 UTC
-+++ ui/native_theme/native_theme_features.cc
-@@ -73,7 +73,7 @@ namespace ui {
+--- ui/native_theme/features/native_theme_features.cc.orig	2025-05-05 10:57:53 UTC
++++ ui/native_theme/features/native_theme_features.cc
+@@ -59,7 +59,7 @@ namespace ui {
  
  bool IsFluentOverlayScrollbarEnabled() {
  // Fluent scrollbars are only used for some OSes due to UI design guidelines.
@@ -9,7 +9,7 @@
    return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar);
  #else
    return false;
-@@ -82,7 +82,7 @@ bool IsFluentOverlayScrollbarEnabled() {
+@@ -68,7 +68,7 @@ bool IsFluentOverlayScrollbarEnabled() {
  
  bool IsFluentScrollbarEnabled() {
  // Fluent scrollbars are only used for some OSes due to UI design guidelines.
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h
index 47b928745062..e9a061594e9f 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme.h
+++ b/www/chromium/files/patch-ui_native__theme_native__theme.h
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme.h.orig	2025-01-15 09:18:26 UTC
+--- ui/native_theme/native_theme.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/native_theme/native_theme.h
-@@ -61,7 +61,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -61,7 +61,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
    // The part to be painted / sized.
    enum Part {
      kCheckbox,
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
index 2cf28f0232ac..c3000486cab6 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
+++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
@@ -1,11 +1,11 @@
---- ui/native_theme/native_theme_base.cc.orig	2025-03-05 08:14:56 UTC
+--- ui/native_theme/native_theme_base.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/native_theme/native_theme_base.cc
-@@ -239,7 +239,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
-                     absl::get<ButtonExtraParams>(extra), color_scheme,
+@@ -240,7 +240,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+                     std::get<ButtonExtraParams>(extra), color_scheme,
                      accent_color_opaque);
        break;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      case kFrameTopArea:
        PaintFrameTopArea(canvas, state, rect,
-                         absl::get<FrameTopAreaExtraParams>(extra),
+                         std::get<FrameTopAreaExtraParams>(extra), color_scheme);
diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
index abde5e0367d0..e77ccb9e8201 100644
--- a/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2024-03-27 13:31:02 UTC
+--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/ozone/platform/headless/ozone_platform_headless.cc
-@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform {
+@@ -108,7 +108,7 @@ class OzonePlatformHeadlessImpl : public OzonePlatform
    }
  
  // Desktop Linux, not CastOS.
diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
index 0f1758671def..80d98b88c8ae 100644
--- a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/x11/x11_window.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/ozone/platform/x11/x11_window.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/ozone/platform/x11/x11_window.cc
-@@ -1472,7 +1472,7 @@ void X11Window::OnXWindowStateChanged() {
+@@ -1459,7 +1459,7 @@ void X11Window::OnXWindowStateChanged() {
    WindowTiledEdges tiled_state = GetTiledState();
    if (tiled_state != tiled_state_) {
      tiled_state_ = tiled_state;
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
index fd980d21b083..df87e6eeac9c 100644
--- a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
+++ b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.h.orig	2025-04-04 08:52:13 UTC
+--- ui/platform_window/platform_window_delegate.h.orig	2025-05-07 06:38:02 UTC
 +++ ui/platform_window/platform_window_delegate.h
-@@ -140,7 +140,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
index ec3268b794a1..9980beaaf6f3 100644
--- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
+++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,4 +1,4 @@
---- ui/platform_window/platform_window_init_properties.h.orig	2024-06-17 12:56:06 UTC
+--- ui/platform_window/platform_window_init_properties.h.orig	2025-05-05 10:57:53 UTC
 +++ ui/platform_window/platform_window_init_properties.h
 @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate;
  class ScenicWindowDelegate;
@@ -9,7 +9,7 @@
  class X11ExtensionDelegate;
  #endif
  
-@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
+@@ -120,7 +120,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
  
    PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault;
  
diff --git a/www/chromium/files/patch-ui_views_BUILD.gn b/www/chromium/files/patch-ui_views_BUILD.gn
index 89be255e7240..a116b96dd35f 100644
--- a/www/chromium/files/patch-ui_views_BUILD.gn
+++ b/www/chromium/files/patch-ui_views_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/views/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- ui/views/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/BUILD.gn
-@@ -836,7 +836,6 @@ component("views") {
+@@ -839,7 +839,6 @@ component("views") {
        sources += [ "accessibility/widget_ax_tree_id_map.cc" ]
      }
      deps += [
diff --git a/www/chromium/files/patch-ui_views_accessibility_view__accessibility.cc b/www/chromium/files/patch-ui_views_accessibility_view__accessibility.cc
index a048e90a7ff6..275f452aa052 100644
--- a/www/chromium/files/patch-ui_views_accessibility_view__accessibility.cc
+++ b/www/chromium/files/patch-ui_views_accessibility_view__accessibility.cc
@@ -1,6 +1,6 @@
---- ui/views/accessibility/view_accessibility.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/views/accessibility/view_accessibility.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/accessibility/view_accessibility.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
  #include "ui/views/accessibility/view_ax_platform_node_delegate_win.h"
  #elif BUILDFLAG(IS_MAC)
  #include "ui/views/accessibility/view_ax_platform_node_delegate_mac.h"
@@ -9,7 +9,7 @@
  #include "ui/views/accessibility/view_ax_platform_node_delegate_auralinux.h"
  #endif
  
-@@ -100,7 +100,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility::
+@@ -101,7 +101,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility::
    return ViewAXPlatformNodeDelegateWin::CreatePlatformSpecific(view);
  #elif BUILDFLAG(IS_MAC)
    return ViewAXPlatformNodeDelegateMac::CreatePlatformSpecific(view);
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
index 62bb5b3509b1..8c459c53365e 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/controls/textfield/textfield.cc
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
  #include "base/win/win_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
-@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -184,7 +184,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -18,25 +18,25 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -790,7 +790,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -791,7 +791,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
      return handled;
    }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!handled && linux_ui &&
-@@ -975,7 +975,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+   if (!handled) {
+     if (auto* linux_ui = ui::LinuxUi::instance()) {
+       const auto command =
+@@ -976,7 +976,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Skip any accelerator handling that conflicts with custom keybindings.
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -2066,7 +2066,7 @@ bool Textfield::ShouldDoLearning() {
+   if (auto* linux_ui = ui::LinuxUi::instance()) {
+     if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent(
+@@ -2062,7 +2062,7 @@ bool Textfield::ShouldDoLearning() {
    return false;
  }
  
@@ -45,7 +45,7 @@
  // TODO(crbug.com/41452689): Implement this method to support Korean IME
  // reconversion feature on native text fields (e.g. find bar).
  bool Textfield::SetCompositionFromExistingText(
-@@ -2584,7 +2584,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2580,7 +2580,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
@@ -54,7 +54,7 @@
        // Only erase by line break on Linux and ChromeOS.
        if (shift) {
          return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
-@@ -2592,7 +2592,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2588,7 +2588,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
        return ui::TextEditCommand::DELETE_WORD_BACKWARD;
      case ui::VKEY_DELETE:
diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
index 02022a772a05..271c476bfb69 100644
--- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,6 +1,6 @@
---- ui/views/corewm/tooltip_aura.cc.orig	2025-01-15 09:18:26 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/corewm/tooltip_aura.cc
-@@ -38,7 +38,7 @@ static constexpr int kTooltipMaxWidth = 800;
+@@ -42,7 +42,7 @@ static constexpr int kTooltipMaxWidth = 800;
  
  // TODO(varkha): Update if native widget can be transparent on Linux.
  bool CanUseTranslucentTooltipWidget() {
diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc
index 10306f9883b5..767ab3d2c1f0 100644
--- a/www/chromium/files/patch-ui_views_examples_widget__example.cc
+++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc
@@ -1,6 +1,6 @@
---- ui/views/examples/widget_example.cc.orig	2024-09-30 07:45:04 UTC
+--- ui/views/examples/widget_example.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/examples/widget_example.cc
-@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container)
+@@ -51,7 +51,7 @@ void WidgetExample::CreateExampleView(View* container)
    modal_button->SetCallback(
        base::BindRepeating(&WidgetExample::CreateDialogWidget,
                            base::Unretained(this), modal_button, true));
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index a22e8ebe5a28..d30b605c23f9 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
 @@ -50,7 +50,7 @@
  #include "ui/wm/core/window_util.h"
@@ -9,7 +9,7 @@
  #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
  #endif
  
-@@ -347,7 +347,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -353,7 +353,7 @@ std::unique_ptr<aura::client::DragDropClient>
  DesktopWindowTreeHostPlatform::CreateDragDropClient() {
    ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
    std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -18,7 +18,7 @@
        std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
  #else
        std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1179,7 +1179,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
+@@ -1185,7 +1185,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc
index 6f8f8bbf940e..4e0b43e89ae6 100644
--- a/www/chromium/files/patch-ui_views_widget_widget.cc
+++ b/www/chromium/files/patch-ui_views_widget_widget.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/widget.cc.orig	2025-04-04 08:52:13 UTC
+--- ui/views/widget/widget.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/widget/widget.cc
 @@ -63,7 +63,7 @@
  #include "ui/views/window/custom_frame_view.h"
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -2452,7 +2452,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
+@@ -2453,7 +2453,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
      return parent_->GetNativeTheme();
    }
  
diff --git a/www/chromium/files/patch-ui_views_widget_widget.h b/www/chromium/files/patch-ui_views_widget_widget.h
new file mode 100644
index 000000000000..9a0232ad9e22
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_widget_widget.h
@@ -0,0 +1,11 @@
+--- ui/views/widget/widget.h.orig	2025-05-05 10:57:53 UTC
++++ ui/views/widget/widget.h
+@@ -487,7 +487,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
+     bool force_system_menu_for_frameless = false;
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Only used by X11, for root level windows. Specifies the res_name and
+     // res_class fields, respectively, of the WM_CLASS window property. Controls
+     // window grouping and desktop file matching in Linux window managers.
diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
index d16c131b3ef9..367559d4ba36 100644
--- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig	2025-03-05 08:14:56 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2025-05-05 10:57:53 UTC
 +++ ui/views/window/dialog_delegate.cc
-@@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -106,7 +106,7 @@ Widget* DialogDelegate::CreateDialogWidget(
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index 58f980f620ba..0b4b946f8351 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig	2025-04-04 08:52:13 UTC
+--- v8/BUILD.gn.orig	2025-05-05 10:57:53 UTC
 +++ v8/BUILD.gn
-@@ -974,6 +974,8 @@ external_v8_defines = [
+@@ -1000,6 +1000,8 @@ external_v8_defines = [
    "V8_TARGET_OS_MACOS",
    "V8_TARGET_OS_WIN",
    "V8_TARGET_OS_CHROMEOS",
@@ -9,7 +9,7 @@
  ]
  
  enabled_external_v8_defines = [
-@@ -1053,6 +1055,12 @@ if (target_os == "android") {
+@@ -1079,6 +1081,12 @@ if (target_os == "android") {
  } else if (target_os == "chromeos") {
    enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
    enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ]
@@ -22,7 +22,7 @@
  }
  
  disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines
-@@ -2479,6 +2487,12 @@ template("run_mksnapshot") {
+@@ -2537,6 +2545,12 @@ template("run_mksnapshot") {
        if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
          args += [ "--reorder-builtins" ]
        }
@@ -35,7 +35,7 @@
      }
  
      if (v8_enable_turboshaft_csa) {
-@@ -6565,7 +6579,7 @@ v8_component("v8_libbase") {
+@@ -6631,7 +6645,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -44,7 +44,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -6576,6 +6590,18 @@ v8_component("v8_libbase") {
+@@ -6642,6 +6656,18 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
diff --git a/www/chromium/files/patch-v8_include_v8config.h b/www/chromium/files/patch-v8_include_v8config.h
index 41a201eca5d4..cb75744698bf 100644
--- a/www/chromium/files/patch-v8_include_v8config.h
+++ b/www/chromium/files/patch-v8_include_v8config.h
@@ -1,4 +1,4 @@
---- v8/include/v8config.h.orig	2025-01-15 09:18:26 UTC
+--- v8/include/v8config.h.orig	2025-05-05 10:57:53 UTC
 +++ v8/include/v8config.h
 @@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line
    && !defined(V8_TARGET_OS_FUCHSIA) \
@@ -35,7 +35,7 @@
  #ifdef V8_OS_MACOS
  # define V8_TARGET_OS_MACOS
  #endif
-@@ -382,6 +396,7 @@ path. Add it with -I<path> to the command line
+@@ -383,6 +397,7 @@ path. Add it with -I<path> to the command line
  #if (defined(_M_X64) || defined(__x86_64__)            /* x64 (everywhere) */  \
       || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */    \
           && !defined(_WIN32)))                         /* not on windows */    \
diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc
index 679b1e4f4ff5..d4df1715879d 100644
--- a/www/chromium/files/patch-v8_src_api_api.cc
+++ b/www/chromium/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
---- v8/src/api/api.cc.orig	2025-04-04 08:52:13 UTC
+--- v8/src/api/api.cc.orig	2025-05-05 10:57:53 UTC
 +++ v8/src/api/api.cc
 @@ -153,7 +153,7 @@
  #include "src/wasm/wasm-serialization.h"
@@ -9,7 +9,7 @@
  #include <signal.h>
  #include <unistd.h>
  
-@@ -6476,7 +6476,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6483,7 +6483,7 @@ bool v8::V8::Initialize(const int build_config) {
    return true;
  }
  
diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc
index fc4ea7a7eee9..0a05b110433a 100644
--- a/www/chromium/files/patch-v8_src_execution_isolate.cc
+++ b/www/chromium/files/patch-v8_src_execution_isolate.cc
@@ -1,6 +1,6 @@
---- v8/src/execution/isolate.cc.orig	2025-04-04 08:52:13 UTC
+--- v8/src/execution/isolate.cc.orig	2025-05-05 10:57:53 UTC
 +++ v8/src/execution/isolate.cc
-@@ -172,6 +172,10 @@
+@@ -173,6 +173,10 @@
  #include "src/execution/simulator-base.h"
  #endif
  
@@ -11,7 +11,7 @@
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -5062,6 +5066,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -5114,6 +5118,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
diff --git a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
index c68268172656..aa60d55c88a9 100644
--- a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
+++ b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
@@ -1,6 +1,6 @@
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-04-04 08:52:13 UTC
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-05-05 10:57:53 UTC
 +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
-@@ -575,7 +575,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
  }
  
  void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -9,7 +9,7 @@
                              LoadType type, uint32_t* protected_load_pc,
                              bool /* is_load_mem */, bool /* i64_offset */,
                              bool needs_shift) {
-@@ -655,7 +655,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
  }
  
  void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -18,7 +18,7 @@
                               StoreType type, LiftoffRegList pinned,
                               uint32_t* protected_store_pc,
                               bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -734,7 +734,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
  }
  
  void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
@@ -27,7 +27,7 @@
                                    LoadType type, LiftoffRegList /* pinned */,
                                    bool /* i64_offset */) {
    if (type.value() != LoadType::kI64Load) {
-@@ -752,7 +752,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
  }
  
  void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
@@ -36,7 +36,7 @@
                                     StoreType type, LiftoffRegList pinned,
                                     bool /* i64_offset */) {
    DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
-@@ -822,7 +822,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
  
  inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
                                         Register dst_addr, Register offset_reg,
@@ -45,7 +45,7 @@
                                         LiftoffRegister value,
                                         LiftoffRegister result, StoreType type) {
    DCHECK_EQ(value, result);
-@@ -890,7 +890,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
  }
  
  inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -54,7 +54,7 @@
                            LiftoffRegister value, LiftoffRegister result,
                            StoreType type) {
    DCHECK_EQ(value, result);
-@@ -1005,7 +1005,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
  }
  
  inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -63,7 +63,7 @@
                            LiftoffRegister value, LiftoffRegister result) {
    // We need {ebx} here, which is the root register. As the root register it
    // needs special treatment. As we use {ebx} directly in the code below, we
-@@ -1101,7 +1101,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
  }  // namespace liftoff
  
  void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
@@ -72,7 +72,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1115,7 +1115,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
@@ -81,7 +81,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1128,7 +1128,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
@@ -90,7 +90,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1142,7 +1142,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
@@ -99,7 +99,7 @@
                                  LiftoffRegister result, StoreType type,
                                  bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1156,7 +1156,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
  }
  
  void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
@@ -108,7 +108,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1170,7 +1170,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
@@ -117,7 +117,7 @@
                                        LiftoffRegister value,
                                        LiftoffRegister result, StoreType type,
                                        bool /* i64_offset */) {
-@@ -1185,7 +1185,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
  }
  
  void LiftoffAssembler::AtomicCompareExchange(
diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile
index c73fbd4cf810..912bc83fc326 100644
--- a/www/cpp-httplib/Makefile
+++ b/www/cpp-httplib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cpp-httplib
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.0
+DISTVERSION=	0.20.1
 CATEGORIES=	www devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/cpp-httplib/distinfo b/www/cpp-httplib/distinfo
index efa35fc0baf5..a8edba732768 100644
--- a/www/cpp-httplib/distinfo
+++ b/www/cpp-httplib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742197116
-SHA256 (yhirose-cpp-httplib-v0.20.0_GH0.tar.gz) = 18064587e0cc6a0d5d56d619f4cbbcaba47aa5d84d86013abbd45d95c6653866
-SIZE (yhirose-cpp-httplib-v0.20.0_GH0.tar.gz) = 1408009
+TIMESTAMP = 1746349039
+SHA256 (yhirose-cpp-httplib-v0.20.1_GH0.tar.gz) = b74b1c2c150be2841eba80192f64d93e9a6711985b3ae8aaa1a9cec4863d1dd9
+SIZE (yhirose-cpp-httplib-v0.20.1_GH0.tar.gz) = 1408474
diff --git a/www/davix/Makefile b/www/davix/Makefile
index aa8322bcd858..3a39c2bdc809 100644
--- a/www/davix/Makefile
+++ b/www/davix/Makefile
@@ -13,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libuuid.so:misc/e2fsprogs-libuuid
+TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++11-lang gnome localbase:ldflags python:build shebangfix ssl
 SHEBANG_GLOB=	*.py
@@ -23,7 +24,9 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	cern-fts
 
 CMAKE_OFF=	EMBEDDED_LIBCURL DAVIX_TESTS
-CMAKE_TESTING_ON=	DAVIX_TESTS UNIT_TESTS BENCH_TESTS # 1 test fails, and several tests hang, see https://github.com/cern-fts/davix/issues/108
+CMAKE_TESTING_ON=	DAVIX_TESTS UNIT_TESTS BENCH_TESTS
+
+TESTING_UNSAFE=	1 test fails, and several tests hang, see https://github.com/cern-fts/davix/issues/108
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/deno/Makefile b/www/deno/Makefile
index 810220896dd6..452a8667e1ea 100644
--- a/www/deno/Makefile
+++ b/www/deno/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.9
 CATEGORIES=	www
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure JavaScript and TypeScript runtime
 WWW=		https://deno.com/runtime
 
diff --git a/www/dot-http/Makefile b/www/dot-http/Makefile
deleted file mode 100644
index 26d3cee39f08..000000000000
--- a/www/dot-http/Makefile
+++ /dev/null
@@ -1,184 +0,0 @@
-PORTNAME=	dot-http
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.0
-PORTREVISION=	21
-CATEGORIES=	www
-
-MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Text-based scriptable HTTP client
-WWW=		https://github.com/bayne/dot-http
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		cargo
-USE_GITHUB=	yes
-GH_ACCOUNT=	bayne
-
-CARGO_CRATES=	Boa-0.5.1 \
-		aho-corasick-0.7.6 \
-		ansi_term-0.11.0 \
-		anyhow-1.0.25 \
-		atty-0.2.13 \
-		autocfg-0.1.6 \
-		base64-0.11.0 \
-		bitflags-1.1.0 \
-		block-buffer-0.7.3 \
-		block-padding-0.1.4 \
-		bumpalo-2.6.0 \
-		byte-tools-0.3.1 \
-		byteorder-1.3.2 \
-		bytes-0.5.3 \
-		c2-chacha-0.2.2 \
-		cc-1.0.45 \
-		cfg-if-0.1.9 \
-		clap-2.33.0 \
-		core-foundation-0.6.4 \
-		core-foundation-sys-0.6.2 \
-		digest-0.8.1 \
-		dtoa-0.4.4 \
-		encoding_rs-0.8.22 \
-		fake-simd-0.1.2 \
-		fnv-1.0.6 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		fuchsia-zircon-0.3.3 \
-		fuchsia-zircon-sys-0.3.3 \
-		futures-channel-0.3.1 \
-		futures-core-0.3.1 \
-		futures-io-0.3.1 \
-		futures-sink-0.3.1 \
-		futures-task-0.3.1 \
-		futures-util-0.3.1 \
-		gc-0.3.3 \
-		gc_derive-0.3.2 \
-		generic-array-0.12.3 \
-		getrandom-0.1.12 \
-		h2-0.2.1 \
-		heck-0.3.1 \
-		http-0.2.0 \
-		http-body-0.3.1 \
-		http-test-server-1.0.0 \
-		httparse-1.3.4 \
-		hyper-0.13.1 \
-		hyper-tls-0.4.0 \
-		idna-0.2.0 \
-		indexmap-1.3.0 \
-		iovec-0.1.4 \
-		itoa-0.4.4 \
-		js-sys-0.3.33 \
-		kernel32-sys-0.2.2 \
-		lazy_static-1.4.0 \
-		libc-0.2.62 \
-		log-0.4.8 \
-		maplit-1.0.2 \
-		matches-0.1.8 \
-		memchr-2.2.1 \
-		mime-0.3.14 \
-		mime_guess-2.0.1 \
-		mio-0.6.21 \
-		miow-0.2.1 \
-		native-tls-0.2.3 \
-		net2-0.2.33 \
-		nom-4.2.3 \
-		num_cpus-1.10.1 \
-		opaque-debug-0.2.3 \
-		openssl-0.10.26 \
-		openssl-probe-0.1.2 \
-		openssl-sys-0.9.53 \
-		percent-encoding-2.1.0 \
-		pest-2.1.2 \
-		pest_derive-2.1.0 \
-		pest_generator-2.1.1 \
-		pest_meta-2.1.2 \
-		pin-project-0.4.6 \
-		pin-project-internal-0.4.6 \
-		pin-project-lite-0.1.2 \
-		pin-utils-0.1.0-alpha.4 \
-		pkg-config-0.3.16 \
-		ppv-lite86-0.2.5 \
-		proc-macro-error-0.2.6 \
-		proc-macro2-1.0.3 \
-		quote-0.3.15 \
-		quote-1.0.2 \
-		rand-0.7.2 \
-		rand_chacha-0.2.1 \
-		rand_core-0.5.1 \
-		rand_hc-0.2.0 \
-		redox_syscall-0.1.56 \
-		regex-1.3.1 \
-		regex-syntax-0.6.12 \
-		remove_dir_all-0.5.2 \
-		reqwest-0.10.0 \
-		ryu-1.0.0 \
-		schannel-0.1.16 \
-		security-framework-0.3.4 \
-		security-framework-sys-0.3.3 \
-		serde-1.0.101 \
-		serde_derive-1.0.102 \
-		serde_json-1.0.40 \
-		serde_urlencoded-0.6.1 \
-		sha-1-0.8.1 \
-		slab-0.4.2 \
-		smallvec-0.6.10 \
-		sourcefile-0.1.4 \
-		strsim-0.8.0 \
-		structopt-0.3.3 \
-		structopt-derive-0.3.3 \
-		syn-0.11.11 \
-		syn-1.0.5 \
-		synom-0.11.3 \
-		synstructure-0.6.1 \
-		tempfile-3.1.0 \
-		textwrap-0.11.0 \
-		thread_local-0.3.6 \
-		time-0.1.42 \
-		tokio-0.2.8 \
-		tokio-tls-0.3.0 \
-		tokio-util-0.2.0 \
-		tower-service-0.3.0 \
-		try-lock-0.2.2 \
-		typenum-1.11.2 \
-		ucd-trie-0.1.2 \
-		unicase-2.5.1 \
-		unicode-bidi-0.3.4 \
-		unicode-normalization-0.1.8 \
-		unicode-segmentation-1.3.0 \
-		unicode-width-0.1.6 \
-		unicode-xid-0.0.4 \
-		unicode-xid-0.2.0 \
-		url-2.1.0 \
-		vcpkg-0.2.7 \
-		vec_map-0.8.1 \
-		version_check-0.1.5 \
-		want-0.3.0 \
-		wasi-0.7.0 \
-		wasm-bindgen-0.2.56 \
-		wasm-bindgen-backend-0.2.56 \
-		wasm-bindgen-futures-0.4.6 \
-		wasm-bindgen-macro-0.2.56 \
-		wasm-bindgen-macro-support-0.2.56 \
-		wasm-bindgen-shared-0.2.56 \
-		wasm-bindgen-webidl-0.2.56 \
-		web-sys-0.3.33 \
-		weedle-0.10.0 \
-		winapi-0.2.8 \
-		winapi-0.3.8 \
-		winapi-build-0.1.1 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		winreg-0.6.2 \
-		ws2_32-sys-0.2.1
-
-OPENSSLINC=	/usr/include
-OPENSSLLIB=	/usr/lib
-
-PLIST_FILES=	bin/${PORTNAME}
-
-.include <bsd.port.options.mk>
-
-.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl} || ${SSL_DEFAULT:Mopenssl3*}
-BROKEN=	Fails to detect OpenSSL 3  and later
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/dot-http/distinfo b/www/dot-http/distinfo
deleted file mode 100644
index d5391a469f64..000000000000
--- a/www/dot-http/distinfo
+++ /dev/null
@@ -1,311 +0,0 @@
-TIMESTAMP = 1672650559
-SHA256 (rust/crates/Boa-0.5.1.crate) = 1363608b60d66a044caf4c3b44735ac1e50c4e364f286d81f51e06fa63ca3de9
-SIZE (rust/crates/Boa-0.5.1.crate) = 4670356
-SHA256 (rust/crates/aho-corasick-0.7.6.crate) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d
-SIZE (rust/crates/aho-corasick-0.7.6.crate) = 108953
-SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
-SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
-SHA256 (rust/crates/anyhow-1.0.25.crate) = 9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14
-SIZE (rust/crates/anyhow-1.0.25.crate) = 25056
-SHA256 (rust/crates/atty-0.2.13.crate) = 1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90
-SIZE (rust/crates/atty-0.2.13.crate) = 4764
-SHA256 (rust/crates/autocfg-0.1.6.crate) = b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875
-SIZE (rust/crates/autocfg-0.1.6.crate) = 11439
-SHA256 (rust/crates/base64-0.11.0.crate) = b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7
-SIZE (rust/crates/base64-0.11.0.crate) = 48362
-SHA256 (rust/crates/bitflags-1.1.0.crate) = 3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd
-SIZE (rust/crates/bitflags-1.1.0.crate) = 16322
-SHA256 (rust/crates/block-buffer-0.7.3.crate) = c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b
-SIZE (rust/crates/block-buffer-0.7.3.crate) = 7179
-SHA256 (rust/crates/block-padding-0.1.4.crate) = 6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09
-SIZE (rust/crates/block-padding-0.1.4.crate) = 7209
-SHA256 (rust/crates/bumpalo-2.6.0.crate) = ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708
-SIZE (rust/crates/bumpalo-2.6.0.crate) = 124915
-SHA256 (rust/crates/byte-tools-0.3.1.crate) = e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7
-SIZE (rust/crates/byte-tools-0.3.1.crate) = 5526
-SHA256 (rust/crates/byteorder-1.3.2.crate) = a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5
-SIZE (rust/crates/byteorder-1.3.2.crate) = 21596
-SHA256 (rust/crates/bytes-0.5.3.crate) = 10004c15deb332055f7a4a208190aed362cf9a7c2f6ab70a305fba50e1105f38
-SIZE (rust/crates/bytes-0.5.3.crate) = 44939
-SHA256 (rust/crates/c2-chacha-0.2.2.crate) = 7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101
-SIZE (rust/crates/c2-chacha-0.2.2.crate) = 13766
-SHA256 (rust/crates/cc-1.0.45.crate) = 4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be
-SIZE (rust/crates/cc-1.0.45.crate) = 49112
-SHA256 (rust/crates/cfg-if-0.1.9.crate) = b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33
-SIZE (rust/crates/cfg-if-0.1.9.crate) = 7353
-SHA256 (rust/crates/clap-2.33.0.crate) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9
-SIZE (rust/crates/clap-2.33.0.crate) = 196458
-SHA256 (rust/crates/core-foundation-0.6.4.crate) = 25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d
-SIZE (rust/crates/core-foundation-0.6.4.crate) = 25233
-SHA256 (rust/crates/core-foundation-sys-0.6.2.crate) = e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b
-SIZE (rust/crates/core-foundation-sys-0.6.2.crate) = 16204
-SHA256 (rust/crates/digest-0.8.1.crate) = f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5
-SIZE (rust/crates/digest-0.8.1.crate) = 9449
-SHA256 (rust/crates/dtoa-0.4.4.crate) = ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e
-SIZE (rust/crates/dtoa-0.4.4.crate) = 14818
-SHA256 (rust/crates/encoding_rs-0.8.22.crate) = cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28
-SIZE (rust/crates/encoding_rs-0.8.22.crate) = 1403758
-SHA256 (rust/crates/fake-simd-0.1.2.crate) = e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed
-SIZE (rust/crates/fake-simd-0.1.2.crate) = 5398
-SHA256 (rust/crates/fnv-1.0.6.crate) = 2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3
-SIZE (rust/crates/fnv-1.0.6.crate) = 11131
-SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
-SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
-SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
-SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
-SHA256 (rust/crates/fuchsia-zircon-0.3.3.crate) = 2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82
-SIZE (rust/crates/fuchsia-zircon-0.3.3.crate) = 22565
-SHA256 (rust/crates/fuchsia-zircon-sys-0.3.3.crate) = 3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7
-SIZE (rust/crates/fuchsia-zircon-sys-0.3.3.crate) = 7191
-SHA256 (rust/crates/futures-channel-0.3.1.crate) = fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86
-SIZE (rust/crates/futures-channel-0.3.1.crate) = 28137
-SHA256 (rust/crates/futures-core-0.3.1.crate) = 79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866
-SIZE (rust/crates/futures-core-0.3.1.crate) = 13543
-SHA256 (rust/crates/futures-io-0.3.1.crate) = e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff
-SIZE (rust/crates/futures-io-0.3.1.crate) = 8884
-SHA256 (rust/crates/futures-sink-0.3.1.crate) = 171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16
-SIZE (rust/crates/futures-sink-0.3.1.crate) = 7633
-SHA256 (rust/crates/futures-task-0.3.1.crate) = 0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9
-SIZE (rust/crates/futures-task-0.3.1.crate) = 6590
-SHA256 (rust/crates/futures-util-0.3.1.crate) = c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76
-SIZE (rust/crates/futures-util-0.3.1.crate) = 125370
-SHA256 (rust/crates/gc-0.3.3.crate) = 75656800ec248b3d0c33b685e442a67e7308009ae59b1f8eb60c4f09ebebb512
-SIZE (rust/crates/gc-0.3.3.crate) = 11972
-SHA256 (rust/crates/gc_derive-0.3.2.crate) = 2501c15cbaf28a0c2214617aa85351982a933161d7937fe6cd71c855364e0ea6
-SIZE (rust/crates/gc_derive-0.3.2.crate) = 1421
-SHA256 (rust/crates/generic-array-0.12.3.crate) = c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec
-SIZE (rust/crates/generic-array-0.12.3.crate) = 18017
-SHA256 (rust/crates/getrandom-0.1.12.crate) = 473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571
-SIZE (rust/crates/getrandom-0.1.12.crate) = 23809
-SHA256 (rust/crates/h2-0.2.1.crate) = b9433d71e471c1736fd5a61b671fc0b148d7a2992f666c958d03cd8feb3b88d1
-SIZE (rust/crates/h2-0.2.1.crate) = 157505
-SHA256 (rust/crates/heck-0.3.1.crate) = 20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205
-SIZE (rust/crates/heck-0.3.1.crate) = 54666
-SHA256 (rust/crates/http-0.2.0.crate) = b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b
-SIZE (rust/crates/http-0.2.0.crate) = 101906
-SHA256 (rust/crates/http-body-0.3.1.crate) = 13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b
-SIZE (rust/crates/http-body-0.3.1.crate) = 5394
-SHA256 (rust/crates/http-test-server-1.0.0.crate) = 5ba28c9537a38005191d6117183fabee88dc170ab0f19041b764f4cc8289e38c
-SIZE (rust/crates/http-test-server-1.0.0.crate) = 10310
-SHA256 (rust/crates/httparse-1.3.4.crate) = cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9
-SIZE (rust/crates/httparse-1.3.4.crate) = 23739
-SHA256 (rust/crates/hyper-0.13.1.crate) = 8bf49cfb32edee45d890537d9057d1b02ed55f53b7b6a30bae83a38c9231749e
-SIZE (rust/crates/hyper-0.13.1.crate) = 126727
-SHA256 (rust/crates/hyper-tls-0.4.0.crate) = ab58a31960b2f78c5c24cf255216789863754438a1e48849a956846f899e762e
-SIZE (rust/crates/hyper-tls-0.4.0.crate) = 14293
-SHA256 (rust/crates/idna-0.2.0.crate) = 02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9
-SIZE (rust/crates/idna-0.2.0.crate) = 257203
-SHA256 (rust/crates/indexmap-1.3.0.crate) = 712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2
-SIZE (rust/crates/indexmap-1.3.0.crate) = 47086
-SHA256 (rust/crates/iovec-0.1.4.crate) = b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e
-SIZE (rust/crates/iovec-0.1.4.crate) = 8720
-SHA256 (rust/crates/itoa-0.4.4.crate) = 501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f
-SIZE (rust/crates/itoa-0.4.4.crate) = 11147
-SHA256 (rust/crates/js-sys-0.3.33.crate) = 367647c532db6f1555d7151e619540ec5f713328235b8c062c6b4f63e84adfe3
-SIZE (rust/crates/js-sys-0.3.33.crate) = 62339
-SHA256 (rust/crates/kernel32-sys-0.2.2.crate) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d
-SIZE (rust/crates/kernel32-sys-0.2.2.crate) = 24537
-SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
-SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
-SHA256 (rust/crates/libc-0.2.62.crate) = 34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba
-SIZE (rust/crates/libc-0.2.62.crate) = 433193
-SHA256 (rust/crates/log-0.4.8.crate) = 14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7
-SIZE (rust/crates/log-0.4.8.crate) = 31297
-SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d
-SIZE (rust/crates/maplit-1.0.2.crate) = 8871
-SHA256 (rust/crates/matches-0.1.8.crate) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08
-SIZE (rust/crates/matches-0.1.8.crate) = 2216
-SHA256 (rust/crates/memchr-2.2.1.crate) = 88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e
-SIZE (rust/crates/memchr-2.2.1.crate) = 20862
-SHA256 (rust/crates/mime-0.3.14.crate) = dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf
-SIZE (rust/crates/mime-0.3.14.crate) = 15035
-SHA256 (rust/crates/mime_guess-2.0.1.crate) = 1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599
-SIZE (rust/crates/mime_guess-2.0.1.crate) = 26646
-SHA256 (rust/crates/mio-0.6.21.crate) = 302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f
-SIZE (rust/crates/mio-0.6.21.crate) = 129233
-SHA256 (rust/crates/miow-0.2.1.crate) = 8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919
-SIZE (rust/crates/miow-0.2.1.crate) = 21133
-SHA256 (rust/crates/native-tls-0.2.3.crate) = 4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e
-SIZE (rust/crates/native-tls-0.2.3.crate) = 29087
-SHA256 (rust/crates/net2-0.2.33.crate) = 42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88
-SIZE (rust/crates/net2-0.2.33.crate) = 20936
-SHA256 (rust/crates/nom-4.2.3.crate) = 2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6
-SIZE (rust/crates/nom-4.2.3.crate) = 115343
-SHA256 (rust/crates/num_cpus-1.10.1.crate) = bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273
-SIZE (rust/crates/num_cpus-1.10.1.crate) = 11151
-SHA256 (rust/crates/opaque-debug-0.2.3.crate) = 2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c
-SIZE (rust/crates/opaque-debug-0.2.3.crate) = 5643
-SHA256 (rust/crates/openssl-0.10.26.crate) = 3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585
-SIZE (rust/crates/openssl-0.10.26.crate) = 186994
-SHA256 (rust/crates/openssl-probe-0.1.2.crate) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de
-SIZE (rust/crates/openssl-probe-0.1.2.crate) = 6427
-SHA256 (rust/crates/openssl-sys-0.9.53.crate) = 465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f
-SIZE (rust/crates/openssl-sys-0.9.53.crate) = 45434
-SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
-SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748
-SHA256 (rust/crates/pest-2.1.2.crate) = 7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a
-SIZE (rust/crates/pest-2.1.2.crate) = 77321
-SHA256 (rust/crates/pest_derive-2.1.0.crate) = 833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0
-SIZE (rust/crates/pest_derive-2.1.0.crate) = 14049
-SHA256 (rust/crates/pest_generator-2.1.1.crate) = 7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0
-SIZE (rust/crates/pest_generator-2.1.1.crate) = 14004
-SHA256 (rust/crates/pest_meta-2.1.2.crate) = df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547
-SIZE (rust/crates/pest_meta-2.1.2.crate) = 27729
-SHA256 (rust/crates/pin-project-0.4.6.crate) = 94b90146c7216e4cb534069fb91366de4ea0ea353105ee45ed297e2d1619e469
-SIZE (rust/crates/pin-project-0.4.6.crate) = 33880
-SHA256 (rust/crates/pin-project-internal-0.4.6.crate) = 44ca92f893f0656d3cba8158dd0f2b99b94de256a4a54e870bd6922fcc6c8355
-SIZE (rust/crates/pin-project-internal-0.4.6.crate) = 23335
-SHA256 (rust/crates/pin-project-lite-0.1.2.crate) = e8822eb8bb72452f038ebf6048efa02c3fe22bf83f76519c9583e47fc194a422
-SIZE (rust/crates/pin-project-lite-0.1.2.crate) = 16098
-SHA256 (rust/crates/pin-utils-0.1.0-alpha.4.crate) = 5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587
-SIZE (rust/crates/pin-utils-0.1.0-alpha.4.crate) = 7446
-SHA256 (rust/crates/pkg-config-0.3.16.crate) = 72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea
-SIZE (rust/crates/pkg-config-0.3.16.crate) = 14429
-SHA256 (rust/crates/ppv-lite86-0.2.5.crate) = e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b
-SIZE (rust/crates/ppv-lite86-0.2.5.crate) = 20606
-SHA256 (rust/crates/proc-macro-error-0.2.6.crate) = aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097
-SIZE (rust/crates/proc-macro-error-0.2.6.crate) = 7963
-SHA256 (rust/crates/proc-macro2-1.0.3.crate) = e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8
-SIZE (rust/crates/proc-macro2-1.0.3.crate) = 34868
-SHA256 (rust/crates/quote-0.3.15.crate) = 7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a
-SIZE (rust/crates/quote-0.3.15.crate) = 12041
-SHA256 (rust/crates/quote-1.0.2.crate) = 053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe
-SIZE (rust/crates/quote-1.0.2.crate) = 23023
-SHA256 (rust/crates/rand-0.7.2.crate) = 3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412
-SIZE (rust/crates/rand-0.7.2.crate) = 111438
-SHA256 (rust/crates/rand_chacha-0.2.1.crate) = 03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853
-SIZE (rust/crates/rand_chacha-0.2.1.crate) = 11475
-SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
-SIZE (rust/crates/rand_core-0.5.1.crate) = 21116
-SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
-SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
-SHA256 (rust/crates/redox_syscall-0.1.56.crate) = 2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84
-SIZE (rust/crates/redox_syscall-0.1.56.crate) = 17117
-SHA256 (rust/crates/regex-1.3.1.crate) = dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd
-SIZE (rust/crates/regex-1.3.1.crate) = 234662
-SHA256 (rust/crates/regex-syntax-0.6.12.crate) = 11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716
-SIZE (rust/crates/regex-syntax-0.6.12.crate) = 289531
-SHA256 (rust/crates/remove_dir_all-0.5.2.crate) = 4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e
-SIZE (rust/crates/remove_dir_all-0.5.2.crate) = 8907
-SHA256 (rust/crates/reqwest-0.10.0.crate) = 03c6cbd2bc1c1cb7052dbe30f4a70cf65811967c800f2dfbb2e6036dc9ee2553
-SIZE (rust/crates/reqwest-0.10.0.crate) = 107457
-SHA256 (rust/crates/ryu-1.0.0.crate) = c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997
-SIZE (rust/crates/ryu-1.0.0.crate) = 40170
-SHA256 (rust/crates/schannel-0.1.16.crate) = 87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021
-SIZE (rust/crates/schannel-0.1.16.crate) = 39153
-SHA256 (rust/crates/security-framework-0.3.4.crate) = 8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df
-SIZE (rust/crates/security-framework-0.3.4.crate) = 48568
-SHA256 (rust/crates/security-framework-sys-0.3.3.crate) = e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895
-SIZE (rust/crates/security-framework-sys-0.3.3.crate) = 9554
-SHA256 (rust/crates/serde-1.0.101.crate) = 9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd
-SIZE (rust/crates/serde-1.0.101.crate) = 73115
-SHA256 (rust/crates/serde_derive-1.0.102.crate) = ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8
-SIZE (rust/crates/serde_derive-1.0.102.crate) = 49693
-SHA256 (rust/crates/serde_json-1.0.40.crate) = 051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704
-SIZE (rust/crates/serde_json-1.0.40.crate) = 69695
-SHA256 (rust/crates/serde_urlencoded-0.6.1.crate) = 9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97
-SIZE (rust/crates/serde_urlencoded-0.6.1.crate) = 12540
-SHA256 (rust/crates/sha-1-0.8.1.crate) = 23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68
-SIZE (rust/crates/sha-1-0.8.1.crate) = 10410
-SHA256 (rust/crates/slab-0.4.2.crate) = c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8
-SIZE (rust/crates/slab-0.4.2.crate) = 10136
-SHA256 (rust/crates/smallvec-0.6.10.crate) = ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7
-SIZE (rust/crates/smallvec-0.6.10.crate) = 22064
-SHA256 (rust/crates/sourcefile-0.1.4.crate) = 4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3
-SIZE (rust/crates/sourcefile-0.1.4.crate) = 3632
-SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
-SIZE (rust/crates/strsim-0.8.0.crate) = 9309
-SHA256 (rust/crates/structopt-0.3.3.crate) = 6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc
-SIZE (rust/crates/structopt-0.3.3.crate) = 40622
-SHA256 (rust/crates/structopt-derive-0.3.3.crate) = 8fe0c13e476b4e21ff7f5c4ace3818b6d7bdc16897c31c73862471bc1663acae
-SIZE (rust/crates/structopt-derive-0.3.3.crate) = 16237
-SHA256 (rust/crates/syn-0.11.11.crate) = d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad
-SIZE (rust/crates/syn-0.11.11.crate) = 63309
-SHA256 (rust/crates/syn-1.0.5.crate) = 66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf
-SIZE (rust/crates/syn-1.0.5.crate) = 190286
-SHA256 (rust/crates/synom-0.11.3.crate) = a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6
-SIZE (rust/crates/synom-0.11.3.crate) = 17120
-SHA256 (rust/crates/synstructure-0.6.1.crate) = 3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd
-SIZE (rust/crates/synstructure-0.6.1.crate) = 11257
-SHA256 (rust/crates/tempfile-3.1.0.crate) = 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9
-SIZE (rust/crates/tempfile-3.1.0.crate) = 25823
-SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
-SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
-SHA256 (rust/crates/thread_local-0.3.6.crate) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b
-SIZE (rust/crates/thread_local-0.3.6.crate) = 12388
-SHA256 (rust/crates/time-0.1.42.crate) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f
-SIZE (rust/crates/time-0.1.42.crate) = 30005
-SHA256 (rust/crates/tokio-0.2.8.crate) = a9d5acfe1b1130d50ac2286a2f1f8cf49309680366ceb7609ce369b75c9058d4
-SIZE (rust/crates/tokio-0.2.8.crate) = 304677
-SHA256 (rust/crates/tokio-tls-0.3.0.crate) = 7bde02a3a5291395f59b06ec6945a3077602fac2b07eeeaf0dee2122f3619828
-SIZE (rust/crates/tokio-tls-0.3.0.crate) = 17274
-SHA256 (rust/crates/tokio-util-0.2.0.crate) = 571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930
-SIZE (rust/crates/tokio-util-0.2.0.crate) = 25141
-SHA256 (rust/crates/tower-service-0.3.0.crate) = e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860
-SIZE (rust/crates/tower-service-0.3.0.crate) = 5321
-SHA256 (rust/crates/try-lock-0.2.2.crate) = e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382
-SIZE (rust/crates/try-lock-0.2.2.crate) = 3638
-SHA256 (rust/crates/typenum-1.11.2.crate) = 6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9
-SIZE (rust/crates/typenum-1.11.2.crate) = 31853
-SHA256 (rust/crates/ucd-trie-0.1.2.crate) = 8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2
-SIZE (rust/crates/ucd-trie-0.1.2.crate) = 44984
-SHA256 (rust/crates/unicase-2.5.1.crate) = 2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150
-SIZE (rust/crates/unicase-2.5.1.crate) = 23105
-SHA256 (rust/crates/unicode-bidi-0.3.4.crate) = 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5
-SIZE (rust/crates/unicode-bidi-0.3.4.crate) = 32228
-SHA256 (rust/crates/unicode-normalization-0.1.8.crate) = 141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426
-SIZE (rust/crates/unicode-normalization-0.1.8.crate) = 71158
-SHA256 (rust/crates/unicode-segmentation-1.3.0.crate) = 1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9
-SIZE (rust/crates/unicode-segmentation-1.3.0.crate) = 90567
-SHA256 (rust/crates/unicode-width-0.1.6.crate) = 7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20
-SIZE (rust/crates/unicode-width-0.1.6.crate) = 16394
-SHA256 (rust/crates/unicode-xid-0.0.4.crate) = 8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc
-SIZE (rust/crates/unicode-xid-0.0.4.crate) = 16034
-SHA256 (rust/crates/unicode-xid-0.2.0.crate) = 826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c
-SIZE (rust/crates/unicode-xid-0.2.0.crate) = 14994
-SHA256 (rust/crates/url-2.1.0.crate) = 75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61
-SIZE (rust/crates/url-2.1.0.crate) = 64776
-SHA256 (rust/crates/vcpkg-0.2.7.crate) = 33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95
-SIZE (rust/crates/vcpkg-0.2.7.crate) = 11012
-SHA256 (rust/crates/vec_map-0.8.1.crate) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a
-SIZE (rust/crates/vec_map-0.8.1.crate) = 14959
-SHA256 (rust/crates/version_check-0.1.5.crate) = 914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd
-SIZE (rust/crates/version_check-0.1.5.crate) = 8173
-SHA256 (rust/crates/want-0.3.0.crate) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0
-SIZE (rust/crates/want-0.3.0.crate) = 6550
-SHA256 (rust/crates/wasi-0.7.0.crate) = b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d
-SIZE (rust/crates/wasi-0.7.0.crate) = 33941
-SHA256 (rust/crates/wasm-bindgen-0.2.56.crate) = 99de4b68939a880d530aed51289a7c7baee154e3ea8ac234b542c49da7134aaf
-SIZE (rust/crates/wasm-bindgen-0.2.56.crate) = 597002
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.56.crate) = b58e66a093a7b7571cb76409763c495b8741ac4319ac20acc2b798f6766d92ee
-SIZE (rust/crates/wasm-bindgen-backend-0.2.56.crate) = 21634
-SHA256 (rust/crates/wasm-bindgen-futures-0.4.6.crate) = 3bf1b55e0dc85085cfab2c0c520b977afcf16ac5801ee0de8dde42a4f5649b2a
-SIZE (rust/crates/wasm-bindgen-futures-0.4.6.crate) = 9458
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.56.crate) = a80f89daea7b0a67b11f6e9f911422ed039de9963dce00048a653b63d51194bf
-SIZE (rust/crates/wasm-bindgen-macro-0.2.56.crate) = 7316
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.56.crate) = 4f9dbc3734ad6cff6b76b75b7df98c06982becd0055f651465a08f769bca5c61
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.56.crate) = 16603
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.56.crate) = d907984f8506b3554eab48b8efff723e764ddbf76d4cd4a3fe4196bc00c49a70
-SIZE (rust/crates/wasm-bindgen-shared-0.2.56.crate) = 2420
-SHA256 (rust/crates/wasm-bindgen-webidl-0.2.56.crate) = f85a3825a459cf6a929d03bacb54dca37a614d43032ad1343ef2d4822972947d
-SIZE (rust/crates/wasm-bindgen-webidl-0.2.56.crate) = 23999
-SHA256 (rust/crates/web-sys-0.3.33.crate) = 2fb60433d0dc12c803b9b017b3902d80c9451bab78d27bc3210bf2a7b96593f1
-SIZE (rust/crates/web-sys-0.3.33.crate) = 208971
-SHA256 (rust/crates/weedle-0.10.0.crate) = 3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164
-SIZE (rust/crates/weedle-0.10.0.crate) = 34686
-SHA256 (rust/crates/winapi-0.2.8.crate) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a
-SIZE (rust/crates/winapi-0.2.8.crate) = 455145
-SHA256 (rust/crates/winapi-0.3.8.crate) = 8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6
-SIZE (rust/crates/winapi-0.3.8.crate) = 1128308
-SHA256 (rust/crates/winapi-build-0.1.1.crate) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc
-SIZE (rust/crates/winapi-build-0.1.1.crate) = 669
-SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
-SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
-SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/winreg-0.6.2.crate) = b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9
-SIZE (rust/crates/winreg-0.6.2.crate) = 19338
-SHA256 (rust/crates/ws2_32-sys-0.2.1.crate) = d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e
-SIZE (rust/crates/ws2_32-sys-0.2.1.crate) = 4697
-SHA256 (bayne-dot-http-v0.2.0_GH0.tar.gz) = bdde648a34ce3accfd0dc425f22ee2aa63468303d20de7fafac976f7134ebb22
-SIZE (bayne-dot-http-v0.2.0_GH0.tar.gz) = 39449
diff --git a/www/dot-http/files/patch-powerpc b/www/dot-http/files/patch-powerpc
deleted file mode 100644
index 1b92066ac900..000000000000
--- a/www/dot-http/files/patch-powerpc
+++ /dev/null
@@ -1,62 +0,0 @@
---- cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2020-03-17 20:35:43 UTC
-+++ cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1486,6 +1486,9 @@ cfg_if! {
-     } else if #[cfg(target_arch = "powerpc64")] {
-         mod powerpc64;
-         pub use self::powerpc64::*;
-+    } else if #[cfg(target_arch = "powerpc")] {
-+        mod powerpc;
-+        pub use self::powerpc::*;
-     } else {
-         // Unknown target_arch
-     }
---- cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig	2021-06-23 22:40:24 UTC
-+++ cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -0,0 +1,47 @@
-+pub type c_char = u8;
-+pub type c_long = i32;
-+pub type c_ulong = u32;
-+pub type wchar_t = i32;
-+pub type time_t = i64;
-+pub type suseconds_t = i32;
-+pub type register_t = i32;
-+
-+s! {
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_mode: ::mode_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        pub st_rdev: ::dev_t,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u32,
-+        pub st_lspare: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+    }
-+}
-+
-+// should be pub(crate), but that requires Rust 1.18.0
-+cfg_if! {
-+    if #[cfg(libc_const_size_of)] {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
-+    } else {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = 4 - 1;
-+    }
-+}
-+
-+pub const MAP_32BIT: ::c_int = 0x00080000;
-+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
diff --git a/www/dot-http/pkg-descr b/www/dot-http/pkg-descr
deleted file mode 100644
index 393dd6294dae..000000000000
--- a/www/dot-http/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-dot-http is a text-based scriptable HTTP client. It is a simple language that
-resembles the actual HTTP protocol but with just a smidgen of magic to make it
-more practical for someone who builds and tests APIs.
diff --git a/www/element-web/Makefile b/www/element-web/Makefile
index 646503740ca6..92dc5e60fcf7 100644
--- a/www/element-web/Makefile
+++ b/www/element-web/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	element
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.98
+DISTVERSION=	1.11.100
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/element-hq/element-web/releases/download/${DISTVERSIONFULL}/
 PKGNAMESUFFIX=	-web
@@ -18,7 +18,7 @@ CPE_VENDOR=	matrix
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
-PLIST_SUB=	COMMITID=547ba66d79cfbd5dc532
+PLIST_SUB=	COMMITID=667479c8bcd11a3fb5b2
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/element-web/distinfo b/www/element-web/distinfo
index 46771e3a0753..a8d87874acf9 100644
--- a/www/element-web/distinfo
+++ b/www/element-web/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745349635
-SHA256 (element-v1.11.98.tar.gz) = 68e0026bf82f1c5337000408018b4b1d4219bc84879a4ab95256bbf616e23b4a
-SIZE (element-v1.11.98.tar.gz) = 34246615
+TIMESTAMP = 1746612506
+SHA256 (element-v1.11.100.tar.gz) = bc4d77152d544fa40fccd7c7e5b6ace4e8ae266f4a2cc1b334b25733c6d1f8cd
+SIZE (element-v1.11.100.tar.gz) = 34364532
diff --git a/www/element-web/pkg-plist b/www/element-web/pkg-plist
index 00883e0a8107..06d1f89bc538 100644
--- a/www/element-web/pkg-plist
+++ b/www/element-web/pkg-plist
@@ -6,15 +6,15 @@
 %%WWWDIR%%/bundles/%%COMMITID%%/1127.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/1188.js
 %%WWWDIR%%/bundles/%%COMMITID%%/1188.js.map
+%%WWWDIR%%/bundles/%%COMMITID%%/1217.js
+%%WWWDIR%%/bundles/%%COMMITID%%/1217.js.LICENSE.txt
+%%WWWDIR%%/bundles/%%COMMITID%%/1217.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/1526.js
 %%WWWDIR%%/bundles/%%COMMITID%%/1526.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/1787.js
 %%WWWDIR%%/bundles/%%COMMITID%%/1787.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/2382.js
 %%WWWDIR%%/bundles/%%COMMITID%%/2382.js.map
-%%WWWDIR%%/bundles/%%COMMITID%%/274.js
-%%WWWDIR%%/bundles/%%COMMITID%%/274.js.LICENSE.txt
-%%WWWDIR%%/bundles/%%COMMITID%%/274.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/2792.js
 %%WWWDIR%%/bundles/%%COMMITID%%/2792.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/2eb85e1feacd09cd026d.wasm
@@ -32,6 +32,9 @@
 %%WWWDIR%%/bundles/%%COMMITID%%/3508.js
 %%WWWDIR%%/bundles/%%COMMITID%%/3636.js
 %%WWWDIR%%/bundles/%%COMMITID%%/3636.js.map
+%%WWWDIR%%/bundles/%%COMMITID%%/3714.js
+%%WWWDIR%%/bundles/%%COMMITID%%/3714.js.LICENSE.txt
+%%WWWDIR%%/bundles/%%COMMITID%%/3714.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/395.js
 %%WWWDIR%%/bundles/%%COMMITID%%/395.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/4006.js
@@ -85,9 +88,6 @@
 %%WWWDIR%%/bundles/%%COMMITID%%/9381.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/9393.js
 %%WWWDIR%%/bundles/%%COMMITID%%/9393.js.map
-%%WWWDIR%%/bundles/%%COMMITID%%/9425.js
-%%WWWDIR%%/bundles/%%COMMITID%%/9425.js.LICENSE.txt
-%%WWWDIR%%/bundles/%%COMMITID%%/9425.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/9924.js
 %%WWWDIR%%/bundles/%%COMMITID%%/9924.js.map
 %%WWWDIR%%/bundles/%%COMMITID%%/9963.js
@@ -345,45 +345,45 @@
 %%WWWDIR%%/fonts/inter-vietnamese-700-italic.feddee8.woff2
 %%WWWDIR%%/fonts/inter-vietnamese-700-normal.5b5cd0c.woff
 %%WWWDIR%%/fonts/inter-vietnamese-700-normal.5d9bfca.woff2
-%%WWWDIR%%/i18n/cs.4e4db29.json
-%%WWWDIR%%/i18n/cy.9db1cbc.json
-%%WWWDIR%%/i18n/de_DE.47708b7.json
-%%WWWDIR%%/i18n/el.f14d14c.json
-%%WWWDIR%%/i18n/en_EN.cb9d325.json
-%%WWWDIR%%/i18n/eo.0f30843.json
-%%WWWDIR%%/i18n/es.b5475c7.json
-%%WWWDIR%%/i18n/et.647277a.json
-%%WWWDIR%%/i18n/fa.1d844b8.json
-%%WWWDIR%%/i18n/fi.7b06d2e.json
-%%WWWDIR%%/i18n/fr.a1e684f.json
-%%WWWDIR%%/i18n/gl.64f26b1.json
-%%WWWDIR%%/i18n/he.aec80e9.json
-%%WWWDIR%%/i18n/hu.4efdce9.json
-%%WWWDIR%%/i18n/id.c11fa3c.json
-%%WWWDIR%%/i18n/is.18e5e8a.json
-%%WWWDIR%%/i18n/it.4193aa7.json
-%%WWWDIR%%/i18n/ja.091a9ce.json
-%%WWWDIR%%/i18n/ka.373ba42.json
-%%WWWDIR%%/i18n/languages.2aa41ec.json
+%%WWWDIR%%/i18n/cs.7b7ba53.json
+%%WWWDIR%%/i18n/cy.820f145.json
+%%WWWDIR%%/i18n/de_DE.c1d8804.json
+%%WWWDIR%%/i18n/el.188effa.json
+%%WWWDIR%%/i18n/en_EN.dcf12d0.json
+%%WWWDIR%%/i18n/eo.b5e64b9.json
+%%WWWDIR%%/i18n/es.814c4d1.json
+%%WWWDIR%%/i18n/et.4616345.json
+%%WWWDIR%%/i18n/fa.ba2268f.json
+%%WWWDIR%%/i18n/fi.b074d4e.json
+%%WWWDIR%%/i18n/fr.71966ba.json
+%%WWWDIR%%/i18n/gl.8eae666.json
+%%WWWDIR%%/i18n/he.931b2ca.json
+%%WWWDIR%%/i18n/hu.b13bd56.json
+%%WWWDIR%%/i18n/id.ef7a0fc.json
+%%WWWDIR%%/i18n/is.720c04f.json
+%%WWWDIR%%/i18n/it.c4dae6a.json
+%%WWWDIR%%/i18n/ja.3050af5.json
+%%WWWDIR%%/i18n/ka.cf27f1d.json
+%%WWWDIR%%/i18n/languages.51496dc.json
 %%WWWDIR%%/i18n/languages.json
-%%WWWDIR%%/i18n/lo.5a0ea74.json
-%%WWWDIR%%/i18n/lt.1a6ab40.json
-%%WWWDIR%%/i18n/lv.b49c5b7.json
-%%WWWDIR%%/i18n/mg_MG.e103ed8.json
-%%WWWDIR%%/i18n/nb_NO.841dd96.json
-%%WWWDIR%%/i18n/nl.a16e603.json
-%%WWWDIR%%/i18n/pl.fad3837.json
-%%WWWDIR%%/i18n/pt.822e1fd.json
-%%WWWDIR%%/i18n/pt_BR.118ae34.json
-%%WWWDIR%%/i18n/ru.cb7f715.json
-%%WWWDIR%%/i18n/sk.fdaf0be.json
-%%WWWDIR%%/i18n/sq.62b60f5.json
-%%WWWDIR%%/i18n/sv.16622e7.json
-%%WWWDIR%%/i18n/tr.31242de.json
-%%WWWDIR%%/i18n/uk.458c518.json
-%%WWWDIR%%/i18n/vi.c250c73.json
-%%WWWDIR%%/i18n/zh_Hans.5340cf4.json
-%%WWWDIR%%/i18n/zh_Hant.f4ac8f1.json
+%%WWWDIR%%/i18n/lo.fabd37f.json
+%%WWWDIR%%/i18n/lt.52c0924.json
+%%WWWDIR%%/i18n/lv.9f659b2.json
+%%WWWDIR%%/i18n/mg_MG.2904523.json
+%%WWWDIR%%/i18n/nb_NO.840e3ca.json
+%%WWWDIR%%/i18n/nl.3d3ea88.json
+%%WWWDIR%%/i18n/pl.e335cf9.json
+%%WWWDIR%%/i18n/pt.ba56256.json
+%%WWWDIR%%/i18n/pt_BR.c0da448.json
+%%WWWDIR%%/i18n/ru.9782881.json
+%%WWWDIR%%/i18n/sk.4fc4270.json
+%%WWWDIR%%/i18n/sq.7223e38.json
+%%WWWDIR%%/i18n/sv.1dc0401.json
+%%WWWDIR%%/i18n/tr.c136827.json
+%%WWWDIR%%/i18n/uk.c600f05.json
+%%WWWDIR%%/i18n/vi.40be522.json
+%%WWWDIR%%/i18n/zh_Hans.fe14cf5.json
+%%WWWDIR%%/i18n/zh_Hant.6de66fb.json
 %%WWWDIR%%/icons/bold.b7f0698.svg
 %%WWWDIR%%/icons/check-circle.99c21d7.svg
 %%WWWDIR%%/icons/check.aaad650.svg
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index b432db34790e..a3e64caf5fb8 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -16,13 +16,13 @@ RUN_DEPENDS=	w3m:www/w3m
 
 USES=		autoreconf emacs tar:xz
 USE_GITHUB=	yes
-GH_TAGNAME=	dc5136d
+GH_TAGNAME=	fc0f30f
 
 ALL_TARGET=	default
 INSTALL_TARGET=	install install-icons
 
 NO_ARCH=	yes
-SNAPDATE=	20240208
+SNAPDATE=	20250504
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 5255ae05aeec..88cff6ad7808 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707572026
-SHA256 (emacs-w3m-emacs-w3m-1.4.632.b.20240208-dc5136d_GH0.tar.gz) = 754b5f2d2dd9ed109177ee337f5f27797b45e059b3e63036d593ba59a114a3f4
-SIZE (emacs-w3m-emacs-w3m-1.4.632.b.20240208-dc5136d_GH0.tar.gz) = 1080936
+TIMESTAMP = 1746512911
+SHA256 (emacs-w3m-emacs-w3m-1.4.632.b.20250504-fc0f30f_GH0.tar.gz) = 97dd66cd6b3f0dc56472d679f61e3fb8567c656924a3838ece9f0726019ddbc3
+SIZE (emacs-w3m-emacs-w3m-1.4.632.b.20250504-fc0f30f_GH0.tar.gz) = 1080876
diff --git a/www/gallery-dl/Makefile b/www/gallery-dl/Makefile
index b394f12c45dd..bd9c6ce3f415 100644
--- a/www/gallery-dl/Makefile
+++ b/www/gallery-dl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gallery-dl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.29.5
+DISTVERSION=	1.29.6
 CATEGORIES=	www
 
 # Implicit approval to commit trivial version updates.
diff --git a/www/gallery-dl/distinfo b/www/gallery-dl/distinfo
index 0989fb1b50a4..89193be16613 100644
--- a/www/gallery-dl/distinfo
+++ b/www/gallery-dl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745681527
-SHA256 (mikf-gallery-dl-v1.29.5_GH0.tar.gz) = 84521691bb0a4024eb52a5ce350c8be085d2269441fc78db85e6699a60630dcf
-SIZE (mikf-gallery-dl-v1.29.5_GH0.tar.gz) = 839586
+TIMESTAMP = 1746349346
+SHA256 (mikf-gallery-dl-v1.29.6_GH0.tar.gz) = 3d6123067586c7b2852c27a90be70dc63ebf14cf426cb5d295e50f19b7ec6f91
+SIZE (mikf-gallery-dl-v1.29.6_GH0.tar.gz) = 844013
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 8ef9989ed2e4..6fa0ea62b87a 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hugo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.147.0
+DISTVERSION=	0.147.2
 PORTEPOCH=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	go
diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo
index 981046d0c7f9..4fbf4c8e298a 100644
--- a/www/gohugo/distinfo
+++ b/www/gohugo/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745603802
-SHA256 (go/www_gohugo/hugo-v0.147.0/v0.147.0.mod) = b6c1a3f1991fd6389594de8d646c3f45e3480cdbd7de2d2a5cd91af50a2556d8
-SIZE (go/www_gohugo/hugo-v0.147.0/v0.147.0.mod) = 8036
-SHA256 (go/www_gohugo/hugo-v0.147.0/v0.147.0.zip) = 375d6e3655176c102745871be2ea06b2b5e705957166198974f41de1a0805f62
-SIZE (go/www_gohugo/hugo-v0.147.0/v0.147.0.zip) = 5732627
+TIMESTAMP = 1746548045
+SHA256 (go/www_gohugo/hugo-v0.147.2/v0.147.2.mod) = cb41ea476364590e46adc72d923c617f69d99544d2a78c743ae4608f4c43ea25
+SIZE (go/www_gohugo/hugo-v0.147.2/v0.147.2.mod) = 8036
+SHA256 (go/www_gohugo/hugo-v0.147.2/v0.147.2.zip) = 2d350d624ec4d6b3e8782c641955e4314f980259e3de0ba843313882587910f6
+SIZE (go/www_gohugo/hugo-v0.147.2/v0.147.2.zip) = 5733684
diff --git a/www/groupoffice/Makefile b/www/groupoffice/Makefile
index d80b25c759d0..a2eef261c60f 100644
--- a/www/groupoffice/Makefile
+++ b/www/groupoffice/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	groupoffice
 DISTVERSIONPREFIX=	com-
-DISTVERSION=	25.0.17
+DISTVERSION=	25.0.19
 CATEGORIES=	www
 MASTER_SITES=	SF/group-office/${DISTVERSION:R}
 DISTNAME=	${PORTNAME}-${DISTVERSION}
diff --git a/www/groupoffice/distinfo b/www/groupoffice/distinfo
index ba076793ccc5..7da68e873e38 100644
--- a/www/groupoffice/distinfo
+++ b/www/groupoffice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744787588
-SHA256 (groupoffice-25.0.17.tar.gz) = 5a91251616e9471936ad94481f7c814f90f17d8cda895942a4150d659b00a083
-SIZE (groupoffice-25.0.17.tar.gz) = 95914380
+TIMESTAMP = 1746350378
+SHA256 (groupoffice-25.0.19.tar.gz) = 6d38be369368131f57ff95cf039b47af7cb7690b3028daf213945af476fc1528
+SIZE (groupoffice-25.0.19.tar.gz) = 95919271
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 563faae9a607..4ad3351a850b 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	hiawatha
-DISTVERSION=	11.6
+DISTVERSION=	11.7
 CATEGORIES=	www
 MASTER_SITES=	https://hiawatha.leisink.net/files/
 
-MAINTAINER=	johntdarrah@gmail.com
+MAINTAINER=	cpetrik@proton.me
 COMMENT=	Advanced and secure web server for Unix
 WWW=		https://hiawatha.leisink.net/
 
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index bbcbe0985b32..71d8a3742a70 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724529515
-SHA256 (hiawatha-11.6.tar.gz) = b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
-SIZE (hiawatha-11.6.tar.gz) = 1886754
+TIMESTAMP = 1746664802
+SHA256 (hiawatha-11.7.tar.gz) = 8bc180ae3b986d02466f081efeefdb1595d96783f581fded2a9b198752ab7ae1
+SIZE (hiawatha-11.7.tar.gz) = 1914236
diff --git a/www/homer-web/Makefile b/www/homer-web/Makefile
index 6195338fc142..24b0cf1031e0 100644
--- a/www/homer-web/Makefile
+++ b/www/homer-web/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	homer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	25.04.1
+DISTVERSION=	25.05.1
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/bastienwirtz/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 PKGNAMESUFFIX=	-web
diff --git a/www/homer-web/distinfo b/www/homer-web/distinfo
index e0a633f15531..2beb55f9b52a 100644
--- a/www/homer-web/distinfo
+++ b/www/homer-web/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743863746
-SHA256 (homer-25.04.1/homer.zip) = a9d51108e14122dc4aa0e4b285c35057a47d601ce0beb74f71ac41ebb59ee405
-SIZE (homer-25.04.1/homer.zip) = 1131055
+TIMESTAMP = 1746467397
+SHA256 (homer-25.05.1/homer.zip) = dc6cec598c7c33008ea66c6a424317190d2a2aba3a54dc2f512e4dba2f088e92
+SIZE (homer-25.05.1/homer.zip) = 1135408
diff --git a/www/homer-web/pkg-plist b/www/homer-web/pkg-plist
index f7622bc8335a..b1e81603448d 100644
--- a/www/homer-web/pkg-plist
+++ b/www/homer-web/pkg-plist
@@ -19,95 +19,99 @@
 %%WWWDIR%%/index.html
 %%WWWDIR%%/logo.png
 %%WWWDIR%%/registerSW.js
-%%WWWDIR%%/resources/AdGuardHome-OFLIW1kq.js
+%%WWWDIR%%/resources/AdGuardHome-BfFM9H2A.js
 %%WWWDIR%%/resources/AdGuardHome-Tw0vCF6f.css
+%%WWWDIR%%/resources/CopyToClipboard-CjlqRd3R.js
 %%WWWDIR%%/resources/CopyToClipboard-DUc_NqZL.css
-%%WWWDIR%%/resources/CopyToClipboard-wUnXqfZ5.js
-%%WWWDIR%%/resources/Docuseal-BCDjCpTv.js
+%%WWWDIR%%/resources/DockerSocketProxy-CtBSfVQ4.js
+%%WWWDIR%%/resources/DockerSocketProxy-x5542i92.css
 %%WWWDIR%%/resources/Docuseal-GTRlXpFw.css
+%%WWWDIR%%/resources/Docuseal-yh1Bp7eU.js
 %%WWWDIR%%/resources/Emby-Cc4XwFHX.css
-%%WWWDIR%%/resources/Emby-Dre4P5Kx.js
+%%WWWDIR%%/resources/Emby-CvTs9TNE.js
 %%WWWDIR%%/resources/FreshRSS-BdJMV5mk.css
-%%WWWDIR%%/resources/FreshRSS-C6rvoHvB.js
-%%WWWDIR%%/resources/Gitea-BHzRbbr7.js
+%%WWWDIR%%/resources/FreshRSS-BtwguxfM.js
+%%WWWDIR%%/resources/Gitea-BjQsojkJ.js
 %%WWWDIR%%/resources/Gitea-DJOaXsSb.css
-%%WWWDIR%%/resources/Glances-1H02XN8q.js
+%%WWWDIR%%/resources/Glances-D-J3iX4l.js
 %%WWWDIR%%/resources/Gotify-CgkfqLBJ.css
-%%WWWDIR%%/resources/Gotify-DqZ260GZ.js
-%%WWWDIR%%/resources/Healthchecks-CYzot75Q.js
+%%WWWDIR%%/resources/Gotify-yj4dQwQn.js
+%%WWWDIR%%/resources/Healthchecks-CG-ysnp9.js
 %%WWWDIR%%/resources/Healthchecks-CuXYh2ap.css
-%%WWWDIR%%/resources/HomeAssistant-CZX893hC.js
+%%WWWDIR%%/resources/HomeAssistant-4k1cqTqL.js
 %%WWWDIR%%/resources/HomeAssistant-D4G66XLG.css
 %%WWWDIR%%/resources/Immich-BQJ4xb-9.css
-%%WWWDIR%%/resources/Immich-C8933yK7.js
-%%WWWDIR%%/resources/Jellystat-1286kvHy.js
+%%WWWDIR%%/resources/Immich-Dpmapxbu.js
+%%WWWDIR%%/resources/Jellystat-CRlyhbsa.js
 %%WWWDIR%%/resources/Jellystat-YCL3xwF6.css
-%%WWWDIR%%/resources/Lidarr-CMnZZ3ph.js
+%%WWWDIR%%/resources/Lidarr-D1KR85PC.js
 %%WWWDIR%%/resources/Lidarr-Dza-1-vv.css
-%%WWWDIR%%/resources/Linkding-5UyEpsth.js
-%%WWWDIR%%/resources/Matrix-IYfx_5Uu.js
+%%WWWDIR%%/resources/Linkding-Fa1evqHd.js
+%%WWWDIR%%/resources/Matrix-CTCYXHVe.js
 %%WWWDIR%%/resources/Matrix-Q-bxbOqk.css
-%%WWWDIR%%/resources/Mealie-BA6P24XS.js
-%%WWWDIR%%/resources/Medusa-0sf1Jb6G.js
+%%WWWDIR%%/resources/Mealie-chMEgEVI.js
 %%WWWDIR%%/resources/Medusa-DcXIgM3A.css
-%%WWWDIR%%/resources/Mylar-BcsU-h_A.js
+%%WWWDIR%%/resources/Medusa-G2vEvJaZ.js
+%%WWWDIR%%/resources/Mylar-Bk6mFch6.js
 %%WWWDIR%%/resources/Mylar-D14wGFq4.css
-%%WWWDIR%%/resources/Nextcloud-D3c314Dg.js
+%%WWWDIR%%/resources/Nextcloud-BkTg4YmH.js
 %%WWWDIR%%/resources/Nextcloud-v71Ld_Cv.css
-%%WWWDIR%%/resources/OctoPrint-DGmkANjA.js
+%%WWWDIR%%/resources/OctoPrint-B1Yz07FH.js
 %%WWWDIR%%/resources/OctoPrint-DqTJwI-L.css
+%%WWWDIR%%/resources/Olivetin-CMt84iMk.js
 %%WWWDIR%%/resources/Olivetin-D8ESXpq5.css
-%%WWWDIR%%/resources/Olivetin-ieZjk8BW.js
 %%WWWDIR%%/resources/OpenHAB-BjwTZqa0.css
-%%WWWDIR%%/resources/OpenHAB-CiOZauVm.js
+%%WWWDIR%%/resources/OpenHAB-DqO798QH.js
 %%WWWDIR%%/resources/OpenWeather-BKPkxLGY.css
-%%WWWDIR%%/resources/OpenWeather-Bvq4Of9k.js
-%%WWWDIR%%/resources/PaperlessNG-DzB35iq5.js
-%%WWWDIR%%/resources/PeaNUT-BbOD23re.js
+%%WWWDIR%%/resources/OpenWeather-UWsD3Ken.js
+%%WWWDIR%%/resources/PaperlessNG-Dr2jVcHs.js
+%%WWWDIR%%/resources/PeaNUT-C28MUCr8.js
 %%WWWDIR%%/resources/PiAlert-27f4aoYp.css
-%%WWWDIR%%/resources/PiAlert-B5triBsf.js
-%%WWWDIR%%/resources/PiHole-BZSinHHL.js
-%%WWWDIR%%/resources/PiHole-Dwei6ArX.css
+%%WWWDIR%%/resources/PiAlert-DmtXo46V.js
+%%WWWDIR%%/resources/PiHole-3sFywXPg.css
+%%WWWDIR%%/resources/PiHole-CewW1sJ8.js
 %%WWWDIR%%/resources/Ping-BVyk1tW9.css
-%%WWWDIR%%/resources/Ping-DKEc2ckg.js
-%%WWWDIR%%/resources/Portainer-BCTVoF0R.js
+%%WWWDIR%%/resources/Ping-CDn56lAz.js
+%%WWWDIR%%/resources/Plex-CtqAc55C.css
+%%WWWDIR%%/resources/Plex-U4yR0ZN3.js
 %%WWWDIR%%/resources/Portainer-BQaRgpcO.css
-%%WWWDIR%%/resources/Prometheus-DI5JWG4d.js
+%%WWWDIR%%/resources/Portainer-BrAttM5X.js
+%%WWWDIR%%/resources/Prometheus-BvsyBoCa.js
 %%WWWDIR%%/resources/Prometheus-DW7rR0zJ.css
 %%WWWDIR%%/resources/Prowlarr-C0MntQnn.css
-%%WWWDIR%%/resources/Prowlarr-CynGFZ40.js
-%%WWWDIR%%/resources/Proxmox-6lc3t3ip.js
+%%WWWDIR%%/resources/Prowlarr-D0o-_4lR.js
 %%WWWDIR%%/resources/Proxmox-B7Ne6yNU.css
+%%WWWDIR%%/resources/Proxmox-CXr0bID6.js
+%%WWWDIR%%/resources/Radarr-DGpUY4mN.js
 %%WWWDIR%%/resources/Radarr-Drh5L8HP.css
-%%WWWDIR%%/resources/Radarr-sME3-iiX.js
-%%WWWDIR%%/resources/Readarr-CXzHfO3J.js
+%%WWWDIR%%/resources/Readarr-DtScEyIt.js
 %%WWWDIR%%/resources/Readarr-QGnLos4n.css
 %%WWWDIR%%/resources/Rtorrent-8y0Hk3ah.css
-%%WWWDIR%%/resources/Rtorrent-BIVgtJ9l.js
-%%WWWDIR%%/resources/SABnzbd-DR8iQv-6.js
-%%WWWDIR%%/resources/SABnzbd-EFz9WUEs.css
+%%WWWDIR%%/resources/Rtorrent-CVI1EAT2.js
+%%WWWDIR%%/resources/SABnzbd-Bq1E7sfL.js
+%%WWWDIR%%/resources/SABnzbd-C7_KSBXO.css
 %%WWWDIR%%/resources/Scrutiny-BFyhoSmH.css
-%%WWWDIR%%/resources/Scrutiny-BcCflv41.js
-%%WWWDIR%%/resources/Sonarr-8t-IzGff.js
+%%WWWDIR%%/resources/Scrutiny-N52Py8RU.js
 %%WWWDIR%%/resources/Sonarr-B0qW27KC.css
-%%WWWDIR%%/resources/SpeedtestTracker-B-4wHSc0.js
-%%WWWDIR%%/resources/Tautulli-4FKasQDm.js
+%%WWWDIR%%/resources/Sonarr-CF-5Hk9N.js
+%%WWWDIR%%/resources/SpeedtestTracker-CYrwstzE.js
 %%WWWDIR%%/resources/Tautulli-CfeJITWv.css
+%%WWWDIR%%/resources/Tautulli-CmYOkCJF.js
 %%WWWDIR%%/resources/Tdarr-BvRK51o8.css
-%%WWWDIR%%/resources/Tdarr-CcWO7do6.js
-%%WWWDIR%%/resources/ThemeChooser-CY7GrwX7.js
+%%WWWDIR%%/resources/Tdarr-ZSMoTlRe.js
 %%WWWDIR%%/resources/ThemeChooser-CcNjZIAP.css
-%%WWWDIR%%/resources/Traefik-CEvvQxDD.js
+%%WWWDIR%%/resources/ThemeChooser-UvSE6ows.js
+%%WWWDIR%%/resources/Traefik-CFx7BitS.js
 %%WWWDIR%%/resources/Traefik-QfL0WZ4b.css
-%%WWWDIR%%/resources/TruenasScale-C9vV2MrH.js
+%%WWWDIR%%/resources/TruenasScale-Dlh3PNum.js
 %%WWWDIR%%/resources/TruenasScale-maMPkiom.css
-%%WWWDIR%%/resources/UptimeKuma-CNOWpcxp.js
+%%WWWDIR%%/resources/UptimeKuma-CcWwR8ZM.js
 %%WWWDIR%%/resources/UptimeKuma-Fq8eQnsp.css
+%%WWWDIR%%/resources/Vaultwarden-DTS3MIuR.js
 %%WWWDIR%%/resources/Vaultwarden-Dy-eliI8.css
-%%WWWDIR%%/resources/Vaultwarden-XL-uiHjq.js
 %%WWWDIR%%/resources/WUD-BLIHvfpt.css
-%%WWWDIR%%/resources/WUD-D-GoZEbt.js
-%%WWWDIR%%/resources/Wallabag-DLX-x8RA.js
+%%WWWDIR%%/resources/WUD-dvk-H_mn.js
+%%WWWDIR%%/resources/Wallabag-BgScaCez.js
 %%WWWDIR%%/resources/Wallabag-VA4tCsKR.css
 %%WWWDIR%%/resources/fa-brands-400-D1LuMI3I.ttf
 %%WWWDIR%%/resources/fa-brands-400-D_cYUPeE.woff2
@@ -117,11 +121,11 @@
 %%WWWDIR%%/resources/fa-solid-900-D0aA9rwL.ttf
 %%WWWDIR%%/resources/fa-v4compatibility-C9RhG_FT.woff2
 %%WWWDIR%%/resources/fa-v4compatibility-CCth-dXg.ttf
-%%WWWDIR%%/resources/index-CS8LWedL.css
-%%WWWDIR%%/resources/index-DtQJUVrN.js
+%%WWWDIR%%/resources/index-CszYxh3i.css
+%%WWWDIR%%/resources/index-D-u-9ayF.js
 %%WWWDIR%%/resources/noto-latin-normal-GUnxZaaT.woff2
-%%WWWDIR%%/resources/qBittorrent-55vsBRUx.js
 %%WWWDIR%%/resources/qBittorrent-B7KcPLhg.css
+%%WWWDIR%%/resources/qBittorrent-DVukxuYf.js
 %%WWWDIR%%/resources/service-BGjJGoFF.js
 %%WWWDIR%%/sw.js
 %%WWWDIR%%/workbox-84c915bb.js
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index aa93615fb419..c8cf75a586d4 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ikiwiki
-DISTVERSION=	3.20250221
+DISTVERSION=	3.20250501
 CATEGORIES=	www
 MASTER_SITES=	DEBIAN_POOL \
 		LOCAL/mat/${PORTNAME}
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index fff5a081a744..adb773a34f3c 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740225494
-SHA256 (ikiwiki_3.20250221.orig.tar.xz) = 6da4bcd0c55f349206fbdb37028663007faaa3d69254c61a3973733c2a1e3084
-SIZE (ikiwiki_3.20250221.orig.tar.xz) = 2783180
+TIMESTAMP = 1746527769
+SHA256 (ikiwiki_3.20250501.orig.tar.xz) = 5ef21d70e4e2a58579c433d52656e889046278ce1a734adec3c52405f199ed3a
+SIZE (ikiwiki_3.20250501.orig.tar.xz) = 2796748
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index e6d4c84d13ef..d2c911f84d6f 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	iridium
-PORTVERSION=	2025.04.135.2
+PORTVERSION=	2025.05.136.1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	www wayland
diff --git a/www/iridium/distinfo b/www/iridium/distinfo
index 4f92424776df..803215ab849b 100644
--- a/www/iridium/distinfo
+++ b/www/iridium/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745557935
-SHA256 (iridium-browser-2025.04.135.2.tar.xz) = e7d90794da9fb086fd56dc0aaa19d4c4c2b4652bdde0ceabf3fd981d4aa896ed
-SIZE (iridium-browser-2025.04.135.2.tar.xz) = 2985921092
+TIMESTAMP = 1746686164
+SHA256 (iridium-browser-2025.05.136.1.tar.xz) = 5baa038eeafcc04a199cff7f512839b9ac3fdac71fe496af9ff3c8544f51f9ae
+SIZE (iridium-browser-2025.05.136.1.tar.xz) = 3044399212
 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (pulseaudio-16.1.tar.gz) = 2763111
diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn
index 4320cea3fdb7..5999930ba76c 100644
--- a/www/iridium/files/patch-BUILD.gn
+++ b/www/iridium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ BUILD.gn
 @@ -71,7 +71,7 @@ declare_args() {
    root_extra_deps = []
@@ -17,7 +17,7 @@
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -448,7 +447,7 @@ group("gn_all") {
+@@ -449,7 +448,7 @@ group("gn_all") {
        }
      }
  
@@ -26,7 +26,7 @@
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -638,6 +637,15 @@ group("gn_all") {
+@@ -636,6 +635,15 @@ group("gn_all") {
        }
      }
  
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
-@@ -686,7 +694,7 @@ group("gn_all") {
+@@ -684,7 +692,7 @@ group("gn_all") {
        }
      }
  
@@ -51,7 +51,7 @@
        # The official builders use this binary from the default toolchain's
        # output directory after building in order to upload the symbols of that
        # binary. They build the binary like `ninja symupload` which requires the
-@@ -721,7 +729,7 @@ group("gn_all") {
+@@ -719,7 +727,7 @@ group("gn_all") {
        ]
      }
  
@@ -60,16 +60,16 @@
        deps += [
          "//third_party/crashpad/crashpad:crashpad_tests",
          "//third_party/crashpad/crashpad/handler:crashpad_handler",
-@@ -1126,7 +1134,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1128,7 +1136,7 @@ if (use_blink && !is_cronet_build) {
+       "//third_party/blink/public:all_blink",
      ]
  
-     if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android &&
--        !is_castos) {
-+        !is_castos && !is_bsd) {
+-    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos) {
++    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
        deps += [
          ":chrome_wpt_tests",
          ":headless_shell_wpt",
-@@ -1273,7 +1281,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
  
@@ -78,7 +78,7 @@
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1287,7 +1295,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1289,7 +1297,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms" ]
      }
  
@@ -87,7 +87,7 @@
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1757,7 +1765,7 @@ group("chromium_builder_perf") {
+@@ -1760,7 +1768,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
  
diff --git a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc
index bbb3d922c5e1..4131a3a1efd2 100644
--- a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc
+++ b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc
@@ -1,4 +1,4 @@
---- apps/ui/views/app_window_frame_view.cc.orig	2025-04-16 18:18:42 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ apps/ui/views/app_window_frame_view.cc
 @@ -146,7 +146,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
  gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
diff --git a/www/iridium/files/patch-ash_display_mirror__window__controller.cc b/www/iridium/files/patch-ash_display_mirror__window__controller.cc
index 3e8f1dfb840b..7e56d1d01d88 100644
--- a/www/iridium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/iridium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,4 +1,4 @@
---- ash/display/mirror_window_controller.cc.orig	2024-12-22 12:24:29 UTC
+--- ash/display/mirror_window_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ ash/display/mirror_window_controller.cc
 @@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
        if (!base::Contains(display_info_list, iter->first,
diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn
index 43fe9551f298..0df8368607d4 100644
--- a/www/iridium/files/patch-base_BUILD.gn
+++ b/www/iridium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- base/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ base/BUILD.gn
-@@ -1094,11 +1094,26 @@ component("base") {
+@@ -1104,11 +1104,26 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -28,7 +28,7 @@
    if (use_allocator_shim) {
      if (is_apple) {
        sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1118,7 +1133,7 @@ component("base") {
+@@ -1128,7 +1143,7 @@ component("base") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -37,7 +37,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -2142,6 +2157,22 @@ component("base") {
+@@ -2152,6 +2167,22 @@ component("base") {
      ]
    }
  
@@ -60,7 +60,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2300,6 +2331,33 @@ component("base") {
+@@ -2312,6 +2343,33 @@ component("base") {
      }
    }
  
@@ -94,7 +94,7 @@
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2649,7 +2707,7 @@ buildflag_header("protected_memory_buildflags") {
+@@ -2690,7 +2748,7 @@ buildflag_header("protected_memory_buildflags") {
    header = "protected_memory_buildflags.h"
    header_dir = "base/memory"
  
@@ -103,7 +103,7 @@
                               (is_win || is_linux || is_android || is_mac)
  
    flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
-@@ -3122,7 +3180,7 @@ if (is_apple) {
+@@ -3163,7 +3221,7 @@ if (is_apple) {
    }
  }
  
@@ -112,7 +112,7 @@
    # This test must compile with -fstack-protector-all
    source_set("stack_canary_linux_unittests") {
      testonly = true
-@@ -3808,7 +3866,7 @@ test("base_unittests") {
+@@ -3851,7 +3909,7 @@ test("base_unittests") {
      ]
    }
  
@@ -121,7 +121,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3836,7 +3894,7 @@ test("base_unittests") {
+@@ -3879,7 +3937,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -130,7 +130,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3847,7 +3905,7 @@ test("base_unittests") {
+@@ -3890,7 +3948,7 @@ test("base_unittests") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -139,7 +139,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -4037,7 +4095,7 @@ test("base_unittests") {
+@@ -4080,7 +4138,7 @@ test("base_unittests") {
      deps += [ ":base_profiler_test_support_library" ]
    }
  
diff --git a/www/iridium/files/patch-base_allocator_dispatcher_tls.h b/www/iridium/files/patch-base_allocator_dispatcher_tls.h
index 7be94ac7db78..f4b1bb3d43e4 100644
--- a/www/iridium/files/patch-base_allocator_dispatcher_tls.h
+++ b/www/iridium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,4 +1,4 @@
---- base/allocator/dispatcher/tls.h.orig	2025-02-22 18:06:53 UTC
+--- base/allocator/dispatcher/tls.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/dispatcher/tls.h
 @@ -81,7 +81,7 @@ struct BASE_EXPORT MMapAllocator {
    constexpr static size_t AllocationChunkSize = 16384;
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index bf1bcd159fcf..fa97d288bda7 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,15 +1,15 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-03-18 16:46:04 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
 @@ -89,7 +89,7 @@ if (is_nacl) {
+ # TODO(crbug.com/329199197): Clean this up when experiments are complete.
  use_large_empty_slot_span_ring = true
  
- has_memory_tagging =
--    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
-+    current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android)
+-has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan &&
++has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd &&
+                      !is_hwasan && (is_linux || is_android)
  
  declare_args() {
-   # Debug configuration.
-@@ -347,7 +347,7 @@ declare_args() {
+@@ -348,7 +348,7 @@ declare_args() {
  declare_args() {
    # Shadow metadata is still under development and only supports Linux
    # for now.
@@ -18,7 +18,7 @@
  }
  
  declare_args() {
-@@ -490,7 +490,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
+@@ -491,7 +491,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
  # dependencies that use partition_allocator are compiled in AOSP against a
  # version of glibc that does not include pkeys syscall numbers.
  is_pkeys_available =
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index 0b789186f2d5..a2b07a07ede7 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
+@@ -886,7 +886,7 @@ if (is_clang_or_gcc) {
          configs -= [ partition_alloc_enable_arc_config ]
        }
      }
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
index 92f3be5747d4..7495c5d6966a 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig	2024-08-01 05:47:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
 @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
  
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
index b77dfaa8ab15..158652b60e83 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig	2024-08-27 06:28:16 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
 @@ -269,7 +269,7 @@ bool DecommitAndZeroSystemPages(void* address,
  // recommitted. Do not assume that this will not change over time.
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
index b7beb55fdb22..84334dd9e009 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig	2025-02-22 18:06:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
 @@ -26,8 +26,8 @@
  #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
index db001f0e9fa3..3c07c6efa8f1 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
 @@ -39,7 +39,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTaskRef task) API
  
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
index e09aac501217..e283d20917db 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig	2025-04-16 18:18:42 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
 @@ -309,8 +309,12 @@ bool TryRecommitSystemPagesInternal(
  
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
index 405c8e06f0cf..2dcad0a4188d 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig	2024-08-27 06:28:16 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc
 @@ -19,7 +19,7 @@
  #include "partition_alloc/partition_alloc_check.h"
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
index 253b43022ad0..326a01c5f105 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig	2024-08-01 05:47:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
 @@ -13,11 +13,11 @@
  #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h"
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
index f8c8409fbf91..75a5c7d72301 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig	2024-08-01 05:47:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
 @@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) {
    if (getentropy(output, output_length) == 0) {
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
index 0f8411099ec9..5e665167939c 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig	2024-08-01 05:47:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h
 @@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId;
  typedef zx_handle_t PlatformThreadId;
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
index 6cc8bc38499d..5eae6d36b896 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig	2024-08-01 05:47:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h
 @@ -10,7 +10,7 @@
  
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
index ee58d0297aef..73cfc961e32d 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
 @@ -18,7 +18,7 @@
  #include "partition_alloc/partition_alloc_base/logging.h"
@@ -7,5 +7,5 @@
 -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
 +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
  #include <sys/syscall.h>
- 
  #include <atomic>
+ #endif
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
index 5a9313be84ba..e38f4d95e771 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2024-12-22 12:24:29 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
 @@ -170,7 +170,7 @@ constexpr bool kUseLazyCommit = false;
  // This may be required on more platforms in the future.
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
index 8624f758b4eb..2179339f424f 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2025-03-18 16:46:04 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
 @@ -327,7 +327,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask);
  // 8GB for each of the glued pools).
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
index 664af81e9b6e..afb1a5e2b155 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig	2024-02-04 14:46:08 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h
 @@ -28,9 +28,13 @@ namespace internal {
  // the second one 16. We could technically return something different for
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
index 26f223b2b26c..a2ceae9a11f4 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig	2025-02-22 18:06:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
 @@ -44,7 +44,7 @@
  #include "wow64apiset.h"
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
index 459b486c9f85..4d805924e5c3 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig	2024-08-27 06:28:16 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
 @@ -17,7 +17,16 @@
  #endif
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
index 80f50f7a162b..87a385e64194 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig	2024-08-01 05:47:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc
 @@ -18,6 +18,10 @@
  #include <pthread.h>
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
index 53345d512dbb..66ac3670bf95 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig	2024-08-01 05:47:53 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc
 @@ -16,7 +16,7 @@
  #include "partition_alloc/partition_alloc_check.h"
diff --git a/www/iridium/files/patch-base_atomicops.h b/www/iridium/files/patch-base_atomicops.h
index fed521c9eb76..cd82ea50bdf8 100644
--- a/www/iridium/files/patch-base_atomicops.h
+++ b/www/iridium/files/patch-base_atomicops.h
@@ -1,4 +1,4 @@
---- base/atomicops.h.orig	2025-02-22 18:06:53 UTC
+--- base/atomicops.h.orig	2025-05-07 06:48:23 UTC
 +++ base/atomicops.h
 @@ -74,7 +74,11 @@ typedef intptr_t Atomic64;
  
diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc
index 613a18325529..54bfbcb65de9 100644
--- a/www/iridium/files/patch-base_base__paths__posix.cc
+++ b/www/iridium/files/patch-base_base__paths__posix.cc
@@ -1,4 +1,4 @@
---- base/base_paths_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/base_paths_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/base_paths_posix.cc
 @@ -15,6 +15,7 @@
  #include <ostream>
diff --git a/www/iridium/files/patch-base_compiler__specific.h b/www/iridium/files/patch-base_compiler__specific.h
index e74d693324fb..01bf015fe27c 100644
--- a/www/iridium/files/patch-base_compiler__specific.h
+++ b/www/iridium/files/patch-base_compiler__specific.h
@@ -1,4 +1,4 @@
---- base/compiler_specific.h.orig	2025-03-18 16:46:04 UTC
+--- base/compiler_specific.h.orig	2025-05-07 06:48:23 UTC
 +++ base/compiler_specific.h
 @@ -729,6 +729,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
  #if __has_cpp_attribute(clang::preserve_most) &&             \
diff --git a/www/iridium/files/patch-base_debug_debugger__posix.cc b/www/iridium/files/patch-base_debug_debugger__posix.cc
index a16de598e0eb..52d9358a5923 100644
--- a/www/iridium/files/patch-base_debug_debugger__posix.cc
+++ b/www/iridium/files/patch-base_debug_debugger__posix.cc
@@ -1,4 +1,4 @@
---- base/debug/debugger_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- base/debug/debugger_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/debug/debugger_posix.cc
 @@ -41,6 +41,10 @@
  #include <sys/sysctl.h>
diff --git a/www/iridium/files/patch-base_debug_elf__reader.cc b/www/iridium/files/patch-base_debug_elf__reader.cc
index 08c02b43fcd0..e812468034a1 100644
--- a/www/iridium/files/patch-base_debug_elf__reader.cc
+++ b/www/iridium/files/patch-base_debug_elf__reader.cc
@@ -1,4 +1,4 @@
---- base/debug/elf_reader.cc.orig	2025-03-18 16:46:04 UTC
+--- base/debug/elf_reader.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/debug/elf_reader.cc
 @@ -49,6 +49,10 @@ using Xword = Elf64_Xword;
  
diff --git a/www/iridium/files/patch-base_debug_proc__maps__linux.cc b/www/iridium/files/patch-base_debug_proc__maps__linux.cc
index e7f67490a26b..c0aeb2d7a56f 100644
--- a/www/iridium/files/patch-base_debug_proc__maps__linux.cc
+++ b/www/iridium/files/patch-base_debug_proc__maps__linux.cc
@@ -1,4 +1,4 @@
---- base/debug/proc_maps_linux.cc.orig	2025-02-22 18:06:53 UTC
+--- base/debug/proc_maps_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/debug/proc_maps_linux.cc
 @@ -22,7 +22,7 @@
  #include "base/strings/string_split.h"
diff --git a/www/iridium/files/patch-base_debug_stack__trace.cc b/www/iridium/files/patch-base_debug_stack__trace.cc
index 14c391e2ef5a..81fe117bfb42 100644
--- a/www/iridium/files/patch-base_debug_stack__trace.cc
+++ b/www/iridium/files/patch-base_debug_stack__trace.cc
@@ -1,4 +1,4 @@
---- base/debug/stack_trace.cc.orig	2025-04-16 18:18:42 UTC
+--- base/debug/stack_trace.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/debug/stack_trace.cc
 @@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
    // Symbols are not expected to be reliable when gn args specifies
diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc
index 753329ba4012..09c594ca30f6 100644
--- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,4 +1,4 @@
---- base/debug/stack_trace_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- base/debug/stack_trace_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/debug/stack_trace_posix.cc
 @@ -51,7 +51,7 @@
  // execinfo.h and backtrace(3) are really only present in glibc and in macOS
diff --git a/www/iridium/files/patch-base_files_dir__reader__linux.h b/www/iridium/files/patch-base_files_dir__reader__linux.h
index 9b8914493a17..c44fbdb32aee 100644
--- a/www/iridium/files/patch-base_files_dir__reader__linux.h
+++ b/www/iridium/files/patch-base_files_dir__reader__linux.h
@@ -1,4 +1,4 @@
---- base/files/dir_reader_linux.h.orig	2025-02-22 18:06:53 UTC
+--- base/files/dir_reader_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ base/files/dir_reader_linux.h
 @@ -21,10 +21,16 @@
  #include "base/logging.h"
diff --git a/www/iridium/files/patch-base_files_dir__reader__posix.h b/www/iridium/files/patch-base_files_dir__reader__posix.h
index ade769e0df79..098168d9ea97 100644
--- a/www/iridium/files/patch-base_files_dir__reader__posix.h
+++ b/www/iridium/files/patch-base_files_dir__reader__posix.h
@@ -1,4 +1,4 @@
---- base/files/dir_reader_posix.h.orig	2022-10-05 07:34:01 UTC
+--- base/files/dir_reader_posix.h.orig	2025-05-07 06:48:23 UTC
 +++ base/files/dir_reader_posix.h
 @@ -17,7 +17,7 @@
  // seems worse than falling back to enumerating all file descriptors so we will
diff --git a/www/iridium/files/patch-base_files_drive__info.h b/www/iridium/files/patch-base_files_drive__info.h
index 0e6771192e8d..9fb9a5b38770 100644
--- a/www/iridium/files/patch-base_files_drive__info.h
+++ b/www/iridium/files/patch-base_files_drive__info.h
@@ -1,4 +1,4 @@
---- base/files/drive_info.h.orig	2025-02-22 18:06:53 UTC
+--- base/files/drive_info.h.orig	2025-05-07 06:48:23 UTC
 +++ base/files/drive_info.h
 @@ -48,7 +48,7 @@ struct BASE_EXPORT DriveInfo {
    std::optional<bool> has_seek_penalty;
diff --git a/www/iridium/files/patch-base_files_drive__info__posix.cc b/www/iridium/files/patch-base_files_drive__info__posix.cc
index 517fb426b193..78e81b080318 100644
--- a/www/iridium/files/patch-base_files_drive__info__posix.cc
+++ b/www/iridium/files/patch-base_files_drive__info__posix.cc
@@ -1,4 +1,4 @@
---- base/files/drive_info_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- base/files/drive_info_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/files/drive_info_posix.cc
 @@ -24,7 +24,7 @@ namespace base {
  
diff --git a/www/iridium/files/patch-base_files_file__path__watcher.h b/www/iridium/files/patch-base_files_file__path__watcher.h
index f33f15587d2d..1a196694db42 100644
--- a/www/iridium/files/patch-base_files_file__path__watcher.h
+++ b/www/iridium/files/patch-base_files_file__path__watcher.h
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher.h.orig	2024-06-25 12:08:48 UTC
+--- base/files/file_path_watcher.h.orig	2025-05-07 06:48:23 UTC
 +++ base/files/file_path_watcher.h
 @@ -105,7 +105,7 @@ class BASE_EXPORT FilePathWatcher {
      Type type = Type::kNonRecursive;
diff --git a/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc b/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc
index 70f8d2563573..f6a4fa92ea2a 100644
--- a/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc
+++ b/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_bsd.cc.orig	2022-12-01 10:35:46 UTC
+--- base/files/file_path_watcher_bsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/files/file_path_watcher_bsd.cc
 @@ -0,0 +1,54 @@
 +// Copyright 2021 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h b/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h
index 78823ee0d3e0..8566580cab64 100644
--- a/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h
+++ b/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_kqueue.h.orig	2022-03-28 18:11:04 UTC
+--- base/files/file_path_watcher_kqueue.h.orig	2025-05-07 06:48:23 UTC
 +++ base/files/file_path_watcher_kqueue.h
 @@ -5,6 +5,7 @@
  #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
diff --git a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc
index 6fa748ff4e0f..2d05f8e5758b 100644
--- a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_unittest.cc.orig	2024-08-01 05:47:53 UTC
+--- base/files/file_path_watcher_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/files/file_path_watcher_unittest.cc
 @@ -902,7 +902,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
    }
diff --git a/www/iridium/files/patch-base_files_file__util__posix.cc b/www/iridium/files/patch-base_files_file__util__posix.cc
index adb24c89d670..60e03248a5c4 100644
--- a/www/iridium/files/patch-base_files_file__util__posix.cc
+++ b/www/iridium/files/patch-base_files_file__util__posix.cc
@@ -1,15 +1,14 @@
---- base/files/file_util_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- base/files/file_util_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/files/file_util_posix.cc
-@@ -902,6 +902,8 @@ bool CreateNewTempDirectory(const FilePath::StringType
+@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePath::StringType
  bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
    ScopedBlockingCall scoped_blocking_call(
        FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
 +  const FilePath kFileSystemRoot("/");
-+
+ 
    // Avoid checking subdirs if directory already exists.
    if (DirectoryExists(full_path)) {
-     return true;
-@@ -910,8 +912,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
    // Collect a list of all missing directories.
    std::vector<FilePath> missing_subpaths({full_path});
    FilePath last_path = full_path;
@@ -20,11 +19,11 @@
      if (DirectoryExists(path)) {
        break;
      }
-@@ -921,21 +923,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+     }
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
-   // Iterate through the missing directories and create.
-   for (const FilePath& subpath : base::Reversed(missing_subpaths)) {
--    if (mkdir(subpath.value().c_str(), 0700) == 0) {
+-    if (mkdir(subpath.value().c_str(), mode) == 0) {
 -      continue;
 -    }
 -    // Mkdir failed, but it might have failed with EEXIST, or some other error
@@ -34,7 +33,7 @@
 -    int saved_errno = errno;
 -    if (!DirectoryExists(subpath)) {
 -      if (error) {
-+    if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
++    if ((mkdir(subpath.value().c_str(), mode) == -1) &&
 +        ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
 +      int saved_errno = errno;
 +      if (error)
diff --git a/www/iridium/files/patch-base_files_file__util__unittest.cc b/www/iridium/files/patch-base_files_file__util__unittest.cc
index 5bd54f20b727..0da4c991499a 100644
--- a/www/iridium/files/patch-base_files_file__util__unittest.cc
+++ b/www/iridium/files/patch-base_files_file__util__unittest.cc
@@ -1,4 +1,4 @@
---- base/files/file_util_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- base/files/file_util_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/files/file_util_unittest.cc
 @@ -3920,7 +3920,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
  }
diff --git a/www/iridium/files/patch-base_files_important__file__writer__cleaner.cc b/www/iridium/files/patch-base_files_important__file__writer__cleaner.cc
index bf6c9673dd86..27752afd7a7f 100644
--- a/www/iridium/files/patch-base_files_important__file__writer__cleaner.cc
+++ b/www/iridium/files/patch-base_files_important__file__writer__cleaner.cc
@@ -1,4 +1,4 @@
---- base/files/important_file_writer_cleaner.cc.orig	2022-03-28 18:11:04 UTC
+--- base/files/important_file_writer_cleaner.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/files/important_file_writer_cleaner.cc
 @@ -25,7 +25,8 @@ namespace base {
  namespace {
diff --git a/www/iridium/files/patch-base_files_scoped__file.cc b/www/iridium/files/patch-base_files_scoped__file.cc
index aa12b7a60e8e..b21cd7daa04f 100644
--- a/www/iridium/files/patch-base_files_scoped__file.cc
+++ b/www/iridium/files/patch-base_files_scoped__file.cc
@@ -1,4 +1,4 @@
---- base/files/scoped_file.cc.orig	2024-08-01 05:47:53 UTC
+--- base/files/scoped_file.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/files/scoped_file.cc
 @@ -32,7 +32,7 @@ void ScopedFDCloseTraits::Free(int fd) {
    int ret = IGNORE_EINTR(close(fd));
diff --git a/www/iridium/files/patch-base_functional_unretained__traits.h b/www/iridium/files/patch-base_functional_unretained__traits.h
index f13710d13dc1..75305b3b116e 100644
--- a/www/iridium/files/patch-base_functional_unretained__traits.h
+++ b/www/iridium/files/patch-base_functional_unretained__traits.h
@@ -1,4 +1,4 @@
---- base/functional/unretained_traits.h.orig	2025-02-22 18:06:53 UTC
+--- base/functional/unretained_traits.h.orig	2025-05-07 06:48:23 UTC
 +++ base/functional/unretained_traits.h
 @@ -90,7 +90,7 @@ struct SupportsUnretainedImpl {
  // official builds, and then in non-test code as well.
diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc
index aa891a646d72..5db923b197a7 100644
--- a/www/iridium/files/patch-base_i18n_icu__util.cc
+++ b/www/iridium/files/patch-base_i18n_icu__util.cc
@@ -1,6 +1,6 @@
---- base/i18n/icu_util.cc.orig	2024-06-25 12:08:48 UTC
+--- base/i18n/icu_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/i18n/icu_util.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #endif
  
@@ -9,7 +9,7 @@
      BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  #endif
-@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() {
+@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() {
        FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/www/iridium/files/patch-base_linux__util.cc b/www/iridium/files/patch-base_linux__util.cc
index 16afd4dff5bb..0bceba4c0207 100644
--- a/www/iridium/files/patch-base_linux__util.cc
+++ b/www/iridium/files/patch-base_linux__util.cc
@@ -1,4 +1,4 @@
---- base/linux_util.cc.orig	2025-04-16 18:18:42 UTC
+--- base/linux_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/linux_util.cc
 @@ -163,10 +163,14 @@ void SetLinuxDistro(const std::string& distro) {
  }
diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc
index 62555f77c5b3..bb7e6f40220a 100644
--- a/www/iridium/files/patch-base_logging__unittest.cc
+++ b/www/iridium/files/patch-base_logging__unittest.cc
@@ -1,4 +1,4 @@
---- base/logging_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- base/logging_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/logging_unittest.cc
 @@ -40,7 +40,7 @@
  #include "base/posix/eintr_wrapper.h"
@@ -9,7 +9,7 @@
  #include <ucontext.h>
  #endif
  
-@@ -588,14 +588,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -586,14 +586,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
    // need the arch-specific boilerplate below, which is inspired by breakpad.
    // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
    uintptr_t crash_addr = 0;
diff --git a/www/iridium/files/patch-base_memory_discardable__memory.cc b/www/iridium/files/patch-base_memory_discardable__memory.cc
index 79900cc35c7f..8bd5eb030d3b 100644
--- a/www/iridium/files/patch-base_memory_discardable__memory.cc
+++ b/www/iridium/files/patch-base_memory_discardable__memory.cc
@@ -1,4 +1,4 @@
---- base/memory/discardable_memory.cc.orig	2025-03-18 16:46:04 UTC
+--- base/memory/discardable_memory.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/memory/discardable_memory.cc
 @@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory,
               base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/iridium/files/patch-base_memory_discardable__memory__internal.h b/www/iridium/files/patch-base_memory_discardable__memory__internal.h
index 2fd6ba8e0ec1..66215c2b36f9 100644
--- a/www/iridium/files/patch-base_memory_discardable__memory__internal.h
+++ b/www/iridium/files/patch-base_memory_discardable__memory__internal.h
@@ -1,4 +1,4 @@
---- base/memory/discardable_memory_internal.h.orig	2024-11-04 08:56:03 UTC
+--- base/memory/discardable_memory_internal.h.orig	2025-05-07 06:48:23 UTC
 +++ base/memory/discardable_memory_internal.h
 @@ -12,7 +12,7 @@
  #include "base/metrics/field_trial_params.h"
diff --git a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
index fa2df95630a3..b6e96536f8a4 100644
--- a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
+++ b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
@@ -1,4 +1,4 @@
---- base/memory/madv_free_discardable_memory_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/memory/madv_free_discardable_memory_posix.cc
 @@ -305,6 +305,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
  
diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h
index db503465598b..c9799f811e15 100644
--- a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h
+++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h
@@ -1,4 +1,4 @@
---- base/memory/platform_shared_memory_region.h.orig	2025-02-22 18:06:53 UTC
+--- base/memory/platform_shared_memory_region.h.orig	2025-05-07 06:48:23 UTC
 +++ base/memory/platform_shared_memory_region.h
 @@ -18,7 +18,7 @@
  #include "base/unguessable_token.h"
diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc
index 4279dfceb52b..4d223b930409 100644
--- a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc
+++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc
@@ -1,4 +1,4 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- base/memory/platform_shared_memory_region_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/memory/platform_shared_memory_region_posix.cc
 @@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) {
  
diff --git a/www/iridium/files/patch-base_memory_protected__memory.h b/www/iridium/files/patch-base_memory_protected__memory.h
index 95b4fc65f22f..256bac38bfec 100644
--- a/www/iridium/files/patch-base_memory_protected__memory.h
+++ b/www/iridium/files/patch-base_memory_protected__memory.h
@@ -1,4 +1,4 @@
---- base/memory/protected_memory.h.orig	2025-02-22 18:06:53 UTC
+--- base/memory/protected_memory.h.orig	2025-05-07 06:48:23 UTC
 +++ base/memory/protected_memory.h
 @@ -120,12 +120,12 @@ __declspec(selectany) char __stop_protected_memory;
  
diff --git a/www/iridium/files/patch-base_memory_protected__memory__posix.cc b/www/iridium/files/patch-base_memory_protected__memory__posix.cc
index 0b84b00bd48d..06ec4bf6df37 100644
--- a/www/iridium/files/patch-base_memory_protected__memory__posix.cc
+++ b/www/iridium/files/patch-base_memory_protected__memory__posix.cc
@@ -1,4 +1,4 @@
---- base/memory/protected_memory_posix.cc.orig	2024-11-04 08:56:03 UTC
+--- base/memory/protected_memory_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/memory/protected_memory_posix.cc
 @@ -6,7 +6,7 @@
  
diff --git a/www/iridium/files/patch-base_message__loop_message__pump__epoll.cc b/www/iridium/files/patch-base_message__loop_message__pump__epoll.cc
index 64137cb3fe3a..9a277ceecc4c 100644
--- a/www/iridium/files/patch-base_message__loop_message__pump__epoll.cc
+++ b/www/iridium/files/patch-base_message__loop_message__pump__epoll.cc
@@ -1,4 +1,4 @@
---- base/message_loop/message_pump_epoll.cc.orig	2025-03-18 16:46:04 UTC
+--- base/message_loop/message_pump_epoll.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/message_loop/message_pump_epoll.cc
 @@ -47,7 +47,7 @@ std::atomic_bool g_use_batched_version = false;
  std::atomic_bool g_use_poll = false;
diff --git a/www/iridium/files/patch-base_message__loop_message__pump__epoll.h b/www/iridium/files/patch-base_message__loop_message__pump__epoll.h
index 68a9894c7a58..982b5a9692e6 100644
--- a/www/iridium/files/patch-base_message__loop_message__pump__epoll.h
+++ b/www/iridium/files/patch-base_message__loop_message__pump__epoll.h
@@ -1,4 +1,4 @@
---- base/message_loop/message_pump_epoll.h.orig	2024-11-04 08:56:03 UTC
+--- base/message_loop/message_pump_epoll.h.orig	2025-05-07 06:48:23 UTC
 +++ base/message_loop/message_pump_epoll.h
 @@ -51,7 +51,11 @@ namespace base {
  // every call, don't do it when we have too many FDs.
diff --git a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc
index 344654fbd205..5791e5dac7e8 100644
--- a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc
+++ b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc
@@ -1,4 +1,4 @@
---- base/message_loop/message_pump_glib.cc.orig	2025-04-16 18:18:42 UTC
+--- base/message_loop/message_pump_glib.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/message_loop/message_pump_glib.cc
 @@ -8,6 +8,11 @@
  #include <glib.h>
diff --git a/www/iridium/files/patch-base_native__library__posix.cc b/www/iridium/files/patch-base_native__library__posix.cc
index a87672b7d492..1dd35780c630 100644
--- a/www/iridium/files/patch-base_native__library__posix.cc
+++ b/www/iridium/files/patch-base_native__library__posix.cc
@@ -1,4 +1,4 @@
---- base/native_library_posix.cc.orig	2024-08-27 06:28:16 UTC
+--- base/native_library_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/native_library_posix.cc
 @@ -34,7 +34,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
    // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
diff --git a/www/iridium/files/patch-base_native__library__unittest.cc b/www/iridium/files/patch-base_native__library__unittest.cc
index d06ad5f322cf..9e19b16afd0e 100644
--- a/www/iridium/files/patch-base_native__library__unittest.cc
+++ b/www/iridium/files/patch-base_native__library__unittest.cc
@@ -1,4 +1,4 @@
---- base/native_library_unittest.cc.orig	2024-11-04 08:56:03 UTC
+--- base/native_library_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/native_library_unittest.cc
 @@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
  // versions with respect to symbol resolution scope.
diff --git a/www/iridium/files/patch-base_posix_can__lower__nice__to.cc b/www/iridium/files/patch-base_posix_can__lower__nice__to.cc
index 34a4cd06e647..d3130b4f5c0c 100644
--- a/www/iridium/files/patch-base_posix_can__lower__nice__to.cc
+++ b/www/iridium/files/patch-base_posix_can__lower__nice__to.cc
@@ -1,4 +1,4 @@
---- base/posix/can_lower_nice_to.cc.orig	2022-03-28 18:11:04 UTC
+--- base/posix/can_lower_nice_to.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/posix/can_lower_nice_to.cc
 @@ -11,8 +11,12 @@
  
diff --git a/www/iridium/files/patch-base_posix_file__descriptor__shuffle.h b/www/iridium/files/patch-base_posix_file__descriptor__shuffle.h
index 88bfe5c5da0d..1950b396906e 100644
--- a/www/iridium/files/patch-base_posix_file__descriptor__shuffle.h
+++ b/www/iridium/files/patch-base_posix_file__descriptor__shuffle.h
@@ -1,4 +1,4 @@
---- base/posix/file_descriptor_shuffle.h.orig	2024-11-04 08:56:03 UTC
+--- base/posix/file_descriptor_shuffle.h.orig	2025-05-07 06:48:23 UTC
 +++ base/posix/file_descriptor_shuffle.h
 @@ -26,6 +26,8 @@
  #include "base/base_export.h"
diff --git a/www/iridium/files/patch-base_posix_sysctl.cc b/www/iridium/files/patch-base_posix_sysctl.cc
index acfa66cfdf4a..35dfb1ea0587 100644
--- a/www/iridium/files/patch-base_posix_sysctl.cc
+++ b/www/iridium/files/patch-base_posix_sysctl.cc
@@ -1,4 +1,4 @@
---- base/posix/sysctl.cc.orig	2024-02-04 14:57:47 UTC
+--- base/posix/sysctl.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/posix/sysctl.cc
 @@ -4,6 +4,7 @@
  
diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket.cc b/www/iridium/files/patch-base_posix_unix__domain__socket.cc
index 4d155e9f0729..456bfe0d6145 100644
--- a/www/iridium/files/patch-base_posix_unix__domain__socket.cc
+++ b/www/iridium/files/patch-base_posix_unix__domain__socket.cc
@@ -1,4 +1,4 @@
---- base/posix/unix_domain_socket.cc.orig	2025-02-22 18:06:53 UTC
+--- base/posix/unix_domain_socket.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/posix/unix_domain_socket.cc
 @@ -47,7 +47,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
  
diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc
index f50079609b45..c49a277cd6bb 100644
--- a/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc
+++ b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc
@@ -1,4 +1,4 @@
---- base/posix/unix_domain_socket_unittest.cc.orig	2024-06-25 12:08:48 UTC
+--- base/posix/unix_domain_socket_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/posix/unix_domain_socket_unittest.cc
 @@ -15,6 +15,8 @@
  #include <sys/types.h>
diff --git a/www/iridium/files/patch-base_process_internal__linux.h b/www/iridium/files/patch-base_process_internal__linux.h
index 1e201ad8091c..e79601de3817 100644
--- a/www/iridium/files/patch-base_process_internal__linux.h
+++ b/www/iridium/files/patch-base_process_internal__linux.h
@@ -1,4 +1,4 @@
---- base/process/internal_linux.h.orig	2025-04-16 18:18:42 UTC
+--- base/process/internal_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ base/process/internal_linux.h
 @@ -144,6 +144,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks);
  // arguments to the lambda.
diff --git a/www/iridium/files/patch-base_process_kill.h b/www/iridium/files/patch-base_process_kill.h
index 6df840728a0c..d29ef226221f 100644
--- a/www/iridium/files/patch-base_process_kill.h
+++ b/www/iridium/files/patch-base_process_kill.h
@@ -1,4 +1,4 @@
---- base/process/kill.h.orig	2025-02-22 18:06:53 UTC
+--- base/process/kill.h.orig	2025-05-07 06:48:23 UTC
 +++ base/process/kill.h
 @@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
  BASE_EXPORT TerminationStatus
diff --git a/www/iridium/files/patch-base_process_kill__posix.cc b/www/iridium/files/patch-base_process_kill__posix.cc
index 4a22d02d5514..f058bbf4ee4f 100644
--- a/www/iridium/files/patch-base_process_kill__posix.cc
+++ b/www/iridium/files/patch-base_process_kill__posix.cc
@@ -1,4 +1,4 @@
---- base/process/kill_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/kill_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/kill_posix.cc
 @@ -161,7 +161,7 @@ void EnsureProcessTerminated(Process process) {
        0, new BackgroundReaper(std::move(process), Seconds(2)));
diff --git a/www/iridium/files/patch-base_process_launch.h b/www/iridium/files/patch-base_process_launch.h
index 0312577bccec..88069a682824 100644
--- a/www/iridium/files/patch-base_process_launch.h
+++ b/www/iridium/files/patch-base_process_launch.h
@@ -1,4 +1,4 @@
---- base/process/launch.h.orig	2024-12-22 12:24:29 UTC
+--- base/process/launch.h.orig	2025-05-07 06:48:23 UTC
 +++ base/process/launch.h
 @@ -241,7 +241,7 @@ struct BASE_EXPORT LaunchOptions {
    bool clear_environment = false;
diff --git a/www/iridium/files/patch-base_process_launch__posix.cc b/www/iridium/files/patch-base_process_launch__posix.cc
index 2c5405cabf3d..c8a3c3492fb6 100644
--- a/www/iridium/files/patch-base_process_launch__posix.cc
+++ b/www/iridium/files/patch-base_process_launch__posix.cc
@@ -1,4 +1,4 @@
---- base/process/launch_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- base/process/launch_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/launch_posix.cc
 @@ -62,6 +62,9 @@
  #error "macOS should use launch_mac.cc"
diff --git a/www/iridium/files/patch-base_process_memory__linux.cc b/www/iridium/files/patch-base_process_memory__linux.cc
index 49f360844638..440f2161e696 100644
--- a/www/iridium/files/patch-base_process_memory__linux.cc
+++ b/www/iridium/files/patch-base_process_memory__linux.cc
@@ -1,4 +1,4 @@
---- base/process/memory_linux.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/memory_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/memory_linux.cc
 @@ -28,6 +28,7 @@ void __libc_free(void*);
  
diff --git a/www/iridium/files/patch-base_process_process__handle.cc b/www/iridium/files/patch-base_process_process__handle.cc
index 545e11fc66ee..0a705004f3aa 100644
--- a/www/iridium/files/patch-base_process_process__handle.cc
+++ b/www/iridium/files/patch-base_process_process__handle.cc
@@ -1,4 +1,4 @@
---- base/process/process_handle.cc.orig	2022-03-28 18:11:04 UTC
+--- base/process/process_handle.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_handle.cc
 @@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() {
               : UniqueProcId(GetCurrentProcId());
diff --git a/www/iridium/files/patch-base_process_process__handle.h b/www/iridium/files/patch-base_process_process__handle.h
index 12fdc4810bf3..ae50196943ec 100644
--- a/www/iridium/files/patch-base_process_process__handle.h
+++ b/www/iridium/files/patch-base_process_process__handle.h
@@ -1,4 +1,4 @@
---- base/process/process_handle.h.orig	2024-06-25 12:08:48 UTC
+--- base/process/process_handle.h.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_handle.h
 @@ -86,7 +86,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
  // processes may be reused.
diff --git a/www/iridium/files/patch-base_process_process__handle__freebsd.cc b/www/iridium/files/patch-base_process_process__handle__freebsd.cc
index e36d6eb2b785..a9182153d836 100644
--- a/www/iridium/files/patch-base_process_process__handle__freebsd.cc
+++ b/www/iridium/files/patch-base_process_process__handle__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_handle_freebsd.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_handle_freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_handle_freebsd.cc
 @@ -3,6 +3,7 @@
  // found in the LICENSE file.
diff --git a/www/iridium/files/patch-base_process_process__handle__openbsd.cc b/www/iridium/files/patch-base_process_process__handle__openbsd.cc
index bf69ded34de8..0c2cc1cbfd91 100644
--- a/www/iridium/files/patch-base_process_process__handle__openbsd.cc
+++ b/www/iridium/files/patch-base_process_process__handle__openbsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_handle_openbsd.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_handle_openbsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_handle_openbsd.cc
 @@ -3,17 +3,25 @@
  // found in the LICENSE file.
diff --git a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc
index 02fbc03ecd11..2f449412fa23 100644
--- a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc
+++ b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_iterator_freebsd.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_iterator_freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_iterator_freebsd.cc
 @@ -18,7 +18,7 @@ namespace base {
  
diff --git a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc
index 4ef76a12970f..d712768959a9 100644
--- a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc
+++ b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_iterator_openbsd.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_iterator_openbsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_iterator_openbsd.cc
 @@ -6,6 +6,9 @@
  
diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc
index abf9aa35b023..b1252d4feea2 100644
--- a/www/iridium/files/patch-base_process_process__metrics.cc
+++ b/www/iridium/files/patch-base_process_process__metrics.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_metrics.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_metrics.cc
 @@ -17,7 +17,7 @@ namespace base {
  namespace {
diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h
index e7ae6eb98d60..20af8ca755f0 100644
--- a/www/iridium/files/patch-base_process_process__metrics.h
+++ b/www/iridium/files/patch-base_process_process__metrics.h
@@ -1,4 +1,4 @@
---- base/process/process_metrics.h.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_metrics.h.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_metrics.h
 @@ -39,7 +39,7 @@
  #endif
diff --git a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc
index 9019ee249616..3728f1c06b63 100644
--- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc
+++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_freebsd.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_metrics_freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_metrics_freebsd.cc
 @@ -3,41 +3,92 @@
  // found in the LICENSE file.
diff --git a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc
index 91cdff0393a4..a75f43c8443e 100644
--- a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc
+++ b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_openbsd.cc.orig	2025-02-25 07:07:23 UTC
+--- base/process/process_metrics_openbsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_metrics_openbsd.cc
 @@ -6,73 +6,85 @@
  
diff --git a/www/iridium/files/patch-base_process_process__metrics__posix.cc b/www/iridium/files/patch-base_process_process__metrics__posix.cc
index 7f084e488eed..fb36a7372075 100644
--- a/www/iridium/files/patch-base_process_process__metrics__posix.cc
+++ b/www/iridium/files/patch-base_process_process__metrics__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_metrics_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_metrics_posix.cc
 @@ -21,6 +21,8 @@
  
diff --git a/www/iridium/files/patch-base_process_process__metrics__unittest.cc b/www/iridium/files/patch-base_process_process__metrics__unittest.cc
index d85beb0615f4..03c9401132c1 100644
--- a/www/iridium/files/patch-base_process_process__metrics__unittest.cc
+++ b/www/iridium/files/patch-base_process_process__metrics__unittest.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- base/process/process_metrics_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_metrics_unittest.cc
 @@ -61,7 +61,8 @@
  #endif
diff --git a/www/iridium/files/patch-base_process_process__posix.cc b/www/iridium/files/patch-base_process_process__posix.cc
index 95e824f4ad62..30bc28db0f29 100644
--- a/www/iridium/files/patch-base_process_process__posix.cc
+++ b/www/iridium/files/patch-base_process_process__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_posix.cc
 @@ -23,10 +23,15 @@
  #include "base/trace_event/base_tracing.h"
diff --git a/www/iridium/files/patch-base_process_process__unittest.cc b/www/iridium/files/patch-base_process_process__unittest.cc
index 79fa086eff61..06c38b92c821 100644
--- a/www/iridium/files/patch-base_process_process__unittest.cc
+++ b/www/iridium/files/patch-base_process_process__unittest.cc
@@ -1,4 +1,4 @@
---- base/process/process_unittest.cc.orig	2025-02-22 18:06:53 UTC
+--- base/process/process_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/process/process_unittest.cc
 @@ -202,7 +202,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
    // was spawned and a time recorded after it was spawned. However, since the
diff --git a/www/iridium/files/patch-base_profiler_module__cache.cc b/www/iridium/files/patch-base_profiler_module__cache.cc
index a9f2a6d699fe..8a8aec62bed8 100644
--- a/www/iridium/files/patch-base_profiler_module__cache.cc
+++ b/www/iridium/files/patch-base_profiler_module__cache.cc
@@ -1,4 +1,4 @@
---- base/profiler/module_cache.cc.orig	2024-06-25 12:08:48 UTC
+--- base/profiler/module_cache.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/profiler/module_cache.cc
 @@ -38,7 +38,7 @@ std::string TransformModuleIDToSymbolServerFormat(std:
    // Android and Linux Chrome builds use the "breakpad" format to index their
diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc
index edfd9dcb8707..8cebe859ae20 100644
--- a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc
+++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc
@@ -1,4 +1,4 @@
---- base/profiler/sampling_profiler_thread_token.cc.orig	2025-04-16 18:18:42 UTC
+--- base/profiler/sampling_profiler_thread_token.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/profiler/sampling_profiler_thread_token.cc
 @@ -6,7 +6,7 @@
  
diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h
index ae2fb16d9db7..1d0f4f7d50c0 100644
--- a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h
+++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h
@@ -1,4 +1,4 @@
---- base/profiler/sampling_profiler_thread_token.h.orig	2025-04-16 18:18:42 UTC
+--- base/profiler/sampling_profiler_thread_token.h.orig	2025-05-07 06:48:23 UTC
 +++ base/profiler/sampling_profiler_thread_token.h
 @@ -13,7 +13,7 @@
  
diff --git a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc
index 67a46f746e33..cf0c2b4b7ff6 100644
--- a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc
+++ b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc
@@ -1,6 +1,6 @@
---- base/profiler/stack_base_address_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- base/profiler/stack_base_address_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/profiler/stack_base_address_posix.cc
-@@ -17,6 +17,10 @@
+@@ -18,6 +18,10 @@
  #include "base/files/scoped_file.h"
  #endif
  
@@ -11,7 +11,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
  extern "C" void* __libc_stack_end;
  #endif
-@@ -47,7 +51,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
+@@ -49,7 +53,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
  
  #if !BUILDFLAG(IS_LINUX)
  uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
@@ -33,7 +33,7 @@
    // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox
    // and pthread_id refers to a different thread, due to the use of
    // sched_getaffinity().
-@@ -60,12 +78,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr
+@@ -62,12 +80,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr
                        << logging::SystemErrorCodeToString(result);
    // See crbug.com/617730 for limitations of this approach on Linux-like
    // systems.
@@ -48,7 +48,7 @@
    const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
    return base_address;
  }
-@@ -82,7 +102,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
+@@ -84,7 +104,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
    // trying to work around the problem.
    return std::nullopt;
  #else
diff --git a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
index 48285261a028..73c54c22d667 100644
--- a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
+++ b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
@@ -1,4 +1,4 @@
---- base/profiler/stack_sampling_profiler_test_util.cc.orig	2025-03-18 16:46:04 UTC
+--- base/profiler/stack_sampling_profiler_test_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/profiler/stack_sampling_profiler_test_util.cc
 @@ -50,7 +50,7 @@
  // Fortunately, it provides _alloca, which functions identically.
diff --git a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
index e650dbc59e68..513ce798ff0f 100644
--- a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
+++ b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
@@ -1,4 +1,4 @@
---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/profiler/stack_sampling_profiler_unittest.cc
 @@ -47,7 +47,7 @@
  
diff --git a/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc
index 87d301f685ee..278cd56a43ab 100644
--- a/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc
+++ b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc
@@ -1,4 +1,4 @@
---- base/profiler/thread_delegate_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- base/profiler/thread_delegate_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/profiler/thread_delegate_posix.cc
 @@ -15,7 +15,7 @@
  #include "base/process/process_handle.h"
diff --git a/www/iridium/files/patch-base_rand__util.h b/www/iridium/files/patch-base_rand__util.h
index 25c260641b9e..14a7b6f9ef8e 100644
--- a/www/iridium/files/patch-base_rand__util.h
+++ b/www/iridium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig	2025-03-18 16:46:04 UTC
+--- base/rand_util.h.orig	2025-05-07 06:48:23 UTC
 +++ base/rand_util.h
-@@ -209,7 +209,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -213,7 +213,7 @@ void RandomShuffle(Itr first, Itr last) {
    std::shuffle(first, last, RandomBitGenerator());
  }
  
diff --git a/www/iridium/files/patch-base_rand__util__posix.cc b/www/iridium/files/patch-base_rand__util__posix.cc
index 6ded913ac652..751d23d50a91 100644
--- a/www/iridium/files/patch-base_rand__util__posix.cc
+++ b/www/iridium/files/patch-base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- base/rand_util_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- base/rand_util_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/rand_util_posix.cc
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  #include "base/time/time.h"
  #include "build/build_config.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/lss/linux_syscall_support.h"
  #elif BUILDFLAG(IS_MAC)
  // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK.
-@@ -44,6 +44,7 @@ namespace base {
+@@ -45,6 +45,7 @@ namespace base {
  
  namespace {
  
@@ -17,7 +17,7 @@
  #if BUILDFLAG(IS_AIX)
  // AIX has no 64-bit support for O_CLOEXEC.
  static constexpr int kOpenFlags = O_RDONLY;
-@@ -68,10 +69,11 @@ class URandomFd {
+@@ -69,10 +70,11 @@ class URandomFd {
   private:
    const int fd_;
  };
@@ -27,10 +27,10 @@
       BUILDFLAG(IS_ANDROID)) &&                        \
 -    !BUILDFLAG(IS_NACL)
 +    !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- // TODO(pasko): Unify reading kernel version numbers in:
- // mojo/core/channel_linux.cc
- // chrome/browser/android/seccomp_support_detector.cc
-@@ -156,6 +158,7 @@ bool UseBoringSSLForRandBytes() {
+ 
+ bool KernelSupportsGetRandom() {
+   return base::SysInfo::KernelVersionNumber::Current() >=
+@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() {
  namespace {
  
  void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
@@ -38,7 +38,7 @@
  #if !BUILDFLAG(IS_NACL)
    // The BoringSSL experiment takes priority over everything else.
    if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -190,6 +193,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
+@@ -163,6 +166,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
    const int urandom_fd = GetUrandomFD();
    const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
    CHECK(success);
@@ -48,7 +48,7 @@
  }
  
  }  // namespace
-@@ -209,9 +215,11 @@ void RandBytes(span<uint8_t> output) {
+@@ -182,9 +188,11 @@ void RandBytes(span<uint8_t> output) {
    RandBytesInternal(output, /*avoid_allocation=*/false);
  }
  
diff --git a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc
index 9de61db8d46b..d8351281edf1 100644
--- a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc
+++ b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc
@@ -1,4 +1,4 @@
---- base/strings/safe_sprintf_unittest.cc.orig	2025-03-18 16:46:04 UTC
+--- base/strings/safe_sprintf_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/strings/safe_sprintf_unittest.cc
 @@ -743,6 +743,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
  #endif
diff --git a/www/iridium/files/patch-base_synchronization_cancelable__event.h b/www/iridium/files/patch-base_synchronization_cancelable__event.h
index 35874fbb7549..971181734231 100644
--- a/www/iridium/files/patch-base_synchronization_cancelable__event.h
+++ b/www/iridium/files/patch-base_synchronization_cancelable__event.h
@@ -1,4 +1,4 @@
---- base/synchronization/cancelable_event.h.orig	2025-02-22 18:06:53 UTC
+--- base/synchronization/cancelable_event.h.orig	2025-05-07 06:48:23 UTC
 +++ base/synchronization/cancelable_event.h
 @@ -11,7 +11,7 @@
  
diff --git a/www/iridium/files/patch-base_synchronization_lock__impl.h b/www/iridium/files/patch-base_synchronization_lock__impl.h
index 10dd083aa6ba..dec4ea589880 100644
--- a/www/iridium/files/patch-base_synchronization_lock__impl.h
+++ b/www/iridium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig	2024-08-27 06:28:16 UTC
+--- base/synchronization/lock_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ base/synchronization/lock_impl.h
-@@ -109,6 +109,10 @@ void LockImpl::Unlock() {
+@@ -110,6 +110,10 @@ void LockImpl::Unlock() {
  }
  
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -11,7 +11,7 @@
  
  #if DCHECK_IS_ON()
  BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -129,6 +133,9 @@ void LockImpl::Unlock() {
+@@ -130,6 +134,9 @@ void LockImpl::Unlock() {
    dcheck_unlock_result(rv);
  #endif
  }
diff --git a/www/iridium/files/patch-base_syslog__logging.cc b/www/iridium/files/patch-base_syslog__logging.cc
index 7b5f1320860f..60b7d88e7c86 100644
--- a/www/iridium/files/patch-base_syslog__logging.cc
+++ b/www/iridium/files/patch-base_syslog__logging.cc
@@ -1,4 +1,4 @@
---- base/syslog_logging.cc.orig	2025-02-22 18:06:53 UTC
+--- base/syslog_logging.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/syslog_logging.cc
 @@ -17,7 +17,7 @@
  #include "base/strings/string_util.h"
diff --git a/www/iridium/files/patch-base_system_sys__info.cc b/www/iridium/files/patch-base_system_sys__info.cc
index e79454ecd3e7..428cca8a8e62 100644
--- a/www/iridium/files/patch-base_system_sys__info.cc
+++ b/www/iridium/files/patch-base_system_sys__info.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info.cc.orig	2025-03-18 16:46:04 UTC
+--- base/system/sys_info.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/system/sys_info.cc
 @@ -224,7 +224,7 @@ std::string SysInfo::SocManufacturer() {
  #endif
diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h
index 6778c9e5c175..01e59a4edf86 100644
--- a/www/iridium/files/patch-base_system_sys__info.h
+++ b/www/iridium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2025-03-18 16:46:04 UTC
+--- base/system/sys_info.h.orig	2025-05-07 06:48:23 UTC
 +++ base/system/sys_info.h
-@@ -332,6 +332,8 @@ class BASE_EXPORT SysInfo {
+@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo {
    static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
  
@@ -9,7 +9,7 @@
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -344,7 +346,7 @@ class BASE_EXPORT SysInfo {
+@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/iridium/files/patch-base_system_sys__info__freebsd.cc b/www/iridium/files/patch-base_system_sys__info__freebsd.cc
index 8ce477422e93..c5aec5efde0d 100644
--- a/www/iridium/files/patch-base_system_sys__info__freebsd.cc
+++ b/www/iridium/files/patch-base_system_sys__info__freebsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_freebsd.cc.orig	2024-11-04 08:56:03 UTC
+--- base/system/sys_info_freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/system/sys_info_freebsd.cc
 @@ -9,28 +9,103 @@
  #include <sys/sysctl.h>
diff --git a/www/iridium/files/patch-base_system_sys__info__openbsd.cc b/www/iridium/files/patch-base_system_sys__info__openbsd.cc
index 2d64568fbc18..68c46e199e39 100644
--- a/www/iridium/files/patch-base_system_sys__info__openbsd.cc
+++ b/www/iridium/files/patch-base_system_sys__info__openbsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_openbsd.cc.orig	2025-02-22 18:06:53 UTC
+--- base/system/sys_info_openbsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/system/sys_info_openbsd.cc
 @@ -12,6 +12,7 @@
  
diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc
index 2f83be1da31b..12884cf495f8 100644
--- a/www/iridium/files/patch-base_system_sys__info__posix.cc
+++ b/www/iridium/files/patch-base_system_sys__info__posix.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- base/system/sys_info_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/system/sys_info_posix.cc
-@@ -124,7 +124,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
+@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* major_version,
  
  namespace base {
  
@@ -9,7 +9,7 @@
  // static
  int SysInfo::NumberOfProcessors() {
  #if BUILDFLAG(IS_MAC)
-@@ -180,7 +180,7 @@ int SysInfo::NumberOfProcessors() {
+@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() {
  
    return cached_num_cpus;
  }
@@ -18,7 +18,7 @@
  
  // static
  uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -268,6 +268,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/www/iridium/files/patch-base_system_sys__info__unittest.cc b/www/iridium/files/patch-base_system_sys__info__unittest.cc
index 442878c36f08..49073e5ece38 100644
--- a/www/iridium/files/patch-base_system_sys__info__unittest.cc
+++ b/www/iridium/files/patch-base_system_sys__info__unittest.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_unittest.cc.orig	2024-08-27 06:28:16 UTC
+--- base/system/sys_info_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/system/sys_info_unittest.cc
 @@ -265,12 +265,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
    EXPECT_TRUE(IsStringUTF8(hardware_info->model));
diff --git a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc
index 77093e601a3a..090206ee768c 100644
--- a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc
+++ b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc
@@ -1,15 +1,15 @@
---- base/task/thread_pool/environment_config_unittest.cc.orig	2025-03-18 16:46:04 UTC
+--- base/task/thread_pool/environment_config_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/task/thread_pool/environment_config_unittest.cc
-@@ -14,7 +14,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
-   EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread());
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
+             base::FeatureList::IsEnabled(
+                 FeatureControllingBackgroundPriorityWorkerThreads()));
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
    EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread());
  #else
  #error Platform doesn't match any block
-@@ -23,7 +23,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
+@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
    EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread());
  #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
diff --git a/www/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc
index 8cca6b0af9cf..4b0d06341321 100644
--- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,4 +1,4 @@
---- base/test/launcher/test_launcher.cc.orig	2025-04-16 18:18:42 UTC
+--- base/test/launcher/test_launcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/test/launcher/test_launcher.cc
 @@ -73,6 +73,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
diff --git a/www/iridium/files/patch-base_test_test__file__util__linux.cc b/www/iridium/files/patch-base_test_test__file__util__linux.cc
index 6c2e8b21eee1..7578427b61ce 100644
--- a/www/iridium/files/patch-base_test_test__file__util__linux.cc
+++ b/www/iridium/files/patch-base_test_test__file__util__linux.cc
@@ -1,4 +1,4 @@
---- base/test/test_file_util_linux.cc.orig	2025-02-22 18:06:53 UTC
+--- base/test/test_file_util_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/test/test_file_util_linux.cc
 @@ -56,9 +56,11 @@ bool EvictFileFromSystemCache(const FilePath& file) {
    if (fdatasync(fd.get()) != 0) {
diff --git a/www/iridium/files/patch-base_test_test__file__util__posix.cc b/www/iridium/files/patch-base_test_test__file__util__posix.cc
index 442bc8867f06..2da5edae5208 100644
--- a/www/iridium/files/patch-base_test_test__file__util__posix.cc
+++ b/www/iridium/files/patch-base_test_test__file__util__posix.cc
@@ -1,4 +1,4 @@
---- base/test/test_file_util_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/test/test_file_util_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/test/test_file_util_posix.cc
 @@ -93,7 +93,7 @@ void SyncPageCacheToDisk() {
  }
diff --git a/www/iridium/files/patch-base_threading_platform__thread.h b/www/iridium/files/patch-base_threading_platform__thread.h
index 856a927ba1b4..44533c630484 100644
--- a/www/iridium/files/patch-base_threading_platform__thread.h
+++ b/www/iridium/files/patch-base_threading_platform__thread.h
@@ -1,4 +1,4 @@
---- base/threading/platform_thread.h.orig	2025-04-16 18:18:42 UTC
+--- base/threading/platform_thread.h.orig	2025-05-07 06:48:23 UTC
 +++ base/threading/platform_thread.h
 @@ -55,6 +55,8 @@ class BASE_EXPORT PlatformThreadId {
    using UnderlyingType = zx_koid_t;
diff --git a/www/iridium/files/patch-base_threading_platform__thread__bsd.cc b/www/iridium/files/patch-base_threading_platform__thread__bsd.cc
index 9b36b8224c21..53ef24406fb8 100644
--- a/www/iridium/files/patch-base_threading_platform__thread__bsd.cc
+++ b/www/iridium/files/patch-base_threading_platform__thread__bsd.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_bsd.cc.orig	2024-06-25 12:08:48 UTC
+--- base/threading/platform_thread_bsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/threading/platform_thread_bsd.cc
 @@ -0,0 +1,31 @@
 +// Copyright 2023 The Chromium Authors
diff --git a/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc b/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc
index 1cb19b5fd1be..7cb4661d38ce 100644
--- a/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc
+++ b/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_internal_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- base/threading/platform_thread_internal_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/threading/platform_thread_internal_posix.cc
 @@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
  }
diff --git a/www/iridium/files/patch-base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_threading_platform__thread__posix.cc
index 8b0b24e9ce28..7c007bde459d 100644
--- a/www/iridium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/iridium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- base/threading/platform_thread_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/threading/platform_thread_posix.cc
 @@ -79,11 +79,11 @@ void* ThreadFunc(void* params) {
        base::DisallowSingleton();
diff --git a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc
index 9fbf62c249cc..b39d4bdcf12e 100644
--- a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc
+++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- base/threading/platform_thread_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/threading/platform_thread_unittest.cc
 @@ -36,7 +36,7 @@
  #include "base/time/time.h"
diff --git a/www/iridium/files/patch-base_time_time__now__posix.cc b/www/iridium/files/patch-base_time_time__now__posix.cc
index 709627a104d7..daba43db0556 100644
--- a/www/iridium/files/patch-base_time_time__now__posix.cc
+++ b/www/iridium/files/patch-base_time_time__now__posix.cc
@@ -1,4 +1,4 @@
---- base/time/time_now_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- base/time/time_now_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/time/time_now_posix.cc
 @@ -27,7 +27,7 @@
  #endif
diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc
index 8346d18186b5..893fdc9644ad 100644
--- a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,4 +1,4 @@
---- base/trace_event/malloc_dump_provider.cc.orig	2025-03-18 16:46:04 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/trace_event/malloc_dump_provider.cc
 @@ -31,6 +31,8 @@
  
diff --git a/www/iridium/files/patch-base_trace__event_memory__dump__manager.cc b/www/iridium/files/patch-base_trace__event_memory__dump__manager.cc
index 7b603c930012..498e2fb03261 100644
--- a/www/iridium/files/patch-base_trace__event_memory__dump__manager.cc
+++ b/www/iridium/files/patch-base_trace__event_memory__dump__manager.cc
@@ -1,4 +1,4 @@
---- base/trace_event/memory_dump_manager.cc.orig	2025-03-18 16:46:04 UTC
+--- base/trace_event/memory_dump_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/trace_event/memory_dump_manager.cc
 @@ -78,7 +78,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP
  #if defined(MALLOC_MEMORY_TRACING_SUPPORTED)
diff --git a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc
index 3d4b4b332d0b..d8dc414d2232 100644
--- a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc
+++ b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc
@@ -1,4 +1,4 @@
---- base/trace_event/process_memory_dump.cc.orig	2025-03-18 16:46:04 UTC
+--- base/trace_event/process_memory_dump.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/trace_event/process_memory_dump.cc
 @@ -119,7 +119,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
  #if BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-base_tracing_trace__time.cc b/www/iridium/files/patch-base_tracing_trace__time.cc
index c7c41312eb48..98aed3b1c5bd 100644
--- a/www/iridium/files/patch-base_tracing_trace__time.cc
+++ b/www/iridium/files/patch-base_tracing_trace__time.cc
@@ -1,4 +1,4 @@
---- base/tracing/trace_time.cc.orig	2025-03-18 16:46:04 UTC
+--- base/tracing/trace_time.cc.orig	2025-05-07 06:48:23 UTC
 +++ base/tracing/trace_time.cc
 @@ -8,12 +8,16 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-base_tracing_trace__time.h b/www/iridium/files/patch-base_tracing_trace__time.h
index 4dbd97537772..fb2445ec11ee 100644
--- a/www/iridium/files/patch-base_tracing_trace__time.h
+++ b/www/iridium/files/patch-base_tracing_trace__time.h
@@ -1,4 +1,4 @@
---- base/tracing/trace_time.h.orig	2022-03-28 18:11:04 UTC
+--- base/tracing/trace_time.h.orig	2025-05-07 06:48:23 UTC
 +++ base/tracing/trace_time.h
 @@ -12,7 +12,7 @@ namespace base {
  namespace tracing {
diff --git a/www/iridium/files/patch-build_config_BUILD.gn b/www/iridium/files/patch-build_config_BUILD.gn
index 78bd3c99109d..80076f741f05 100644
--- a/www/iridium/files/patch-build_config_BUILD.gn
+++ b/www/iridium/files/patch-build_config_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- build/config/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/config/BUILD.gn
 @@ -215,6 +215,10 @@ config("default_libs") {
      # Targets should choose to explicitly link frameworks they require. Since
diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn
index 655297e96d0a..2941b0421d93 100644
--- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,4 +1,4 @@
---- build/config/BUILDCONFIG.gn.orig	2025-02-22 18:06:53 UTC
+--- build/config/BUILDCONFIG.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/config/BUILDCONFIG.gn
 @@ -136,7 +136,8 @@ declare_args() {
    is_official_build = false
@@ -10,7 +10,7 @@
               (current_cpu != "s390x" && current_cpu != "s390" &&
                current_cpu != "ppc64" && current_cpu != "ppc" &&
                current_cpu != "mips" && current_cpu != "mips64" &&
-@@ -234,6 +235,10 @@ if (host_toolchain == "") {
+@@ -235,6 +236,10 @@ if (host_toolchain == "") {
      host_toolchain = "//build/toolchain/aix:$host_cpu"
    } else if (host_os == "zos") {
      host_toolchain = "//build/toolchain/zos:$host_cpu"
@@ -21,7 +21,7 @@
    } else {
      assert(false, "Unsupported host_os: $host_os")
    }
-@@ -278,6 +283,8 @@ if (target_os == "android") {
+@@ -279,6 +284,8 @@ if (target_os == "android") {
    _default_toolchain = "//build/toolchain/aix:$target_cpu"
  } else if (target_os == "zos") {
    _default_toolchain = "//build/toolchain/zos:$target_cpu"
@@ -30,7 +30,7 @@
  } else {
    assert(false, "Unsupported target_os: $target_os")
  }
-@@ -312,7 +319,11 @@ is_android = current_os == "android"
+@@ -313,7 +320,11 @@ is_android = current_os == "android"
  is_chromeos = current_os == "chromeos"
  is_fuchsia = current_os == "fuchsia"
  is_ios = current_os == "ios"
@@ -42,4 +42,4 @@
 +is_bsd = current_os == "openbsd" || current_os == "freebsd"
  is_mac = current_os == "mac"
  is_nacl = current_os == "nacl"
- is_watchos = current_os == "watchos"
+ is_wasm = current_os == "emscripten"
diff --git a/www/iridium/files/patch-build_config_clang_BUILD.gn b/www/iridium/files/patch-build_config_clang_BUILD.gn
index 2cb8c0bcbda0..9d9ec1d3c295 100644
--- a/www/iridium/files/patch-build_config_clang_BUILD.gn
+++ b/www/iridium/files/patch-build_config_clang_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/clang/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- build/config/clang/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/config/clang/BUILD.gn
-@@ -251,7 +251,12 @@ template("clang_lib") {
+@@ -252,7 +252,12 @@ template("clang_lib") {
  
  # Adds a dependency on the Clang runtime library clang_rt.builtins.
  clang_lib("compiler_builtins") {
@@ -13,4 +13,4 @@
 +  } else if (is_mac) {
      libname = "osx"
    } else if (is_ios) {
-     if (target_environment == "simulator") {
+     if (target_platform == "iphoneos") {
diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn
index b07cbc4dc8e4..faa794dcc771 100644
--- a/www/iridium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- build/config/compiler/BUILD.gn.orig	2025-05-07 13:10:49 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -198,7 +198,7 @@ declare_args() {
+@@ -197,7 +197,7 @@ declare_args() {
    # This greatly reduces the size of debug builds, at the cost of
    # debugging information which is required by some specialized
    # debugging tools.
@@ -9,7 +9,7 @@
  }
  
  declare_args() {
-@@ -255,13 +255,16 @@ config("default_include_dirs") {
+@@ -254,13 +254,16 @@ config("default_include_dirs") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
  # the executable they are loaded into, so they are unresolved at link-time.
  config("no_unresolved_symbols") {
@@ -27,7 +27,7 @@
  }
  
  # compiler ---------------------------------------------------------------------
-@@ -519,6 +522,10 @@ config("compiler") {
+@@ -508,6 +511,10 @@ config("compiler") {
      }
    }
  
@@ -38,7 +38,7 @@
    # Linux-specific compiler flags setup.
    # ------------------------------------
    if (use_icf && (!is_apple || use_lld)) {
-@@ -578,7 +585,7 @@ config("compiler") {
+@@ -567,7 +574,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -47,7 +47,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
      if (save_reproducers_on_lld_crash && use_lld) {
        ldflags += [
-@@ -1223,7 +1230,7 @@ config("compiler_cpu_abi") {
+@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -56,7 +56,7 @@
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
        }
-@@ -1238,7 +1245,7 @@ config("compiler_cpu_abi") {
+@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
        if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
@@ -65,7 +65,7 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1572,7 +1579,7 @@ config("compiler_deterministic") {
+@@ -1561,7 +1568,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -74,7 +74,7 @@
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1630,7 +1637,7 @@ config("compiler_deterministic") {
+@@ -1619,7 +1626,7 @@ config("compiler_deterministic") {
  }
  
  config("clang_revision") {
@@ -83,32 +83,26 @@
        current_os != "zos") {
      update_args = [
        "--print-revision",
-@@ -1960,23 +1967,12 @@ config("default_warnings") {
-         ]
-       }
+@@ -1652,7 +1659,7 @@ config("clang_revision") {
+ # e.g. by setting in the the project's .gn file.
+ config("clang_warning_suppression") {
+   # Some build configs use older versions of clang that don't support WSMs
+-  if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
++  if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
+       !llvm_android_mainline && is_clang &&
+       clang_warning_suppression_file != "") {
+     from_build_root =
+@@ -1985,9 +1992,6 @@ config("default_warnings") {
  
--      cflags += [
--        # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
--        "-Wno-cast-function-type",
--
--        # TODO(crbug.com/40284799): Fix and re-enable.
--        "-Wno-thread-safety-reference-return",
+         # TODO(crbug.com/40284799): Fix and re-enable.
+         "-Wno-thread-safety-reference-return",
 -
 -        # TODO(crbug.com/376641662): Fix and re-enable.
 -        "-Wno-nontrivial-memcall",
--      ]
--
-       cflags_cc += [
-         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
-         "-Wenum-compare-conditional",
        ]
  
--      if (!is_nacl) {
-+      if (!is_nacl && !is_bsd) {
-         cflags_cc += [
-           # TODO(crbug.com/41486292): Fix and re-enable.
-           "-Wno-c++11-narrowing-const-reference",
-@@ -2742,7 +2738,7 @@ config("afdo_optimize_size") {
+       cflags_cc += [
+@@ -2776,7 +2780,7 @@ config("afdo_optimize_size") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -117,7 +111,7 @@
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2769,7 +2765,7 @@ config("afdo") {
+@@ -2803,7 +2807,7 @@ config("afdo") {
        cflags += [ "-Wno-backend-plugin" ]
        inputs = [ _clang_sample_profile ]
      }
@@ -126,7 +120,7 @@
      cflags = [ "-fauto-profile=${auto_profile_path}" ]
      inputs = [ auto_profile_path ]
    }
-@@ -2946,7 +2942,7 @@ config("symbols") {
+@@ -2980,7 +2984,7 @@ config("symbols") {
      cflags += [ "-gomit-unreferenced-methods" ]
    }
  
diff --git a/www/iridium/files/patch-build_config_gcc_BUILD.gn b/www/iridium/files/patch-build_config_gcc_BUILD.gn
index cc3ee115dbee..471d98f1baa7 100644
--- a/www/iridium/files/patch-build_config_gcc_BUILD.gn
+++ b/www/iridium/files/patch-build_config_gcc_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/gcc/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- build/config/gcc/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/config/gcc/BUILD.gn
 @@ -32,7 +32,9 @@ declare_args() {
  # See http://gcc.gnu.org/wiki/Visibility
diff --git a/www/iridium/files/patch-build_config_linux_BUILD.gn b/www/iridium/files/patch-build_config_linux_BUILD.gn
index 57a77d064bb5..d1959de18d5f 100644
--- a/www/iridium/files/patch-build_config_linux_BUILD.gn
+++ b/www/iridium/files/patch-build_config_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/linux/BUILD.gn.orig	2022-10-05 07:34:01 UTC
+--- build/config/linux/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/config/linux/BUILD.gn
 @@ -41,7 +41,7 @@ config("runtime_library") {
    }
diff --git a/www/iridium/files/patch-build_config_linux_libdrm_BUILD.gn b/www/iridium/files/patch-build_config_linux_libdrm_BUILD.gn
index 279961b01ffb..68f16e0c5e88 100644
--- a/www/iridium/files/patch-build_config_linux_libdrm_BUILD.gn
+++ b/www/iridium/files/patch-build_config_linux_libdrm_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/linux/libdrm/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- build/config/linux/libdrm/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/config/linux/libdrm/BUILD.gn
 @@ -15,7 +15,7 @@ declare_args() {
  }
diff --git a/www/iridium/files/patch-build_config_linux_pkg-config.py b/www/iridium/files/patch-build_config_linux_pkg-config.py
index f3b1f8d5a5a1..010ae190db8f 100644
--- a/www/iridium/files/patch-build_config_linux_pkg-config.py
+++ b/www/iridium/files/patch-build_config_linux_pkg-config.py
@@ -1,4 +1,4 @@
---- build/config/linux/pkg-config.py.orig	2023-03-13 07:33:08 UTC
+--- build/config/linux/pkg-config.py.orig	2025-05-07 06:48:23 UTC
 +++ build/config/linux/pkg-config.py
 @@ -108,7 +108,7 @@ def main():
    # If this is run on non-Linux platforms, just return nothing and indicate
diff --git a/www/iridium/files/patch-build_config_ozone.gni b/www/iridium/files/patch-build_config_ozone.gni
index 8b71da74b934..7ee2990192c0 100644
--- a/www/iridium/files/patch-build_config_ozone.gni
+++ b/www/iridium/files/patch-build_config_ozone.gni
@@ -1,6 +1,6 @@
---- build/config/ozone.gni.orig	2025-04-16 18:18:42 UTC
+--- build/config/ozone.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/config/ozone.gni
-@@ -81,7 +81,15 @@ declare_args() {
+@@ -80,7 +80,15 @@ declare_args() {
        ozone_platform = "x11"
        ozone_platform_drm = true
        ozone_platform_x11 = true
diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni
index 00a7a6f73648..9bb3bfd26cff 100644
--- a/www/iridium/files/patch-build_config_rust.gni
+++ b/www/iridium/files/patch-build_config_rust.gni
@@ -1,6 +1,6 @@
---- build/config/rust.gni.orig	2025-02-22 18:06:53 UTC
+--- build/config/rust.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/config/rust.gni
-@@ -297,6 +297,10 @@ if (is_linux || is_chromeos) {
+@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) {
    }
  }
  
diff --git a/www/iridium/files/patch-build_config_v8__target__cpu.gni b/www/iridium/files/patch-build_config_v8__target__cpu.gni
index 1457fb459a58..cff5ee41e3d4 100644
--- a/www/iridium/files/patch-build_config_v8__target__cpu.gni
+++ b/www/iridium/files/patch-build_config_v8__target__cpu.gni
@@ -1,4 +1,4 @@
---- build/config/v8_target_cpu.gni.orig	2022-03-28 18:11:04 UTC
+--- build/config/v8_target_cpu.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/config/v8_target_cpu.gni
 @@ -36,6 +36,10 @@ declare_args() {
  if (v8_target_cpu == "") {
diff --git a/www/iridium/files/patch-build_detect__host__arch.py b/www/iridium/files/patch-build_detect__host__arch.py
index 2c92005c703a..9e64aa01f511 100644
--- a/www/iridium/files/patch-build_detect__host__arch.py
+++ b/www/iridium/files/patch-build_detect__host__arch.py
@@ -1,4 +1,4 @@
---- build/detect_host_arch.py.orig	2023-03-13 07:33:08 UTC
+--- build/detect_host_arch.py.orig	2025-05-07 06:48:23 UTC
 +++ build/detect_host_arch.py
 @@ -20,6 +20,8 @@ def HostArch():
      host_arch = 'ia32'
diff --git a/www/iridium/files/patch-build_gn__run__binary.py b/www/iridium/files/patch-build_gn__run__binary.py
index c719f3fb1931..fe2df98b2740 100644
--- a/www/iridium/files/patch-build_gn__run__binary.py
+++ b/www/iridium/files/patch-build_gn__run__binary.py
@@ -1,4 +1,4 @@
---- build/gn_run_binary.py.orig	2023-03-13 07:33:08 UTC
+--- build/gn_run_binary.py.orig	2025-05-07 06:48:23 UTC
 +++ build/gn_run_binary.py
 @@ -23,7 +23,7 @@ if not os.path.isabs(path):
  # The rest of the arguments are passed directly to the executable.
diff --git a/www/iridium/files/patch-build_linux_chrome.map b/www/iridium/files/patch-build_linux_chrome.map
index ecb097ced958..ed040f84b25b 100644
--- a/www/iridium/files/patch-build_linux_chrome.map
+++ b/www/iridium/files/patch-build_linux_chrome.map
@@ -1,4 +1,4 @@
---- build/linux/chrome.map.orig	2022-03-28 18:11:04 UTC
+--- build/linux/chrome.map.orig	2025-05-07 06:48:23 UTC
 +++ build/linux/chrome.map
 @@ -20,6 +20,10 @@ global:
    # Program entry point.
diff --git a/www/iridium/files/patch-build_linux_strip__binary.py b/www/iridium/files/patch-build_linux_strip__binary.py
index df1ce60c6878..957874034316 100644
--- a/www/iridium/files/patch-build_linux_strip__binary.py
+++ b/www/iridium/files/patch-build_linux_strip__binary.py
@@ -1,4 +1,4 @@
---- build/linux/strip_binary.py.orig	2022-03-28 18:11:04 UTC
+--- build/linux/strip_binary.py.orig	2025-05-07 06:48:23 UTC
 +++ build/linux/strip_binary.py
 @@ -10,6 +10,7 @@ import sys
  
diff --git a/www/iridium/files/patch-build_linux_unbundle_icu.gn b/www/iridium/files/patch-build_linux_unbundle_icu.gn
index 0685cacfb689..5f7a5139bd98 100644
--- a/www/iridium/files/patch-build_linux_unbundle_icu.gn
+++ b/www/iridium/files/patch-build_linux_unbundle_icu.gn
@@ -1,4 +1,4 @@
---- build/linux/unbundle/icu.gn.orig	2025-02-22 18:06:53 UTC
+--- build/linux/unbundle/icu.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/linux/unbundle/icu.gn
 @@ -17,6 +17,15 @@ config("icu_config") {
      "USING_SYSTEM_ICU=1",
diff --git a/www/iridium/files/patch-build_linux_unbundle_libusb.gn b/www/iridium/files/patch-build_linux_unbundle_libusb.gn
index 5170ad293de8..5ac1d7e88e78 100644
--- a/www/iridium/files/patch-build_linux_unbundle_libusb.gn
+++ b/www/iridium/files/patch-build_linux_unbundle_libusb.gn
@@ -1,4 +1,4 @@
---- build/linux/unbundle/libusb.gn.orig	2024-02-04 14:46:08 UTC
+--- build/linux/unbundle/libusb.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/linux/unbundle/libusb.gn
 @@ -1,3 +1,27 @@
 +# Copyright 2016 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-build_nocompile.gni b/www/iridium/files/patch-build_nocompile.gni
index b9b57ea8d5d1..a3d74a4d12e0 100644
--- a/www/iridium/files/patch-build_nocompile.gni
+++ b/www/iridium/files/patch-build_nocompile.gni
@@ -1,4 +1,4 @@
---- build/nocompile.gni.orig	2025-02-22 18:06:53 UTC
+--- build/nocompile.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/nocompile.gni
 @@ -55,7 +55,7 @@ if (is_win) {
  }
diff --git a/www/iridium/files/patch-build_rust_rust__bindgen.gni b/www/iridium/files/patch-build_rust_rust__bindgen.gni
index fdf61649b007..8c777f4b406d 100644
--- a/www/iridium/files/patch-build_rust_rust__bindgen.gni
+++ b/www/iridium/files/patch-build_rust_rust__bindgen.gni
@@ -1,4 +1,4 @@
---- build/rust/rust_bindgen.gni.orig	2025-02-22 18:06:53 UTC
+--- build/rust/rust_bindgen.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/rust/rust_bindgen.gni
 @@ -12,14 +12,14 @@ if (is_win) {
    import("//build/toolchain/win/win_toolchain_data.gni")
diff --git a/www/iridium/files/patch-build_rust_rust__bindgen__generator.gni b/www/iridium/files/patch-build_rust_rust__bindgen__generator.gni
index 6d51fdfd00cc..14b2304a9a25 100644
--- a/www/iridium/files/patch-build_rust_rust__bindgen__generator.gni
+++ b/www/iridium/files/patch-build_rust_rust__bindgen__generator.gni
@@ -1,4 +1,4 @@
---- build/rust/rust_bindgen_generator.gni.orig	2025-02-22 18:06:53 UTC
+--- build/rust/rust_bindgen_generator.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/rust/rust_bindgen_generator.gni
 @@ -11,14 +11,14 @@ if (is_win) {
    import("//build/toolchain/win/win_toolchain_data.gni")
diff --git a/www/iridium/files/patch-build_rust_std_BUILD.gn b/www/iridium/files/patch-build_rust_std_BUILD.gn
index 0a5335d58d48..d0b722a2cab3 100644
--- a/www/iridium/files/patch-build_rust_std_BUILD.gn
+++ b/www/iridium/files/patch-build_rust_std_BUILD.gn
@@ -1,4 +1,4 @@
---- build/rust/std/BUILD.gn.orig	2025-04-05 13:54:50 UTC
+--- build/rust/std/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/rust/std/BUILD.gn
 @@ -89,13 +89,20 @@ if (toolchain_has_rust) {
      # These are no longer present in the Windows toolchain.
diff --git a/www/iridium/files/patch-build_toolchain_freebsd_BUILD.gn b/www/iridium/files/patch-build_toolchain_freebsd_BUILD.gn
index 74e2284abeed..7412250e64d1 100644
--- a/www/iridium/files/patch-build_toolchain_freebsd_BUILD.gn
+++ b/www/iridium/files/patch-build_toolchain_freebsd_BUILD.gn
@@ -1,4 +1,4 @@
---- build/toolchain/freebsd/BUILD.gn.orig	2022-03-28 18:11:04 UTC
+--- build/toolchain/freebsd/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/toolchain/freebsd/BUILD.gn
 @@ -0,0 +1,66 @@
 +# Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-build_toolchain_gcc__solink__wrapper.py b/www/iridium/files/patch-build_toolchain_gcc__solink__wrapper.py
index e59066c37424..ae0a5da428be 100644
--- a/www/iridium/files/patch-build_toolchain_gcc__solink__wrapper.py
+++ b/www/iridium/files/patch-build_toolchain_gcc__solink__wrapper.py
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_solink_wrapper.py.orig	2022-03-28 18:11:04 UTC
+--- build/toolchain/gcc_solink_wrapper.py.orig	2025-05-07 06:48:23 UTC
 +++ build/toolchain/gcc_solink_wrapper.py
 @@ -39,7 +39,7 @@ def CollectDynSym(args):
    """Replaces: nm --format=posix -g -D -p $sofile | cut -f1-2 -d' '"""
diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
index ccbd45581d2c..39c56c05ab7b 100644
--- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_toolchain.gni.orig	2025-04-16 18:18:42 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/toolchain/gcc_toolchain.gni
 @@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) {
        "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
diff --git a/www/iridium/files/patch-build_toolchain_openbsd_BUILD.gn b/www/iridium/files/patch-build_toolchain_openbsd_BUILD.gn
index 60694db854e9..c330d865aed3 100644
--- a/www/iridium/files/patch-build_toolchain_openbsd_BUILD.gn
+++ b/www/iridium/files/patch-build_toolchain_openbsd_BUILD.gn
@@ -1,4 +1,4 @@
---- build/toolchain/openbsd/BUILD.gn.orig	2022-03-28 18:11:04 UTC
+--- build/toolchain/openbsd/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ build/toolchain/openbsd/BUILD.gn
 @@ -0,0 +1,66 @@
 +# Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-build_toolchain_toolchain.gni b/www/iridium/files/patch-build_toolchain_toolchain.gni
index 64dd88aa0248..956b9a58f7cd 100644
--- a/www/iridium/files/patch-build_toolchain_toolchain.gni
+++ b/www/iridium/files/patch-build_toolchain_toolchain.gni
@@ -1,6 +1,6 @@
---- build/toolchain/toolchain.gni.orig	2025-04-16 18:18:42 UTC
+--- build/toolchain/toolchain.gni.orig	2025-05-07 06:48:23 UTC
 +++ build/toolchain/toolchain.gni
-@@ -72,7 +72,7 @@ if (host_os == "mac") {
+@@ -75,7 +75,7 @@ if (host_os == "mac") {
    host_shlib_extension = ".dylib"
  } else if (host_os == "win") {
    host_shlib_extension = ".dll"
diff --git a/www/iridium/files/patch-cc_base_features.cc b/www/iridium/files/patch-cc_base_features.cc
index 41ac54f25618..37daa223cf4f 100644
--- a/www/iridium/files/patch-cc_base_features.cc
+++ b/www/iridium/files/patch-cc_base_features.cc
@@ -1,6 +1,6 @@
---- cc/base/features.cc.orig	2025-02-22 18:06:53 UTC
+--- cc/base/features.cc.orig	2025-05-07 06:48:23 UTC
 +++ cc/base/features.cc
-@@ -43,7 +43,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
+@@ -48,7 +48,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
  // be using a separate flag to control the launch on GL.
  BASE_FEATURE(kUseDMSAAForTiles,
               "UseDMSAAForTiles",
diff --git a/www/iridium/files/patch-chrome_app_chrome__command__ids.h b/www/iridium/files/patch-chrome_app_chrome__command__ids.h
index 561610c5aeae..2e03886ee5c6 100644
--- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h
+++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,4 +1,4 @@
---- chrome/app/chrome_command_ids.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/app/chrome_command_ids.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/app/chrome_command_ids.h
 @@ -72,11 +72,11 @@
  #define IDC_TOGGLE_MULTITASK_MENU       34050
diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc
index b65a185f5b4b..cfa6c781feed 100644
--- a/www/iridium/files/patch-chrome_app_chrome__main.cc
+++ b/www/iridium/files/patch-chrome_app_chrome__main.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/app/chrome_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/app/chrome_main.cc
 @@ -28,11 +28,11 @@
  #include "chrome/app/chrome_main_mac.h"
diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
index 639d4b12c935..e38af5ff3f40 100644
--- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/app/chrome_main_delegate.cc
 @@ -147,7 +147,7 @@
  #include "components/webui/about/credit_utils.h"
@@ -129,7 +129,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess &&
        !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) {
-@@ -1532,13 +1532,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1532,13 +1532,13 @@ std::variant<int, content::MainFunctionParams> ChromeM
  #else
  
  #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \
diff --git a/www/iridium/files/patch-chrome_browser_BUILD.gn b/www/iridium/files/patch-chrome_browser_BUILD.gn
index ca0c5a41a56a..233158193287 100644
--- a/www/iridium/files/patch-chrome_browser_BUILD.gn
+++ b/www/iridium/files/patch-chrome_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/BUILD.gn
-@@ -6819,6 +6819,13 @@ static_library("browser") {
+@@ -6866,6 +6866,13 @@ static_library("browser") {
            [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ]
      }
  
diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc
index 1cf698356235..12835627d5e0 100644
--- a/www/iridium/files/patch-chrome_browser_about__flags.cc
+++ b/www/iridium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/about_flags.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/about_flags.cc
-@@ -258,7 +258,7 @@
+@@ -260,7 +260,7 @@
  #include "extensions/common/extension_features.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -344,7 +344,7 @@
+@@ -349,7 +349,7 @@
  #include "device/vr/public/cpp/switches.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "ui/ozone/public/ozone_switches.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -354,7 +354,7 @@
+@@ -359,7 +359,7 @@
  #include "chrome/browser/win/mica_titlebar.h"
  #endif
  
@@ -26,8 +26,8 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/contextual_cueing/contextual_cueing_features.h"  // nogncheck
  #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -365,7 +365,7 @@
+ #include "chrome/browser/enterprise/webstore/features.h"
+@@ -371,7 +371,7 @@
  #include "components/user_education/common/user_education_features.h"  // nogncheck
  #endif
  
@@ -36,7 +36,16 @@
  #include "chrome/browser/ui/ui_features.h"
  #include "ui/base/ui_base_features.h"
  #endif
-@@ -520,7 +520,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -423,7 +423,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = {
+ #endif  // USE_AURA
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ 
+ const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = {
+     {"LocalNetworkAccessChecksWarn", "false"}};
+@@ -539,7 +539,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
      {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
  #endif
  
@@ -45,7 +54,7 @@
  const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
      {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
      {flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -821,6 +821,26 @@ const FeatureEntry::FeatureVariation
+@@ -852,6 +852,26 @@ const FeatureEntry::FeatureVariation
           std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
           nullptr}};
  
@@ -72,8 +81,8 @@
  const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
      {"UIClipboardMaximumAge", "60"}};
  const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
-@@ -1184,7 +1204,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
- };
+@@ -1227,7 +1247,7 @@ constexpr FeatureEntry::FeatureVariation
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
@@ -81,7 +90,7 @@
  const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
      {"AtKeywordAcceleration", "true"},
  };
-@@ -1222,7 +1242,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
+@@ -1265,7 +1285,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
  };
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -89,8 +98,8 @@
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  
  // A limited number of combinations of the rich autocompletion params.
- const FeatureEntry::FeatureParam
-@@ -3582,7 +3602,7 @@ const FeatureEntry::FeatureVariation
+ const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = {
+@@ -3555,7 +3575,7 @@ const FeatureEntry::FeatureVariation
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -99,7 +108,7 @@
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
      {{"link_capturing_state", "on_by_default"}};
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
-@@ -4088,7 +4108,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
+@@ -4059,7 +4079,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
       std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
  };
  
@@ -108,7 +117,7 @@
  const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
      {"TranslationAPIAcceptLanguagesCheck", "false"},
      {"TranslationAPILimitLanguagePackCount", "false"}};
-@@ -4154,7 +4174,7 @@ const FeatureEntry::FeatureVariation
+@@ -4125,7 +4145,7 @@ const FeatureEntry::FeatureVariation
           1, nullptr},
  };
  
@@ -117,7 +126,7 @@
  const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
      {"BackoffTime", "0h"},
      {"BackoffMultiplierBase", "0.0"},
-@@ -4997,7 +5017,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4992,7 +5012,7 @@ const FeatureEntry kFeatureEntries[] = {
      },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -126,7 +135,7 @@
      {
          "fluent-overlay-scrollbars",
          flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5286,7 +5306,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5279,7 +5299,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableIsolatedWebAppDevModeName,
       flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
@@ -135,7 +144,7 @@
      {"enable-iwa-key-distribution-component",
       flag_descriptions::kEnableIwaKeyDistributionComponentName,
       flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
-@@ -5545,7 +5565,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5500,7 +5520,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kWebShare)},
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  
@@ -144,10 +153,10 @@
      {"pulseaudio-loopback-for-cast",
       flag_descriptions::kPulseaudioLoopbackForCastName,
       flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
-@@ -5581,6 +5601,16 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWaylandLinuxDrmSyncobjName,
-      flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)},
+@@ -5541,6 +5561,16 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWaylandSessionManagementName,
+      flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
+      FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
 +
 +#if BUILDFLAG(IS_BSD)
 +    {"audio-backend",
@@ -161,7 +170,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(ENABLE_VR)
-@@ -6461,7 +6491,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6427,7 +6457,7 @@ const FeatureEntry kFeatureEntries[] = {
                                      "MlUrlScoring")},
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -170,16 +179,16 @@
      {"omnibox-domain-suggestions",
       flag_descriptions::kOmniboxDomainSuggestionsName,
       flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
-@@ -6674,7 +6704,7 @@ const FeatureEntry kFeatureEntries[] = {
-                                     "OrganicRepeatableQueries")},
- 
+@@ -6697,7 +6727,7 @@ const FeatureEntry kFeatureEntries[] = {
+                                     kNumSrpZpsRelatedSearches,
+                                     "PowerTools")},
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
       flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
       FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
-@@ -7171,7 +7201,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7189,7 +7219,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -188,7 +197,7 @@
      {"cups-ipp-printing-backend",
       flag_descriptions::kCupsIppPrintingBackendName,
       flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
-@@ -7436,7 +7466,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7437,7 +7467,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)},
  
@@ -197,7 +206,7 @@
      {"wasm-tts-component-updater-enabled",
       flag_descriptions::kWasmTtsComponentUpdaterEnabledName,
       flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop,
-@@ -8092,7 +8122,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8109,7 +8139,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
  #endif  // !BUILDFLAG(IS_CHROMEOS)
  
@@ -206,7 +215,7 @@
      {"enable-network-service-sandbox",
       flag_descriptions::kEnableNetworkServiceSandboxName,
       flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8773,7 +8803,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8774,7 +8804,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -215,7 +224,7 @@
      {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
       flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
-@@ -8798,7 +8828,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8799,7 +8829,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
  
@@ -224,7 +233,7 @@
      {
          "ui-debug-tools",
          flag_descriptions::kUIDebugToolsName,
-@@ -9265,7 +9295,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9275,7 +9305,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -233,7 +242,7 @@
      {"media-session-enter-picture-in-picture",
       flag_descriptions::kMediaSessionEnterPictureInPictureName,
       flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -9903,7 +9933,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9924,7 +9954,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
  
@@ -242,7 +251,7 @@
      {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
       flag_descriptions::kCameraMicEffectsDescription,
       static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10027,7 +10057,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10048,7 +10078,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)},
  #endif
  
@@ -251,7 +260,7 @@
      {"third-party-profile-management",
       flag_descriptions::kThirdPartyProfileManagementName,
       flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10062,7 +10092,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10077,7 +10107,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -260,16 +269,16 @@
      {"enable-user-navigation-capturing-pwa",
       flag_descriptions::kPwaNavigationCapturingName,
       flag_descriptions::kPwaNavigationCapturingDescription,
-@@ -10823,7 +10853,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10817,7 +10847,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCanvasHibernationDescription, kOsAll,
       FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"sync-enable-bookmarks-in-transport-mode",
-      flag_descriptions::kSyncEnableBookmarksInTransportModeName,
-      flag_descriptions::kSyncEnableBookmarksInTransportModeDescription,
-@@ -10939,7 +10969,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-history-sync-optin",
+      flag_descriptions::kEnableHistorySyncOptinName,
+      flag_descriptions::kEnableHistorySyncOptinDescription,
+@@ -10920,7 +10950,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)},
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -278,7 +287,7 @@
      {"supervised-profile-safe-search",
       flag_descriptions::kSupervisedProfileSafeSearchName,
       flag_descriptions::kSupervisedProfileSafeSearchDescription,
-@@ -11186,7 +11216,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11167,7 +11197,7 @@ const FeatureEntry kFeatureEntries[] = {
           segmentation_platform::features::kSegmentationSurveyPage)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -287,7 +296,7 @@
      {"autofill-enable-buy-now-pay-later",
       flag_descriptions::kAutofillEnableBuyNowPayLaterName,
       flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
-@@ -11306,7 +11336,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11282,7 +11312,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
  
@@ -296,7 +305,7 @@
      {"translation-api", flag_descriptions::kTranslationAPIName,
       flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
       FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
-@@ -11343,7 +11373,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11319,7 +11349,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           password_manager::features::kPasswordFormClientsideClassifier)},
  
@@ -305,7 +314,7 @@
      {"contextual-cueing", flag_descriptions::kContextualCueingName,
       flag_descriptions::kContextualCueingDescription,
       kOsLinux | kOsMac | kOsWin,
-@@ -11662,7 +11692,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11653,7 +11683,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -314,7 +323,7 @@
      {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
       flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
       FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
-@@ -11712,7 +11742,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11703,7 +11733,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -323,7 +332,7 @@
      {"autofill-enable-amount-extraction-desktop",
       flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
       flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
-@@ -11732,7 +11762,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11723,7 +11753,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -332,3 +341,39 @@
      {"autofill-enable-amount-extraction-allowlist-desktop",
       flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
       flag_descriptions::
+@@ -11834,7 +11864,7 @@ const FeatureEntry kFeatureEntries[] = {
+          apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)},
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     {"chrome-web-store-navigation-throttle",
+      flag_descriptions::kChromeWebStoreNavigationThrottleName,
+      flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
+@@ -11869,7 +11899,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"autofill-enable-amount-extraction-desktop-logging",
+      flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName,
+      flag_descriptions::
+@@ -11899,7 +11929,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)},
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"root-scrollbar-follows-browser-theme",
+      flag_descriptions::kRootScrollbarFollowsTheme,
+      flag_descriptions::kRootScrollbarFollowsThemeDescription,
+@@ -11921,7 +11951,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"local-network-access-check",
+      flag_descriptions::kLocalNetworkAccessChecksName,
+      flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop,
diff --git a/www/iridium/files/patch-chrome_browser_accessibility_page__colors.cc b/www/iridium/files/patch-chrome_browser_accessibility_page__colors.cc
index a42765c38d71..576bb772d25a 100644
--- a/www/iridium/files/patch-chrome_browser_accessibility_page__colors.cc
+++ b/www/iridium/files/patch-chrome_browser_accessibility_page__colors.cc
@@ -1,4 +1,4 @@
---- chrome/browser/accessibility/page_colors.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/accessibility/page_colors.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/accessibility/page_colors.cc
 @@ -12,7 +12,7 @@
  #include "components/sync_preferences/pref_service_syncable.h"
diff --git a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc
index 5ce002ba6407..59843f04850c 100644
--- a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc
@@ -1,4 +1,4 @@
---- chrome/browser/after_startup_task_utils.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/after_startup_task_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/after_startup_task_utils.cc
 @@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() {
                         TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count);
diff --git a/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
index c080f9e8525a..333c6a7b56e9 100644
--- a/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
+++ b/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
@@ -1,4 +1,4 @@
---- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/apps/app_service/publishers/extension_apps.cc
 @@ -23,7 +23,7 @@ ExtensionApps::ExtensionApps(AppServiceProxy* proxy)
  ExtensionApps::~ExtensionApps() = default;
diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
index 5d53ab58f94e..87ae41a0b256 100644
--- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
+++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
@@ -1,4 +1,4 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/apps/platform_apps/platform_app_launch.cc
 @@ -19,7 +19,7 @@
  #include "extensions/common/constants.h"
diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
index 5cc69021077e..5dfd78640e8f 100644
--- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
+++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
@@ -1,4 +1,4 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/apps/platform_apps/platform_app_launch.h
 @@ -38,7 +38,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
  content::WebContents* OpenExtensionApplicationTab(Profile* profile,
diff --git a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
index 877e7133b7bd..28372d2932d0 100644
--- a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
+++ b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
@@ -1,4 +1,4 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 @@ -89,7 +89,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
        return metrics::OmniboxInputType::QUERY;
diff --git a/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc b/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc
index 8f87bc433ef3..3ab738b0a94a 100644
--- a/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/background/extensions/background_mode_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/background/extensions/background_mode_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/background/extensions/background_mode_manager.cc
 @@ -893,7 +893,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
    }
diff --git a/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__optimizer.cc b/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
index 8f6ac4ab21a4..c3205eb42ac7 100644
--- a/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
+++ b/www/iridium/files/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/background/extensions/background_mode_optimizer.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/background/extensions/background_mode_optimizer.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/background/extensions/background_mode_optimizer.cc
 @@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod
      return nullptr;
diff --git a/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc b/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
index deadf3fcbcdc..ce88fa8d98f5 100644
--- a/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
+++ b/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
@@ -1,6 +1,6 @@
---- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/background/glic/glic_status_icon.cc
-@@ -83,7 +83,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
+@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
    if (!status_icon_) {
      return;
    }
@@ -9,8 +9,8 @@
    //  Set a vector icon for proper themeing on Linux.
    status_icon_->SetIcon(
        GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON));
-@@ -113,7 +113,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
- GlicStatusIcon::~GlicStatusIcon() {
+@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() {
+ 
    context_menu_ = nullptr;
    if (status_icon_) {
 -#if !BUILDFLAG(IS_LINUX)
@@ -18,7 +18,16 @@
      status_icon_->RemoveObserver(this);
  #endif
      std::unique_ptr<StatusIcon> removed_icon =
-@@ -201,7 +201,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
+@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const ui::Accelerato
+ }
+ 
+ void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (context_menu_) {
+     context_menu_->SetCommandIdVisible(IDC_GLIC_STATUS_ICON_MENU_EXIT,
+                                        BrowserList::GetInstance()->empty());
+@@ -272,7 +272,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
    menu->AddItem(
        IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON,
        l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON));
diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc
index ad4f26babebc..ee8c3b499c35 100644
--- a/www/iridium/files/patch-chrome_browser_browser__features.cc
+++ b/www/iridium/files/patch-chrome_browser_browser__features.cc
@@ -1,15 +1,15 @@
---- chrome/browser/browser_features.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/browser_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/browser_features.cc
-@@ -81,7 +81,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode,
-              "ContentUsesBrowserThemeColorMode",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDestruction,
+              "ClearUserDataUponProfileDestruction",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Enables usage of os_crypt_async::SecretPortalKeyProvider.  Once
  // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be
  // disabled without losing data.
-@@ -100,7 +100,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
+@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
  // the browser exits.
  BASE_FEATURE(kDestroyProfileOnBrowserClose,
               "DestroyProfileOnBrowserClose",
@@ -18,7 +18,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT);
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -233,7 +233,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
+@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
               "SandboxExternalProtocolBlockedWarning",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/iridium/files/patch-chrome_browser_browser__features.h b/www/iridium/files/patch-chrome_browser_browser__features.h
index 756e2d7a1db8..4f9f7242d154 100644
--- a/www/iridium/files/patch-chrome_browser_browser__features.h
+++ b/www/iridium/files/patch-chrome_browser_browser__features.h
@@ -1,15 +1,15 @@
---- chrome/browser/browser_features.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/browser_features.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/browser_features.h
-@@ -39,7 +39,7 @@ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
- 
- BASE_DECLARE_FEATURE(kContentUsesBrowserThemeColorMode);
+@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore
+ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
+ BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kDbusSecretPortal);
  BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider);
  #endif
-@@ -101,7 +101,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
+@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked);
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning);
  
diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
index 7c3902405405..25d894bf3466 100644
--- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/browser_process_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/browser_process_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/browser_process_impl.cc
 @@ -259,7 +259,7 @@
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@@ -18,7 +18,7 @@
  // How often to check if the persistent instance of Chrome needs to restart
  // to install an update.
  static const int kUpdateCheckIntervalHours = 6;
-@@ -1133,7 +1133,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
+@@ -1145,7 +1145,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
                                  GoogleUpdateSettings::GetCollectStatsConsent());
    registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
  
@@ -27,7 +27,7 @@
    os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
  #endif
  }
-@@ -1401,7 +1401,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1413,7 +1413,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
            local_state())));
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -36,7 +36,7 @@
    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) !=
        "basic") {
-@@ -1670,7 +1670,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1682,7 +1682,7 @@ void BrowserProcessImpl::Unpin() {
  }
  
  // Mac is currently not supported.
diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.h b/www/iridium/files/patch-chrome_browser_browser__process__impl.h
index c8821eea8c93..0e924548c16a 100644
--- a/www/iridium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,4 +1,4 @@
---- chrome/browser/browser_process_impl.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/browser_process_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/browser_process_impl.h
 @@ -408,7 +408,7 @@ class BrowserProcessImpl : public BrowserProcess,
  
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.cc
index bf121ce13041..be6bf01b26ac 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_field_trials.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_browser_field_trials.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_field_trials.cc
 @@ -37,7 +37,7 @@
  #include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h"
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.h b/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.h
index 752030bd302f..ac23e14c0033 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.h
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__field__trials.h
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_field_trials.h.orig	2024-12-22 12:24:29 UTC
+--- chrome/browser/chrome_browser_field_trials.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_field_trials.h
 @@ -33,7 +33,7 @@ class ChromeBrowserFieldTrials : public variations::Pl
        const variations::EntropyProviders& entropy_providers,
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 233f00a46115..30694d4f4f5f 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_interface_binders.cc
 @@ -77,7 +77,7 @@
  #endif  // BUILDFLAG(ENABLE_UNHANDLED_TAP)
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
index 205097bea3f4..27438125f6d5 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_interface_binders_webui.cc
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
  #include "content/public/browser/web_ui_controller_interface_binder.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
  #endif
  
@@ -17,8 +17,8 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
-@@ -440,7 +440,7 @@ void PopulateChromeWebUIFrameBinders(
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin.mojom.h"
+@@ -445,7 +445,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
    RegisterWebUIControllerInterfaceBinder<
        connectors_internals::mojom::PageHandler,
        enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -451,7 +451,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -456,7 +456,7 @@ void PopulateChromeWebUIFrameBinders(
                                           policy::DlpInternalsUI>(map);
  #endif
  
@@ -36,9 +36,9 @@
    RegisterWebUIControllerInterfaceBinder<
        app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
  
-@@ -544,14 +544,14 @@ void PopulateChromeWebUIFrameBinders(
-       page_image_service::mojom::PageImageServiceHandler, HistoryUI,
-       HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
+@@ -583,14 +583,14 @@ void PopulateChromeWebUIFrameBinders(
+         HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
+   }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
@@ -53,7 +53,7 @@
        WhatsNewUI,
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
        NewTabPageUI>(map);
-@@ -1084,7 +1084,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1123,7 +1123,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
index ba61d4f355cb..dd7571e733ec 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_main.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_main.cc
 @@ -149,7 +149,7 @@
  #endif
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
index a845c00419b8..fd485655f51d 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
 @@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
  
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
index b387c51d6947..f4a5a65ac119 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc
 @@ -28,7 +28,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM
  }
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc
index e3534cbbfa73..d3fd7b9d43ef 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
 @@ -24,7 +24,7 @@
  #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h
index 1efda4097a61..07c580860fd4 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_main_linux.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/chrome_browser_main_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_main_linux.h
 @@ -31,7 +31,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows
  
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc
index 06fff0ed5179..02a95414dec1 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_browser_main_posix.cc
 @@ -81,7 +81,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
      // ExitHandler takes care of deleting itself.
diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc
index fd214a7c0652..6af38235692b 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -504,7 +504,7 @@
+@@ -506,7 +506,7 @@
  #include "components/user_manager/user_manager.h"
  #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
  #include "storage/browser/file_system/external_mount_points.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #elif BUILDFLAG(IS_ANDROID)
-@@ -618,11 +618,11 @@
+@@ -622,11 +622,11 @@
  #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
  #endif  //  !BUILDFLAG(IS_ANDROID)
  
@@ -23,7 +23,7 @@
  #include "components/crash/core/app/crash_switches.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -633,7 +633,7 @@
+@@ -637,7 +637,7 @@
  #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
  #endif
  
@@ -32,7 +32,7 @@
  #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
  #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
  #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
-@@ -642,7 +642,7 @@
+@@ -646,7 +646,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -41,7 +41,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -651,7 +651,7 @@
+@@ -655,7 +655,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -50,7 +50,7 @@
  #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
  #elif BUILDFLAG(IS_OZONE)
  #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1544,7 +1544,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+@@ -1549,7 +1549,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
    registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache,
                                  false);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -59,7 +59,7 @@
    registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
                                  true);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1758,7 +1758,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  #elif BUILDFLAG(IS_CHROMEOS)
    main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>(
        is_integration_test, &startup_data_);
@@ -68,7 +68,7 @@
    main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
        is_integration_test, &startup_data_);
  #elif BUILDFLAG(IS_ANDROID)
-@@ -1781,7 +1781,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1787,7 +1787,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
      // Construct additional browser parts. Stages are called in the order in
      // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -77,7 +77,7 @@
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -1798,7 +1798,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>());
  #endif
  
@@ -86,7 +86,7 @@
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
  #elif BUILDFLAG(IS_OZONE)
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1817,7 +1817,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1823,7 +1823,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  
    chrome::AddMetricsExtraParts(main_parts.get());
  
@@ -95,7 +95,7 @@
    main_parts->AddParts(
        std::make_unique<
            enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2700,7 +2700,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
+@@ -2706,7 +2706,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
  void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
      base::CommandLine* command_line,
      int child_process_id) {
@@ -105,7 +105,7 @@
  #if BUILDFLAG(IS_MAC)
    std::unique_ptr<metrics::ClientInfo> client_info =
        GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -2709,7 +2711,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2715,7 +2717,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
                                      client_info->client_id);
    }
  #elif BUILDFLAG(IS_POSIX)
@@ -114,7 +114,7 @@
    pid_t pid;
    if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
      command_line->AppendSwitchASCII(
-@@ -3069,7 +3071,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -3080,7 +3082,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      }
    }
  
@@ -123,7 +123,25 @@
    // Opt into a hardened stack canary mitigation if it hasn't already been
    // force-disabled.
    if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4911,7 +4913,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4030,7 +4032,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr
+   return old_preferred_color_scheme != web_prefs->preferred_color_scheme;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a
+ // custom colored frame for the UI.
+ void UpdateRootScrollbarThemeColor(Profile* profile,
+@@ -4657,7 +4659,7 @@ void ChromeContentBrowserClient::OverrideWebPreference
+ 
+   UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(),
+                              web_contents, GetWebTheme());
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs);
+ #endif  //  BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+ 
+@@ -4973,7 +4975,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -132,7 +150,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -5423,7 +5425,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5485,7 +5487,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
          &throttles);
    }
  
@@ -141,7 +159,7 @@
    MaybeAddThrottle(
        WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
        &throttles);
-@@ -5440,7 +5442,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5502,7 +5504,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -150,7 +168,7 @@
    MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -5481,7 +5483,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5543,7 +5545,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
    }
  #endif
  
@@ -159,7 +177,7 @@
    MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -7419,7 +7421,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -7496,7 +7498,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
  bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
  // This enterprise policy is supported on Android, but the feature will not be
  // launched there.
diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h
index 48b26dadfddd..488acfaa6e19 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -555,7 +555,7 @@ class ChromeContentBrowserClient : public content::Con
    bool IsPluginAllowedToUseDevChannelAPIs(
        content::BrowserContext* browser_context,
        const GURL& url) override;
diff --git a/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
index 9ddaad421898..b3df8b939c9c 100644
--- a/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc
-@@ -100,7 +100,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo
+@@ -102,7 +102,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo
    // This configuration object allows us to control platform specific behavior.
    MessagingBackendConfiguration configuration;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc b/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
index 67dec6f92cfc..b0e9b3ddfc01 100644
--- a/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
+++ b/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
@@ -1,6 +1,6 @@
---- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc
-@@ -56,7 +56,7 @@ void OnDemandUpdateCompleted(update_client::Error err)
+@@ -64,7 +64,7 @@ component_updater::OnDemandUpdater::Priority GetOnDema
  
  namespace component_updater {
  
@@ -9,7 +9,7 @@
  BASE_FEATURE(kIwaKeyDistributionComponent,
               "IwaKeyDistributionComponent",
  #if BUILDFLAG(IS_CHROMEOS)
-@@ -81,7 +81,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
+@@ -89,7 +89,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
    // the main IWA feature.
  #if BUILDFLAG(IS_WIN)
    return base::FeatureList::IsEnabled(features::kIsolatedWebApps);
diff --git a/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h b/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
index d51a87e9f81d..8d00c5d6742d 100644
--- a/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
+++ b/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
@@ -1,4 +1,4 @@
---- chrome/browser/component_updater/iwa_key_distribution_component_installer.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/component_updater/iwa_key_distribution_component_installer.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/component_updater/iwa_key_distribution_component_installer.h
 @@ -27,7 +27,7 @@ class IwaKeyDistributionInfoProvider;
  
diff --git a/www/iridium/files/patch-chrome_browser_component__updater_registration.cc b/www/iridium/files/patch-chrome_browser_component__updater_registration.cc
index 94d4ce8d1b6a..c66de2b1f63e 100644
--- a/www/iridium/files/patch-chrome_browser_component__updater_registration.cc
+++ b/www/iridium/files/patch-chrome_browser_component__updater_registration.cc
@@ -1,4 +1,4 @@
---- chrome/browser/component_updater/registration.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/component_updater/registration.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/component_updater/registration.cc
 @@ -101,7 +101,7 @@
  #endif  // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
diff --git a/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc b/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
index 196f813d262e..dae972e24c3d 100644
--- a/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
+++ b/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc
 @@ -8,7 +8,7 @@
  #include "base/functional/callback.h"
diff --git a/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h b/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
index bdd8a9c3a930..a797eaf15b52 100644
--- a/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
+++ b/www/iridium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
@@ -1,4 +1,4 @@
---- chrome/browser/component_updater/wasm_tts_engine_component_installer.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/component_updater/wasm_tts_engine_component_installer.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/component_updater/wasm_tts_engine_component_installer.h
 @@ -27,7 +27,7 @@ class WasmTtsEngineComponentInstallerPolicy : public C
    WasmTtsEngineComponentInstallerPolicy& operator=(
diff --git a/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
index fdf1e1c0b70f..2b59efd0517f 100644
--- a/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
+++ b/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
 @@ -41,7 +41,7 @@
  #include "third_party/widevine/cdm/buildflags.h"
diff --git a/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
index b1d334b2ebdc..90c953d9d4b2 100644
--- a/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig	2023-03-13 07:33:08 UTC
+--- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc
 @@ -68,7 +68,7 @@ void ChromeProtocolHandlerRegistryDelegate::CheckDefau
  // If true default protocol handlers will be removed if the OS level
diff --git a/www/iridium/files/patch-chrome_browser_defaults.cc b/www/iridium/files/patch-chrome_browser_defaults.cc
index 27c425266511..d41af63a1a20 100644
--- a/www/iridium/files/patch-chrome_browser_defaults.cc
+++ b/www/iridium/files/patch-chrome_browser_defaults.cc
@@ -1,4 +1,4 @@
---- chrome/browser/defaults.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/defaults.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/defaults.cc
 @@ -31,7 +31,7 @@ const bool kAlwaysCreateTabbedBrowserOnSessionRestore 
  const bool kShowHelpMenuItemIcon = false;
diff --git a/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
index 13968db8498e..cfdf29cbf43d 100644
--- a/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
 @@ -26,7 +26,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
  #if BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-chrome_browser_devtools_features.cc b/www/iridium/files/patch-chrome_browser_devtools_features.cc
new file mode 100644
index 000000000000..16712c0e7db5
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_devtools_features.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/features.cc.orig	2025-05-07 06:48:23 UTC
++++ chrome/browser/devtools/features.cc
+@@ -157,7 +157,7 @@ BASE_FEATURE(kDevToolsAiGeneratedTimelineLabels,
+              "DevToolsAiGeneratedTimelineLabels",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If enabled, DevTools does not accept remote debugging connections unless
+ // using a non-default user data dir via the --user-data-dir switch.
+ BASE_FEATURE(kDevToolsDebuggingRestrictions,
diff --git a/www/iridium/files/patch-chrome_browser_devtools_features.h b/www/iridium/files/patch-chrome_browser_devtools_features.h
new file mode 100644
index 000000000000..7cfa7ddab0cc
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_devtools_features.h
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/features.h.orig	2025-05-07 06:48:23 UTC
++++ chrome/browser/devtools/features.h
+@@ -89,7 +89,7 @@ BASE_DECLARE_FEATURE(kDevToolsCssValueTracing);
+ 
+ BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabels);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/iridium/files/patch-chrome_browser_devtools_remote__debugging__server.cc b/www/iridium/files/patch-chrome_browser_devtools_remote__debugging__server.cc
new file mode 100644
index 000000000000..82f01d707bcb
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_devtools_remote__debugging__server.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/remote_debugging_server.cc.orig	2025-05-07 06:48:23 UTC
++++ chrome/browser/devtools/remote_debugging_server.cc
+@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::optional<bool>& is
+         RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy);
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) &&
+       is_default_user_data_dir.value_or(true)) {
+     return base::unexpected(
diff --git a/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
index 16fd22580410..048bd0e82800 100644
--- a/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
+++ b/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
@@ -1,4 +1,4 @@
---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/diagnostics/diagnostics_writer.h
 @@ -16,6 +16,8 @@ namespace diagnostics {
  // Console base class used internally.
diff --git a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 01a3361753a3..44fe2a2473a8 100644
--- a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
 @@ -1864,7 +1864,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.cc b/www/iridium/files/patch-chrome_browser_download_download__commands.cc
index eb01975da898..15efa7040404 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_commands.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/download/download_commands.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/download/download_commands.cc
 @@ -27,7 +27,7 @@
  #include "ui/base/clipboard/scoped_clipboard_writer.h"
diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h
index 578ad4a25fe8..a78c9d0a7580 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__commands.h
+++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_commands.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/download/download_commands.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/download/download_commands.h
 @@ -66,7 +66,7 @@ class DownloadCommands {
    void ExecuteCommand(Command command);
diff --git a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc
index e3cc0ed860e4..53d27163f5d8 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_file_picker.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/download/download_file_picker.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/download/download_file_picker.cc
 @@ -18,7 +18,7 @@
  #include "content/public/browser/web_contents.h"
diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc
index 31b01bf16638..f11e88132ced 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_item_model.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/download/download_item_model.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/download/download_item_model.cc
 @@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked(
               download_crx_util::IsExtensionDownload(*download_);
@@ -18,7 +18,7 @@
        if (download_commands->CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1215,7 +1215,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1206,7 +1206,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
      return;
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
index e3d5e1da4708..eb0cd255f498 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/download/download_prefs.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/download/download_prefs.cc
 @@ -11,6 +11,7 @@
  #include <vector>
diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.h b/www/iridium/files/patch-chrome_browser_download_download__prefs.h
index 6a282ccd1ed7..1a6ebbdfac86 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/download/download_prefs.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/download/download_prefs.h
 @@ -107,7 +107,7 @@ class DownloadPrefs {
    void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
index 44a5e8ee9ea2..8645a4310f76 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
 @@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
    const char* verification_key = kKeyWindowsVerification;
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc
index c7970fecdb8d..329f39edd885 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/common.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/connectors/common.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/common.cc
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  #include "components/user_manager/user.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/prefs/pref_service.h"
  #endif
-@@ -191,7 +191,7 @@ std::string GetProfileEmail(Profile* profile) {
+@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* profile) {
    std::string email =
        GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
index 46e29dfb7a8d..1aa630da05d7 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -470,7 +470,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope(
+@@ -476,7 +476,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope(
  bool ConnectorsService::ConnectorsEnabled() const {
    Profile* profile = Profile::FromBrowserContext(context_);
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
index e0da2f3f6cf1..1088f5e4dc62 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
 @@ -10,7 +10,7 @@
  #include "chrome/browser/profiles/profile.h"
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
index fa2a3b5a0dd3..1ed5ae261310 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
 @@ -22,7 +22,7 @@
  #include "components/policy/core/common/management/management_service.h"
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
index 4f364b761eee..b507aba772b6 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
 @@ -19,7 +19,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
index f68e1dc47821..9682a9e73abb 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc
 @@ -13,7 +13,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h"
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
index 9043acd01e4e..3cb3e67ab080 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
 @@ -23,7 +23,7 @@
  #include "chrome/browser/enterprise/connectors/connectors_service.h"
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
index 48f3f368304c..0402cfdfefe5 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
 @@ -13,7 +13,7 @@ namespace enterprise_connectors {
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
index 11d235c99317..729721b1b8e4 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
 @@ -20,7 +20,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
index ccde528a750d..6144bb748aaf 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
-@@ -55,7 +55,7 @@
+@@ -53,7 +53,7 @@
  #include "base/strings/utf_string_conversions.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/device_signals/core/browser/signals_aggregator.h"
-@@ -160,7 +160,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
+@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
                                       /*include_profile_user_name=*/false);
  }
  
@@ -18,7 +18,7 @@
  
  void AddCrowdstrikeSignalsToEvent(
      base::Value::Dict& event,
-@@ -196,7 +196,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
+@@ -194,7 +194,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
    username_ =
        identity_manager_ ? GetProfileEmail(identity_manager_) : std::string();
  
@@ -27,7 +27,7 @@
    if (username_.empty()) {
      username_ = Profile::FromBrowserContext(context_)->GetPrefs()->GetString(
          enterprise_signin::prefs::kProfileUserEmail);
-@@ -248,7 +248,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
+@@ -246,7 +246,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
    return client_id;
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
index f9ce1b95e1c9..4663bfd0e1f4 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
 @@ -19,7 +19,7 @@
  #include "components/keyed_service/core/keyed_service.h"
@@ -9,7 +9,7 @@
  #include "components/device_signals/core/browser/signals_types.h"
  #endif
  
-@@ -118,7 +118,7 @@ class RealtimeReportingClient : public RealtimeReporti
+@@ -113,7 +113,7 @@ class RealtimeReportingClient : public RealtimeReporti
        const std::string& dm_token) override;
  #endif
  
@@ -18,7 +18,7 @@
    // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...).
    void MaybeCollectDeviceSignalsAndReportEventDeprecated(
        base::Value::Dict event,
-@@ -168,7 +168,7 @@ class RealtimeReportingClient : public RealtimeReporti
+@@ -163,7 +163,7 @@ class RealtimeReportingClient : public RealtimeReporti
    base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
  };
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
index 1695fd2433f8..6fbd47ab732f 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
 @@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileAttributes>& Ge
    // TODO(crbug.com/40267996): Add actual domains with attribute names.
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
index eeece954a15a..c7b5d73195f0 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig	2024-02-04 14:46:08 UTC
+--- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc
 @@ -11,7 +11,7 @@
  #include "chrome/browser/profiles/profile_manager.h"
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc b/www/iridium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
new file mode 100644
index 000000000000..3872f28cf1a0
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig	2025-05-07 06:48:23 UTC
++++ chrome/browser/enterprise/signals/context_info_fetcher.cc
+@@ -179,6 +179,8 @@ std::vector<std::string> ContextInfoFetcher::GetOnSecu
+ SettingValue ContextInfoFetcher::GetOSFirewall() {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+   return device_signals::GetOSFirewall();
++#elif BUILDFLAG(IS_OPENBSD)
++  return SettingValue::ENABLED;
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return GetChromeosFirewall();
+ #else
+@@ -198,7 +200,7 @@ ScopedUfwConfigPathForTesting::~ScopedUfwConfigPathFor
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+ std::vector<std::string> ContextInfoFetcher::GetDnsServers() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   return device_signals::GetSystemDnsServers();
+ #else
+   return std::vector<std::string>();
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
index 8e6e581b42ea..d9ab03e2a427 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/signals/device_info_fetcher.cc
 @@ -10,7 +10,7 @@
  #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
  #endif
  
-@@ -74,7 +74,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
+@@ -76,7 +76,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
    return CreateInstanceInternal();
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h b/www/iridium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
index 874e6a9c08ec..aede766546d4 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
+++ b/www/iridium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/signin/enterprise_signin_service.h.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/enterprise/signin/enterprise_signin_service.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/signin/enterprise_signin_service.h
 @@ -9,7 +9,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc b/www/iridium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
index 3ea5d21ab1d5..0825a3a4b308 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc
 @@ -94,7 +94,7 @@ void ManagedProfileRequiredPage::CommandReceived(const
  
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
index 0a022dc93f6e..49e6466b0398 100644
--- a/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/enterprise/util/managed_browser_utils.cc
-@@ -224,7 +224,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
+@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
+       profile_manager->GetProfileAttributesStorage()
            .GetProfileAttributesWithPath(profile->GetPath());
    if (entry) {
-     entry->SetUserAcceptedAccountManagement(accepted);
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     entry->SetEnterpriseProfileLabel(GetEnterpriseLabel(profile));
+     SetEnterpriseProfileLabel(profile);
  #endif
-   }
+     entry->SetUserAcceptedAccountManagement(accepted);
diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
index dfabd5430d8d..ea75c853f1c5 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1436,6 +1436,10 @@ source_set("extensions") {
+@@ -1464,6 +1464,10 @@ source_set("extensions") {
        deps += [ "//chrome/services/printing/public/mojom" ]
      }
  
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
index 97f782b02b5d..919b3e577a1e 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
 @@ -24,7 +24,7 @@
  #include "base/win/registry.h"
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
index 2694389b8c25..3614ae6017a2 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig	2022-12-06 08:09:13 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc
 @@ -8,7 +8,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
index 378d71ccb2d8..0d32080facaf 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h
 @@ -7,7 +7,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index 0893ac1cb876..94fb1b621bb6 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 @@ -40,7 +40,7 @@
  #include "components/reporting/util/statusor.h"
@@ -9,7 +9,7 @@
  #include <optional>
  
  #include "base/strings/string_util.h"
-@@ -157,7 +157,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+@@ -156,7 +156,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
  }
  
  bool AllowClientCertificateReportingForUsers() {
@@ -18,7 +18,7 @@
    return base::FeatureList::IsEnabled(
        enterprise_signals::features::kAllowClientCertificateReportingForUsers);
  #else
-@@ -170,7 +170,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin
+@@ -169,7 +169,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin
    return pref && pref->IsManaged();
  }
  
@@ -27,7 +27,7 @@
  
  device_signals::SignalsAggregationRequest CreateAggregationRequest(
      device_signals::SignalName signal_name) {
-@@ -232,7 +232,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -231,7 +231,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
  
  // getPersistentSecret
  
@@ -36,7 +36,7 @@
  
  EnterpriseReportingPrivateGetPersistentSecretFunction::
      EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -672,7 +672,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+@@ -671,7 +671,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
  }
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
index 1880e7f0365d..b29d47f9107c 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig	2023-03-13 07:33:08 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
 @@ -20,7 +20,7 @@
  #include "components/reporting/proto/synced/record.pb.h"
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
index c5f4ee48141e..96e5096b8092 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2023-10-21 11:51:27 UTC
+--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
 @@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
  
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
index 791186a0b9e2..ddcc7f9cf682 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -409,7 +409,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
+@@ -410,7 +410,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
    apps::LaunchContainer launch_container =
        GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
    Profile* profile = Profile::FromBrowserContext(context);
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc b/www/iridium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
index faee313fd054..609555dc8900 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig	2024-12-22 12:24:29 UTC
+--- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/messaging/launch_context_posix.cc
 @@ -84,7 +84,7 @@ std::optional<LaunchContext::ProcessState> LaunchConte
  
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
index fb7c5b33cb9c..f8bb6da28a95 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
 @@ -634,7 +634,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
  }
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index 160f657c4fb8..f2ed3001c5df 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -293,7 +293,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+@@ -292,7 +292,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PlatformOs::kLinux;
    } else if (strcmp(os, "openbsd") == 0) {
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index 1971fcbfef6c..64656528b1aa 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,15 +1,15 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] =
        settings_api::PrefType::kBoolean;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] =
-       settings_api::PrefType::kBoolean;
    (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] =
-@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+       settings_api::PrefType::kBoolean;
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
        settings_api::PrefType::kBoolean;
  
@@ -18,7 +18,7 @@
    (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::kBoolean;
  #endif
-@@ -223,7 +223,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
    (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
    (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
index e3887015d41d..3d587b8bd822 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -931,7 +931,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
+@@ -932,7 +932,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
  // created as minimized.
  // TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
  // TODO(crbug.com/40254339): Find a fix for wayland as well.
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
index 8c5b26e03194..a72ef816cdbf 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2024-12-22 12:24:29 UTC
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 @@ -28,7 +28,7 @@
  #include "extensions/browser/process_manager.h"
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
index c503a435ed0e..fcc1b7908f1e 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 @@ -916,7 +916,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
  #if BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc b/www/iridium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
index 422ad1542e7f..dd3714f1281a 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
 @@ -48,7 +48,7 @@ bool IsComponentExtensionAllowlisted(const std::string
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index d9a894503eaa..3fa95804d169 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -795,7 +795,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
    if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
@@ -9,7 +9,7 @@
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
          base::MakeRefCounted<ExternalPrefLoader>(
-@@ -823,7 +823,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders(
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.
diff --git a/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
index 9e7e64f02777..2e49f1412ec0 100644
--- a/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
+++ b/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
@@ -1,6 +1,6 @@
---- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
-@@ -38,7 +38,7 @@
+@@ -37,7 +37,7 @@
  #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
  #endif
  
-@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content
+@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content
    fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>());
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
index d49cf6b65d11..e18e393ce17a 100644
--- a/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
+++ b/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
@@ -1,6 +1,6 @@
---- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc
-@@ -45,7 +45,7 @@
+@@ -44,7 +44,7 @@
  #include "services/network/public/cpp/shared_url_loader_factory.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
  #endif
  
-@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil
+@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil
    fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data));
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
index 7251ed83a7df..388d42ced8c9 100644
--- a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,4 +1,4 @@
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
 @@ -357,7 +357,7 @@ const struct {
       FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h
index b2d8171fa57b..c8e4df426c5c 100644
--- a/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h
+++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h
@@ -1,4 +1,4 @@
---- chrome/browser/first_run/first_run_dialog.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/first_run/first_run_dialog.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/first_run/first_run_dialog.h
 @@ -9,7 +9,7 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h
index 0aa34886cd4e..fdc0415892a7 100644
--- a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h
+++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h
@@ -1,4 +1,4 @@
---- chrome/browser/first_run/first_run_internal.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/first_run/first_run_internal.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/first_run/first_run_internal.h
 @@ -53,7 +53,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
                                       bool force_first_run,
diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc
index eab51c9ad7d2..b8def59696fd 100644
--- a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/first_run/first_run_internal_linux.cc.orig	2023-07-24 14:27:53 UTC
+--- chrome/browser/first_run/first_run_internal_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/first_run/first_run_internal_linux.cc
 @@ -21,7 +21,13 @@ bool IsOrganicFirstRun() {
  base::FilePath InitialPrefsPath() {
diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
index feb185365a43..b13beb70d0ec 100644
--- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -562,7 +562,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
+@@ -602,7 +602,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
      "Autofill suggestions on the allowlisted merchant websites.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kAutofillEnableAmountExtractionAllowlistDesktopName[] =
      "Enable loading and querying the checkout amount extraction allowlist on "
      "Chrome Desktop";
-@@ -580,7 +580,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr
+@@ -626,7 +626,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi
          // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  const char kAutofillEnableBuyNowPayLaterName[] =
      "Enable buy now pay later on Autofill";
  const char kAutofillEnableBuyNowPayLaterDescription[] =
-@@ -992,7 +992,7 @@ const char kDevicePostureDescription[] =
+@@ -1031,7 +1031,7 @@ const char kDevicePostureDescription[] =
      "Enables Device Posture API (foldable devices)";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -27,16 +27,16 @@
  const char kDocumentPictureInPictureAnimateResizeName[] =
      "Document Picture-in-Picture Animate Resize";
  const char kDocumentPictureInPictureAnimateResizeDescription[] =
-@@ -1077,7 +1077,7 @@ const char kCompressionDictionaryTransportRequireKnown
-     "when the connection is using a well known root cert or when the server is "
-     "a localhost.";
+@@ -1123,7 +1123,7 @@ const char kContextMenuEmptySpaceDescription[] =
+     "space, a context menu containing page-related items will be shown.";
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  const char kContextualCueingName[] = "Contextual cueing";
  const char kContextualCueingDescription[] =
-     "Enables the contextual cueing system to support showing actions";
-@@ -1496,7 +1496,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
+     "Enables the contextual cueing system to support showing actions.";
+@@ -1563,7 +1563,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
  const char kEnableIsolatedWebAppDevModeDescription[] =
      "Enables the installation of unverified Isolated Web Apps";
  
@@ -45,7 +45,16 @@
  const char kEnableIwaKeyDistributionComponentName[] =
      "Enable the Iwa Key Distribution component";
  const char kEnableIwaKeyDistributionComponentDescription[] =
-@@ -3494,7 +3494,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
+@@ -3430,7 +3430,7 @@ const char kRetainOmniboxOnFocusDescription[] =
+     "exhibit a change in behavior.";
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme";
+ const char kRootScrollbarFollowsThemeDescription[] =
+     "If enabled makes the root scrollbar follow the browser's theme color.";
+@@ -3648,7 +3648,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
      "SiteInstance.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,25 +63,25 @@
  const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing";
  const char kPwaNavigationCapturingDescription[] =
      "Enables opening links from Chrome in an installed PWA. Currently under "
-@@ -3729,7 +3729,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
+@@ -3863,7 +3863,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
      "Force the Translate Triggering on English pages experiment to be enabled "
      "with the selected language model active.";
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kTranslationAPIName[] = "Experimental translation API";
- const char kTranslationAPIDescription[] =
-     "Enables the on-device language translation API. "
-@@ -5352,7 +5352,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes
-     "Enables a mitigation during web app install on CrOS for syncing "
-     "user_display_mode: kStandalone to non-CrOS devices.";
+ const char kEnableHistorySyncOptinName[] = "History Sync Opt-in";
+ const char kEnableHistorySyncOptinDescription[] =
+     "Enables the History Sync Opt-in screen on Desktop platforms. The screen "
+@@ -5451,7 +5451,7 @@ const char kTranslateOpenSettingsDescription[] =
+     "Add an option to the translate bubble menu to open language settings.";
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  const char kWasmTtsComponentUpdaterEnabledName[] =
      "Enable Wasm TTS Extension Component";
  const char kWasmTtsComponentUpdaterEnabledDescription[] =
-@@ -7350,7 +7350,7 @@ const char kTetheringExperimentalFunctionalityDescript
+@@ -7459,7 +7459,7 @@ const char kTetheringExperimentalFunctionalityDescript
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -81,7 +90,7 @@
  const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
  const char kGetAllScreensMediaDescription[] =
      "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7580,7 +7580,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
+@@ -7688,7 +7688,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
  
  // Linux -----------------------------------------------------------------------
  
@@ -90,7 +99,7 @@
  const char kOzonePlatformHintChoiceDefault[] = "Default";
  const char kOzonePlatformHintChoiceAuto[] = "Auto";
  const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7626,6 +7626,18 @@ const char kWaylandUiScalingDescription[] =
+@@ -7738,6 +7738,18 @@ const char kWaylandUiScalingDescription[] =
      "Enable experimental support for text scaling in the Wayland backend "
      "backed by full UI scaling. Requires #wayland-per-window-scaling to be "
      "enabled too.";
@@ -109,7 +118,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -7638,7 +7650,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+@@ -7750,7 +7762,7 @@ const char kZeroCopyVideoCaptureDescription[] =
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -118,16 +127,16 @@
  const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
  const char kFollowingFeedSidepanelDescription[] =
      "Enables the following feed in the sidepanel.";
-@@ -7671,7 +7683,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
-     "Enables a refreshed design for the Task Manager on Desktop platforms.";
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -7793,7 +7805,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P
+ const char kGroupPromoPrototypeDescription[] =
+     "Enables prototype for group promo.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  const char kEnableNetworkServiceSandboxName[] =
      "Enable the network service sandbox.";
  const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7703,7 +7715,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7825,7 +7837,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
      "Bluetooth";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -136,7 +145,7 @@
  #if BUILDFLAG(ENABLE_PRINTING)
  const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend";
  const char kCupsIppPrintingBackendDescription[] =
-@@ -7848,7 +7860,7 @@ const char kElementCaptureDescription[] =
+@@ -7967,7 +7979,7 @@ const char kElementCaptureDescription[] =
      "media track into a track capturing just a specific DOM element.";
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -145,7 +154,7 @@
  const char kUIDebugToolsName[] = "Debugging tools for UI";
  const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
-@@ -7904,7 +7916,7 @@ const char kComposeUpfrontInputModesDescription[] =
+@@ -8018,7 +8030,7 @@ const char kComposeUpfrontInputModesDescription[] =
      "Enables upfront input modes in the Compose dialog";
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -154,9 +163,9 @@
  const char kThirdPartyProfileManagementName[] =
      "Third party profile management";
  const char kThirdPartyProfileManagementDescription[] =
-@@ -8048,7 +8060,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] =
-     "Enable the OS settings for overlay scrollbars on ChromeOS.";
- #endif  // BUILDFLAG(IS_CHROMEOS)
+@@ -8154,7 +8166,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] =
+ const char kSupervisedUserBlockInterstitialV3Description[] =
+     "Enables URL filter interstitial V3 for Family Link users.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h
index a770c5575ea6..ed0cbb0f5abe 100644
--- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/flag_descriptions.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -356,7 +356,7 @@ extern const char
+@@ -373,7 +373,7 @@ extern const char
      kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[];
  extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[];
  extern const char kAutofillEnableAmountExtractionDesktopName[];
-@@ -365,7 +365,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
+@@ -384,7 +384,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
          // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,16 +18,16 @@
  extern const char kAutofillEnableBuyNowPayLaterName[];
  extern const char kAutofillEnableBuyNowPayLaterDescription[];
  
-@@ -581,7 +581,7 @@ extern const char kCrossTabRegionCaptureName[];
- extern const char kCrossTabRegionCaptureDescription[];
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -602,7 +602,7 @@ extern const char kContextMenuEmptySpaceName[];
+ extern const char kContextMenuEmptySpaceDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  extern const char kContextualCueingName[];
  extern const char kContextualCueingDescription[];
- #endif  // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -753,7 +753,7 @@ extern const char kDevicePostureName[];
+ extern const char kGlicZeroStateSuggestionsName[];
+@@ -786,7 +786,7 @@ extern const char kDevicePostureName[];
  extern const char kDevicePostureDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +36,7 @@
  extern const char kDocumentPictureInPictureAnimateResizeName[];
  extern const char kDocumentPictureInPictureAnimateResizeDescription[];
  
-@@ -915,7 +915,7 @@ extern const char kEnableIsolatedWebAppManagedGuestSes
+@@ -948,7 +948,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri
  extern const char kEnableIsolatedWebAppDevModeName[];
  extern const char kEnableIsolatedWebAppDevModeDescription[];
  
@@ -45,7 +45,16 @@
  extern const char kEnableIwaKeyDistributionComponentName[];
  extern const char kEnableIwaKeyDistributionComponentDescription[];
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -2017,7 +2017,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
+@@ -1964,7 +1964,7 @@ extern const char kRetainOmniboxOnFocusName[];
+ extern const char kRetainOmniboxOnFocusDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kRootScrollbarFollowsTheme[];
+ extern const char kRootScrollbarFollowsThemeDescription[];
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+@@ -2096,7 +2096,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
  extern const char kDefaultSiteInstanceGroupsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,25 +63,25 @@
  extern const char kPwaNavigationCapturingName[];
  extern const char kPwaNavigationCapturingDescription[];
  #endif
-@@ -2177,7 +2177,7 @@ extern const char kTouchTextEditingRedesignDescription
+@@ -2242,7 +2242,7 @@ extern const char kTouchTextEditingRedesignDescription
  extern const char kTranslateForceTriggerOnEnglishName[];
  extern const char kTranslateForceTriggerOnEnglishDescription[];
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kTranslationAPIName[];
- extern const char kTranslationAPIDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -3144,7 +3144,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio
- extern const char kUserDisplayModeSyncStandaloneMitigationName[];
- extern const char kUserDisplayModeSyncStandaloneMitigationDescription[];
+ extern const char kEnableHistorySyncOptinName[];
+ extern const char kEnableHistorySyncOptinDescription[];
+ 
+@@ -3197,7 +3197,7 @@ extern const char kTranslateOpenSettingsName[];
+ extern const char kTranslateOpenSettingsDescription[];
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  extern const char kWasmTtsComponentUpdaterEnabledName[];
  extern const char kWasmTtsComponentUpdaterEnabledDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -4325,7 +4325,7 @@ extern const char kTetheringExperimentalFunctionalityD
+@@ -4385,7 +4385,7 @@ extern const char kTetheringExperimentalFunctionalityD
  
  #endif  // #if BUILDFLAG(IS_CHROMEOS)
  
@@ -81,7 +90,7 @@
  extern const char kGetAllScreensMediaName[];
  extern const char kGetAllScreensMediaDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4460,7 +4460,7 @@ extern const char kEnableArmHwdrmDescription[];
+@@ -4520,7 +4520,7 @@ extern const char kEnableArmHwdrmDescription[];
  
  // Linux ---------------------------------------------------------------------
  
@@ -90,7 +99,7 @@
  extern const char kOzonePlatformHintChoiceDefault[];
  extern const char kOzonePlatformHintChoiceAuto[];
  extern const char kOzonePlatformHintChoiceX11[];
-@@ -4488,6 +4488,9 @@ extern const char kWaylandTextInputV3Description[];
+@@ -4551,6 +4551,9 @@ extern const char kWaylandTextInputV3Description[];
  
  extern const char kWaylandUiScalingName[];
  extern const char kWaylandUiScalingDescription[];
@@ -100,7 +109,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -4507,7 +4510,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -4570,7 +4573,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
  extern const char kWebBluetoothConfirmPairingSupportDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -109,7 +118,7 @@
  #if BUILDFLAG(ENABLE_PRINTING)
  extern const char kCupsIppPrintingBackendName[];
  extern const char kCupsIppPrintingBackendDescription[];
-@@ -4520,7 +4523,7 @@ extern const char kScreenlockReauthCardDescription[];
+@@ -4583,7 +4586,7 @@ extern const char kScreenlockReauthCardDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -117,8 +126,8 @@
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kFollowingFeedSidepanelName[];
  extern const char kFollowingFeedSidepanelDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4534,7 +4537,7 @@ extern const char kTaskManagerDesktopRefreshName[];
+ 
+@@ -4600,7 +4603,7 @@ extern const char kTaskManagerDesktopRefreshName[];
  extern const char kTaskManagerDesktopRefreshDescription[];
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -127,7 +136,7 @@
  extern const char kEnableNetworkServiceSandboxName[];
  extern const char kEnableNetworkServiceSandboxDescription[];
  
-@@ -4629,7 +4632,7 @@ extern const char kElementCaptureName[];
+@@ -4695,7 +4698,7 @@ extern const char kElementCaptureName[];
  extern const char kElementCaptureDescription[];
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -136,7 +145,7 @@
  extern const char kUIDebugToolsName[];
  extern const char kUIDebugToolsDescription[];
  #endif
-@@ -4671,7 +4674,7 @@ extern const char kComposeUpfrontInputModesName[];
+@@ -4734,7 +4737,7 @@ extern const char kComposeUpfrontInputModesName[];
  extern const char kComposeUpfrontInputModesDescription[];
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -145,9 +154,9 @@
  extern const char kThirdPartyProfileManagementName[];
  extern const char kThirdPartyProfileManagementDescription[];
  
-@@ -4756,7 +4759,7 @@ extern const char kEnablePolicyPromotionBannerName[];
- extern const char kEnablePolicyPromotionBannerDescription[];
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -4814,7 +4817,7 @@ extern const char kEnablePolicyPromotionBannerDescript
+ extern const char kSupervisedUserBlockInterstitialV3Name[];
+ extern const char kSupervisedUserBlockInterstitialV3Description[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
index e530b5f76922..7c56c9eb2738 100644
--- a/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/gcm/gcm_profile_service_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/gcm/gcm_profile_service_factory.cc
 @@ -110,7 +110,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle
  // static
diff --git a/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
index 9997aa8703de..417f3c70eaca 100644
--- a/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
 @@ -16,7 +16,7 @@ namespace instance_id {
  // static
diff --git a/www/iridium/files/patch-chrome_browser_global__features.cc b/www/iridium/files/patch-chrome_browser_global__features.cc
index d1c755ec4102..55e3e9757b12 100644
--- a/www/iridium/files/patch-chrome_browser_global__features.cc
+++ b/www/iridium/files/patch-chrome_browser_global__features.cc
@@ -1,7 +1,7 @@
---- chrome/browser/global_features.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/global_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/global_features.cc
-@@ -21,7 +21,7 @@
- #include "chrome/browser/glic/glic_profile_manager.h"  // nogncheck
+@@ -22,7 +22,7 @@
+ #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h"  // nogncheck
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
  // This causes a gn error on Android builds, because gn does not understand
  // buildflags, so we include it only on platforms where it is used.
  #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h"
-@@ -60,7 +60,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
+@@ -61,7 +61,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
  
  void GlobalFeatures::Init() {
    system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
@@ -18,7 +18,7 @@
    whats_new_registry_ = CreateWhatsNewRegistry();
  #endif
  
-@@ -88,7 +88,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
+@@ -93,7 +93,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
    return system_permission_settings::PlatformHandle::Create();
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_global__features.h b/www/iridium/files/patch-chrome_browser_global__features.h
index 2cefb9ad1e95..8b45b945d265 100644
--- a/www/iridium/files/patch-chrome_browser_global__features.h
+++ b/www/iridium/files/patch-chrome_browser_global__features.h
@@ -1,4 +1,4 @@
---- chrome/browser/global_features.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/global_features.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/global_features.h
 @@ -14,7 +14,7 @@
  namespace system_permission_settings {
@@ -9,7 +9,7 @@
  namespace whats_new {
  class WhatsNewRegistry;
  }  // namespace whats_new
-@@ -55,7 +55,7 @@ class GlobalFeatures {
+@@ -56,7 +56,7 @@ class GlobalFeatures {
    system_permissions_platform_handle() {
      return system_permissions_platform_handle_.get();
    }
@@ -18,7 +18,7 @@
    whats_new::WhatsNewRegistry* whats_new_registry() {
      return whats_new_registry_.get();
    }
-@@ -80,7 +80,7 @@ class GlobalFeatures {
+@@ -85,7 +85,7 @@ class GlobalFeatures {
  
    virtual std::unique_ptr<system_permission_settings::PlatformHandle>
    CreateSystemPermissionsPlatformHandle();
@@ -27,7 +27,7 @@
    virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry();
  #endif
  
-@@ -90,7 +90,7 @@ class GlobalFeatures {
+@@ -95,7 +95,7 @@ class GlobalFeatures {
  
    std::unique_ptr<system_permission_settings::PlatformHandle>
        system_permissions_platform_handle_;
diff --git a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc
index 7f742c22e5f7..c48ededf1309 100644
--- a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc
+++ b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/headless/headless_mode_util.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/headless/headless_mode_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/headless/headless_mode_util.cc
 @@ -10,7 +10,7 @@
  // New headless mode is available on Linux, Windows and Mac platforms.
diff --git a/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h
index 6fe08bc60ad0..0a1e477cb996 100644
--- a/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h
+++ b/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h
@@ -1,4 +1,4 @@
---- chrome/browser/intranet_redirect_detector.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/intranet_redirect_detector.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/intranet_redirect_detector.h
 @@ -25,7 +25,7 @@ class SimpleURLLoader;
  class PrefRegistrySimple;
diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
index a7ec225555bf..0e4577554313 100644
--- a/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
+++ b/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
 @@ -40,10 +40,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
      // Note that this initializes the delegate asynchronously, but since
diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
index a94d8c358456..4251b18881ad 100644
--- a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc
index e025ab5c5563..f88ad2879066 100644
--- a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc
+++ b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/audio_service_util.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/media/audio_service_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/audio_service_util.cc
 @@ -20,7 +20,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
index 90fb7400af6e..fc0f7d017a34 100644
--- a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
+++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
@@ -1,4 +1,4 @@
---- chrome/browser/media/router/discovery/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/media/router/discovery/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/router/discovery/BUILD.gn
 @@ -79,7 +79,7 @@ static_library("discovery") {
    ]
diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
index d42036a810cd..6050541262fd 100644
--- a/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
+++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc
 @@ -10,11 +10,12 @@
  #include "chrome/browser/media/router/discovery/discovery_network_list.h"
diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
index fdece8a5ae17..1b084d95d8ae 100644
--- a/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc
 @@ -9,7 +9,11 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
index 7189ce3a4bb4..49dcd1440e9a 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
 @@ -21,7 +21,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
index b26c4a7b897e..1e42b35a9c01 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/webrtc/chrome_screen_enumerator.h
 @@ -18,7 +18,7 @@
  namespace aura {
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
index 0faeb8843ab3..410002be85f4 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc
 @@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur
  #if BUILDFLAG(IS_MAC)
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
index e36225c94097..a826eabc0caf 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
 @@ -105,7 +105,7 @@ std::string GetLogUploadProduct() {
    const char product[] = "Chrome";
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
index 94d50d043c75..c4c7de4ecf76 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
 @@ -25,10 +25,10 @@
  #include "components/webrtc_logging/browser/text_log_list.h"
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
index c077614dd449..8f5932b0326a 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.h
 @@ -133,7 +133,7 @@ class WebRtcLoggingController
                           size_t web_app_id,
diff --git a/www/iridium/files/patch-chrome_browser_memory__details.cc b/www/iridium/files/patch-chrome_browser_memory__details.cc
index c769a88fac1b..8f69cf12dc8e 100644
--- a/www/iridium/files/patch-chrome_browser_memory__details.cc
+++ b/www/iridium/files/patch-chrome_browser_memory__details.cc
@@ -1,4 +1,4 @@
---- chrome/browser/memory_details.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/memory_details.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/memory_details.cc
 @@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
            });
diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 202fb3d6bba2..af5f6f24c4a0 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -86,7 +86,7 @@
+@@ -85,7 +85,7 @@
  #include "chrome/browser/flags/android/chrome_session_state.h"
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -9,7 +9,7 @@
  #if defined(__GLIBC__)
  #include <gnu/libc-version.h>
  #endif  // defined(__GLIBC__)
-@@ -111,7 +111,7 @@
+@@ -110,7 +110,7 @@
  #include "chrome/installer/util/taskbar_util.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -18,7 +18,7 @@
  #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -120,7 +120,7 @@
+@@ -119,7 +119,7 @@
  #include "components/user_manager/user_manager.h"
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -27,7 +27,7 @@
  #include "components/power_metrics/system_power_monitor.h"
  #endif
  
-@@ -872,7 +872,7 @@ void RecordStartupMetrics() {
+@@ -873,7 +873,7 @@ void RecordStartupMetrics() {
  
    // Record whether Chrome is the default browser or not.
    // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -36,7 +36,7 @@
    shell_integration::DefaultWebClientState default_state =
        shell_integration::GetDefaultBrowser();
    base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1183,11 +1183,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -1181,11 +1181,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
        std::make_unique<web_app::SamplingMetricsProvider>();
  #endif  // !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
index e102cc83118e..1b6c9280f30c 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
+++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
@@ -1,4 +1,4 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
 @@ -29,7 +29,7 @@ class PowerMetricsReporter;
  class ProcessMonitor;
diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index 363f6cf95c83..5371d239f2c5 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -196,11 +196,11 @@
+@@ -197,11 +197,11 @@
  #include "chrome/browser/metrics/google_update_metrics_provider_mac.h"
  #endif
  
@@ -41,7 +41,7 @@
    // Register the environment with the crash reporter. Note that there is a
    // window from startup to this point during which crash reports will not have
    // an environment set.
-@@ -724,7 +724,7 @@ void ChromeMetricsServiceClient::Initialize() {
+@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::Initialize() {
          std::make_unique<metrics::dwa::DwaService>(this, local_state);
    }
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -50,7 +50,7 @@
    metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
        base::SequencedTaskRunner::GetCurrentDefault());
  #endif
-@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -781,7 +781,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::CPUMetricsProvider>());
  
@@ -59,7 +59,7 @@
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::MotherboardMetricsProvider>());
  #endif
-@@ -873,7 +873,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
        std::make_unique<GoogleUpdateMetricsProviderMac>());
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
index 9e10655f3bd4..cb853712d59c 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
+++ b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/metrics/perf/cpu_identity.cc
-@@ -145,7 +145,7 @@ CPUIdentity GetCPUIdentity() {
+@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() {
    result.release =
  #if BUILDFLAG(IS_CHROMEOS)
        base::SysInfo::KernelVersion();
diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
index b053d2dad451..b655479128c9 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
+++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
 @@ -65,7 +65,7 @@ void RecordProcessHistograms(const char* histogram_suf
                               const ProcessMonitor::Metrics& metrics) {
diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc
index c72b8187e6ca..a81f764addfd 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc
+++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc
@@ -1,4 +1,4 @@
---- chrome/browser/metrics/power/process_monitor.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/metrics/power/process_monitor.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/metrics/power/process_monitor.cc
 @@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
        process_metrics.GetPlatformIndependentCPUUsage());
diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h
index 8ca778a3412d..c4755a67f52e 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h
+++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h
@@ -1,4 +1,4 @@
---- chrome/browser/metrics/power/process_monitor.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/metrics/power/process_monitor.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/metrics/power/process_monitor.h
 @@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro
      std::optional<double> cpu_usage;
diff --git a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc
index 3f835e59406f..f08fc33fa59c 100644
--- a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc
+++ b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc
@@ -1,15 +1,15 @@
---- chrome/browser/net/profile_network_context_service.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/net/profile_network_context_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/net/profile_network_context_service.cc
-@@ -134,7 +134,7 @@
+@@ -135,7 +135,7 @@
  #include "extensions/common/constants.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -261,7 +261,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+@@ -276,7 +276,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
        });
  }
  
@@ -18,7 +18,7 @@
  std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
      Profile* profile,
      std::unique_ptr<net::ClientCertStore> platform_store) {
-@@ -1202,7 +1202,7 @@ ProfileNetworkContextService::CreateClientCertStore() 
+@@ -1228,7 +1228,7 @@ ProfileNetworkContextService::CreateClientCertStore() 
        std::make_unique<net::ClientCertStoreNSS>(
            base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate,
                                kCryptoModulePasswordClientAuth));
diff --git a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc
index 446e7947f1c7..59f0458fcdd0 100644
--- a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/net/profile_network_context_service_factory.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/net/profile_network_context_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/net/profile_network_context_service_factory.cc
 @@ -24,7 +24,7 @@
  #include "chrome/browser/net/server_certificate_database_service_factory.h"  // nogncheck
diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc
index d29ac33631b0..f5bac4029b88 100644
--- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -134,7 +134,7 @@ SystemNetworkContextManager* g_system_network_context_
+@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_
  // received a failed launch for a sandboxed network service.
  bool g_previously_failed_to_launch_sandboxed_service = false;
  
@@ -9,7 +9,7 @@
  // Whether kerberos library loading will work in the network service due to the
  // sandbox.
  bool g_network_service_will_allow_gssapi_library_load = false;
-@@ -142,7 +142,7 @@ bool g_network_service_will_allow_gssapi_library_load 
+@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load 
  const char* kGssapiDesiredPref =
  #if BUILDFLAG(IS_CHROMEOS)
      prefs::kKerberosEnabled;
@@ -18,7 +18,7 @@
      prefs::kReceivedHttpAuthNegotiateHeader;
  #endif
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -188,7 +188,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
    auth_dynamic_params->basic_over_http_enabled =
        local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
  
@@ -27,7 +27,7 @@
    auth_dynamic_params->delegate_by_kdc_policy =
        local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -203,7 +203,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
        local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -36,7 +36,7 @@
    auth_dynamic_params->allow_gssapi_library_load =
        local_state->GetBoolean(kGssapiDesiredPref);
  #endif  // BUILDFLAG(IS_CHROMEOS)
-@@ -213,7 +213,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
  
  void OnNewHttpAuthDynamicParams(
      network::mojom::HttpAuthDynamicParamsPtr& params) {
@@ -45,7 +45,7 @@
    // The kerberos library is incompatible with the network service sandbox, so
    // if library loading is now enabled, the network service needs to be
    // restarted. It will be restarted unsandboxed because is
-@@ -255,11 +255,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    if (g_previously_failed_to_launch_sandboxed_service) {
      return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
    }
@@ -59,7 +59,7 @@
    // The network service sandbox and the kerberos library are incompatible.
    // If kerberos is enabled by policy, disable the network service sandbox.
    if (g_network_service_will_allow_gssapi_library_load ||
-@@ -275,7 +275,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -68,7 +68,7 @@
    if (local_state &&
        local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
      return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -519,7 +519,7 @@ void SystemNetworkContextManager::DeleteInstance() {
+@@ -522,7 +522,7 @@ void SystemNetworkContextManager::DeleteInstance() {
    g_system_network_context_manager = nullptr;
  }
  
@@ -77,7 +77,7 @@
  SystemNetworkContextManager::GssapiLibraryLoadObserver::
      GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
      : owner_(owner) {}
-@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
                               auth_pref_callback);
  
@@ -86,7 +86,7 @@
    pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -591,7 +591,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -95,7 +95,7 @@
    pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  
-@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -659,7 +659,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
                                 std::string());
  
@@ -104,7 +104,7 @@
    registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
                                  false);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -681,11 +681,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -684,11 +684,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
  
    registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
  
@@ -118,7 +118,7 @@
    registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -738,7 +738,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -741,7 +741,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
    network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
  
@@ -127,7 +127,7 @@
    gssapi_library_loader_observer_.Install(network_service);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
+@@ -960,7 +960,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
        break;
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h
index e9c3b73704e8..279eb9ee88b3 100644
--- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h
+++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h
@@ -1,4 +1,4 @@
---- chrome/browser/net/system_network_context_manager.h.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/net/system_network_context_manager.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/net/system_network_context_manager.h
 @@ -198,7 +198,7 @@ class SystemNetworkContextManager {
    class URLLoaderFactoryForSystem;
diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
index 0d5af2ed56a2..2743ba3f4afc 100644
--- a/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
+++ b/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc
 @@ -35,7 +35,7 @@
  #include "services/network/public/cpp/resource_request.h"
diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
index 6235be23db05..4cb7f166656d 100644
--- a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
+++ b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/new_tab_page/new_tab_page_util.cc
 @@ -28,7 +28,7 @@ bool IsOsSupportedForCart() {
  }
diff --git a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
index f496d8a496c5..6ee9c30ed4b3 100644
--- a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/notifications/notification_display_service_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/notifications/notification_display_service_impl.cc
 @@ -31,7 +31,7 @@
  #endif
diff --git a/www/iridium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/iridium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
index 9ea673e0e3c6..8ea750fb5486 100644
--- a/www/iridium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
+++ b/www/iridium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc
 @@ -55,7 +55,7 @@ bool SystemNotificationsEnabled(Profile* profile) {
  #elif BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index 8d0b08c991d6..09518958c5c4 100644
--- a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -642,7 +642,7 @@ void ChromePasswordManagerClient::
+@@ -638,7 +638,7 @@ void ChromePasswordManagerClient::
  bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
      device_reauth::DeviceAuthenticator* authenticator) {
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
    if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
      return false;
    }
-@@ -920,7 +920,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
+@@ -916,7 +916,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
  }
  
  void ChromePasswordManagerClient::NotifyKeychainError() {
diff --git a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
index 566ff411b4b1..1c5de3fc957f 100644
--- a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/password_manager/password_reuse_manager_factory.cc
 @@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
    // Prepare password hash data for reuse detection.
diff --git a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc
index 5d5efb832003..f65b74c1d5fc 100644
--- a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/platform_util_linux.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/platform_util_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/platform_util_linux.cc
 @@ -302,7 +302,9 @@ void OnLaunchOptionsCreated(const std::string& command
    argv.push_back(command);
diff --git a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
index c18a4b5f00f2..3d667ce1d7d2 100644
--- a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2022-12-01 10:35:46 UTC
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/policy/browser_signin_policy_handler.cc
 @@ -45,7 +45,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
        policies.GetValue(policy_name(), base::Value::Type::INTEGER);
diff --git a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
index 15b926c56936..3ca5bdd40b1d 100644
--- a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
+++ b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
 @@ -60,7 +60,7 @@
  #include "chrome/browser/policy/browser_dm_token_storage_mac.h"
diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index 6b8076654cd2..ffbb9c210dfa 100644
--- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
 @@ -255,19 +255,19 @@
  #include "components/spellcheck/browser/pref_names.h"
@@ -39,7 +39,7 @@
  #include "components/search_engines/enterprise/search_aggregator_policy_handler.h"
  #include "components/search_engines/enterprise/site_search_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -595,7 +595,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -592,7 +592,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
    { key::kDefaultDirectSocketsSetting,
      prefs::kManagedDefaultDirectSocketsSetting,
      base::Value::Type::INTEGER },
@@ -48,7 +48,7 @@
    { key::kDeletingUndecryptablePasswordsEnabled,
      password_manager::prefs::kDeletingUndecryptablePasswordsEnabled,
      base::Value::Type::BOOLEAN },
-@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -957,7 +957,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kManagedDefaultGeolocationSetting,
      base::Value::Type::INTEGER },
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -57,7 +57,7 @@
    { key::kRequireOnlineRevocationChecksForLocalAnchors,
      prefs::kCertRevocationCheckingRequiredLocalAnchors,
      base::Value::Type::BOOLEAN },
-@@ -975,7 +975,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
          // || BUILDFLAG(IS_WIN)  || BUILDFLAG(IS_MAC)
@@ -66,7 +66,7 @@
    { key::kFullscreenAllowed,
      prefs::kFullscreenAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1821,7 +1821,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::INTEGER},
  #endif // BUILDFLAG(IS_CHROMEOS)
  
@@ -75,7 +75,7 @@
    { key::kGSSAPILibraryName,
      prefs::kGSSAPILibraryName,
      base::Value::Type::STRING },
-@@ -1880,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -84,7 +84,7 @@
    { key::kNetworkServiceSandboxEnabled,
      prefs::kNetworkServiceSandboxEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1900,12 +1900,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1921,12 +1921,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kTotalMemoryLimitMb,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -99,7 +99,7 @@
    { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
      device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1916,7 +1916,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1937,7 +1937,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kLiveTranslateEnabled,
      base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -108,7 +108,7 @@
    { key::kDefaultBrowserSettingEnabled,
      prefs::kDefaultBrowserSettingEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1928,7 +1928,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -117,7 +117,7 @@
    { key::kAutoplayAllowed,
      prefs::kAutoplayAllowed,
      base::Value::Type::BOOLEAN },
-@@ -2029,7 +2029,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2050,7 +2050,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
  
@@ -126,8 +126,8 @@
    { key::kAlternativeBrowserPath,
      browser_switcher::prefs::kAlternativeBrowserPath,
      base::Value::Type::STRING },
-@@ -2131,7 +2131,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::LIST },
+@@ -2155,7 +2155,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -135,7 +135,7 @@
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
-@@ -2202,7 +2202,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      ash::prefs::kUrlParameterToAutofillSAMLUsername,
      base::Value::Type::STRING },
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -144,7 +144,7 @@
    { key::kTabDiscardingExceptions,
      performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
      base::Value::Type::LIST },
-@@ -2231,7 +2231,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kUiAutomationProviderEnabled,
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
@@ -153,7 +153,7 @@
    { key::kOutOfProcessSystemDnsResolutionEnabled,
      prefs::kOutOfProcessSystemDnsResolutionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2271,7 +2271,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2298,7 +2298,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::INTEGER },
  #endif
  #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -162,7 +162,7 @@
    { key::kExtensionInstallTypeBlocklist,
      extensions::pref_names::kExtensionInstallTypeBlocklist,
      base::Value::Type::LIST},
-@@ -2297,7 +2297,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2324,7 +2324,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
    { key::kTabCompareSettings,
      optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
      base::Value::Type::INTEGER},
@@ -171,7 +171,7 @@
    { key::kChromeForTestingAllowed,
      prefs::kChromeForTestingAllowed,
      base::Value::Type::BOOLEAN },
-@@ -2483,7 +2483,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2513,7 +2513,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    // Policies for all platforms - End
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -180,7 +180,7 @@
    handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
        key::kMemorySaverModeSavings,
        performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
-@@ -2710,7 +2710,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2734,7 +2734,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -189,7 +189,7 @@
    handlers->AddHandler(
        std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
    handlers->AddHandler(
-@@ -2763,7 +2763,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2793,7 +2793,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
        key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
        chrome_schema));
  
@@ -198,7 +198,7 @@
    handlers->AddHandler(std::make_unique<GuestModePolicyHandler>());
    handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
    handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
-@@ -2849,7 +2849,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2890,7 +2890,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
        signin_legacy_policies;
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -207,7 +207,7 @@
    signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
        key::kForceBrowserSignin, prefs::kForceBrowserSignin,
        base::Value::Type::BOOLEAN));
-@@ -3221,7 +3221,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3262,7 +3262,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif
  
  #if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -216,7 +216,7 @@
    handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
    handlers->AddHandler(
        std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -3229,7 +3229,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3270,7 +3270,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -225,7 +225,7 @@
    handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
        key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
        base::Value::Type::BOOLEAN));
-@@ -3247,7 +3247,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3288,7 +3288,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            first_party_sets::FirstPartySetsOverridesPolicyHandler>(
            key::kRelatedWebsiteSetsOverrides, chrome_schema)));
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -234,7 +234,7 @@
    handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-@@ -3270,7 +3270,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3311,7 +3311,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            base::Value::Type::BOOLEAN)));
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -243,7 +243,7 @@
    handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -3288,7 +3288,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3329,7 +3329,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails>
        gen_ai_default_policies;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
index 8f42a6e0a837..db8778a2959e 100644
--- a/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
+++ b/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/device_management_service_configuration.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/policy/device_management_service_configuration.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/policy/device_management_service_configuration.cc
 @@ -22,7 +22,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
index ac968aa096cf..6abf6049908b 100644
--- a/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
+++ b/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/policy/policy_value_and_status_aggregator.cc
 @@ -49,7 +49,7 @@
  #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc
index c08cde65095b..68f915a33635 100644
--- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,15 +1,15 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -312,7 +312,7 @@
- #include "components/ntp_tiles/custom_links_manager_impl.h"
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -316,7 +316,7 @@
+ #include "chrome/browser/devtools/devtools_window.h"
+ #endif  // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -481,11 +481,11 @@
+@@ -487,11 +487,11 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -23,7 +23,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
-@@ -513,7 +513,7 @@
+@@ -519,7 +519,7 @@
  #include "chrome/browser/sessions/session_service_log.h"
  #endif
  
@@ -32,7 +32,7 @@
  #include "ui/color/system_theme.h"
  #endif
  
-@@ -1663,7 +1663,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+@@ -1664,7 +1664,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
    on_device_translation::RegisterLocalStatePrefs(registry);
  #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
  
@@ -41,7 +41,7 @@
    WhatsNewUI::RegisterLocalStatePrefs(registry);
  #endif
  
-@@ -1822,7 +1822,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+@@ -1821,7 +1821,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
  #endif  // BUILDFLAG(ENABLE_PDF)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -50,7 +50,7 @@
    registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
  #endif
  
-@@ -2176,12 +2176,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -2177,12 +2177,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
index 1f16af088cb1..464df721babe 100644
--- a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
+++ b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
@@ -1,4 +1,4 @@
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
 @@ -203,7 +203,7 @@ const char* const kPersistentPrefNames[] = {
      prefs::kShowFullscreenToolbar,
diff --git a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
index 123c17dfa015..4865a768ef5c 100644
--- a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/printing/print_backend_service_manager.cc
 @@ -36,7 +36,7 @@
  #include "printing/printing_context.h"
diff --git a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc
index fb5fdc74de33..35e602b6ee9b 100644
--- a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc
+++ b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/printer_query.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/printing/printer_query.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/printing/printer_query.cc
-@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
+@@ -342,7 +342,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
      crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
          printer_name, print_backend->GetPrinterDriverInfo(printer_name));
  
diff --git a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc
index 4116e95754db..cfcc5562179d 100644
--- a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/process_singleton_posix.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/process_singleton_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/process_singleton_posix.cc
 @@ -102,7 +102,7 @@
  #include "ui/base/l10n/l10n_util.h"
diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index 6bfb9bad9e12..21f8824c780a 100644
--- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -350,7 +350,7 @@
+@@ -358,7 +358,7 @@
  #endif
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/idle/idle_service_factory.h"
  #endif
  
-@@ -392,7 +392,7 @@
+@@ -400,7 +400,7 @@
  #endif
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
  #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
-@@ -400,7 +400,7 @@
+@@ -408,7 +408,7 @@
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
  #endif
  
@@ -27,7 +27,7 @@
  #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
  #endif
  
-@@ -408,7 +408,7 @@
+@@ -416,7 +416,7 @@
  #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h"
  #endif
  
@@ -36,7 +36,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
-@@ -722,7 +722,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    DiceBoundSessionCookieServiceFactory::GetInstance();
  #endif
  #endif
@@ -45,7 +45,7 @@
    browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
  #endif
    browser_sync::UserEventServiceFactory::GetInstance();
-@@ -779,7 +779,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -787,7 +787,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    commerce::ShoppingServiceFactory::GetInstance();
    ConsentAuditorFactory::GetInstance();
    ContentIndexProviderFactory::GetInstance();
@@ -54,9 +54,9 @@
    contextual_cueing::ContextualCueingServiceFactory::GetInstance();
  #endif
    CookieControlsServiceFactory::GetInstance();
-@@ -834,31 +834,31 @@ void ChromeBrowserMainExtraPartsProfiles::
- #endif
+@@ -843,31 +843,31 @@ void ChromeBrowserMainExtraPartsProfiles::
    enterprise_connectors::ConnectorsServiceFactory::GetInstance();
+   enterprise_connectors::ReportingEventRouterFactory::GetInstance();
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
@@ -92,7 +92,7 @@
    enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
  #endif
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -985,7 +985,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_ANDROID)
    MerchantViewerDataManagerFactory::GetInstance();
  #endif
@@ -101,7 +101,7 @@
    metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1101,7 +1101,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_CHROMEOS)
    policy::PolicyCertServiceFactory::GetInstance();
  #endif
@@ -110,7 +110,7 @@
    policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
-@@ -1147,7 +1147,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1157,7 +1157,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
    ProfileStatisticsFactory::GetInstance();
  #endif
@@ -119,7 +119,7 @@
    ProfileTokenWebSigninInterceptorFactory::GetInstance();
    OidcAuthenticationSigninInterceptorFactory::GetInstance();
  #endif
-@@ -1167,7 +1167,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1177,7 +1177,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    ReduceAcceptLanguageFactory::GetInstance();
    RendererUpdaterFactory::GetInstance();
    regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance();
@@ -128,7 +128,7 @@
    reporting::ManualTestHeartbeatEventFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1354,7 +1354,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1368,7 +1368,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    WebDataServiceFactory::GetInstance();
    webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc
index 73a3ecc0ccb6..214004ebaeea 100644
--- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/profiles/profile_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/profiles/profile_impl.cc
 @@ -270,6 +270,10 @@
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -20,7 +20,7 @@
      ProfileManager* profile_manager = g_browser_process->profile_manager();
      ProfileAttributesEntry* entry =
          profile_manager->GetProfileAttributesStorage()
-@@ -892,7 +896,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
+@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
  }
  
  base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc
index 39771cced11a..adbab97a5fba 100644
--- a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc
+++ b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc
@@ -1,4 +1,4 @@
---- chrome/browser/profiles/profiles_state.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/profiles/profiles_state.cc
 @@ -188,7 +188,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
                            PrefService* local_state,
diff --git a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
index eb7db9bb25b4..026ca93a5bb9 100644
--- a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
+++ b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
@@ -1,24 +1,6 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc
-@@ -8,7 +8,7 @@
- #include "base/strings/string_util.h"
- #include "components/country_codes/country_codes.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/variations/service/variations_service.h"
- #endif
- 
-@@ -20,7 +20,7 @@
- #endif
- 
- namespace regional_capabilities {
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- RegionalCapabilitiesServiceClient::RegionalCapabilitiesServiceClient(
-     variations::VariationsService* variations_service)
-@@ -56,7 +56,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId
+@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId
        base::android::AttachCurrentThread(),
        reinterpret_cast<intptr_t>(heap_callback.release()));
  }
@@ -26,4 +8,4 @@
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void RegionalCapabilitiesServiceClient::FetchCountryId(
      CountryIdCallback on_country_id_fetched) {
-   std::move(on_country_id_fetched).Run(variations_country_id_);
+   std::move(on_country_id_fetched).Run(variations_latest_country_id_);
diff --git a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h
deleted file mode 100644
index 7bec89c3a014..000000000000
--- a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_client.h.orig	2025-03-18 16:46:04 UTC
-+++ chrome/browser/regional_capabilities/regional_capabilities_service_client.h
-@@ -21,7 +21,7 @@ namespace regional_capabilities {
- class RegionalCapabilitiesServiceClient
-     : public RegionalCapabilitiesService::Client {
-  public:
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   explicit RegionalCapabilitiesServiceClient(
-       variations::VariationsService* variations_service);
- #else
-@@ -35,7 +35,7 @@ class RegionalCapabilitiesServiceClient
-   void FetchCountryId(CountryIdCallback country_id_fetched_callback) override;
- 
-  private:
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const int variations_country_id_;
- #endif
- };
diff --git a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc
deleted file mode 100644
index 12144795d95a..000000000000
--- a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc.orig	2025-03-18 16:46:04 UTC
-+++ chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc
-@@ -12,7 +12,7 @@
- #include "chrome/browser/regional_capabilities/regional_capabilities_service_client.h"
- #include "components/regional_capabilities/regional_capabilities_service.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/variations/service/variations_service.h"
- #endif
- 
-@@ -57,7 +57,7 @@ RegionalCapabilitiesServiceFactory::BuildServiceInstan
-   Profile* profile = Profile::FromBrowserContext(context);
-   auto regional_capabilities_service_client =
-       std::make_unique<RegionalCapabilitiesServiceClient>(
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-           g_browser_process->variations_service()
- #endif
-       );
diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
index 8f8c752ff3dd..c4d18e5548a8 100644
--- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
  #include "ui/views/controls/textfield/textfield.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/linux/linux_ui.h"
-@@ -181,7 +181,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -180,7 +180,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
    prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
  #endif
  
@@ -18,7 +18,7 @@
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    if (linux_ui_theme) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -204,7 +204,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -203,7 +203,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
index 7048d1618b0f..9d30e71682ca 100644
--- a/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
+++ b/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
@@ -1,4 +1,4 @@
---- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig	2022-12-01 10:35:46 UTC
+--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/resources/settings/autofill_page/passwords_shared.css
 @@ -100,7 +100,7 @@ cr-input.password-input::part(input),
     * necessary to prevent Chrome from using the operating system's font
diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css b/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css
index 677631dc2dc5..374335f3860b 100644
--- a/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css
+++ b/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css
@@ -1,4 +1,4 @@
---- chrome/browser/resources/signin/signin_shared.css.orig	2022-12-06 08:09:13 UTC
+--- chrome/browser/resources/signin/signin_shared.css.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/resources/signin/signin_shared.css
 @@ -54,7 +54,7 @@ a {
    border-radius: var(--scrollbar-width);
diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
index 89504580acce..f64c1386d55f 100644
--- a/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
+++ b/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
-@@ -1251,7 +1251,7 @@ std::string ChromePasswordProtectionService::GetOrgani
+@@ -1262,7 +1262,7 @@ std::string ChromePasswordProtectionService::GetOrgani
      ReusedPasswordAccountType password_type) const {
    if (base::FeatureList::IsEnabled(
            safe_browsing::kEnterprisePasswordReuseUiRefresh)) {
diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
index c1653e33e6d8..dcd911767459 100644
--- a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
+++ b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
@@ -1,8 +1,8 @@
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
 @@ -20,7 +20,7 @@
+ #include "components/safe_browsing/core/common/safebrowsing_switches.h"
  #include "net/base/url_util.h"
- #include "third_party/abseil-cpp/absl/types/variant.h"
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
index abee2141af83..0c6a4588d972 100644
--- a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
+++ b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
 @@ -697,7 +697,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
  
diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
index ef4cf52e0782..c66e345a622e 100644
--- a/www/iridium/files/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc
 @@ -12,7 +12,7 @@
  #include "content/public/browser/web_contents.h"
diff --git a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
index dd8d93663b49..4450b64953f9 100644
--- a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
+++ b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
@@ -1,4 +1,4 @@
---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/screen_ai/screen_ai_install_state.cc
 @@ -30,7 +30,7 @@ bool IsDeviceCompatible() {
    // TODO(crbug.com/381256355): Update when ScreenAI library is compatible with
diff --git a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
index a4b4f32f349f..f8d6d3703227 100644
--- a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
+++ b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
@@ -1,6 +1,6 @@
---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/screen_ai/screen_ai_service_router.cc
-@@ -316,7 +316,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -403,7 +403,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
    base::FilePath binary_path = state_instance->get_component_binary_path();
  #if BUILDFLAG(IS_WIN)
    std::vector<base::FilePath> preload_libraries = {binary_path};
@@ -9,7 +9,7 @@
    std::vector<std::string> extra_switches = {
        base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
                           binary_path.MaybeAsASCII().c_str())};
-@@ -330,7 +330,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -417,7 +417,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
            .WithPreloadedLibraries(
                preload_libraries,
                content::ServiceProcessHostPreloadLibraries::GetPassKey())
diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
deleted file mode 100644
index 9f8da6367ccd..000000000000
--- a/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2024-06-25 12:08:48 UTC
-+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
-@@ -15,7 +15,7 @@
- #include "components/send_tab_to_self/features.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
-@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController*
- ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
-     Profile* profile) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   for (const std::unique_ptr<ReceivingUiHandler>& handler :
-        applicable_handlers_) {
-     auto* button_controller =
diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
deleted file mode 100644
index 376f8d1f3499..000000000000
--- a/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig	2024-06-25 12:08:48 UTC
-+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
-@@ -16,7 +16,7 @@
- #include "components/send_tab_to_self/send_tab_to_self_model.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
- 
-@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
-     const std::vector<const SendTabToSelfEntry*>& new_entries) {
-   for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     // Only respond to notifications corresponding to this service's profile
-     // for these OSes; mobile does not have a Profile.
-     // Cast note: on desktop, handlers are guaranteed to be the derived class
diff --git a/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc b/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc
index f106f71f0d62..f68ae7beb75c 100644
--- a/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc
+++ b/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sessions/session_restore.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/sessions/session_restore.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/sessions/session_restore.cc
 @@ -108,7 +108,7 @@
  #include "ui/wm/core/scoped_animation_disabler.h"
diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
index fc1801e930f8..060d9176decb 100644
--- a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/sharing/sharing_handler_registry_impl.cc
 @@ -21,7 +21,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-chrome_browser_shortcuts_icon__badging.cc b/www/iridium/files/patch-chrome_browser_shortcuts_icon__badging.cc
index 09b01eaece47..495438038a32 100644
--- a/www/iridium/files/patch-chrome_browser_shortcuts_icon__badging.cc
+++ b/www/iridium/files/patch-chrome_browser_shortcuts_icon__badging.cc
@@ -1,4 +1,4 @@
---- chrome/browser/shortcuts/icon_badging.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/shortcuts/icon_badging.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/shortcuts/icon_badging.cc
 @@ -59,7 +59,7 @@ enum class BadgeSize {
  constexpr ShortcutSize kSizesNeededForShortcutCreation[] = {
diff --git a/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.cc b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.cc
index 29ab9ae1bb7a..021ab0f4eb1f 100644
--- a/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/signin/accounts_policy_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/signin/accounts_policy_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/signin/accounts_policy_manager.cc
 @@ -41,7 +41,7 @@
  #include "chrome/browser/ui/webui/profile_helper.h"
diff --git a/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.h b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.h
index 5fbd55baca13..3ed85de1cc84 100644
--- a/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.h
+++ b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.h
@@ -1,4 +1,4 @@
---- chrome/browser/signin/accounts_policy_manager.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/signin/accounts_policy_manager.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/signin/accounts_policy_manager.h
 @@ -13,7 +13,7 @@
  #include "components/signin/public/base/signin_metrics.h"
diff --git a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc
index 5ab1a98a3ac9..d37da58874bd 100644
--- a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc
+++ b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/signin/signin_util.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/signin/signin_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/signin/signin_util.cc
 @@ -80,7 +80,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
  CookiesMover::~CookiesMover() = default;
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
index 6e4e2c5dbed5..5af5e4b7685a 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
@@ -1,4 +1,4 @@
---- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc
 @@ -68,7 +68,7 @@ std::ostream& operator<<(std::ostream& stream,
    }
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
index 691e86c4f2ef..1af3d2d197b4 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
@@ -1,4 +1,4 @@
---- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_browser_utils.cc
 @@ -40,7 +40,7 @@
  #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
index 044e151c6bb2..1251b1889d50 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
@@ -1,4 +1,4 @@
---- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig	2024-12-22 12:24:29 UTC
+--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_browser_utils.h
 @@ -52,7 +52,7 @@ std::string GetAccountGivenName(Profile& profile);
  // of the user.
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
index d40f0143cb3e..b90d51817367 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
-@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
+@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
        return;
      }
    }
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
index c0ec8719ad5a..8c2c90f50584 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
-@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager::
+@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager::
      ActivateManagementPolicyAndUpdateRegistration() {
    SetActiveForSupervisedUsers();
    UpdateManagementPolicyRegistration();
@@ -9,7 +9,7 @@
    MaybeMarkExtensionsLocallyParentApproved();
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  }
-@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
+@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
    return false;
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
index 7a12c8e7af43..b81b8e19c766 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
@@ -1,4 +1,4 @@
---- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.h
 @@ -153,7 +153,7 @@ class SupervisedUserExtensionsManager : public Extensi
    // launched.
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
index cca682019c6a..ee7cd9fa7782 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
-@@ -34,12 +34,12 @@
+@@ -33,12 +33,12 @@
  #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "ui/android/view_android.h"
@@ -15,7 +15,7 @@
  namespace {
  bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) {
    if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) {
-@@ -161,7 +161,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
+@@ -160,7 +160,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
      return content::NavigationThrottle::DEFER;
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
index 3febda052a77..3bc22e7f2f08 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc
 @@ -14,7 +14,7 @@
  #include "components/supervised_user/core/browser/supervised_user_service.h"
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
index cee4480c5635..2cc7d8c59c3d 100644
--- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
 @@ -47,7 +47,7 @@
  #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
diff --git a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
index 79d887ff009f..8c473d052f2f 100644
--- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
+++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sync/chrome_sync_controller_builder.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/sync/chrome_sync_controller_builder.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/sync/chrome_sync_controller_builder.cc
 @@ -280,7 +280,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService
  #if BUILDFLAG(ENABLE_SPELLCHECK)
diff --git a/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
index c82b35401ffb..948467ef8b14 100644
--- a/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sync/device_info_sync_client_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/sync/device_info_sync_client_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/sync/device_info_sync_client_impl.cc
 @@ -34,7 +34,7 @@ DeviceInfoSyncClientImpl::~DeviceInfoSyncClientImpl() 
  std::string DeviceInfoSyncClientImpl::GetSigninScopedDeviceId() const {
diff --git a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc
index 677560ed782e..ec59b3f170c4 100644
--- a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sync/sync_service_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/sync/sync_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/sync/sync_service_factory.cc
 @@ -108,7 +108,7 @@
  #endif  // BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
index e251c9b39728..e9b432940d8e 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/task_manager/sampling/task_group.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/task_manager/sampling/task_group.cc
 @@ -36,7 +36,7 @@ const int kBackgroundRefreshTypesMask =
  #if BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index 595856105600..f6bc151ba5ee 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/task_manager/sampling/task_group.h
 @@ -41,7 +41,7 @@ constexpr int kUnsupportedVMRefreshFlags =
      REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
index 996873eb8e5c..9a0a1bc05f6b 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.cc
 @@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler(
      const OnCpuRefreshCallback& on_cpu_refresh,
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
index bc813df511b7..dea06ad15f06 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2023-10-21 11:51:27 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.h
 @@ -31,7 +31,7 @@ class TaskGroupSampler : public base::RefCountedThread
    using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>;
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index 05fc96b7dca0..fab259c49cba 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -227,7 +227,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h
index 5a7dd8d5ba83..979895deb810 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h
+++ b/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/task_manager_observer.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/task_manager/task_manager_observer.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/task_manager/task_manager_observer.h
 @@ -46,7 +46,7 @@ enum RefreshType {
    // or backgrounded.
diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc
index 990937666424..cbb200e2a3c2 100644
--- a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc
+++ b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc
@@ -1,4 +1,4 @@
---- chrome/browser/themes/theme_helper.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/themes/theme_helper.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/themes/theme_helper.cc
 @@ -16,7 +16,7 @@
  #include "ui/gfx/image/image.h"
diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc
index b10b8b55dc98..0de9a12544b0 100644
--- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/themes/theme_service.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/themes/theme_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/themes/theme_service.cc
-@@ -71,7 +71,7 @@
+@@ -72,7 +72,7 @@
  #include "extensions/browser/extension_registry_observer.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #include "ui/ozone/public/ozone_platform.h"  // nogncheck
  #endif
-@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
+@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
  }
  
  bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc
index e4966e22953a..d3fe580b4d25 100644
--- a/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/themes/theme_service_aura_linux.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/themes/theme_service_aura_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/themes/theme_service_aura_linux.cc
 @@ -23,7 +23,7 @@ namespace {
  ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) {
diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc
index 75004b95e588..9080a3213933 100644
--- a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/themes/theme_service_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/themes/theme_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/themes/theme_service_factory.cc
 @@ -24,7 +24,7 @@
  #include "chrome/browser/themes/theme_helper_win.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
index be8b40271e87..006d2dd7613c 100644
--- a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
+++ b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/actions/chrome_action_id.h
-@@ -495,7 +495,7 @@
+@@ -497,7 +497,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
  #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
    E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU)
diff --git a/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
index 429246354510..a49308e6c0c6 100644
--- a/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
 @@ -57,7 +57,7 @@ gfx::Rect GetPopupSizeForBnpl() {
  DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
diff --git a/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
index e78a473fbb43..fa919c7338c4 100644
--- a/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
+++ b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
 @@ -14,7 +14,7 @@
  #include "components/autofill/core/browser/payments/payments_window_manager.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h
index 6db58f6ac4d1..65d361019c60 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser.h
+++ b/www/iridium/files/patch-chrome_browser_ui_browser.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/browser.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/browser.h
-@@ -300,7 +300,7 @@ class Browser : public TabStripModelObserver,
+@@ -301,7 +301,7 @@ class Browser : public TabStripModelObserver,
      std::optional<int64_t> display_id;
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 0e2a83b4cbbe..1c7bc766f343 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,14 +1,14 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -127,7 +127,7 @@
+@@ -126,7 +126,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/base/ime/text_edit_commands.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
- #endif
 @@ -136,7 +136,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif
@@ -18,7 +18,7 @@
  #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h"
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  
-@@ -329,7 +329,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -332,7 +332,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  #endif
    }
  
@@ -27,7 +27,7 @@
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    auto* linux_ui = ui::LinuxUi::instance();
-@@ -581,7 +581,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -595,7 +595,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -36,7 +36,7 @@
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -801,7 +801,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -812,7 +812,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
      case IDC_CREATE_SHORTCUT:
        base::RecordAction(base::UserMetricsAction("CreateShortcut"));
@@ -45,7 +45,7 @@
        chrome::CreateDesktopShortcutForActiveWebContents(browser_);
  #else
        web_app::CreateWebAppFromCurrentWebContents(
-@@ -968,7 +968,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -979,7 +979,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
      case IDC_CHROME_WHATS_NEW:
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
@@ -54,7 +54,7 @@
        ShowChromeWhatsNew(browser_);
        break;
  #else
-@@ -1284,7 +1284,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1324,7 +1324,7 @@ void BrowserCommandController::InitCommandState() {
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
  #endif
@@ -63,7 +63,7 @@
    command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
-@@ -1640,7 +1640,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
+@@ -1682,7 +1682,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
    bool can_create_web_app = web_app::CanCreateWebApp(browser_);
    command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc b/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc
index b02c72124660..89ab0fd83d4e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_commands.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/browser_commands.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/browser_commands.cc
-@@ -1991,7 +1991,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
+@@ -1980,7 +1980,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
    } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
      UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
    } else {
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
index ea17dd777734..44515fba34e4 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/browser_ui_prefs.cc
-@@ -71,7 +71,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
+@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
    registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
    registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime,
                               base::Time());
@@ -9,7 +9,7 @@
    registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser,
                                 std::string());
    registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser,
-@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
+@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
    registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
index e870a0b4cc43..d0f8cca08cea 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/browser_view_prefs.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/browser_view_prefs.cc
 @@ -14,7 +14,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc
index 01681e503e3c..176711eece65 100644
--- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/chrome_pages.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/chrome_pages.cc
-@@ -85,7 +85,7 @@
+@@ -84,7 +84,7 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/web_applications/web_app_utils.h"
  #endif
  
-@@ -379,7 +379,7 @@ void ShowChromeTips(Browser* browser) {
+@@ -381,7 +381,7 @@ void ShowChromeTips(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeTipsURL));
  }
  
@@ -18,7 +18,7 @@
  void ShowChromeWhatsNew(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL));
  }
-@@ -702,7 +702,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+@@ -699,7 +699,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h
index cb6069bc2255..475ea4c73383 100644
--- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h
+++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/chrome_pages.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/chrome_pages.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/chrome_pages.h
 @@ -39,7 +39,7 @@ namespace signin {
  enum class ConsentLevel;
diff --git a/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc b/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
index 126040b78982..1e02a604e745 100644
--- a/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig	2023-10-21 11:51:27 UTC
+--- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/color/native_chrome_color_mixer.cc
 @@ -7,7 +7,7 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc b/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc
index 4269c9f01957..38de43aa6f30 100644
--- a/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/managed_ui.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/managed_ui.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/managed_ui.cc
 @@ -433,7 +433,7 @@ std::optional<std::string> GetDeviceManagerIdentity() 
        g_browser_process->platform_part()->browser_policy_connector_ash();
diff --git a/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
index fbdab3e168d3..59c8cc7a1405 100644
--- a/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
 @@ -1985,7 +1985,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
    return omnibox::kShareMacChromeRefreshIcon;
diff --git a/www/iridium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc b/www/iridium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
index 574a6b1c5260..51081decc7ee 100644
--- a/www/iridium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc
 @@ -44,7 +44,7 @@ std::u16string RelaunchChromeBubbleController::GetTitl
  #if BUILDFLAG(IS_MAC)
diff --git a/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
index a30c20ecec47..593ce05dea35 100644
--- a/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
 @@ -102,7 +102,7 @@ namespace {
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/www/iridium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
new file mode 100644
index 000000000000..335f5790feb5
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig	2025-05-07 06:48:23 UTC
++++ chrome/browser/ui/prefs/prefs_tab_helper.cc
+@@ -66,7 +66,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If a font name in prefs default values starts with a comma, consider it's a
+ // comma-separated font list and resolve it to the first available font.
+ #define PREFS_FONT_LIST 1
diff --git a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc
index 7eb0dbffd636..fe34f0f384cf 100644
--- a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/sad_tab.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/sad_tab.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/sad_tab.cc
 @@ -179,7 +179,7 @@ std::vector<int> SadTab::GetSubMessages() {
        if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) {
diff --git a/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h b/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
index 68d099570054..d08f90b00660 100644
--- a/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
+++ b/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
 @@ -36,7 +36,7 @@ class SharingHubBubbleController {
    // Returns true if the omnibox icon should be shown.
diff --git a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
index 138e0dc89883..96f169b74811 100644
--- a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/signin/signin_view_controller.cc
-@@ -428,7 +428,7 @@ void SigninViewController::ShowModalSyncConfirmationDi
+@@ -443,7 +443,7 @@ void SigninViewController::ShowModalSyncConfirmationDi
  void SigninViewController::ShowModalManagedUserNoticeDialog(
      std::unique_ptr<signin::EnterpriseProfileCreationDialogParams>
          create_param) {
diff --git a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
index c1ffea6aac84..7a855c40311f 100644
--- a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
+++ b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/signin/signin_view_controller_delegate.h
 @@ -79,7 +79,7 @@ class SigninViewControllerDelegate {
        SignoutConfirmationCallback callback);
diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 78801cecf25b..11e55a040065 100644
--- a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -94,7 +94,7 @@ const char* const kBadFlags[] = {
+@@ -95,7 +95,7 @@ const char* const kBadFlags[] = {
      extensions::switches::kExtensionsOnChromeURLs,
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 7f0635cf07eb..9d7757f5d210 100644
--- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
 @@ -134,7 +134,7 @@
  #include "chrome/credential_provider/common/gcp_strings.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
index 537cd8d3a245..1221e0fbf1f2 100644
--- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
 @@ -76,7 +76,7 @@
  #include "components/app_restore/full_restore_utils.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -207,7 +207,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
      // at the state of the MessageLoop.
      Browser::CreateParams params = Browser::CreateParams(profile_, false);
      params.creation_source = Browser::CreationSource::kStartupCreator;
@@ -18,7 +18,7 @@
      params.startup_id =
          command_line_->GetSwitchValueASCII("desktop-startup-id");
  #endif
-@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
        continue;
      }
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc
index fbd9e3922523..e8cf079132a5 100644
--- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_tab_provider.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/startup/startup_tab_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/startup/startup_tab_provider.cc
 @@ -62,7 +62,7 @@
  #include "extensions/browser/extension_registry.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
index ae6feb4ad2e3..024397a21b23 100644
--- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -216,7 +216,7 @@
+@@ -218,7 +218,7 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -687,12 +687,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -697,12 +697,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
    webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents);
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc b/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc
index 267c0ceba749..418d146c993a 100644
--- a/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tabs/features.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/tabs/features.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/tabs/features.cc
-@@ -48,7 +48,7 @@ bool CanShowTabSearchPositionSetting() {
+@@ -47,7 +47,7 @@ bool CanShowTabSearchPositionSetting() {
    }
  // Mac and other platforms will always have the tab search position in the
  // correct location, cros/linux/win git the user the option to change.
diff --git a/www/iridium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc b/www/iridium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
index 150dfcd644b9..2e2938735214 100644
--- a/www/iridium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/tabs/tab_dialog_manager.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/tabs/tab_dialog_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/tabs/tab_dialog_manager.cc
 @@ -83,7 +83,7 @@ bool SupportsGlobalScreenCoordinates() {
  }
diff --git a/www/iridium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
index dbff796f5ad7..c0871bce19ac 100644
--- a/www/iridium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/tabs/tab_strip_prefs.cc
 @@ -21,7 +21,7 @@ namespace tabs {
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h
index e98d7a4784b3..aad8d9e3bfea 100644
--- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h
+++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/task_manager/task_manager_columns.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/task_manager/task_manager_columns.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/task_manager/task_manager_columns.h
 @@ -277,7 +277,7 @@ inline constexpr std::array kColumns = {
                      .default_visibility = false},
diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index 368e87363753..e956580712cf 100644
--- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,15 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -530,7 +530,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
+@@ -419,7 +419,7 @@ TaskManagerTableModel::~TaskManagerTableModel() {
+   // Note: system_total_time_ is used for both since there is no functional
+   // difference between browser & system (they are essentially the same tab).
+   // Instead, the data is routed to the platform appropriate bucket.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser,
+                                      system_total_time_);
+ #elif BUILDFLAG(IS_CHROMEOS)
+@@ -560,7 +560,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
                   ? stringifier_->backgrounded_string()
                   : stringifier_->foregrounded_string();
  
@@ -9,7 +18,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
        return fd_count >= 0 ? base::FormatNumber(fd_count)
-@@ -693,7 +693,7 @@ int TaskManagerTableModel::CompareValues(size_t row1,
+@@ -723,7 +723,7 @@ int TaskManagerTableModel::CompareValues(size_t row1,
        return BooleanCompare(is_proc1_bg, is_proc2_bg);
      }
  
@@ -18,7 +27,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -935,7 +935,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -1030,7 +1030,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc b/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
index 066ea30701f2..d0a8b676d986 100644
--- a/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/test/popup_browsertest.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/ui/test/popup_browsertest.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/test/popup_browsertest.cc
 @@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo
    const display::Display display = GetDisplayNearestBrowser(popup);
diff --git a/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
index 249664bdb363..dfb817eb2ca6 100644
--- a/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/test/test_browser_ui.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/test/test_browser_ui.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/test/test_browser_ui.cc
 @@ -19,7 +19,7 @@
  #include "ui/views/widget/widget.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc
index 559f836a696d..3d08159e3f62 100644
--- a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/ui_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/ui_features.cc
-@@ -67,7 +67,7 @@ bool IsExtensionMenuInRootAppMenu() {
+@@ -45,7 +45,7 @@ bool IsExtensionMenuInRootAppMenu() {
    return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu);
  }
  
@@ -9,7 +9,7 @@
  // Enables the feature to remove the last confirmation dialog when relaunching
  // to update Chrome.
  BASE_FEATURE(kFewerUpdateConfirmations,
-@@ -333,7 +333,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
+@@ -326,7 +326,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.h b/www/iridium/files/patch-chrome_browser_ui_ui__features.h
index bf4f8a1a426f..016337d725be 100644
--- a/www/iridium/files/patch-chrome_browser_ui_ui__features.h
+++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/ui_features.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/ui_features.h
-@@ -47,7 +47,7 @@ extern const base::FeatureParam<int> kMaxPromptCount;
+@@ -31,7 +31,7 @@ BASE_DECLARE_FEATURE(kCloseOmniboxPopupOnInactiveAreaC
  BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu);
  bool IsExtensionMenuInRootAppMenu();
  
@@ -9,7 +9,7 @@
  BASE_DECLARE_FEATURE(kFewerUpdateConfirmations);
  #endif
  
-@@ -211,7 +211,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog);
+@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog);
  BASE_DECLARE_FEATURE(kViewsJSAppModalDialog);
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 724d0729e697..38c882262852 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/accelerator_table.cc
-@@ -67,11 +67,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -70,11 +70,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
      {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
      {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
@@ -14,7 +14,7 @@
      {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
      {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
       IDC_MOVE_TAB_PREVIOUS},
-@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -102,7 +102,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
      {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
      {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
@@ -23,7 +23,7 @@
      {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -151,7 +151,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
       IDC_SHOW_AVATAR_MENU},
  
  // Platform-specific key maps.
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
index 5667ea51e1cd..9b5bbe5b7872 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
 @@ -19,7 +19,7 @@
  #include "ui/menus/simple_menu_model.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
index eeb723c19690..2b3c14eaa0b4 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
 @@ -39,7 +39,7 @@
  #include "ui/wm/core/wm_state.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
index ef423a07d165..a2f7fe8bdfe6 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate.h
 @@ -52,7 +52,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
                               base::OnceClosure callback) override;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
index 47c517596c02..164313b52b30 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate_linux.cc
 @@ -26,7 +26,7 @@ bool IsDesktopEnvironmentUnity() {
    return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
index 335d6b905440..afa9273acc3c 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/compose/compose_dialog_view.cc
 @@ -160,7 +160,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit(
      views::Widget::InitParams* params,
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 068912a37f1c..c7704a8bd1b2 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
 @@ -52,7 +52,7 @@
  #include "ui/aura/window.h"
@@ -18,7 +18,7 @@
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -182,7 +182,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() {
  
    Init(std::move(params));
  
@@ -27,7 +27,7 @@
    SelectNativeTheme();
  #else
    SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi());
-@@ -368,7 +368,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
    chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
    chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
                                             IsVisibleOnAllWorkspaces());
@@ -36,7 +36,7 @@
    // If the window was sent to a different workspace, prioritize it if
    // it was sent to the current workspace and deprioritize it
    // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()
-@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() {
+@@ -568,7 +568,7 @@ void BrowserFrame::OnMenuClosed() {
  }
  
  void BrowserFrame::SelectNativeTheme() {
@@ -45,7 +45,7 @@
    // Use the regular NativeTheme instance if running incognito mode, regardless
    // of system theme (gtk, qt etc).
    ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
-@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() {
+@@ -609,7 +609,7 @@ void BrowserFrame::OnTouchUiChanged() {
  bool BrowserFrame::RegenerateFrameOnThemeChange(
      BrowserThemeChangeType theme_change_type) {
    bool need_regenerate = false;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
index 81863218058e..1c5afe09b209 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/frame/browser_frame.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.h
 @@ -66,7 +66,7 @@ class BrowserFrame : public views::Widget, public view
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
index 52fe2542f64a..45894ba7ac52 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc
 @@ -54,7 +54,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame
          OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets());
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
index 3d22332e3991..3f2418654d5a 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
 @@ -18,7 +18,7 @@ BrowserFrameViewLayoutLinuxNative::~BrowserFrameViewLa
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
index 4b7d1d7ef790..1c47a871d7dd 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig	2024-12-22 12:24:29 UTC
+--- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc
 @@ -70,7 +70,7 @@ gfx::ShadowValues BrowserFrameViewLinux::GetShadowValu
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
index e4aa28c99535..c2819cf4d062 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
 @@ -15,7 +15,7 @@
  #include "chrome/browser/ui/views/frame/browser_frame_view_win.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index c40c0885ccd8..382eba7e2362 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2519,7 +2519,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
+@@ -2581,7 +2581,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
  }
  
  void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
@@ -9,7 +9,7 @@
    GetContentsWebView()->SetFastResize(is_dragging);
    if (multi_contents_view_) {
      multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging);
-@@ -5559,7 +5559,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() {
+@@ -5825,7 +5825,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() {
  }
  
  void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() {
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 2ce21c855cdf..ddd5c2dbf4e7 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
 @@ -54,7 +54,7 @@
  #include "ui/views/window/vector_icons/vector_icons.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
index d5211b3b8d37..37ab52fd1a44 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
 @@ -110,7 +110,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
    FrameButtonStyle GetFrameButtonStyle() const override;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
index 877d09ee5f1a..bf4f3650bf4b 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
 @@ -9,7 +9,7 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index e3e9fd692ea9..de3366562cf5 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
 @@ -62,7 +62,7 @@
  #include "ui/aura/window.h"
@@ -9,7 +9,16 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
-@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16;
+@@ -76,7 +76,7 @@
+ 
+ // Windows, Mac and CrOS do not clip child widgets to their parents, so we
+ // don't have to worry about resizing quite as much.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define PLATFORM_CLIPS_CHILD_WINDOWS
+ #endif
+ 
+@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 16;
  // The height of the controls bar at the top of the window.
  constexpr int kTopControlsHeight = 34;
  
@@ -18,7 +27,7 @@
  // Frame border when window shadow is not drawn.
  constexpr int kFrameBorderThickness = 4;
  #endif
-@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::EventObserver {
  
      gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
  
@@ -27,7 +36,7 @@
      // Calculate input bounds for Linux. This is needed because the input bounds
      // is not necessary the same as the local bounds on Linux.
      if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -618,7 +618,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -630,7 +630,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
          AddChildView(std::move(auto_pip_setting_overlay));
    }
  
@@ -36,7 +45,7 @@
    auto* profile = browser_view->browser()->profile();
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -843,7 +843,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -855,7 +855,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
      view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
    }
  
@@ -45,7 +54,7 @@
    // On Linux the top bar background will be drawn in OnPaint().
    top_bar_container_view_->SetBackground(views::CreateSolidBackground(
        color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -932,7 +932,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -944,7 +944,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
    BrowserNonClientFrameView::RemovedFromWidget();
  }
  
@@ -54,7 +63,7 @@
  gfx::Insets
  PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const {
    auto border = FrameBorderInsets();
-@@ -1223,7 +1223,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -1235,7 +1235,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
  // views::View implementations:
  
  void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +72,7 @@
    // Draw the PiP window frame borders and shadows, including the top bar
    // background.
    if (window_frame_provider_) {
-@@ -1378,7 +1378,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -1390,7 +1390,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,7 +81,7 @@
    if (window_frame_provider_) {
      const auto insets = window_frame_provider_->GetFrameThicknessDip();
      const bool tiled = frame()->tiled();
-@@ -1396,7 +1396,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+@@ -1408,7 +1408,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -81,7 +90,7 @@
    return FrameBorderInsets();
  #elif !BUILDFLAG(IS_CHROMEOS)
    return gfx::Insets(kResizeBorder);
-@@ -1417,7 +1417,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+@@ -1429,7 +1429,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
                     top_height + border_thickness.bottom());
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
index b5b28828effe..7a68023d289d 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
 @@ -30,7 +30,7 @@
  #include "ui/views/layout/flex_layout_view.h"
@@ -9,7 +9,7 @@
  #include "ui/linux/window_frame_provider.h"
  #endif
  
-@@ -90,7 +90,7 @@ class PictureInPictureBrowserFrameView
+@@ -87,7 +87,7 @@ class PictureInPictureBrowserFrameView
    void Layout(PassKey) override;
    void AddedToWidget() override;
    void RemovedFromWidget() override;
@@ -18,7 +18,7 @@
    gfx::Insets RestoredMirroredFrameBorderInsets() const override;
    gfx::Insets GetInputInsets() const override;
    SkRRect GetRestoredClipRegion() const override;
-@@ -182,7 +182,7 @@ class PictureInPictureBrowserFrameView
+@@ -179,7 +179,7 @@ class PictureInPictureBrowserFrameView
    // Returns true if there's an overlay view that's currently shown.
    bool IsOverlayViewVisible() const;
  
@@ -27,7 +27,7 @@
    // Returns whether a client-side shadow should be drawn for the window.
    bool ShouldDrawFrameShadow() const;
  
-@@ -391,7 +391,7 @@ class PictureInPictureBrowserFrameView
+@@ -388,7 +388,7 @@ class PictureInPictureBrowserFrameView
    // `top_bar_color_animation_`.
    std::optional<SkColor> current_foreground_color_;
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
index 99648ad794fb..8e814da5db50 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
 @@ -74,7 +74,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
index dd80764bb71c..e23009796dbc 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
 @@ -20,7 +20,7 @@
  #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
index cd94bacb050c..1f7831545d79 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
 @@ -222,7 +222,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
        new_tab_button_->GetViewAccessibility().SetName(
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index 46dab0cf84df..82d1e5441fce 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -419,7 +419,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
+@@ -452,7 +452,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
index aabd4a1634f8..a2279ab5e38e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc
-@@ -2064,7 +2064,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem(
+@@ -2089,7 +2089,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem(
  }
  
  void OmniboxViewViews::OnPopupOpened() {
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/iridium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
index 5d33f3131962..bf74376521cc 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc
 @@ -42,7 +42,7 @@
  #include "ui/base/metadata/metadata_impl_macros.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
index c78ff84c7d78..5d8674c148f1 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/avatar_toolbar_button.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/profiles/avatar_toolbar_button.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
 @@ -346,7 +346,7 @@ void AvatarToolbarButton::MaybeShowProfileSwitchIPH() 
    }
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h b/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
index 6c5ff5a43acf..1850f8e213b9 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/avatar_toolbar_button.h
 @@ -84,7 +84,7 @@ class AvatarToolbarButton : public ToolbarButton {
    // Attempts showing the In-Produce-Help for profile Switching.
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
index 12f592f96452..ea3e0428e3f5 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
 @@ -50,7 +50,7 @@ void ProfileMenuCoordinator::Show(bool is_source_accel
    browser.window()->NotifyFeaturePromoFeatureUsed(
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
index 05b09eb5d4a7..1b8218cc1ae4 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -91,7 +91,7 @@
+@@ -92,7 +92,7 @@
  #include "ui/strings/grit/ui_strings.h"
  #include "ui/views/accessibility/view_accessibility.h"
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
  
-@@ -549,7 +549,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() {
+@@ -550,7 +550,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() {
      case signin_util::SignedInState::kSignedOut:
      case signin_util::SignedInState::kWebOnlySignedIn: {
        std::string profile_user_display_name, profile_user_email;
@@ -18,7 +18,7 @@
        profile_user_display_name = profile->GetPrefs()->GetString(
            enterprise_signin::prefs::kProfileUserDisplayName);
        profile_user_email = profile->GetPrefs()->GetString(
-@@ -646,7 +646,7 @@ void ProfileMenuView::BuildIdentity() {
+@@ -647,7 +647,7 @@ void ProfileMenuView::BuildIdentity() {
          badge_image_model, menu_title_, menu_subtitle_, management_label);
    } else {
      std::string profile_user_display_name, profile_user_email;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index 7546c45cc6a5..b11b1a45e560 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 @@ -650,7 +650,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
        ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder,
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
index 9003affcd821..4b4fc8e86d3d 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/profile_picker_view.cc
 @@ -85,7 +85,7 @@
  #include "chrome/browser/global_keyboard_shortcuts_mac.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
index ec4bcd622a21..7bfd03c98476 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
 @@ -65,7 +65,7 @@
  namespace {
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
index f08ff1e533fe..ced6a345b43d 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
 @@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
        SignoutConfirmationCallback callback);
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
index e28913e2c4d2..6fdb04bdd59c 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
-@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
  
  void UpdateSystemDnDDragImage(TabDragContext* attached_context,
                                const gfx::ImageSkia& image) {
@@ -9,7 +9,7 @@
    VLOG(1) << __func__ << " image size=" << image.size().ToString();
    aura::Window* root_window =
        attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
-@@ -392,7 +392,7 @@ TabDragController::Liveness TabDragController::Init(
+@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragController::Init(
    //     synchronous on desktop Linux, so use that.
    // - ChromeOS Ash
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -18,7 +18,7 @@
    ref->can_release_capture_ = false;
  #endif
    ref->start_point_in_screen_ =
-@@ -954,7 +954,7 @@ TabDragController::Liveness TabDragController::DragBro
+@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragController::DragBro
        CHECK_EQ(SetCapture(target_context), Liveness::ALIVE);
      }
  
@@ -27,7 +27,7 @@
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() {
+@@ -1914,7 +1914,7 @@ void TabDragController::CompleteDrag() {
      }
  
      // If source window was maximized - maximize the new window as well.
@@ -36,7 +36,7 @@
      // Keeping maximized state breaks snap to Grid on Windows when dragging
      // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
      // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2527,7 +2527,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2331,7 +2331,7 @@ TabDragController::Liveness TabDragController::GetLoca
      }
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index 7284d07fb803..664894f3d812 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -643,7 +643,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -642,7 +642,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
      return;
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
index 779b5e5f17e7..28ba982b6e47 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -379,7 +379,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+@@ -380,7 +380,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
    // not become active. Setting this to false creates the need to explicitly
    // hide the hovercard on press, touch, and keyboard events.
    SetCanActivate(false);
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
index f866d30041b3..c3e633e35018 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc
-@@ -96,7 +96,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow
+@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow
        base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged,
                            base::Unretained(this))));
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
index 1f22e3c7042d..c5dccbdf8567 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/tabs/tab_style_views.cc
-@@ -511,7 +511,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con
+@@ -545,7 +545,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con
    if (!IsHoverAnimationActive()) {
      return base_opacity;
    }
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
index 4ae16cbd0fcf..86896a84534e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/task_manager_search_bar_view.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/views/task_manager_search_bar_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/task_manager_search_bar_view.cc
 @@ -27,7 +27,7 @@ TaskManagerSearchBarView::TaskManagerSearchBarView(
      const gfx::Insets& margins,
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
index b9099ead5449..e94603d487ef 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -917,7 +917,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -930,7 +930,7 @@ void MaybeRegisterChromeFeaturePromos(
                  "Triggered when a shared tab becomes the active tab.")));
    }
  
@@ -9,7 +9,7 @@
    // kIPHSupervisedUserProfileSigninFeature
    registry.RegisterFeature(std::move(
        FeaturePromoSpecification::CreateForCustomAction(
-@@ -1171,7 +1171,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -1209,7 +1209,7 @@ void MaybeRegisterChromeFeaturePromos(
                         "Triggered to inform users of the availability of the "
                         "new translate screen feature on the Lens Overlay.")));
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
index 8ff44c05b936..9b03261c0d2d 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
 @@ -510,7 +510,7 @@ std::string GetFileExtension(FileExtension file_extens
  }
diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
index c8f028ad663b..8fa78bf68a4e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
+++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/web_applications/web_app_dialogs.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/web_applications/web_app_dialogs.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/web_applications/web_app_dialogs.h
 @@ -21,7 +21,7 @@
  #include "ui/gfx/native_widget_types.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
index 6bc69902e9aa..acf093258ac2 100644
--- a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
-@@ -518,7 +518,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
+@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
      Browser* browser,
      Profile* profile,
      const std::string& app_id) {
@@ -9,7 +9,7 @@
    WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
    CHECK(provider);
  
-@@ -747,7 +747,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
+@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
    }
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
index d39cbb43a311..9c84acdbe87f 100644
--- a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
+++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h
 @@ -225,7 +225,7 @@ class WebAppUiManagerImpl : public BrowserListObserver
        UninstallCompleteCallback uninstall_complete_callback,
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc
index 6d818f64517b..020439754e72 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/about/about_ui.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/about/about_ui.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/about/about_ui.cc
 @@ -496,7 +496,7 @@ std::string ChromeURLs(content::BrowserContext* browse
    return html;
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h
index 81fb2a04ddb3..67aaf5a6c26e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/about/about_ui.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/webui/about/about_ui.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/about/about_ui.h
 @@ -55,7 +55,7 @@ class TermsUIConfig : public AboutUIConfigBase {
  };
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index 2ae70da32550..f9c4686f8cbf 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -62,7 +62,7 @@
+@@ -61,7 +61,7 @@
  #include "ui/base/window_open_disposition_utils.h"
  #include "url/gurl.h"
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
index 09240b07c3eb..5c4d8626de70 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig	2024-08-01 05:47:53 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.h
 @@ -24,7 +24,7 @@
  #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h b/www/iridium/files/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
index be9375a08b78..e86dd16658b3 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/app_settings/web_app_settings_ui.h.orig	2024-12-22 12:24:29 UTC
+--- chrome/browser/ui/webui/app_settings/web_app_settings_ui.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/app_settings/web_app_settings_ui.h
 @@ -14,13 +14,13 @@
  #include "ui/webui/mojo_web_ui_controller.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
index bdf831f69c09..103c576d6336 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc
 @@ -221,7 +221,7 @@ CertificateManagerPageHandler::GetCertSource(
                  CERTIFICATE_TRUST_TYPE_DISTRUSTED,
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
index 7f38bcda9569..b99cc2d624a6 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc
 @@ -54,7 +54,7 @@
  #include "net/ssl/client_cert_store_mac.h"
@@ -6,10 +6,10 @@
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -174,7 +174,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto
  };
  #endif
  
@@ -18,7 +18,7 @@
  std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader(
      Profile* profile) {
  #if BUILDFLAG(IS_WIN)
-@@ -189,7 +189,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC
+@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC
  }
  #endif
  
@@ -27,7 +27,7 @@
  // ClientCertStore implementation that always returns an empty list. The
  // CertificateProvisioningService implementation expects to wrap a platform
  // cert store, but here we only want to get results from the provisioning
-@@ -347,7 +347,7 @@ class ClientCertSource : public CertificateManagerPage
+@@ -368,7 +368,7 @@ class ClientCertSource : public CertificateManagerPage
    std::optional<net::CertificateList> certs_;
  };
  
@@ -36,7 +36,7 @@
  // ChromeOS currently can use either Kcer or NSS for listing client certs, and
  // Linux uses NSS only. This interface provides an abstraction to hide that
  // from WritableClientCertSource. Currently this class only handles reading
-@@ -1078,7 +1078,7 @@ CreatePlatformClientCertSource(
+@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource(
      mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>*
          remote_client,
      Profile* profile) {
@@ -45,7 +45,7 @@
    return std::make_unique<WritableClientCertSource>(remote_client, profile);
  #else
    return std::make_unique<ClientCertSource>(
-@@ -1086,7 +1086,7 @@ CreatePlatformClientCertSource(
+@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource(
  #endif
  }
  
@@ -54,7 +54,7 @@
  std::unique_ptr<CertificateManagerPageHandler::CertSource>
  CreateProvisionedClientCertSource(Profile* profile) {
    return std::make_unique<ClientCertSource>(
-@@ -1135,7 +1135,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow
+@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow
  
    return client_cert_policy_ == ClientCertificateManagementPermission::kAll;
  }
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
index f3789a00df43..e8c1ae8c1d2e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h
 @@ -19,7 +19,7 @@ CreatePlatformClientCertSource(
          remote_client,
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
index 7f78811ca0bc..095676e89059 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -136,26 +136,26 @@
+@@ -137,7 +137,7 @@
  #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -8,7 +8,8 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h"
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h"
+@@ -145,19 +145,19 @@
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -31,7 +32,7 @@
  #include "chrome/browser/ui/webui/discards/discards_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -183,7 +183,7 @@
+@@ -185,7 +185,7 @@
  #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
  #endif  //  !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
  
@@ -40,7 +41,7 @@
  #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -320,7 +320,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -323,7 +323,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>());
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -49,16 +50,16 @@
    map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
          // BUILDFLAG(IS_OPENBSD)
-@@ -345,7 +345,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>());
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>());
-@@ -353,13 +353,13 @@ void RegisterChromeWebUIConfigs() {
+   map.AddWebUIConfig(std::make_unique<HistorySyncOptinUIConfig>());
+   map.AddWebUIConfig(std::make_unique<OnDeviceTranslationInternalsUIConfig>());
+@@ -357,13 +357,13 @@ void RegisterChromeWebUIConfigs() {
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 722ea766f0f6..67207234e19d 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -114,16 +114,16 @@
+@@ -118,16 +118,16 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -20,7 +20,7 @@
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -404,7 +404,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
+@@ -408,7 +408,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
      return NewTabPageUI::GetFaviconResourceBytes(scale_factor);
    }
  
@@ -29,7 +29,7 @@
    if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) {
      return WhatsNewUI::GetFaviconResourceBytes(scale_factor);
    }
-@@ -438,7 +438,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
+@@ -442,7 +442,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
    }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
index 1920cd46ec03..65928b5f90c9 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
 @@ -7,7 +7,7 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
index 87d432b3c365..f7f2d37967cc 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -74,7 +74,7 @@
+@@ -77,7 +77,7 @@
  #include "components/security_interstitials/content/captive_portal_blocking_page.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
-@@ -420,7 +420,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa
+@@ -424,7 +424,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa
  }
  #endif
  
@@ -18,7 +18,7 @@
  std::unique_ptr<SupervisedUserVerificationPageForYouTube>
  CreateSupervisedUserVerificationPageForYouTube(
      content::WebContents* web_contents,
-@@ -647,7 +647,7 @@ void InterstitialHTMLSource::StartDataRequest(
+@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRequest(
      interstitial_delegate = CreateInsecureFormPage(web_contents);
    } else if (path_without_query == "/https_only") {
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
index e4ed21234f89..3a814d8803ab 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/management/management_ui.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/management/management_ui.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/management/management_ui.cc
 @@ -175,11 +175,11 @@ void ManagementUI::GetLocalizedStrings(
         IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
index 09078ebb453e..fbde1daed041 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/management/management_ui_constants.cc.orig	2024-12-22 12:24:29 UTC
+--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/management/management_ui_constants.cc
 @@ -89,12 +89,12 @@ const char kProfileReportingExtension[] = "profileRepo
  const char kProfileReportingPolicy[] = "profileReportingPolicy";
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h
index b96ee42f7a54..adf0a7003569 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/management/management_ui_constants.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/webui/management/management_ui_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/management/management_ui_constants.h
 @@ -7,14 +7,14 @@
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
index 922e4440440f..75e981382676 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/management/management_ui_handler.cc
 @@ -58,7 +58,7 @@
  #include "ui/base/l10n/l10n_util.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
index e0e8a9191fab..8263fbe23a27 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/management/management_ui_handler.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/management/management_ui_handler.h
 @@ -30,7 +30,7 @@ namespace policy {
  class PolicyService;
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
index 287592567d88..14c11afc3d38 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/password_manager/promo_cards_handler.cc
 @@ -28,7 +28,7 @@
  #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
index b79c788802dc..d17dac5b1934 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc
 @@ -37,7 +37,7 @@ std::u16string RelaunchChromePromo::GetTitle() const {
    return l10n_util::GetStringUTF16(
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
index ec00f42e46dc..70bd58643593 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc
 @@ -111,7 +111,7 @@ const char* kMacShareIconResourceName =
  #elif BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
index be23d336fba6..7934d2832441 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/settings/appearance_handler.cc
 @@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages() {
        "useDefaultTheme",
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index c0e9f5524058..4591d1e65a51 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -138,7 +138,7 @@
+@@ -140,7 +140,7 @@
  #include "chrome/browser/ui/webui/settings/system_handler.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/display/screen.h"
  #endif
  
-@@ -157,7 +157,7 @@
+@@ -159,7 +159,7 @@
  #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
  #endif
  
@@ -18,16 +18,16 @@
  #include "ui/linux/linux_ui_factory.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -282,7 +282,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
-       {"focusHighlightLabel",
-        IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+@@ -288,7 +288,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
+       {"toastAlertLevelDescription",
+        IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION},
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
        {"overscrollHistoryNavigationTitle",
         IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
        {"overscrollHistoryNavigationSubtitle",
-@@ -571,7 +571,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -577,7 +577,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
        {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT},
        {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT},
        {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT},
@@ -36,7 +36,7 @@
        {"gtkTheme", IDS_SETTINGS_GTK_THEME},
        {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
        {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -579,7 +579,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
        {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
        {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME},
  #endif
@@ -45,7 +45,7 @@
        {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -601,7 +601,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -607,7 +607,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
    html_source->AddBoolean("tabSearchIsRightAlignedAtStartup",
                            tabs::GetTabSearchTrailingTabstrip(profile));
  
@@ -54,7 +54,7 @@
    bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
                                        ->GetPlatformRuntimeProperties()
                                        .supports_server_side_window_decorations;
-@@ -1504,7 +1504,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource*
+@@ -1495,7 +1495,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource*
            g_browser_process->GetApplicationLocale())
            .spec();
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
index dca5b4b5ba68..169afcebffda 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc
-@@ -164,7 +164,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr
+@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr
        IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name);
    if (AccountInfo::IsManaged(entry->GetHostedDomain())) {
      profile_entry.Set("avatarBadge", "cr:domain");
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
index 5da58916915a..d03a74b1eb17 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc
 @@ -50,7 +50,7 @@
  #include "ui/base/l10n/l10n_util.h"
@@ -18,7 +18,7 @@
    return g_browser_process->GetFeatures()->whats_new_registry();
  #else
    return nullptr;
-@@ -794,7 +794,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats
+@@ -828,7 +828,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats
  }
  
  void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() {
diff --git a/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
index 57ba0fa664fb..1c32d23fe910 100644
--- a/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/window_sizer/window_sizer.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/window_sizer/window_sizer.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/ui/window_sizer/window_sizer.cc
 @@ -220,7 +220,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
        browser, window_bounds, show_state);
diff --git a/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc b/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
index 92a9b8f99b0e..d4149a2d02f2 100644
--- a/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
+++ b/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/upgrade_detector/version_history_client.cc
-@@ -50,7 +50,7 @@ GURL GetVersionReleasesUrl(base::Version version) {
+@@ -175,7 +175,7 @@ GURL GetVersionReleasesUrl(base::Version version) {
  #define CURRENT_PLATFORM "win"
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
index b1171e872198..bfc3b0d2668e 100644
--- a/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  #include "components/visited_url_ranking/public/visited_url_ranking_service.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h"
  #elif BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h"
-@@ -118,7 +118,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF
+@@ -119,7 +119,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF
  
    std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc b/www/iridium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
index 9addfeaf3fde..db6dcffc1f50 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/commands/launch_web_app_command.cc
 @@ -101,7 +101,7 @@ void LaunchWebAppCommand::StartWithLock(std::unique_pt
      // OsIntegrationTestOverride can use the xdg install command to detect
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc b/www/iridium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
index 3be799d754c7..d1e57056189d 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/commands/set_user_display_mode_command.cc
 @@ -57,7 +57,7 @@ void SetUserDisplayModeCommand::StartWithLock(
      // OsIntegrationTestOverride can use the xdg install command to detect
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h
index b706510c4783..fefb00abd936 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/extension_status_utils.h.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/web_applications/extension_status_utils.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/extension_status_utils.h
 @@ -50,7 +50,7 @@ bool IsExtensionDefaultInstalled(content::BrowserConte
  bool IsExternalExtensionUninstalled(content::BrowserContext* context,
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
index 1e921900e07a..da2464d61dec 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/extensions/extension_status_utils.cc
-@@ -25,7 +25,7 @@ namespace {
+@@ -26,7 +26,7 @@ namespace {
  
  const char* g_preinstalled_app_for_testing = nullptr;
  
@@ -9,7 +9,7 @@
  // TODO(b/268221237): Remove this allow-list.
  const char kDefaultAllowedExtensionIds[] =
      "alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -107,7 +107,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
+@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
    return prefs && prefs->IsExternalExtensionUninstalled(extension_id);
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
index 1a5dc583c2ad..c909566cccf5 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc
-@@ -660,7 +660,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu
+@@ -662,7 +662,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu
      }
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
index 03e34fecdefd..744d489b4ffa 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig	2024-06-25 12:08:48 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/os_integration/os_integration_test_override.h
 @@ -99,7 +99,7 @@ class OsIntegrationTestOverride
    virtual base::FilePath chrome_apps_folder() = 0;
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
index abe969c4cdd4..8b1e7519c1b3 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2023-10-21 11:51:27 UTC
+--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc
-@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT
+@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode ConvertWebAppRunOn
  // different from other platforms, see web_app_run_on_os_login_manager.h for
  // more info.
  bool DoesRunOnOsLoginRequireExecution() {
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
index fce2282025b1..932fee2ec0d3 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
 @@ -199,7 +199,7 @@ void ShortcutSubManager::Execute(
      return;
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
index 144d89847349..b3e3af680e26 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig	2024-02-04 14:46:08 UTC
+--- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
 @@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const webapps::AppId
                                    const base::FilePath& profile_path,
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
index d52fa37d2109..334211771134 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc
 @@ -71,7 +71,7 @@ namespace {
  
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
index 7349b0085eeb..89146023fe69 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
 @@ -22,7 +22,7 @@
  #include "ui/gfx/image/image_family.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -75,7 +75,7 @@ struct ShortcutInfo {
+@@ -77,7 +77,7 @@ struct ShortcutInfo {
    // the installed PWA experience and thus the icons are not designed to be
    // displayed on an OS dock.
    bool is_diy_app = false;
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
index 01d3d4a393e6..da03034b3219 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc
 @@ -105,7 +105,7 @@ namespace web_app {
  
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
index e38ea184cba3..703a186779cc 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc
 @@ -45,7 +45,7 @@
  #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
index 4a871dbfaf34..958288bbb756 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h
 @@ -40,7 +40,7 @@ class ShellLinkItem;
  
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app__helpers.cc b/www/iridium/files/patch-chrome_browser_web__applications_web__app__helpers.cc
index a1f35d926213..427b97fc4bcb 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_web__app__helpers.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app__helpers.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/web_app_helpers.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/web_applications/web_app_helpers.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/web_app_helpers.cc
 @@ -145,7 +145,7 @@ bool IsValidWebAppUrl(const GURL& app_url) {
      return false;
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h b/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h
index a4be3a78d312..e275ed54460a 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/web_app_install_info.h.orig	2025-02-22 18:06:53 UTC
+--- chrome/browser/web_applications/web_app_install_info.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/web_applications/web_app_install_info.h
 @@ -38,7 +38,7 @@
  #include "url/gurl.h"
diff --git a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index 86ab5ab8be37..c802b580d2b8 100644
--- a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -574,7 +574,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
+@@ -577,7 +577,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
      g_observer->ConfiguringCable(request_type);
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc
index 608b4ea92018..a5f8d5a5ec6a 100644
--- a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc
@@ -1,20 +1,20 @@
---- chrome/browser/webauthn/enclave_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/webauthn/enclave_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/webauthn/enclave_manager.cc
-@@ -711,7 +711,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
+@@ -689,7 +689,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
  
  std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return label;
  #else
    return std::string("placeholder");
-@@ -721,7 +721,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
+@@ -699,7 +699,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
  std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString(
      std::string saved_label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return saved_label;
  #else
    return std::nullopt;
diff --git a/www/iridium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc b/www/iridium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
index 1f7a451c3f1e..c31c63431c7b 100644
--- a/www/iridium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
+++ b/www/iridium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
@@ -1,4 +1,4 @@
---- chrome/browser/webauthn/gpm_user_verification_policy.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/browser/webauthn/gpm_user_verification_policy.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/webauthn/gpm_user_verification_policy.cc
 @@ -17,7 +17,7 @@ bool GpmWillDoUserVerification(device::UserVerificatio
        return platform_has_biometrics;
diff --git a/www/iridium/files/patch-chrome_browser_webauthn_password__credential__controller.cc b/www/iridium/files/patch-chrome_browser_webauthn_password__credential__controller.cc
new file mode 100644
index 000000000000..f23db80c3993
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_webauthn_password__credential__controller.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/webauthn/password_credential_controller.cc.orig	2025-05-07 06:48:23 UTC
++++ chrome/browser/webauthn/password_credential_controller.cc
+@@ -46,7 +46,7 @@ password_manager::PasswordManagerClient* GetPasswordMa
+ }
+ 
+ std::u16string GetAuthenticationMessage(std::string_view rp_id) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return u"";
+ #else
+   return l10n_util::GetStringFUTF16(IDS_PASSWORD_MANAGER_FILLING_REAUTH,
diff --git a/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
index 6c85b440e8c5..e8f50c6fbcd1 100644
--- a/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
@@ -1,11 +1,11 @@
---- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/browser/webauthn/unexportable_key_utils.cc
-@@ -34,7 +34,7 @@ GetWebAuthnUnexportableKeyProvider() {
+@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() {
    // If there is a scoped UnexportableKeyProvider configured, we always use
    // that so that tests can still override the key provider.
    const bool use_software_provider =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        !crypto::internal::HasScopedUnexportableKeyProvider();
  #else
        false;
diff --git a/www/iridium/files/patch-chrome_common_channel__info.h b/www/iridium/files/patch-chrome_common_channel__info.h
index c422655e5a3a..52fed33d6c15 100644
--- a/www/iridium/files/patch-chrome_common_channel__info.h
+++ b/www/iridium/files/patch-chrome_common_channel__info.h
@@ -1,4 +1,4 @@
---- chrome/common/channel_info.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/channel_info.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/channel_info.h
 @@ -11,7 +11,7 @@
  #include "build/branding_buildflags.h"
diff --git a/www/iridium/files/patch-chrome_common_channel__info__posix.cc b/www/iridium/files/patch-chrome_common_channel__info__posix.cc
index 373d1ddf5fb4..b7ce8e0cf09c 100644
--- a/www/iridium/files/patch-chrome_common_channel__info__posix.cc
+++ b/www/iridium/files/patch-chrome_common_channel__info__posix.cc
@@ -1,4 +1,4 @@
---- chrome/common/channel_info_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/channel_info_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/channel_info_posix.cc
 @@ -94,7 +94,7 @@ std::string GetChannelSuffixForDataDir() {
    }
diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc
index fa8a40c490e4..88684c3b9e1d 100644
--- a/www/iridium/files/patch-chrome_common_chrome__features.cc
+++ b/www/iridium/files/patch-chrome_common_chrome__features.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/chrome_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/chrome_features.cc
 @@ -80,7 +80,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims,
  #endif  // BUILDFLAG(IS_MAC)
@@ -36,7 +36,7 @@
  // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
  // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
  // Apps will not launch and will be marked in the UI as deprecated.
-@@ -834,7 +834,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+@@ -898,7 +898,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
               "KAnonymityServiceStorage",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -45,7 +45,7 @@
  BASE_FEATURE(kLinuxLowMemoryMonitor,
               "LinuxLowMemoryMonitor",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -847,7 +847,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -911,7 +911,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
      &kLinuxLowMemoryMonitor, "critical_level", 255};
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h
index ae4f3f0d10c1..3ceaf1b684b2 100644
--- a/www/iridium/files/patch-chrome_common_chrome__features.h
+++ b/www/iridium/files/patch-chrome_common_chrome__features.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/chrome_features.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/chrome_features.h
 @@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims);
  #endif  // BUILDFLAG(IS_MAC)
@@ -25,7 +25,7 @@
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kShortcutsNotApps);
-@@ -494,7 +494,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
+@@ -521,7 +521,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
  
@@ -34,7 +34,7 @@
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -502,7 +502,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -529,7 +529,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc
index 16517dcd8206..dab8f76ae528 100644
--- a/www/iridium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/chrome_paths.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/chrome_paths.cc
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
  #include "base/apple/foundation_util.h"
  #endif
  
@@ -9,9 +9,9 @@
  #include "components/policy/core/common/policy_paths.h"
  #endif
  
-@@ -44,14 +44,14 @@
+@@ -48,14 +48,14 @@ namespace {
  
- namespace {
+ std::optional<bool> g_override_using_default_data_directory_for_testing;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -27,7 +27,7 @@
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -208,7 +208,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePath* result) {
        }
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -36,7 +36,7 @@
        if (!GetUserDownloadsDirectorySafe(&cur)) {
          return false;
        }
-@@ -500,13 +500,13 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -52,7 +52,7 @@
      (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
-@@ -516,7 +516,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -61,7 +61,7 @@
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -554,7 +554,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
  
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
@@ -70,7 +70,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if BUILDFLAG(IS_MAC)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -568,6 +568,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -572,6 +572,9 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(
            FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts"));
diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.h b/www/iridium/files/patch-chrome_common_chrome__paths.h
index b5771fdb72f1..701ebf57c93f 100644
--- a/www/iridium/files/patch-chrome_common_chrome__paths.h
+++ b/www/iridium/files/patch-chrome_common_chrome__paths.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/chrome_paths.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/chrome_paths.h
 @@ -56,7 +56,7 @@ enum {
                       // to set policies for chrome. This directory
diff --git a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
index 00fe703a2371..89653870748e 100644
--- a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths_internal.h.orig	2023-07-24 14:27:53 UTC
+--- chrome/common/chrome_paths_internal.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/chrome_paths_internal.h
-@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
+@@ -53,7 +53,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
  // Get the path to the user's documents directory.
  bool GetUserDocumentsDirectory(base::FilePath* result);
  
diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc
index 6c240ac00c84..ece1f9d9c392 100644
--- a/www/iridium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/chrome_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -874,7 +874,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -883,7 +883,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -9,8 +9,8 @@
  const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
  
  // Causes the browser to launch directly in guest mode.
-@@ -897,7 +897,7 @@ const char kGlicAllowedOrigins[] = "glic-webui-allowed
- const char kGlicDev[] = "glic-dev";
+@@ -911,7 +911,7 @@ const char kGlicDev[] = "glic-dev";
+ const char kGlicHostLogging[] = "glic-host-logging";
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h
index 45fce740871e..732323a94897 100644
--- a/www/iridium/files/patch-chrome_common_chrome__switches.h
+++ b/www/iridium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/chrome_switches.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/chrome_switches.h
-@@ -271,7 +271,7 @@ extern const char kAllowNaClSocketAPI[];
+@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[];
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -9,8 +9,8 @@
  extern const char kEnableNewAppMenuIcon[];
  extern const char kGuest[];
  extern const char kForceNtpMobilePromo[];
-@@ -286,7 +286,7 @@ extern const char kGlicAllowedOrigins[];
- extern const char kGlicDev[];
+@@ -290,7 +290,7 @@ extern const char kGlicDev[];
+ extern const char kGlicHostLogging[];
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-chrome_common_crash__keys.cc b/www/iridium/files/patch-chrome_common_crash__keys.cc
index 1c33ee688f49..319f98129753 100644
--- a/www/iridium/files/patch-chrome_common_crash__keys.cc
+++ b/www/iridium/files/patch-chrome_common_crash__keys.cc
@@ -1,4 +1,4 @@
---- chrome/common/crash_keys.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/crash_keys.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/crash_keys.cc
 @@ -51,7 +51,9 @@ class CrashKeyWithName {
    ~CrashKeyWithName() = delete;
diff --git a/www/iridium/files/patch-chrome_common_extensions_extension__constants.cc b/www/iridium/files/patch-chrome_common_extensions_extension__constants.cc
index 643bff43e021..916cfcbf62da 100644
--- a/www/iridium/files/patch-chrome_common_extensions_extension__constants.cc
+++ b/www/iridium/files/patch-chrome_common_extensions_extension__constants.cc
@@ -1,4 +1,4 @@
---- chrome/common/extensions/extension_constants.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/extensions/extension_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/extensions/extension_constants.cc
 @@ -38,7 +38,7 @@ const char* const kBuiltInFirstPartyExtensionIds[] = {
      kGoogleSpeechSynthesisExtensionId,
diff --git a/www/iridium/files/patch-chrome_common_extensions_extension__constants.h b/www/iridium/files/patch-chrome_common_extensions_extension__constants.h
index a7afe64f959f..12c0aef6bae5 100644
--- a/www/iridium/files/patch-chrome_common_extensions_extension__constants.h
+++ b/www/iridium/files/patch-chrome_common_extensions_extension__constants.h
@@ -1,4 +1,4 @@
---- chrome/common/extensions/extension_constants.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/extensions/extension_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/extensions/extension_constants.h
 @@ -310,7 +310,7 @@ inline constexpr char kReadingModeGDocsHelperExtension
  inline constexpr base::FilePath::CharType
diff --git a/www/iridium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/www/iridium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
index 504577bdea90..bdaa8ae3604a 100644
--- a/www/iridium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
+++ b/www/iridium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
@@ -1,4 +1,4 @@
---- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/extensions/permissions/chrome_permission_message_rules.cc
 @@ -280,7 +280,7 @@ class USBDevicesFormatter : public ChromePermissionMes
  int GetEnterpriseReportingPrivatePermissionMessageId() {
diff --git a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc
index 8f389574c4bc..1d7fdb5fce04 100644
--- a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc
+++ b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc
@@ -1,4 +1,4 @@
---- chrome/common/media/cdm_host_file_path.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/common/media/cdm_host_file_path.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/media/cdm_host_file_path.cc
 @@ -90,7 +90,7 @@ void AddCdmHostFilePaths(
    cdm_host_file_paths->emplace_back(chrome_framework_path,
diff --git a/www/iridium/files/patch-chrome_common_media_cdm__registration.cc b/www/iridium/files/patch-chrome_common_media_cdm__registration.cc
index bf3aa7cda939..e8158956f5b4 100644
--- a/www/iridium/files/patch-chrome_common_media_cdm__registration.cc
+++ b/www/iridium/files/patch-chrome_common_media_cdm__registration.cc
@@ -1,4 +1,4 @@
---- chrome/common/media/cdm_registration.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/media/cdm_registration.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/media/cdm_registration.cc
 @@ -32,7 +32,7 @@
  #if BUILDFLAG(ENABLE_WIDEVINE)
diff --git a/www/iridium/files/patch-chrome_common_media_cdm__registration.h b/www/iridium/files/patch-chrome_common_media_cdm__registration.h
index 3545fbe9cb91..81b97b13a3ba 100644
--- a/www/iridium/files/patch-chrome_common_media_cdm__registration.h
+++ b/www/iridium/files/patch-chrome_common_media_cdm__registration.h
@@ -1,4 +1,4 @@
---- chrome/common/media/cdm_registration.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/media/cdm_registration.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/media/cdm_registration.h
 @@ -15,7 +15,7 @@
  void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms);
diff --git a/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
index c0620b43c14e..2864a2a2cd06 100644
--- a/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
+++ b/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
@@ -1,4 +1,4 @@
---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h
 @@ -14,7 +14,7 @@
  #error "This file only applies when Widevine used."
diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h
index 02a51a515c82..ac15114e3aec 100644
--- a/www/iridium/files/patch-chrome_common_pref__names.h
+++ b/www/iridium/files/patch-chrome_common_pref__names.h
@@ -1,4 +1,4 @@
---- chrome/common/pref_names.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/pref_names.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/pref_names.h
 @@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem
  inline constexpr char kAllowedDomainsForApps[] =
@@ -18,7 +18,7 @@
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -2120,7 +2120,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
+@@ -2129,7 +2129,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
  inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
  inline constexpr char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
  #endif
-@@ -2613,14 +2613,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
+@@ -2622,14 +2622,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
  inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -44,7 +44,7 @@
  // Records whether the user has seen an HTTP auth "negotiate" header.
  inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
      "net.received_http_auth_negotiate_headers";
-@@ -2712,7 +2712,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[
+@@ -2721,7 +2721,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[
  inline constexpr char kIsolatedWebAppPendingInitializationCount[] =
      "profile.isolated_web_app.install.pending_initialization_count";
  
@@ -53,7 +53,7 @@
  // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
  // along with kAuthNegotiateDelegateAllowlist.
  inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] 
+@@ -3240,7 +3240,7 @@ inline constexpr char kKioskChromeAppsForceAllowed[] =
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -62,7 +62,7 @@
  // Defines administrator-set availability of Chrome for Testing.
  inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed";
  #endif
-@@ -3764,7 +3764,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo
+@@ -3763,7 +3763,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo
  inline constexpr char kSandboxExternalProtocolBlocked[] =
      "profile.sandbox_external_protocol_blocked";
  
@@ -71,7 +71,7 @@
  // Boolean that indicates if system notifications are allowed to be used in
  // place of Chrome notifications.
  inline constexpr char kAllowSystemNotifications[] =
-@@ -3960,7 +3960,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] =
+@@ -3959,7 +3959,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] =
      "policy.lens_desktop_ntp_search_enabled";
  #endif
  
@@ -80,7 +80,7 @@
  // A dict mapping the edition name with the major version it was shown.
  inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used";
  // A list containing the features of each module in order of when they
-@@ -4057,7 +4057,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
+@@ -4056,7 +4056,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
      "printing.oauth2_authorization_servers";
  #endif
  
diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h
index dc968f808a85..5d0f0d7120d4 100644
--- a/www/iridium/files/patch-chrome_common_url__constants.h
+++ b/www/iridium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/url_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/url_constants.h
-@@ -981,7 +981,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] =
+@@ -983,7 +983,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] =
  inline constexpr char kPhoneHubPermissionLearnMoreURL[] =
      "https://support.google.com/chromebook?p=multidevice";
  
diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.cc b/www/iridium/files/patch-chrome_common_webui__url__constants.cc
index af7b7af19343..e4e6caee98ab 100644
--- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,4 +1,4 @@
---- chrome/common/webui_url_constants.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/common/webui_url_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/webui_url_constants.cc
 @@ -192,18 +192,18 @@ base::span<const base::cstring_view> ChromeURLHosts() 
        kChromeUIAssistantOptInHost,
diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h
index 33e296926bf9..8d7af9596985 100644
--- a/www/iridium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig	2025-04-16 18:18:42 UTC
+--- chrome/common/webui_url_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ chrome/common/webui_url_constants.h
-@@ -509,18 +509,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome
+@@ -513,18 +513,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -22,7 +22,7 @@
  inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings";
  inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
  inline constexpr char kChromeUIWhatsNewHost[] = "whats-new";
-@@ -532,11 +532,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] 
+@@ -536,11 +536,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] 
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -36,8 +36,8 @@
  inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch";
  inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
  inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser";
-@@ -558,7 +558,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[
- inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/";
+@@ -565,7 +565,7 @@ inline constexpr char kChromeUIHistorySyncOptinURL[] =
+     "chrome://history-sync-optin/";
  #endif
  
 -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
diff --git a/www/iridium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/www/iridium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc
index 4998a3aa4e78..d2491471af7e 100644
--- a/www/iridium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc
+++ b/www/iridium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc
@@ -1,4 +1,4 @@
---- chrome/enterprise_companion/enterprise_companion_client.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/enterprise_companion/enterprise_companion_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/enterprise_companion/enterprise_companion_client.cc
 @@ -35,7 +35,7 @@ namespace {
  
diff --git a/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc b/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc
index 6b603867e651..638f693fe3ea 100644
--- a/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc
+++ b/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc
@@ -1,6 +1,6 @@
---- chrome/enterprise_companion/event_logger.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/enterprise_companion/event_logger.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/enterprise_companion/event_logger.cc
-@@ -124,7 +124,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() {
+@@ -126,7 +126,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() {
    metadata.set_application_arch(proto::ARM64);
  #endif
  
diff --git a/www/iridium/files/patch-chrome_enterprise__companion_lock.cc b/www/iridium/files/patch-chrome_enterprise__companion_lock.cc
index e425e2d54e7d..2087ced52d3d 100644
--- a/www/iridium/files/patch-chrome_enterprise__companion_lock.cc
+++ b/www/iridium/files/patch-chrome_enterprise__companion_lock.cc
@@ -1,4 +1,4 @@
---- chrome/enterprise_companion/lock.cc.orig	2024-08-27 06:28:16 UTC
+--- chrome/enterprise_companion/lock.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/enterprise_companion/lock.cc
 @@ -17,7 +17,7 @@
  
diff --git a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index 3779fe489da1..7ce56597f612 100644
--- a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/services/printing/print_backend_service_impl.cc
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
  #include "printing/backend/cups_connection_pool.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/no_destructor.h"
  #include "ui/linux/linux_ui.h"
  #include "ui/linux/linux_ui_delegate_stub.h"
-@@ -77,7 +77,7 @@ namespace printing {
+@@ -76,7 +76,7 @@ namespace printing {
  
  namespace {
  
@@ -18,7 +18,7 @@
  void InstantiateLinuxUiDelegate() {
    // TODO(crbug.com/40561724)  Until a real UI can be used in a utility process,
    // need to use the stub version.
-@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() {
+@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
  #endif
  
  scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() {
@@ -27,7 +27,7 @@
    // Use task runner associated with equivalent of UI thread.  Needed for calls
    // made through `PrintDialogLinuxInterface` to properly execute.
    CHECK(base::SequencedTaskRunner::HasCurrentDefault());
-@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init(
+@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init(
    // `InitCommon()`.
    InitializeProcessForPrinting();
    print_backend_ = PrintBackend::CreateInstance(locale);
@@ -36,7 +36,7 @@
    // Test framework already initializes the UI, so this should not go in
    // `InitCommon()`.  Additionally, low-level Linux UI is not needed when tests
    // are using `TestPrintingContext`.
-@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
    crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
        *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name));
  
diff --git a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
index dfa2283cd3d2..e28c2cea04e3 100644
--- a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
+++ b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
@@ -1,4 +1,4 @@
---- chrome/services/speech/audio_source_fetcher_impl.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/services/speech/audio_source_fetcher_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/services/speech/audio_source_fetcher_impl.cc
 @@ -132,7 +132,7 @@ void AudioSourceFetcherImpl::Start(
  
diff --git a/www/iridium/files/patch-chrome_test_base_scoped__channel__override__posix.cc b/www/iridium/files/patch-chrome_test_base_scoped__channel__override__posix.cc
index 3da3d44a105b..9e98756d663d 100644
--- a/www/iridium/files/patch-chrome_test_base_scoped__channel__override__posix.cc
+++ b/www/iridium/files/patch-chrome_test_base_scoped__channel__override__posix.cc
@@ -1,4 +1,4 @@
---- chrome/test/base/scoped_channel_override_posix.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/test/base/scoped_channel_override_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/test/base/scoped_channel_override_posix.cc
 @@ -45,7 +45,7 @@ std::string GetVersionExtra(ScopedChannelOverride::Cha
        return "beta";
diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
index 1da55d33209e..352d226bf269 100644
--- a/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
+++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/chrome_launcher.cc.orig	2024-02-04 14:46:08 UTC
+--- chrome/test/chromedriver/chrome_launcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/test/chromedriver/chrome_launcher.cc
 @@ -73,6 +73,7 @@
  #include <fcntl.h>
diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
index 41c9c2c9a729..fecd76c12c1e 100644
--- a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
+++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2024-02-04 14:46:08 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/test/chromedriver/chrome/chrome_finder.cc
 @@ -58,7 +58,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
          installation_locations[i].Append(L"Chromium\\Application"));
diff --git a/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc
index 9d1d3df1ab7d..eafe75cc7743 100644
--- a/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc
+++ b/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/key_converter_unittest.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/test/chromedriver/key_converter_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/test/chromedriver/key_converter_unittest.cc
 @@ -252,7 +252,7 @@ TEST(KeyConverter, ToggleModifiers) {
    CheckEventsReleaseModifiers(keys, key_events);
diff --git a/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
index 5cd2afb8a6cd..1df109a7d2d6 100644
--- a/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
+++ b/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc
 @@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo
  
diff --git a/www/iridium/files/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc b/www/iridium/files/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
index d2f2b0bb7fdc..9a4900cb366e 100644
--- a/www/iridium/files/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
+++ b/www/iridium/files/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
@@ -1,4 +1,4 @@
---- chrome/test/supervised_user/google_auth_state_waiter_mixin.cc.orig	2024-11-04 08:56:03 UTC
+--- chrome/test/supervised_user/google_auth_state_waiter_mixin.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/test/supervised_user/google_auth_state_waiter_mixin.cc
 @@ -24,7 +24,7 @@ GoogleAuthStateWaiterMixin::GoogleAuthStateWaiterMixin
  GoogleAuthStateWaiterMixin::~GoogleAuthStateWaiterMixin() = default;
diff --git a/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc b/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc
index a4c27f190086..44b20c4fd945 100644
--- a/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc
+++ b/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc
@@ -1,4 +1,4 @@
---- chrome/updater/app/app_uninstall.cc.orig	2025-02-22 18:06:53 UTC
+--- chrome/updater/app/app_uninstall.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/updater/app/app_uninstall.cc
 @@ -157,7 +157,7 @@ void UninstallInThreadPool(UpdaterScope scope,
              }
diff --git a/www/iridium/files/patch-chrome_updater_configurator.cc b/www/iridium/files/patch-chrome_updater_configurator.cc
index 93a2bd5739eb..0f0f782fd745 100644
--- a/www/iridium/files/patch-chrome_updater_configurator.cc
+++ b/www/iridium/files/patch-chrome_updater_configurator.cc
@@ -1,4 +1,4 @@
---- chrome/updater/configurator.cc.orig	2025-03-18 16:46:04 UTC
+--- chrome/updater/configurator.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/updater/configurator.cc
 @@ -73,7 +73,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs>
          return std::nullopt;
diff --git a/www/iridium/files/patch-chrome_updater_lock.cc b/www/iridium/files/patch-chrome_updater_lock.cc
index c8675ad2d486..eb205fe271cf 100644
--- a/www/iridium/files/patch-chrome_updater_lock.cc
+++ b/www/iridium/files/patch-chrome_updater_lock.cc
@@ -1,4 +1,4 @@
---- chrome/updater/lock.cc.orig	2024-08-01 05:47:53 UTC
+--- chrome/updater/lock.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/updater/lock.cc
 @@ -26,7 +26,7 @@ namespace updater {
  std::unique_ptr<ScopedLock> CreateScopedLock(const std::string& name,
diff --git a/www/iridium/files/patch-chrome_updater_util_posix__util.cc b/www/iridium/files/patch-chrome_updater_util_posix__util.cc
index cc3ab6996de9..fdeed110bbe3 100644
--- a/www/iridium/files/patch-chrome_updater_util_posix__util.cc
+++ b/www/iridium/files/patch-chrome_updater_util_posix__util.cc
@@ -1,4 +1,4 @@
---- chrome/updater/util/posix_util.cc.orig	2024-06-25 12:08:48 UTC
+--- chrome/updater/util/posix_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/updater/util/posix_util.cc
 @@ -20,7 +20,7 @@
  #include "chrome/updater/updater_branding.h"
diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc
index 9f6392ec1d70..41c6c1b082a8 100644
--- a/www/iridium/files/patch-chrome_utility_services.cc
+++ b/www/iridium/files/patch-chrome_utility_services.cc
@@ -1,6 +1,6 @@
---- chrome/utility/services.cc.orig	2025-04-16 18:18:42 UTC
+--- chrome/utility/services.cc.orig	2025-05-07 06:48:23 UTC
 +++ chrome/utility/services.cc
-@@ -49,7 +49,7 @@
+@@ -48,7 +48,7 @@
  #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -9,7 +9,7 @@
  #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -209,7 +209,7 @@ auto RunMacNotificationService(
+@@ -205,7 +205,7 @@ auto RunMacNotificationService(
  }
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -18,7 +18,7 @@
  auto RunSystemSignalsService(
      mojo::PendingReceiver<device_signals::mojom::SystemSignalsService>
          receiver) {
-@@ -485,7 +485,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
    services.Add(RunWindowsIconReader);
  #endif  // BUILDFLAG(IS_WIN)
  
diff --git a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index fc488edef44d..68c7525a704e 100644
--- a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig	2025-02-22 18:06:53 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2025-05-07 06:48:23 UTC
 +++ chromecast/browser/cast_browser_main_parts.cc
-@@ -95,7 +95,7 @@
+@@ -100,7 +100,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -9,7 +9,7 @@
  #include <fontconfig/fontconfig.h>
  #include <signal.h>
  #include <sys/prctl.h>
-@@ -268,7 +268,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
+@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
  
  #endif  // defined(USE_AURA)
  
@@ -18,7 +18,7 @@
  
  base::FilePath GetApplicationFontsDir() {
    std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -314,7 +314,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {switches::kDisableThreadedAnimation, ""},
  #endif  // BUILDFLAG(IS_ANDROID)
  #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -27,7 +27,7 @@
  #if defined(ARCH_CPU_X86_FAMILY)
      // This is needed for now to enable the x11 Ozone platform to work with
      // current Linux/NVidia OpenGL drivers.
-@@ -491,7 +491,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -496,7 +496,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
      views_delegate_ = std::make_unique<CastViewsDelegate>();
  #endif  // defined(USE_AURA)
  
diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
index c44fbe98b5b2..2b0ae1dcc852 100644
--- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,4 +1,4 @@
---- chromecast/browser/cast_content_browser_client.cc.orig	2025-04-16 18:18:42 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ chromecast/browser/cast_content_browser_client.cc
 @@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
                                            switches::kAudioOutputChannels));
diff --git a/www/iridium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc b/www/iridium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
index c4a41568f379..5b35e6074011 100644
--- a/www/iridium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
+++ b/www/iridium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
@@ -1,4 +1,4 @@
---- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc
 @@ -352,7 +352,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre
    params->force_720p_resolution =
diff --git a/www/iridium/files/patch-chromecast_media_base_default__monotonic__clock.cc b/www/iridium/files/patch-chromecast_media_base_default__monotonic__clock.cc
index 7b076ff6561d..4cc16ecca3ec 100644
--- a/www/iridium/files/patch-chromecast_media_base_default__monotonic__clock.cc
+++ b/www/iridium/files/patch-chromecast_media_base_default__monotonic__clock.cc
@@ -1,4 +1,4 @@
---- chromecast/media/base/default_monotonic_clock.cc.orig	2022-03-28 18:11:04 UTC
+--- chromecast/media/base/default_monotonic_clock.cc.orig	2025-05-07 06:48:23 UTC
 +++ chromecast/media/base/default_monotonic_clock.cc
 @@ -11,7 +11,7 @@
  #include "base/time/time.h"
diff --git a/www/iridium/files/patch-components_BUILD.gn b/www/iridium/files/patch-components_BUILD.gn
index 04ba556b3677..e4c4a24a3289 100644
--- a/www/iridium/files/patch-components_BUILD.gn
+++ b/www/iridium/files/patch-components_BUILD.gn
@@ -1,4 +1,4 @@
---- components/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- components/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ components/BUILD.gn
 @@ -208,7 +208,6 @@ test("components_unittests") {
      "//components/content_settings/core/browser:unit_tests",
@@ -8,7 +8,7 @@
      "//components/cross_device/logging:unit_tests",
      "//components/crx_file:unit_tests",
      "//components/data_sharing:unit_tests",
-@@ -607,7 +606,7 @@ test("components_unittests") {
+@@ -610,7 +609,7 @@ test("components_unittests") {
        deps += [ "//components/cast:unit_tests" ]
      }
  
@@ -17,7 +17,7 @@
        deps += [
          "//components/crash/content/browser:unit_tests",
          "//components/crash/core/app:unit_tests",
-@@ -765,7 +764,7 @@ test("components_unittests") {
+@@ -771,7 +770,7 @@ test("components_unittests") {
      deps += [ "//components/constrained_window:unit_tests" ]
    }
  
diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
index 28df39cd4771..16e0be84af1c 100644
--- a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
+++ b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
@@ -1,6 +1,15 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
-@@ -1003,7 +1003,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
+@@ -950,7 +950,7 @@ void PaymentsDataManager::SetPrefService(PrefService* 
+           &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
+           base::Unretained(this)));
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   pref_registrar_.Add(
+       prefs::kAutofillBnplEnabled,
+       base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
+@@ -1026,7 +1026,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,21 +18,21 @@
  bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
    return prefs::HasSeenBnpl(pref_service_);
  }
-@@ -1172,7 +1172,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar
- bool PaymentsDataManager::ShouldShowCardsFromAccountOption() const {
- // The feature is only for Linux, Windows, Mac, and Fuchsia.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // This option should only be shown for users that have not enabled the Sync
-   // Feature and that have server credit cards available.
-   // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and
-@@ -2026,7 +2026,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
+@@ -2022,7 +2022,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
  
  bool PaymentsDataManager::AreBnplIssuersSupported() const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return app_locale_ == "en-US" &&
+   return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" &&
           base::FeatureList::IsEnabled(
               features::kAutofillEnableBuyNowPayLaterSyncing);
+@@ -2055,7 +2055,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void PaymentsDataManager::OnBnplEnabledPrefChange() {
+   // On pref change to `false`, clearing BNPL issuers is implicitly handled by
+   // `GetBnplIssuers()`, since it returns an empty vector when
diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
index 23c8197eb6a2..9e94c0e0d11b 100644
--- a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
+++ b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
@@ -1,4 +1,4 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-04-16 18:18:42 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-05-07 06:48:23 UTC
 +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
 @@ -354,7 +354,7 @@ class PaymentsDataManager : public AutofillWebDataServ
    void SetAutofillHasSeenIban();
@@ -9,3 +9,12 @@
    // Returns the value of the kAutofillHasSeenBnpl pref.
    bool IsAutofillHasSeenBnplPrefEnabled() const;
  
+@@ -683,7 +683,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+   void ClearAllCreditCardBenefits();
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Monitors the `kAutofillBnplEnabled` preference for changes and controls the
+   // clearing/loading of payment instruments accordingly. Will also log the
+   // `Autofill.SettingsPage.BnplToggled` metric.
diff --git a/www/iridium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc b/www/iridium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
index 21ea2731ecf6..3e6228b8d306 100644
--- a/www/iridium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
+++ b/www/iridium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
@@ -1,4 +1,4 @@
---- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig	2025-04-16 18:18:42 UTC
+--- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/autofill/core/browser/integrators/autofill_optimization_guide.cc
 @@ -231,7 +231,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
    }
diff --git a/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
index b9c80cb8eec2..11751e1737b2 100644
--- a/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
+++ b/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/autofill/core/browser/payments/bnpl_manager.cc
-@@ -109,7 +109,7 @@ void BnplManager::OnAmountExtractionReturned(
+@@ -114,7 +114,7 @@ void BnplManager::OnAmountExtractionReturned(
  
  bool BnplManager::ShouldShowBnplSettings() const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
    const PaymentsDataManager& payments_data_manager =
        payments_autofill_client().GetPaymentsDataManager();
  
-@@ -223,7 +223,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl(
+@@ -431,7 +431,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl(
        .Run(update_suggestions_result.suggestions, trigger_source);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index bac68db6f090..9d6c24ac4898 100644
--- a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig	2025-04-16 18:18:42 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -269,7 +269,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts,
+@@ -267,7 +267,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts,
  #endif  // BUILDFLAG(IS_ANDROID)
  
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc
index 0dff42d0bbff..60ddeaf54585 100644
--- a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc
+++ b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc
@@ -1,15 +1,15 @@
---- components/autofill/core/common/autofill_prefs.cc.orig	2025-04-16 18:18:42 UTC
+--- components/autofill/core/common/autofill_prefs.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/autofill/core/common/autofill_prefs.cc
-@@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -98,7 +98,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled,
-                                 false);
    registry->RegisterBooleanPref(
-@@ -297,7 +297,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer
+       kAutofillBnplEnabled, true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+@@ -277,7 +277,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  void SetAutofillBnplEnabled(PrefService* prefs, bool value) {
    prefs->SetBoolean(kAutofillBnplEnabled, value);
  }
-@@ -306,7 +306,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
+@@ -286,7 +286,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
  
  bool IsAutofillBnplEnabled(const PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
    return prefs->GetBoolean(kAutofillBnplEnabled);
  #else
    return false;
-@@ -315,7 +315,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) {
+@@ -295,7 +295,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) {
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h
index 0f2a0d9d09c3..45fcfb6b78e2 100644
--- a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h
+++ b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h
@@ -1,24 +1,15 @@
---- components/autofill/core/common/autofill_prefs.h.orig	2025-04-16 18:18:42 UTC
+--- components/autofill/core/common/autofill_prefs.h.orig	2025-05-07 06:48:23 UTC
 +++ components/autofill/core/common/autofill_prefs.h
-@@ -26,7 +26,7 @@ namespace autofill::prefs {
- inline constexpr std::string_view kAutofillAblationSeedPref =
-     "autofill.ablation_seed";
+@@ -32,7 +32,7 @@ inline constexpr std::string_view kAutofillAblationSee
+ inline constexpr char kAutofillAiOptInStatus[] =
+     "autofill.autofill_ai.opt_in_status";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Boolean that is true if BNPL on Autofill is enabled.
  inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled";
  // Boolean that is true if the user has ever seen a BNPL suggestion.
-@@ -82,7 +82,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] =
- inline constexpr char kAutofillPaymentCardBenefits[] =
-     "autofill.payment_card_benefits";
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Boolean that controls improved autofill filling predictions. When enabled,
- // the autofill functionality is enhanced with adopting user data to
- // the form being filled in, which is triggered by the user via an extra
-@@ -237,7 +237,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs,
+@@ -208,7 +208,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs,
  bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +18,7 @@
  void SetAutofillBnplEnabled(PrefService* prefs, bool value);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -245,7 +245,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
+@@ -216,7 +216,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
  bool IsAutofillBnplEnabled(const PrefService* prefs);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc
index 88663baaae09..1c41bbebbbfe 100644
--- a/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc
+++ b/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc
@@ -1,24 +1,25 @@
---- components/commerce/core/commerce_feature_list.cc.orig	2025-04-16 18:18:42 UTC
+--- components/commerce/core/commerce_feature_list.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/commerce/core/commerce_feature_list.cc
-@@ -156,7 +156,7 @@ BASE_FEATURE(kPriceAnnotationsRegionLaunched,
- BASE_FEATURE(kPriceInsights,
+@@ -156,7 +156,8 @@ BASE_FEATURE(kPriceInsights,
               "PriceInsights",
               base::FEATURE_DISABLED_BY_DEFAULT);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \
++    BUILDFLAG(IS_BSD)
  BASE_FEATURE(kPriceInsightsRegionLaunched,
               "PriceInsightsRegionLaunched",
-@@ -222,7 +222,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
  const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  const base::FeatureParam<bool> kDiscountOnShoppyPage{
      &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true};
  #else
-@@ -231,7 +231,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{
+@@ -236,7 +237,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +28,7 @@
  BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched,
               "EnableDiscountInfoApiRegionLaunched",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -246,7 +246,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi
+@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi
  const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,13 +37,3 @@
  BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting,
               "DiscountDialogAutoPopupBehaviorSetting",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -287,7 +287,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl
- 
- BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || \
-+    BUILDFLAG(IS_BSD)
- BASE_FEATURE(kShoppingListRegionLaunched,
-              "ShoppingListRegionLaunched",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc b/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc
index d286146d8b37..3154c27167ea 100644
--- a/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc
+++ b/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc
@@ -1,6 +1,6 @@
---- components/constrained_window/constrained_window_views.cc.orig	2025-03-18 16:46:04 UTC
+--- components/constrained_window/constrained_window_views.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/constrained_window/constrained_window_views.cc
-@@ -375,7 +375,7 @@ bool SupportsGlobalScreenCoordinates() {
+@@ -377,7 +377,7 @@ bool SupportsGlobalScreenCoordinates() {
  }
  
  bool PlatformClipsChildrenToViewport() {
diff --git a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
index c4bdbc1855aa..448c69dc9a9e 100644
--- a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
+++ b/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
@@ -1,4 +1,4 @@
---- components/content_settings/core/browser/website_settings_registry.cc.orig	2025-02-22 18:06:53 UTC
+--- components/content_settings/core/browser/website_settings_registry.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/content_settings/core/browser/website_settings_registry.cc
 @@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
  #if BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc b/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc
index 537219bf4f68..d0b22ede18d4 100644
--- a/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc
+++ b/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc
@@ -1,4 +1,4 @@
---- components/cookie_config/cookie_store_util.cc.orig	2024-06-25 12:08:48 UTC
+--- components/cookie_config/cookie_store_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/cookie_config/cookie_store_util.cc
 @@ -12,7 +12,7 @@
  namespace cookie_config {
diff --git a/www/iridium/files/patch-components_crash_core_app_BUILD.gn b/www/iridium/files/patch-components_crash_core_app_BUILD.gn
index a5900d865b12..0bc6361ffc26 100644
--- a/www/iridium/files/patch-components_crash_core_app_BUILD.gn
+++ b/www/iridium/files/patch-components_crash_core_app_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/app/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- components/crash/core/app/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ components/crash/core/app/BUILD.gn
 @@ -70,6 +70,10 @@ static_library("app") {
      ]
@@ -20,7 +20,7 @@
      sources += [ "crashpad_linux.cc" ]
      data_deps = [ ":chrome_crashpad_handler" ]
    }
-@@ -103,7 +107,7 @@ static_library("app") {
+@@ -105,7 +109,7 @@ static_library("app") {
      libs = [ "log" ]
    }
  
@@ -29,7 +29,7 @@
      deps += [
        "//base:base_static",
        "//components/crash/core/common",
-@@ -235,11 +239,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -237,11 +241,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
    # define custom UserStreamDataSources.
    executable("chrome_crashpad_handler") {
      sources = [ "chrome_crashpad_handler.cc" ]
diff --git a/www/iridium/files/patch-components_crash_core_app_chrome__crashpad__handler.cc b/www/iridium/files/patch-components_crash_core_app_chrome__crashpad__handler.cc
index 8597b8aef7dd..818226c9a081 100644
--- a/www/iridium/files/patch-components_crash_core_app_chrome__crashpad__handler.cc
+++ b/www/iridium/files/patch-components_crash_core_app_chrome__crashpad__handler.cc
@@ -1,4 +1,4 @@
---- components/crash/core/app/chrome_crashpad_handler.cc.orig	2022-03-28 18:11:04 UTC
+--- components/crash/core/app/chrome_crashpad_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/crash/core/app/chrome_crashpad_handler.cc
 @@ -6,5 +6,9 @@
  extern "C" int CrashpadHandlerMain(int argc, char* argv[]);
diff --git a/www/iridium/files/patch-components_crash_core_app_crashpad__handler__main.cc b/www/iridium/files/patch-components_crash_core_app_crashpad__handler__main.cc
index 732ba2d50247..0d1c852922c3 100644
--- a/www/iridium/files/patch-components_crash_core_app_crashpad__handler__main.cc
+++ b/www/iridium/files/patch-components_crash_core_app_crashpad__handler__main.cc
@@ -1,4 +1,4 @@
---- components/crash/core/app/crashpad_handler_main.cc.orig	2024-06-25 12:08:48 UTC
+--- components/crash/core/app/crashpad_handler_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/crash/core/app/crashpad_handler_main.cc
 @@ -10,7 +10,7 @@
  #include "third_party/crashpad/crashpad/handler/handler_main.h"
diff --git a/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc b/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
index 0cd2ea7e8ce3..2e6f587ecaa7 100644
--- a/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
+++ b/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
@@ -1,4 +1,4 @@
---- components/crash/core/browser/crash_upload_list_crashpad.cc.orig	2025-02-22 18:06:53 UTC
+--- components/crash/core/browser/crash_upload_list_crashpad.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/crash/core/browser/crash_upload_list_crashpad.cc
 @@ -37,7 +37,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() = 
  std::vector<std::unique_ptr<UploadList::UploadInfo>>
diff --git a/www/iridium/files/patch-components_crash_core_common_BUILD.gn b/www/iridium/files/patch-components_crash_core_common_BUILD.gn
index 2eb8ded90053..fe568f50273e 100644
--- a/www/iridium/files/patch-components_crash_core_common_BUILD.gn
+++ b/www/iridium/files/patch-components_crash_core_common_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/common/BUILD.gn.orig	2023-07-24 14:27:53 UTC
+--- components/crash/core/common/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ components/crash/core/common/BUILD.gn
 @@ -9,7 +9,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
  
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_browser__utils.h b/www/iridium/files/patch-components_device__signals_core_browser_browser__utils.h
new file mode 100644
index 000000000000..0ff352cbf560
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_browser__utils.h
@@ -0,0 +1,20 @@
+--- components/device_signals/core/browser/browser_utils.h.orig	2025-05-07 06:48:23 UTC
++++ components/device_signals/core/browser/browser_utils.h
+@@ -15,7 +15,7 @@ namespace device_signals {
+ // Returns the hostname of the current machine.
+ std::string GetHostName();
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the hostname of the current machine.
+ std::vector<std::string> GetSystemDnsServers();
+ 
+@@ -23,7 +23,7 @@ std::vector<std::string> GetSystemDnsServers();
+ SettingValue GetOSFirewall();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the path to the ufw configuration file.
+ const char** GetUfwConfigPath();
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h b/www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h
index 2a32fc1e61a5..8b1fed7d1088 100644
--- a/www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h
+++ b/www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h
@@ -1,4 +1,4 @@
---- components/device_signals/core/browser/mock_signals_aggregator.h.orig	2023-07-24 14:27:53 UTC
+--- components/device_signals/core/browser/mock_signals_aggregator.h.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/browser/mock_signals_aggregator.h
 @@ -17,7 +17,7 @@ class MockSignalsAggregator : public SignalsAggregator
    MockSignalsAggregator();
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h
index b004f058e724..bd581e31a837 100644
--- a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h
+++ b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h
@@ -1,4 +1,4 @@
---- components/device_signals/core/browser/signals_aggregator.h.orig	2023-07-24 14:27:53 UTC
+--- components/device_signals/core/browser/signals_aggregator.h.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/browser/signals_aggregator.h
 @@ -22,7 +22,7 @@ class SignalsAggregator : public KeyedService {
  
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
index 66d8658f46b7..b27ca1b63cc1 100644
--- a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
+++ b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
@@ -1,4 +1,4 @@
---- components/device_signals/core/browser/signals_aggregator_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- components/device_signals/core/browser/signals_aggregator_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/browser/signals_aggregator_impl.cc
 @@ -64,7 +64,7 @@ SignalsAggregatorImpl::SignalsAggregatorImpl(
  
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h
index f6061c9d6a7f..7fba77cf66e1 100644
--- a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h
+++ b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h
@@ -1,4 +1,4 @@
---- components/device_signals/core/browser/signals_aggregator_impl.h.orig	2025-04-16 18:18:42 UTC
+--- components/device_signals/core/browser/signals_aggregator_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/browser/signals_aggregator_impl.h
 @@ -30,7 +30,7 @@ class SignalsAggregatorImpl : public SignalsAggregator
    ~SignalsAggregatorImpl() override;
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h
index 007da4b37caa..5a96c37d1e8a 100644
--- a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h
+++ b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h
@@ -1,4 +1,4 @@
---- components/device_signals/core/browser/user_permission_service.h.orig	2023-07-24 14:27:53 UTC
+--- components/device_signals/core/browser/user_permission_service.h.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/browser/user_permission_service.h
 @@ -57,7 +57,7 @@ class UserPermissionService : public KeyedService {
    // missing.
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
index af74fb7d2990..d9500aa2ac4f 100644
--- a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
+++ b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
@@ -1,4 +1,4 @@
---- components/device_signals/core/browser/user_permission_service_impl.cc.orig	2024-08-01 05:47:53 UTC
+--- components/device_signals/core/browser/user_permission_service_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/browser/user_permission_service_impl.cc
 @@ -87,7 +87,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent()
           consent_required_by_dependent_policy;
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h
index 95600c2815fe..19d880ddee66 100644
--- a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h
+++ b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h
@@ -1,4 +1,4 @@
---- components/device_signals/core/browser/user_permission_service_impl.h.orig	2024-08-01 05:47:53 UTC
+--- components/device_signals/core/browser/user_permission_service_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/browser/user_permission_service_impl.h
 @@ -38,7 +38,7 @@ class UserPermissionServiceImpl : public UserPermissio
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/iridium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
index 7936196a4d32..af8a7374e4a6 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc
+++ b/www/iridium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
@@ -1,8 +1,8 @@
---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig	2025-03-05 08:14:56 UTC
-+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc
+--- components/device_signals/core/common/linux/platform_utils_linux.cc.orig	2025-05-07 06:48:23 UTC
++++ components/device_signals/core/common/linux/platform_utils_linux.cc
 @@ -4,12 +4,23 @@
  
- #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
+ #include "components/device_signals/core/common/platform_utils.h"
  
 +#include "build/build_config.h"
 +
@@ -22,17 +22,17 @@
 +#endif
 +
  #include <algorithm>
+ #include <optional>
  #include <string>
- 
-@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() {
+@@ -100,6 +111,7 @@ SettingValue GetScreenlockSecured() {
  // Implements the logic from the native host installation script. First find the
  // root device identifier, then locate its parent and get its type.
  SettingValue GetDiskEncrypted() {
 +#if !BUILDFLAG(IS_BSD)
    struct stat info;
    // First figure out the device identifier. Fail fast if this fails.
-   if (stat("/", &info) != 0)
-@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() {
+   if (stat("/", &info) != 0) {
+@@ -122,11 +134,35 @@ SettingValue GetDiskEncrypted() {
      }
      return SettingValue::UNKNOWN;
    }
@@ -66,9 +66,9 @@
 +  }
 +#else
    base::DirReaderPosix reader("/sys/class/net");
-   if (!reader.IsValid())
+   if (!reader.IsValid()) {
      return result;
-@@ -165,6 +201,7 @@ std::vector<std::string> GetMacAddresses() {
+@@ -151,6 +187,7 @@ std::vector<std::string> GetMacAddresses() {
                                &address);
      result.push_back(address);
    }
diff --git a/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc b/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc
index 8a6c01df1a90..2b22a946e7c2 100644
--- a/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc
+++ b/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc
@@ -1,4 +1,4 @@
---- components/device_signals/core/common/signals_features.cc.orig	2025-04-16 18:18:42 UTC
+--- components/device_signals/core/common/signals_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/common/signals_features.cc
 @@ -31,7 +31,7 @@ bool IsBrowserSignalsReportingEnabled() {
  }
diff --git a/www/iridium/files/patch-components_device__signals_core_common_signals__features.h b/www/iridium/files/patch-components_device__signals_core_common_signals__features.h
index bb6476a68084..c8ca0067d636 100644
--- a/www/iridium/files/patch-components_device__signals_core_common_signals__features.h
+++ b/www/iridium/files/patch-components_device__signals_core_common_signals__features.h
@@ -1,4 +1,4 @@
---- components/device_signals/core/common/signals_features.h.orig	2025-04-16 18:18:42 UTC
+--- components/device_signals/core/common/signals_features.h.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/common/signals_features.h
 @@ -24,7 +24,7 @@ bool IsProfileSignalsReportingEnabled();
  bool IsBrowserSignalsReportingEnabled();
diff --git a/www/iridium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc b/www/iridium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc
index b6bfb2378735..74d4a4fdad1f 100644
--- a/www/iridium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc
+++ b/www/iridium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc
@@ -1,4 +1,4 @@
---- components/device_signals/core/system_signals/platform_delegate.cc.orig	2022-10-05 07:34:01 UTC
+--- components/device_signals/core/system_signals/platform_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/core/system_signals/platform_delegate.cc
 @@ -11,7 +11,7 @@ namespace device_signals {
  
diff --git a/www/iridium/files/patch-components_device__signals_test_signals__contract.cc b/www/iridium/files/patch-components_device__signals_test_signals__contract.cc
index 1686d4b6fce1..b198197a2102 100644
--- a/www/iridium/files/patch-components_device__signals_test_signals__contract.cc
+++ b/www/iridium/files/patch-components_device__signals_test_signals__contract.cc
@@ -1,4 +1,4 @@
---- components/device_signals/test/signals_contract.cc.orig	2025-04-16 18:18:42 UTC
+--- components/device_signals/test/signals_contract.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/device_signals/test/signals_contract.cc
 @@ -221,7 +221,7 @@ GetSignalsContract(bool is_av_signal_enabled) {
        base::BindRepeating(VerifyUnset, names::kCrowdStrike);
diff --git a/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
index fc1ea1de7c3c..e773484d930f 100644
--- a/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -1,4 +1,4 @@
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2024-11-04 08:56:03 UTC
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/discardable_memory/service/discardable_shared_memory_manager.cc
 @@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() {
    // Limits the number of FDs used to 32, assuming a 4MB allocation size.
diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc
index 5b0ec07b78be..c15e92c710aa 100644
--- a/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc
+++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc
@@ -1,12 +1,47 @@
---- components/embedder_support/user_agent_utils.cc.orig	2025-04-16 18:18:42 UTC
+--- components/embedder_support/user_agent_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/embedder_support/user_agent_utils.cc
-@@ -435,6 +435,9 @@ std::string GetPlatformForUAMetadata() {
- # else
+@@ -318,7 +318,7 @@ std::string GetUserAgentPlatform() {
+   return "";
+ #elif BUILDFLAG(IS_MAC)
+   return "Macintosh; ";
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return "X11; ";  // strange, but that's what Firefox uses
+ #elif BUILDFLAG(IS_ANDROID)
+   return "Linux; ";
+@@ -344,7 +344,7 @@ std::string GetUnifiedPlatform() {
+   return "Windows NT 10.0; Win64; x64";
+ #elif BUILDFLAG(IS_FUCHSIA)
+   return "Fuchsia";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return "X11; Linux x86_64";
+ #elif BUILDFLAG(IS_IOS)
+   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
+@@ -601,6 +601,9 @@ std::string GetPlatformForUAMetadata() {
+ #else
    return "Chromium OS";
- # endif
+ #endif
 +#elif BUILDFLAG(IS_BSD)
 +  // The internet is weird...
 +  return "Linux";
  #else
    return std::string(version_info::GetOSType());
  #endif
+@@ -813,6 +816,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
+                       "Android %s", os_version.c_str()
+ #elif BUILDFLAG(IS_FUCHSIA)
+                       "Fuchsia"
++#elif BUILDFLAG(IS_BSD)
++#if defined(__x86_64__)
++                      "Linux x86_64; %s %s",
++#elif defined(__aarch64__)
++                      "Linux aarch64; %s %s",
++#else 
++                      "Linux i686; %s %s",
++#endif
++                      unixinfo.sysname,  // e.g. Linux
++                      cpu_type.c_str()   // e.g. i686
+ #elif BUILDFLAG(IS_IOS)
+                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
+                       os_version.c_str()
diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
index 856ffb7ebdaa..d1b121dbc72f 100644
--- a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
@@ -1,6 +1,6 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -151,7 +151,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
+@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
    ASSERT_EQ("CrOS", pieces[0]);
    ASSERT_EQ("x86_64", pieces[1]);
    ASSERT_EQ("14541.0.0", pieces[2]);
@@ -9,7 +9,7 @@
    // Post-UA Reduction there is a single <unifiedPlatform> value for Linux:
    // X11; Linux x86_64
    ASSERT_EQ(2u, pieces.size());
-@@ -339,7 +339,7 @@ class UserAgentUtilsTest : public testing::Test,
+@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testing::Test,
          "X11; CrOS x86_64 14541.0.0";
  #elif BUILDFLAG(IS_FUCHSIA)
          "Fuchsia";
@@ -18,7 +18,7 @@
          "X11; Linux x86_64";
  #elif BUILDFLAG(IS_MAC)
          "Macintosh; Intel Mac OS X 10_15_7";
-@@ -699,7 +699,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) {
+@@ -696,7 +696,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) {
  #endif
  #elif BUILDFLAG(IS_ANDROID)
    EXPECT_EQ(metadata.platform, "Android");
diff --git a/www/iridium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc b/www/iridium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
index 7abf8bc6dd86..ec4b72a4f98a 100644
--- a/www/iridium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
+++ b/www/iridium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
@@ -1,4 +1,4 @@
---- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig	2025-04-16 18:18:42 UTC
+--- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/enterprise/connectors/core/realtime_reporting_client_base.cc
 @@ -190,7 +190,7 @@ void RealtimeReportingClientBase::ReportEvent(
      event.mutable_time()->set_nanos((timestamp_millis % 1000) * 1000000);
diff --git a/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc b/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc
index 7760699631db..bd4e7e0493a7 100644
--- a/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc
+++ b/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc
@@ -1,4 +1,4 @@
---- components/enterprise/watermarking/watermark.cc.orig	2025-02-22 18:06:53 UTC
+--- components/enterprise/watermarking/watermark.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/enterprise/watermarking/watermark.cc
 @@ -31,7 +31,7 @@ gfx::Font WatermarkFont() {
        "Segoe UI",
diff --git a/www/iridium/files/patch-components_error__page_common_localized__error.cc b/www/iridium/files/patch-components_error__page_common_localized__error.cc
index 87e2b4f281d8..8519953ea2d4 100644
--- a/www/iridium/files/patch-components_error__page_common_localized__error.cc
+++ b/www/iridium/files/patch-components_error__page_common_localized__error.cc
@@ -1,4 +1,4 @@
---- components/error_page/common/localized_error.cc.orig	2025-02-22 18:06:53 UTC
+--- components/error_page/common/localized_error.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/error_page/common/localized_error.cc
 @@ -901,7 +901,7 @@ void AddSuggestionsDetails(int error_code,
    if (suggestions & SUGGEST_PROXY_CONFIG) {
diff --git a/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc
index 46d95d639409..c747f7eeb600 100644
--- a/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc
+++ b/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc
@@ -1,4 +1,4 @@
---- components/eye_dropper/eye_dropper_view.cc.orig	2025-03-18 16:46:04 UTC
+--- components/eye_dropper/eye_dropper_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/eye_dropper/eye_dropper_view.cc
 @@ -208,7 +208,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent,
    // EyeDropper/WidgetDelegate.
diff --git a/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc
index 9c8b5514f3a1..daa76ccafe32 100644
--- a/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc
+++ b/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/event_constants.cc.orig	2024-12-22 12:24:29 UTC
+--- components/feature_engagement/public/event_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feature_engagement/public/event_constants.cc
 @@ -11,7 +11,7 @@ namespace feature_engagement {
  namespace events {
diff --git a/www/iridium/files/patch-components_feature__engagement_public_event__constants.h b/www/iridium/files/patch-components_feature__engagement_public_event__constants.h
index 6cb7fcd7b82e..88d25502de9a 100644
--- a/www/iridium/files/patch-components_feature__engagement_public_event__constants.h
+++ b/www/iridium/files/patch-components_feature__engagement_public_event__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/event_constants.h.orig	2023-10-21 11:51:27 UTC
+--- components/feature_engagement/public/event_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ components/feature_engagement/public/event_constants.h
 @@ -14,7 +14,7 @@ namespace events {
  
diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 296eec10d162..88993bd0bb49 100644
--- a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig	2025-04-16 18:18:42 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feature_engagement/public/feature_configurations.cc
 @@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro
  
@@ -18,7 +18,7 @@
    if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) {
      FeatureConfig config;
      config.valid = true;
-@@ -1722,7 +1722,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
+@@ -1740,7 +1740,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -27,4 +27,4 @@
 +    BUILDFLAG(IS_BSD)
  
    if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) {
-     // Credit card benefit IPH is shown:
+     // The credit card benefit IPH appears up to three times over 10 years and
diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc
index a84a233a2d38..43eba87fe51b 100644
--- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig	2025-04-16 18:18:42 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feature_engagement/public/feature_constants.cc
 @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU
  BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  BASE_FEATURE(kEsbDownloadRowPromoFeature,
               "EsbDownloadRowPromo",
-@@ -682,7 +682,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
+@@ -710,7 +710,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
  
  #endif  // BUILDFLAG(IS_IOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
- BASE_FEATURE(kIPHAutofillCardInfoRetrievalSuggestionFeature,
-              "IPH_AutofillCardInfoRetrievalSuggestion",
-@@ -823,7 +823,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
+ BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+              "IPH_AutofillBnplAffirmOrZipSuggestion",
+@@ -857,7 +857,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h
index 64569e4e2db9..e1e9cbf79917 100644
--- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig	2025-04-16 18:18:42 UTC
+--- components/feature_engagement/public/feature_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ components/feature_engagement/public/feature_constants.h
 @@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode);
  FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature);
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature);
  #endif
-@@ -303,7 +303,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg
+@@ -316,7 +316,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg
  
  #endif  // BUILDFLAG(IS_IOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature);
  FEATURE_CONSTANTS_DECLARE_FEATURE(
-     kIPHAutofillCardInfoRetrievalSuggestionFeature);
-@@ -359,7 +359,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA
+@@ -374,7 +374,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA
  FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
  #endif
  
diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc
index 0b1ff76acb90..9378e4276a91 100644
--- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_list.cc.orig	2025-04-16 18:18:42 UTC
+--- components/feature_engagement/public/feature_list.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feature_engagement/public/feature_list.cc
-@@ -170,7 +170,7 @@ const base::Feature* const kAllFeatures[] = {
-     &kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature,
+@@ -175,7 +175,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHiOSSettingsInOverflowMenuBubbleFeature,
  #endif  // BUILDFLAG(IS_IOS)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
      &kEsbDownloadRowPromoFeature,
  #endif
-@@ -241,7 +241,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -247,7 +247,7 @@ const base::Feature* const kAllFeatures[] = {
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-     &kIPHAutofillCardInfoRetrievalSuggestionFeature,
-     &kIPHAutofillCreditCardBenefitFeature,
-@@ -294,7 +294,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHAutofillAiOptInFeature,
+     &kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+@@ -302,7 +302,7 @@ const base::Feature* const kAllFeatures[] = {
      &kIPHScalableIphGamingFeature,
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h
index 9530828869af..a64e527fb486 100644
--- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig	2025-04-16 18:18:42 UTC
+--- components/feature_engagement/public/feature_list.h.orig	2025-05-07 06:48:23 UTC
 +++ components/feature_engagement/public/feature_list.h
-@@ -302,7 +302,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDownloadAutoDeletionFeat
+@@ -312,7 +312,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSettingsInOverflowMenuBu
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,17 +9,17 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo");
  #endif
-@@ -415,7 +415,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF
+@@ -427,7 +427,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
- DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature,
-                        "IPH_AutofillCreditCardBenefit");
- 
-@@ -509,7 +510,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
+ DEFINE_VARIATION_PARAM(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn");
+ DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+                        "IPH_AutofillBnplAffirmOrZipSuggestion");
+@@ -523,7 +524,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
  DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -28,7 +28,7 @@
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
                         "IPH_DesktopPWAsLinkCapturingLaunch");
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab,
-@@ -682,7 +683,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -697,7 +698,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
              kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature),
          VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature),
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -37,17 +37,17 @@
          VARIATION_ENTRY(kIPHBatterySaverModeFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
-@@ -743,7 +744,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -759,7 +760,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHAutofillAiOptInFeature),
          VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature),
          VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature),
-         VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature),
-@@ -795,7 +797,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -812,7 +814,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
          VARIATION_ENTRY(kIPHScalableIphGamingFeature),
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/iridium/files/patch-components_feed_core_proto_v2_wire_version.proto b/www/iridium/files/patch-components_feed_core_proto_v2_wire_version.proto
index 8333a1ba2035..b61a4e83a30e 100644
--- a/www/iridium/files/patch-components_feed_core_proto_v2_wire_version.proto
+++ b/www/iridium/files/patch-components_feed_core_proto_v2_wire_version.proto
@@ -1,4 +1,4 @@
---- components/feed/core/proto/v2/wire/version.proto.orig	2022-03-28 18:11:04 UTC
+--- components/feed/core/proto/v2/wire/version.proto.orig	2025-05-07 06:48:23 UTC
 +++ components/feed/core/proto/v2/wire/version.proto
 @@ -25,8 +25,8 @@ message Version {
      BETA = 3;
diff --git a/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
index 271da20725a2..73dcdd4bb3c1 100644
--- a/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
+++ b/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
@@ -1,4 +1,4 @@
---- components/feed/core/v2/feed_network_impl_unittest.cc.orig	2024-11-04 08:56:03 UTC
+--- components/feed/core/v2/feed_network_impl_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feed/core/v2/feed_network_impl_unittest.cc
 @@ -747,8 +747,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
  
diff --git a/www/iridium/files/patch-components_feed_core_v2_proto__util.cc b/www/iridium/files/patch-components_feed_core_v2_proto__util.cc
index 5d025834a8a7..8fdca0eab096 100644
--- a/www/iridium/files/patch-components_feed_core_v2_proto__util.cc
+++ b/www/iridium/files/patch-components_feed_core_v2_proto__util.cc
@@ -1,4 +1,4 @@
---- components/feed/core/v2/proto_util.cc.orig	2023-07-24 14:27:53 UTC
+--- components/feed/core/v2/proto_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feed/core/v2/proto_util.cc
 @@ -93,8 +93,8 @@ feedwire::Version GetPlatformVersionMessage() {
  
diff --git a/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc
index 99e4e9e9143c..339f5dd920eb 100644
--- a/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc
+++ b/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc
@@ -1,4 +1,4 @@
---- components/feed/core/v2/proto_util_unittest.cc.orig	2024-08-27 06:28:16 UTC
+--- components/feed/core/v2/proto_util_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feed/core/v2/proto_util_unittest.cc
 @@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) {
    feedwire::ClientInfo result = CreateClientInfo(request_metadata);
diff --git a/www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc b/www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc
index 59a5fedc25fa..f5abdb3a86aa 100644
--- a/www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc
+++ b/www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc
@@ -1,4 +1,4 @@
---- components/feed/core/v2/test/proto_printer.cc.orig	2023-07-24 14:27:53 UTC
+--- components/feed/core/v2/test/proto_printer.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/feed/core/v2/test/proto_printer.cc
 @@ -158,8 +158,8 @@ class TextProtoPrinter {
    }
diff --git a/www/iridium/files/patch-components_gcm__driver_gcm__desktop__utils.cc b/www/iridium/files/patch-components_gcm__driver_gcm__desktop__utils.cc
index fc4ba66ff48c..3a6f51117ca6 100644
--- a/www/iridium/files/patch-components_gcm__driver_gcm__desktop__utils.cc
+++ b/www/iridium/files/patch-components_gcm__driver_gcm__desktop__utils.cc
@@ -1,4 +1,4 @@
---- components/gcm_driver/gcm_desktop_utils.cc.orig	2025-02-22 18:06:53 UTC
+--- components/gcm_driver/gcm_desktop_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/gcm_driver/gcm_desktop_utils.cc
 @@ -32,7 +32,7 @@ GCMClient::ChromePlatform GetPlatform() {
    return GCMClient::PLATFORM_ANDROID;
diff --git a/www/iridium/files/patch-components_gwp__asan_BUILD.gn b/www/iridium/files/patch-components_gwp__asan_BUILD.gn
index 460737d2bc59..5708bee18d8e 100644
--- a/www/iridium/files/patch-components_gwp__asan_BUILD.gn
+++ b/www/iridium/files/patch-components_gwp__asan_BUILD.gn
@@ -1,11 +1,11 @@
---- components/gwp_asan/BUILD.gn.orig	2022-12-06 08:09:13 UTC
+--- components/gwp_asan/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ components/gwp_asan/BUILD.gn
 @@ -15,7 +15,7 @@ test("gwp_asan_unittests") {
      "//testing/gtest",
      "//third_party/boringssl",
    ]
--  if (is_win || is_mac || is_linux || is_chromeos || is_android) {
-+  if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) {
+-  if (is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) {
++  if ((is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) && !is_bsd) {
      deps += [
        "//components/gwp_asan/client:unit_tests",
        "//components/gwp_asan/crash_handler:unit_tests",
diff --git a/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni b/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni
index 4edaa2625eee..35a3ed70322a 100644
--- a/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni
+++ b/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni
@@ -1,11 +1,11 @@
---- components/gwp_asan/buildflags/buildflags.gni.orig	2025-04-16 18:18:42 UTC
+--- components/gwp_asan/buildflags/buildflags.gni.orig	2025-05-07 06:48:23 UTC
 +++ components/gwp_asan/buildflags/buildflags.gni
 @@ -10,10 +10,7 @@ import("//build/config/compiler/compiler.gni")
  # Android component builds are disabled due to https://crbug.com/976399
  # Android requires frame pointers for unwinding, unwind tables aren't shipped in
  # official builds.
 -supported_platform =
--    is_linux || is_chromeos || is_mac ||
+-    is_linux || is_chromeos || is_mac || is_ios ||
 -    (is_win && (current_cpu == "x64" || current_cpu == "arm64")) ||
 -    (is_android && !is_component_build && enable_frame_pointers)
 +supported_platform = false
diff --git a/www/iridium/files/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc b/www/iridium/files/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
index 55d8ca57cf42..70e96b569893 100644
--- a/www/iridium/files/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
+++ b/www/iridium/files/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
@@ -1,4 +1,4 @@
---- components/gwp_asan/client/guarded_page_allocator_posix.cc.orig	2023-10-21 11:51:27 UTC
+--- components/gwp_asan/client/guarded_page_allocator_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/gwp_asan/client/guarded_page_allocator_posix.cc
 @@ -35,8 +35,9 @@ void GuardedPageAllocator::MarkPageInaccessible(void* 
    // mmap() a PROT_NONE page over the address to release it to the system, if
diff --git a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc
index 3d2aa33af03c..1a62e596fe77 100644
--- a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc
+++ b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc
@@ -1,6 +1,6 @@
---- components/gwp_asan/client/gwp_asan.cc.orig	2024-06-25 12:08:48 UTC
+--- components/gwp_asan/client/gwp_asan.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/gwp_asan/client/gwp_asan.cc
-@@ -75,7 +75,7 @@ namespace {
+@@ -76,7 +76,7 @@ namespace {
  // ProcessSamplingBoost is the multiplier to increase the
  // ProcessSamplingProbability in scenarios where we want to perform additional
  // testing (e.g., on canary/dev builds).
diff --git a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc
index 5b873fee3827..d88da304c2f5 100644
--- a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc
+++ b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc
@@ -1,4 +1,4 @@
---- components/gwp_asan/client/gwp_asan_features.cc.orig	2024-06-25 12:08:48 UTC
+--- components/gwp_asan/client/gwp_asan_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/gwp_asan/client/gwp_asan_features.cc
 @@ -9,7 +9,7 @@
  namespace gwp_asan::internal {
diff --git a/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
index cca3ec18e77f..66055b4cfcaf 100644
--- a/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
+++ b/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
@@ -1,4 +1,4 @@
---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2024-11-04 08:56:03 UTC
+--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/gwp_asan/crash_handler/crash_analyzer.cc
 @@ -35,7 +35,7 @@
  #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
@@ -9,7 +9,7 @@
  #include <signal.h>
  #elif BUILDFLAG(IS_APPLE)
  #include <mach/exception_types.h>
-@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo(
+@@ -113,7 +113,7 @@ bool CrashAnalyzer::GetExceptionInfo(
  
  crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
      const crashpad::ExceptionSnapshot& exception) {
diff --git a/www/iridium/files/patch-components_live__caption_caption__util.cc b/www/iridium/files/patch-components_live__caption_caption__util.cc
index e5a227e5311c..749cfdef6977 100644
--- a/www/iridium/files/patch-components_live__caption_caption__util.cc
+++ b/www/iridium/files/patch-components_live__caption_caption__util.cc
@@ -1,4 +1,4 @@
---- components/live_caption/caption_util.cc.orig	2025-02-22 18:06:53 UTC
+--- components/live_caption/caption_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/live_caption/caption_util.cc
 @@ -136,7 +136,7 @@ bool IsLiveCaptionFeatureSupported() {
  std::string GetCaptionSettingsUrl() {
diff --git a/www/iridium/files/patch-components_live__caption_caption__util.h b/www/iridium/files/patch-components_live__caption_caption__util.h
index afd0640a8c08..9e5d16635e4c 100644
--- a/www/iridium/files/patch-components_live__caption_caption__util.h
+++ b/www/iridium/files/patch-components_live__caption_caption__util.h
@@ -1,4 +1,4 @@
---- components/live_caption/caption_util.h.orig	2024-06-25 12:08:48 UTC
+--- components/live_caption/caption_util.h.orig	2025-05-07 06:48:23 UTC
 +++ components/live_caption/caption_util.h
 @@ -15,7 +15,7 @@ class PrefService;
  namespace captions {
diff --git a/www/iridium/files/patch-components_media__router_common_media__source.cc b/www/iridium/files/patch-components_media__router_common_media__source.cc
index 13a501ff0a10..d2e833dae2e3 100644
--- a/www/iridium/files/patch-components_media__router_common_media__source.cc
+++ b/www/iridium/files/patch-components_media__router_common_media__source.cc
@@ -1,4 +1,4 @@
---- components/media_router/common/media_source.cc.orig	2025-03-18 16:46:04 UTC
+--- components/media_router/common/media_source.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/media_router/common/media_source.cc
 @@ -62,7 +62,7 @@ bool IsSystemAudioCaptureSupported() {
    if (!media::IsSystemLoopbackCaptureSupported()) {
diff --git a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
index e0a154d3bc36..673144016b92 100644
--- a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
+++ b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
@@ -1,4 +1,4 @@
---- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig	2025-02-22 18:06:53 UTC
+--- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/media_router/common/providers/cast/channel/cast_message_util.cc
 @@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() {
    return 4;
diff --git a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h
index d8a59d924ffd..00cd65b88c55 100644
--- a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h
+++ b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h
@@ -1,4 +1,4 @@
---- components/media_router/common/providers/cast/channel/enum_table.h.orig	2024-12-22 12:24:29 UTC
+--- components/media_router/common/providers/cast/channel/enum_table.h.orig	2025-05-07 06:48:23 UTC
 +++ components/media_router/common/providers/cast/channel/enum_table.h
 @@ -368,7 +368,12 @@ class EnumTable {
  
diff --git a/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc b/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc
index e271157774e9..f7960e91a398 100644
--- a/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc
+++ b/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc
@@ -1,9 +1,18 @@
---- components/metrics/drive_metrics_provider.cc.orig	2025-03-18 16:46:04 UTC
+--- components/metrics/drive_metrics_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/metrics/drive_metrics_provider.cc
-@@ -113,7 +113,7 @@ void DriveMetricsProvider::FillDriveMetrics(
-                        response.has_seek_penalty);
-   RecordTriStateMetric("UMA.SeekPenaltyResult.Base",
-                        response.has_seek_penalty_base);
+@@ -21,7 +21,7 @@
+ namespace metrics {
+ 
+ namespace {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void RecordTriStateMetric(const char* name, std::optional<bool> sample) {
+   base::UmaHistogramEnumeration(
+       name, !sample.has_value()
+@@ -106,7 +106,7 @@ void DriveMetricsProvider::FillDriveMetrics(
+     drive->set_has_seek_penalty(*response.has_seek_penalty);
+   }
+ 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable);
diff --git a/www/iridium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/iridium/files/patch-components_metrics_drive__metrics__provider__linux.cc
deleted file mode 100644
index 2aa7f2065d39..000000000000
--- a/www/iridium/files/patch-components_metrics_drive__metrics__provider__linux.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- components/metrics/drive_metrics_provider_linux.cc.orig	2023-10-21 11:51:27 UTC
-+++ components/metrics/drive_metrics_provider_linux.cc
-@@ -4,7 +4,13 @@
- 
- #include "components/metrics/drive_metrics_provider.h"
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/types.h>
-+#define MAJOR(dev) major(dev)
-+#define MINOR(dev) minor(dev)
-+#else
- #include <linux/kdev_t.h>  // For MAJOR()/MINOR().
-+#endif
- #include <sys/stat.h>
- #include <string>
- 
diff --git a/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc b/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc
index 59739505c337..1acbb268bbcf 100644
--- a/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc
+++ b/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc
@@ -1,4 +1,4 @@
---- components/metrics/dwa/dwa_service.cc.orig	2025-04-16 18:18:42 UTC
+--- components/metrics/dwa/dwa_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/metrics/dwa/dwa_service.cc
 @@ -162,7 +162,7 @@ void DwaService::RecordCoarseSystemInformation(
    coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_WINDOWS);
diff --git a/www/iridium/files/patch-components_metrics_metrics__log.cc b/www/iridium/files/patch-components_metrics_metrics__log.cc
index bb5537554911..5fc68336002c 100644
--- a/www/iridium/files/patch-components_metrics_metrics__log.cc
+++ b/www/iridium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig	2025-04-16 18:18:42 UTC
+--- components/metrics/metrics_log.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/metrics/metrics_log.cc
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
  #include "base/win/current_module.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -157,7 +157,7 @@ void RecordCurrentTime(
+@@ -158,7 +158,7 @@ void RecordCurrentTime(
    }
  }
  
diff --git a/www/iridium/files/patch-components_metrics_motherboard.cc b/www/iridium/files/patch-components_metrics_motherboard.cc
index d555a1c25a68..97d8e15344b7 100644
--- a/www/iridium/files/patch-components_metrics_motherboard.cc
+++ b/www/iridium/files/patch-components_metrics_motherboard.cc
@@ -1,4 +1,4 @@
---- components/metrics/motherboard.cc.orig	2022-12-01 10:35:46 UTC
+--- components/metrics/motherboard.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/metrics/motherboard.cc
 @@ -1,6 +1,7 @@
  // Copyright 2022 The Chromium Authors
diff --git a/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h b/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h
index 26e31a26c146..ccb7c2eaa7f2 100644
--- a/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h
+++ b/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h
@@ -1,4 +1,4 @@
---- components/named_mojo_ipc_server/connection_info.h.orig	2025-04-16 18:18:42 UTC
+--- components/named_mojo_ipc_server/connection_info.h.orig	2025-05-07 06:48:23 UTC
 +++ components/named_mojo_ipc_server/connection_info.h
 @@ -12,7 +12,10 @@
  #include "base/win/scoped_handle.h"
diff --git a/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
index 739288745792..0194cf3c429b 100644
--- a/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
+++ b/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
@@ -1,4 +1,4 @@
---- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig	2024-11-04 08:56:03 UTC
+--- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc
 @@ -23,7 +23,7 @@ namespace named_mojo_ipc_server {
  // static
diff --git a/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc b/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
index 195b30da52bb..9bb8fde27624 100644
--- a/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
+++ b/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
@@ -1,4 +1,4 @@
---- components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc.orig	2025-04-16 18:18:42 UTC
+--- components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc
 @@ -89,7 +89,9 @@ void NamedMojoServerEndpointConnectorLinux::OnSocketRe
      PLOG(ERROR) << "getsockopt failed.";
diff --git a/www/iridium/files/patch-components_named__system__lock_BUILD.gn b/www/iridium/files/patch-components_named__system__lock_BUILD.gn
index 36bbea7143dd..d394c51afa9a 100644
--- a/www/iridium/files/patch-components_named__system__lock_BUILD.gn
+++ b/www/iridium/files/patch-components_named__system__lock_BUILD.gn
@@ -1,4 +1,4 @@
---- components/named_system_lock/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- components/named_system_lock/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ components/named_system_lock/BUILD.gn
 @@ -5,7 +5,7 @@
  static_library("named_system_lock") {
diff --git a/www/iridium/files/patch-components_named__system__lock_lock.h b/www/iridium/files/patch-components_named__system__lock_lock.h
index 4f13172d804e..8af8064d58f4 100644
--- a/www/iridium/files/patch-components_named__system__lock_lock.h
+++ b/www/iridium/files/patch-components_named__system__lock_lock.h
@@ -1,4 +1,4 @@
---- components/named_system_lock/lock.h.orig	2024-08-01 05:47:53 UTC
+--- components/named_system_lock/lock.h.orig	2025-05-07 06:48:23 UTC
 +++ components/named_system_lock/lock.h
 @@ -38,7 +38,7 @@ class ScopedLock {
    // may acquire that lock. The lock name has different meanings per platform:
diff --git a/www/iridium/files/patch-components_named__system__lock_lock__unittest.cc b/www/iridium/files/patch-components_named__system__lock_lock__unittest.cc
index 354c50a1cff7..4f960d6e9c1b 100644
--- a/www/iridium/files/patch-components_named__system__lock_lock__unittest.cc
+++ b/www/iridium/files/patch-components_named__system__lock_lock__unittest.cc
@@ -1,4 +1,4 @@
---- components/named_system_lock/lock_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- components/named_system_lock/lock_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/named_system_lock/lock_unittest.cc
 @@ -18,7 +18,7 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc
index 15d2fb5872d5..76ef522576a6 100644
--- a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc
+++ b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc
@@ -1,4 +1,4 @@
---- components/optimization_guide/core/optimization_guide_features.cc.orig	2025-02-22 18:06:53 UTC
+--- components/optimization_guide/core/optimization_guide_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/optimization_guide/core/optimization_guide_features.cc
 @@ -136,7 +136,7 @@ BASE_FEATURE(kOptimizationGuideModelExecution,
  // Whether to use the on device model service in optimization guide.
diff --git a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc
index 4896e371dbf1..ddc32d2bb38a 100644
--- a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc
+++ b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc
@@ -1,4 +1,4 @@
---- components/optimization_guide/core/optimization_guide_util.cc.orig	2024-12-22 12:24:29 UTC
+--- components/optimization_guide/core/optimization_guide_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/optimization_guide/core/optimization_guide_util.cc
 @@ -37,7 +37,7 @@ optimization_guide::proto::Platform GetPlatform() {
    return optimization_guide::proto::PLATFORM_CHROMEOS;
diff --git a/www/iridium/files/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc b/www/iridium/files/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
index a9cd5b015ede..6b4fdec9eaba 100644
--- a/www/iridium/files/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
+++ b/www/iridium/files/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
@@ -1,4 +1,4 @@
---- components/os_crypt/async/browser/secret_portal_key_provider.cc.orig	2024-11-04 08:56:03 UTC
+--- components/os_crypt/async/browser/secret_portal_key_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/os_crypt/async/browser/secret_portal_key_provider.cc
 @@ -5,7 +5,9 @@
  #include "components/os_crypt/async/browser/secret_portal_key_provider.h"
diff --git a/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc b/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
index 49c1bbd29371..87ba7aec9b54 100644
--- a/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
+++ b/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
@@ -1,4 +1,4 @@
---- components/os_crypt/sync/libsecret_util_linux.cc.orig	2024-11-04 08:56:03 UTC
+--- components/os_crypt/sync/libsecret_util_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/os_crypt/sync/libsecret_util_linux.cc
 @@ -185,16 +185,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() {
  
diff --git a/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h b/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h
index ca721f588382..0902ed08f88a 100644
--- a/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h
+++ b/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h
@@ -1,4 +1,4 @@
---- components/os_crypt/sync/os_crypt.h.orig	2025-04-16 18:18:42 UTC
+--- components/os_crypt/sync/os_crypt.h.orig	2025-05-07 06:48:23 UTC
 +++ components/os_crypt/sync/os_crypt.h
 @@ -16,7 +16,7 @@
  #include "build/chromecast_buildflags.h"
diff --git a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc
index 345615cbcf3a..017e24bd9013 100644
--- a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc
+++ b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc
@@ -1,4 +1,4 @@
---- components/paint_preview/browser/paint_preview_client.cc.orig	2024-11-04 08:56:03 UTC
+--- components/paint_preview/browser/paint_preview_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/paint_preview/browser/paint_preview_client.cc
 @@ -326,8 +326,8 @@ void PaintPreviewClient::CapturePaintPreview(
    metadata->set_version(kPaintPreviewVersion);
diff --git a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
index 7a2ff0bcdb99..1876216166b9 100644
--- a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
+++ b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
@@ -1,4 +1,4 @@
---- components/paint_preview/browser/paint_preview_client_unittest.cc.orig	2024-06-25 12:08:48 UTC
+--- components/paint_preview/browser/paint_preview_client_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/paint_preview/browser/paint_preview_client_unittest.cc
 @@ -174,8 +174,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa
    metadata->set_version(kPaintPreviewVersion);
diff --git a/www/iridium/files/patch-components_paint__preview_common_proto_paint__preview.proto b/www/iridium/files/patch-components_paint__preview_common_proto_paint__preview.proto
index d88f542ead7b..9cccbbdaa630 100644
--- a/www/iridium/files/patch-components_paint__preview_common_proto_paint__preview.proto
+++ b/www/iridium/files/patch-components_paint__preview_common_proto_paint__preview.proto
@@ -1,4 +1,4 @@
---- components/paint_preview/common/proto/paint_preview.proto.orig	2022-03-28 18:11:04 UTC
+--- components/paint_preview/common/proto/paint_preview.proto.orig	2025-05-07 06:48:23 UTC
 +++ components/paint_preview/common/proto/paint_preview.proto
 @@ -82,8 +82,8 @@ message PaintPreviewFrameProto {
  // Stores Chrome version.
diff --git a/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
index fc0037e5bb9b..469a13980fcc 100644
--- a/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
+++ b/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
@@ -1,4 +1,4 @@
---- components/paint_preview/player/player_compositor_delegate.cc.orig	2025-02-22 18:06:53 UTC
+--- components/paint_preview/player/player_compositor_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/paint_preview/player/player_compositor_delegate.cc
 @@ -433,8 +433,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
    auto chrome_version = capture_result_->proto.metadata().chrome_version();
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc
index eb14f6cb0437..7ff9b99777e3 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/features/password_features.cc.orig	2025-04-16 18:18:42 UTC
+--- components/password_manager/core/browser/features/password_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/features/password_features.cc
 @@ -40,7 +40,7 @@ BASE_FEATURE(kClearUndecryptablePasswords,
  BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h
index 5f2203905c39..4c08ef1f4076 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h
+++ b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/features/password_features.h.orig	2025-03-18 16:46:04 UTC
+--- components/password_manager/core/browser/features/password_features.h.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/features/password_features.h
 @@ -108,7 +108,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable)
  // Detects password reuse based on hashed password values.
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc
index f512270b287f..2f9dc9d72859 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_form_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- components/password_manager/core/browser/password_form_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_form_manager.cc
-@@ -63,7 +63,7 @@
+@@ -64,7 +64,7 @@
  #include "components/webauthn/android/webauthn_cred_man_delegate.h"
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -9,7 +9,7 @@
  #include "components/os_crypt/sync/os_crypt.h"
  #endif
  
-@@ -239,7 +239,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
+@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
    return false;
  }
  
@@ -18,7 +18,7 @@
  bool ShouldShowKeychainErrorBubble(
      std::optional<PasswordStoreBackendError> backend_error) {
    if (!backend_error.has_value()) {
-@@ -898,7 +898,7 @@ void PasswordFormManager::OnFetchCompleted() {
+@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchCompleted() {
          error.value().type);
    }
  
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc
index 2658a5dc9cb6..babcbe1c4aa7 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc
@@ -1,15 +1,15 @@
---- components/password_manager/core/browser/password_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- components/password_manager/core/browser/password_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_manager.cc
-@@ -492,7 +492,7 @@ void PasswordManager::RegisterProfilePrefs(
-                                 false);
- #endif
+@@ -511,7 +511,7 @@ void PasswordManager::RegisterProfilePrefs(
+       prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false);
+ #endif  // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
    registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter,
                                  0);
  #endif
-@@ -505,7 +505,7 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -524,7 +524,7 @@ void PasswordManager::RegisterProfilePrefs(
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h
index 051924f9ba8a..8db4c0cb8b66 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_manager_client.h.orig	2025-04-16 18:18:42 UTC
+--- components/password_manager/core/browser/password_manager_client.h.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_manager_client.h
 @@ -31,7 +31,7 @@
  #include "net/cert/cert_status_flags.h"
@@ -9,8 +9,8 @@
  #include "base/i18n/rtl.h"
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #include "ui/gfx/geometry/rect_f.h"
-@@ -550,7 +550,7 @@ class PasswordManagerClient {
-       CredentialsCallback callback);
+@@ -533,7 +533,7 @@ class PasswordManagerClient {
+   virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.cc
index 72e5c17a8f99..65f0b7d16fee 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_manager_switches.cc.orig	2024-06-25 12:08:48 UTC
+--- components/password_manager/core/browser/password_manager_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_manager_switches.cc
 @@ -6,7 +6,7 @@
  
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.h
index 73ebf66c95ef..c45f941ed3bd 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.h
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_manager_switches.h.orig	2025-02-22 18:06:53 UTC
+--- components/password_manager/core/browser/password_manager_switches.h.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_manager_switches.h
 @@ -9,7 +9,7 @@
  
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
index fd1b67478a8b..b9335252f11f 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-03-18 16:46:04 UTC
+--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_manual_fallback_flow.cc
-@@ -45,7 +45,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri
+@@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  // Returns the password form corresponding to the `payload` data. In most
  // cases there is only one such form stored, but having more than one or no
  // forms is also possible. If there is more than one form, showing any of them
-@@ -294,7 +294,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion(
+@@ -295,7 +295,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion(
      }
      case autofill::SuggestionType::kViewPasswordDetails: {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
        std::optional<password_manager::PasswordForm> credentials =
            GetCorrespondingPasswordForm(
                suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(),
-@@ -429,7 +429,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass
+@@ -425,7 +425,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass
      const Suggestion::PasswordSuggestionDetails& payload,
      base::OnceClosure on_allowed) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
index c0ac6c0bdc96..598716cdc417 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2024-11-04 08:56:03 UTC
+--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_manual_fallback_flow.h
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@
  #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : public autofill::Au
+@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : public autofill::Au
    std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc
index 55d75d797857..58aa8f09d255 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_store_factory_util.cc.orig	2024-11-04 08:56:03 UTC
+--- components/password_manager/core/browser/password_store_factory_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_store_factory_util.cc
 @@ -29,7 +29,7 @@ namespace {
  LoginDatabase::DeletingUndecryptablePasswordsEnabled GetPolicyFromPrefs(
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
index 1653ed29700e..f02d5f14c9a4 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_store/login_database.cc.orig	2024-11-04 08:56:03 UTC
+--- components/password_manager/core/browser/password_store/login_database.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_store/login_database.cc
 @@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords(
      bool is_user_data_dir_policy_set,
@@ -6,10 +6,10 @@
      IsAccountStore is_account_store) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string user_data_dir_string;
    std::unique_ptr<base::Environment> environment(base::Environment::Create());
    // On Linux user data directory ca be specified using an env variable. If it
-@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords(
+   // exists, passwords shouldn't be deleted.
+@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords(
      return false;
    }
  
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
index 5f8e6a7f8abf..a2c38ba78d5d 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig	2024-11-04 08:56:03 UTC
+--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_store/login_database_async_helper.cc
 @@ -154,7 +154,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc
      std::vector<PasswordForm> matched_forms;
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
index 10ab8cb15ff8..441f22f991d3 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig	2025-02-22 18:06:53 UTC
+--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/password_store/login_database_unittest.cc
 @@ -2257,7 +2257,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent,
                                            testing::Bool()));
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
index 1e546e243231..f18124906558 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
+++ b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-04-16 18:18:42 UTC
+--- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/stub_password_manager_client.cc
-@@ -201,7 +201,7 @@ version_info::Channel StubPasswordManagerClient::GetCh
+@@ -206,7 +206,7 @@ version_info::Channel StubPasswordManagerClient::GetCh
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h
index e982b0438641..20b5a4653125 100644
--- a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h
+++ b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/stub_password_manager_client.h.orig	2025-03-18 16:46:04 UTC
+--- components/password_manager/core/browser/stub_password_manager_client.h.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/browser/stub_password_manager_client.h
 @@ -77,7 +77,7 @@ class StubPasswordManagerClient : public PasswordManag
    MockPasswordFeatureManager* GetPasswordFeatureManager();
diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
index 7ebd554a6067..0c8e8dadfab9 100644
--- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
+++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-04-16 18:18:42 UTC
+--- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-05-07 06:48:23 UTC
 +++ components/password_manager/core/common/password_manager_pref_names.h
 @@ -59,7 +59,7 @@ inline constexpr char kCredentialProviderEnabledOnStar
  #endif
@@ -9,7 +9,7 @@
  // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy.
  // If set to false it blocks deleting undecryptable passwords, otherwise the
  // deletion can happen.
-@@ -357,7 +357,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme
+@@ -356,7 +356,7 @@ inline constexpr char kAutofillableCredentialsAccountS
  inline constexpr char kPasswordSharingEnabled[] =
      "password_manager.password_sharing_enabled";
  
diff --git a/www/iridium/files/patch-components_performance__manager_decorators_process__metrics__decorator.cc b/www/iridium/files/patch-components_performance__manager_decorators_process__metrics__decorator.cc
index beaa3d0789d1..9c36e173b12d 100644
--- a/www/iridium/files/patch-components_performance__manager_decorators_process__metrics__decorator.cc
+++ b/www/iridium/files/patch-components_performance__manager_decorators_process__metrics__decorator.cc
@@ -1,4 +1,4 @@
---- components/performance_manager/decorators/process_metrics_decorator.cc.orig	2024-12-22 12:24:29 UTC
+--- components/performance_manager/decorators/process_metrics_decorator.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/performance_manager/decorators/process_metrics_decorator.cc
 @@ -264,7 +264,7 @@ void ProcessMetricsDecorator::DidGetMemoryUsage(
      // RSS and PMF to each node proportionally to its V8 heap size.
diff --git a/www/iridium/files/patch-components_performance__manager_public_features.h b/www/iridium/files/patch-components_performance__manager_public_features.h
index 39b059faf95a..b1d968ce9ac4 100644
--- a/www/iridium/files/patch-components_performance__manager_public_features.h
+++ b/www/iridium/files/patch-components_performance__manager_public_features.h
@@ -1,6 +1,6 @@
---- components/performance_manager/public/features.h.orig	2025-03-18 16:46:04 UTC
+--- components/performance_manager/public/features.h.orig	2025-05-07 06:48:23 UTC
 +++ components/performance_manager/public/features.h
-@@ -17,7 +17,7 @@ namespace performance_manager::features {
+@@ -19,7 +19,7 @@ namespace performance_manager::features {
  
  #if !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc b/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc
index 06fa3c5e40ff..4099ffbbb05f 100644
--- a/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc
+++ b/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc
@@ -1,4 +1,4 @@
---- components/permissions/prediction_service/prediction_common.cc.orig	2025-04-16 18:18:42 UTC
+--- components/permissions/prediction_service/prediction_common.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/permissions/prediction_service/prediction_common.cc
 @@ -34,7 +34,7 @@ int BucketizeValue(int count) {
  
diff --git a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
index 1a9eaf3740bc..69f92ed0fcc8 100644
--- a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
@@ -1,7 +1,7 @@
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-04-16 18:18:42 UTC
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -413,7 +413,7 @@ class PolicyTestCase {
-     const std::string os("chromeos_ash");
+@@ -432,7 +432,7 @@ class PolicyTestCase {
+     const std::string os("chromeos");
  #elif BUILDFLAG(IS_IOS)
      const std::string os("ios");
 -#elif BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index bb556b8e3d3e..68bdbc8412e1 100644
--- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-04-16 18:18:42 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -741,7 +741,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
+@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
          fetch_request->set_invalidation_payload(invalidation_payload_);
        }
      }
diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
index b9077c827e20..183a4512837a 100644
--- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
+++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc.orig	2024-11-04 08:56:03 UTC
+--- components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc
 @@ -25,7 +25,7 @@ namespace policy {
  
diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index b9e116125dff..5807a63c38f7 100644
--- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-02-22 18:06:53 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include "base/win/wincred_shim.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <pwd.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -35,10 +35,15 @@
+@@ -36,10 +36,15 @@
  #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
  #endif
  
@@ -26,7 +26,7 @@
  #include <algorithm>
  #include <utility>
  
-@@ -83,7 +88,7 @@ namespace policy {
+@@ -84,7 +89,7 @@ namespace policy {
  namespace em = enterprise_management;
  
  std::string GetMachineName() {
@@ -35,7 +35,7 @@
    char hostname[HOST_NAME_MAX];
    if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
      return hostname;
-@@ -139,7 +144,7 @@ std::string GetMachineName() {
+@@ -140,7 +145,7 @@ std::string GetMachineName() {
  
  std::string GetOSVersion() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -44,7 +44,7 @@
    return base::SysInfo::OperatingSystemVersion();
  #elif BUILDFLAG(IS_WIN)
    base::win::OSInfo::VersionNumber version_number =
-@@ -161,7 +166,7 @@ std::string GetOSArchitecture() {
+@@ -162,7 +167,7 @@ std::string GetOSArchitecture() {
  }
  
  std::string GetOSUsername() {
diff --git a/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc b/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc
index faef992d4de8..73ad2fb3b9d2 100644
--- a/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc
+++ b/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/policy_loader_common.cc.orig	2025-02-22 18:06:53 UTC
+--- components/policy/core/common/policy_loader_common.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/core/common/policy_loader_common.cc
 @@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = {
      key::kDefaultSearchProviderEnabled,
diff --git a/www/iridium/files/patch-components_policy_core_common_policy__paths.cc b/www/iridium/files/patch-components_policy_core_common_policy__paths.cc
index 8964b6dd7e3d..b062f7ce75c1 100644
--- a/www/iridium/files/patch-components_policy_core_common_policy__paths.cc
+++ b/www/iridium/files/patch-components_policy_core_common_policy__paths.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/policy_paths.cc.orig	2025-02-22 18:06:53 UTC
+--- components/policy/core/common/policy_paths.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/core/common/policy_paths.cc
 @@ -17,6 +17,8 @@ namespace policy {
  const char kPolicyPath[] = "/etc/iridium-browser/policies";
diff --git a/www/iridium/files/patch-components_policy_core_common_policy__utils.cc b/www/iridium/files/patch-components_policy_core_common_policy__utils.cc
index fb3fdfe01b8c..65226b94eef9 100644
--- a/www/iridium/files/patch-components_policy_core_common_policy__utils.cc
+++ b/www/iridium/files/patch-components_policy_core_common_policy__utils.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/policy_utils.cc.orig	2024-11-04 08:56:03 UTC
+--- components/policy/core/common/policy_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/core/common/policy_utils.cc
 @@ -22,7 +22,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service,
      return true;
diff --git a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py
index 84765c954c1a..b0ff155bc024 100644
--- a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py
+++ b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py
@@ -1,4 +1,4 @@
---- components/policy/tools/generate_policy_source.py.orig	2024-06-25 12:08:48 UTC
+--- components/policy/tools/generate_policy_source.py.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/tools/generate_policy_source.py
 @@ -38,9 +38,9 @@ PLATFORM_STRINGS = {
      'ios': ['ios'],
diff --git a/www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py b/www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py
index 846837bacc38..5d3a8c360af7 100644
--- a/www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py
+++ b/www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py
@@ -1,4 +1,4 @@
---- components/policy/tools/template_writers/writer_configuration.py.orig	2023-10-21 11:51:27 UTC
+--- components/policy/tools/template_writers/writer_configuration.py.orig	2025-05-07 06:48:23 UTC
 +++ components/policy/tools/template_writers/writer_configuration.py
 @@ -59,7 +59,7 @@ def GetConfigurationForBuild(defines):
              },
diff --git a/www/iridium/files/patch-components_power__metrics_BUILD.gn b/www/iridium/files/patch-components_power__metrics_BUILD.gn
index ce7dc5570e08..65d1f7041158 100644
--- a/www/iridium/files/patch-components_power__metrics_BUILD.gn
+++ b/www/iridium/files/patch-components_power__metrics_BUILD.gn
@@ -1,4 +1,4 @@
---- components/power_metrics/BUILD.gn.orig	2023-10-21 11:51:27 UTC
+--- components/power_metrics/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ components/power_metrics/BUILD.gn
 @@ -41,7 +41,7 @@ static_library("power_metrics") {
      ldflags = [ "/DELAYLOAD:setupapi.dll" ]
diff --git a/www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc b/www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc
index 61a787b64229..e6892704a86b 100644
--- a/www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc
+++ b/www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc
@@ -1,4 +1,4 @@
---- components/power_metrics/energy_metrics_provider.cc.orig	2023-08-28 20:17:35 UTC
+--- components/power_metrics/energy_metrics_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/power_metrics/energy_metrics_provider.cc
 @@ -9,6 +9,8 @@
  #include "components/power_metrics/energy_metrics_provider_win.h"
diff --git a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
index c1065cf38f74..57a0ad0b806d 100644
--- a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
+++ b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
@@ -1,11 +1,11 @@
---- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-03-18 16:46:04 UTC
+--- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/regional_capabilities/regional_capabilities_service.cc
-@@ -85,7 +85,7 @@ void RegionalCapabilitiesService::InitializeCountryIdC
-       base::UmaHistogramEnumeration(kUnknownCountryIdStored,
-                                     UnknownCountryIdStored::kValidCountryId);
-     } else {
+@@ -216,7 +216,7 @@ std::optional<CountryId> RegionalCapabilitiesService::
+     return persisted_country_id;
+   }
+ 
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
-         profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
-         country_id.reset();
+   if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
+     profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
+     base::UmaHistogramEnumeration(kUnknownCountryIdStored,
diff --git a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
index 80e50a6d6518..5a017d109bdd 100644
--- a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
+++ b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
@@ -1,4 +1,4 @@
---- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-03-18 16:46:04 UTC
+--- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/regional_capabilities/regional_capabilities_switches.cc
 @@ -6,7 +6,7 @@
  
@@ -8,4 +8,4 @@
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_FEATURE(kClearPrefForUnknownCountry,
               "ClearCountryPrefForStoredUnknownCountry",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
index d6c8cbd1f8f4..d40db626b6c9 100644
--- a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
+++ b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
@@ -1,4 +1,4 @@
---- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-03-18 16:46:04 UTC
+--- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-05-07 06:48:23 UTC
 +++ components/regional_capabilities/regional_capabilities_switches.h
 @@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoiceCountry[] =
  inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA";
@@ -6,6 +6,6 @@
  
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // When the `country_codes::kCountryIDUnknown` is stored in prefs and this
+ // When an invalid `country_codes::CountryId` is stored in prefs and this
  // feature is enabled the pref will be cleared allowing a valid country to be
  // set again.
diff --git a/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
index d9298ba731c6..d05a26d6e381 100644
--- a/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
+++ b/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
@@ -1,4 +1,4 @@
---- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig	2025-02-22 18:06:53 UTC
+--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/safe_browsing/content/common/file_type_policies_unittest.cc
 @@ -146,7 +146,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) {
    EXPECT_EQ(142, file_type.uma_value());
diff --git a/www/iridium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py b/www/iridium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
index f80db4035440..eaee81a37be7 100644
--- a/www/iridium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
+++ b/www/iridium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
@@ -1,4 +1,4 @@
---- components/safe_browsing/content/resources/gen_file_type_proto.py.orig	2024-08-27 06:28:16 UTC
+--- components/safe_browsing/content/resources/gen_file_type_proto.py.orig	2025-05-07 06:48:23 UTC
 +++ components/safe_browsing/content/resources/gen_file_type_proto.py
 @@ -37,6 +37,8 @@ def PlatformTypes():
          "chromeos":
diff --git a/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
index 8536e4240e43..a75b25091e2b 100644
--- a/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
+++ b/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
@@ -1,4 +1,4 @@
---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2024-11-04 08:56:03 UTC
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
 @@ -119,7 +119,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
  PlatformType GetCurrentPlatformType() {
diff --git a/www/iridium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/iridium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
index 98b82815285f..acd34b44e3ce 100644
--- a/www/iridium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
+++ b/www/iridium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
@@ -1,4 +1,4 @@
---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig	2025-04-16 18:18:42 UTC
+--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
 @@ -111,7 +111,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() {
    return RTLookupRequest::OS_TYPE_CHROME_OS;
diff --git a/www/iridium/files/patch-components_search__engines_template__url__service.cc b/www/iridium/files/patch-components_search__engines_template__url__service.cc
index df2becc50a8d..cba59fad874a 100644
--- a/www/iridium/files/patch-components_search__engines_template__url__service.cc
+++ b/www/iridium/files/patch-components_search__engines_template__url__service.cc
@@ -1,6 +1,6 @@
---- components/search_engines/template_url_service.cc.orig	2025-04-16 18:18:42 UTC
+--- components/search_engines/template_url_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/search_engines/template_url_service.cc
-@@ -3411,7 +3411,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
+@@ -3435,7 +3435,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
  std::unique_ptr<EnterpriseSearchManager>
  TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_security__interstitials_content_utils.cc b/www/iridium/files/patch-components_security__interstitials_content_utils.cc
index 9c04bf2c0a4f..821de2929e3a 100644
--- a/www/iridium/files/patch-components_security__interstitials_content_utils.cc
+++ b/www/iridium/files/patch-components_security__interstitials_content_utils.cc
@@ -1,4 +1,4 @@
---- components/security_interstitials/content/utils.cc.orig	2025-02-22 18:06:53 UTC
+--- components/security_interstitials/content/utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/security_interstitials/content/utils.cc
 @@ -37,7 +37,7 @@ void LaunchDateAndTimeSettings() {
  #if BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
index 6b3a98a7d055..0c6ab10dd12f 100644
--- a/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
+++ b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
@@ -1,4 +1,4 @@
---- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig	2025-02-22 18:06:53 UTC
+--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc
 @@ -147,7 +147,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput(
  // Check for current device type and subtract it from the device count
diff --git a/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.cc b/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.cc
index c2284064dfac..658485452ada 100644
--- a/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.cc
+++ b/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.cc
@@ -1,4 +1,4 @@
---- components/services/on_device_translation/sandbox_hook.cc.orig	2024-12-22 12:24:29 UTC
+--- components/services/on_device_translation/sandbox_hook.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/services/on_device_translation/sandbox_hook.cc
 @@ -7,12 +7,15 @@
  #include "components/services/on_device_translation/translate_kit_client.h"
diff --git a/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.h b/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.h
index db763652b7ec..82eb226321fe 100644
--- a/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.h
+++ b/www/iridium/files/patch-components_services_on__device__translation_sandbox__hook.h
@@ -1,4 +1,4 @@
---- components/services/on_device_translation/sandbox_hook.h.orig	2024-12-22 12:24:29 UTC
+--- components/services/on_device_translation/sandbox_hook.h.orig	2025-05-07 06:48:23 UTC
 +++ components/services/on_device_translation/sandbox_hook.h
 @@ -5,7 +5,13 @@
  #ifndef COMPONENTS_SERVICES_ON_DEVICE_TRANSLATION_SANDBOX_HOOK_H_
diff --git a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
index 6cb8f6700a7c..dfc83f8be92c 100644
--- a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
+++ b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
@@ -1,4 +1,4 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2024-06-25 12:08:48 UTC
+--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
 @@ -22,7 +22,7 @@
  
diff --git a/www/iridium/files/patch-components_signin_public_base_signin__switches.cc b/www/iridium/files/patch-components_signin_public_base_signin__switches.cc
new file mode 100644
index 000000000000..96dd3fc0917d
--- /dev/null
+++ b/www/iridium/files/patch-components_signin_public_base_signin__switches.cc
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.cc.orig	2025-05-07 06:48:23 UTC
++++ components/signin/public/base/signin_switches.cc
+@@ -55,7 +55,7 @@ BASE_FEATURE(kUseHostedDomainForManagementCheckOnSigni
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables the History Sync Opt-in on Desktop.
+ BASE_FEATURE(kEnableHistorySyncOptin,
+              "EnableHistorySyncOptin",
diff --git a/www/iridium/files/patch-components_signin_public_base_signin__switches.h b/www/iridium/files/patch-components_signin_public_base_signin__switches.h
new file mode 100644
index 000000000000..c1c99e6d4215
--- /dev/null
+++ b/www/iridium/files/patch-components_signin_public_base_signin__switches.h
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.h.orig	2025-05-07 06:48:23 UTC
++++ components/signin/public/base/signin_switches.h
+@@ -52,7 +52,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kEnableHistorySyncOptin);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-components_soda_soda__util.cc b/www/iridium/files/patch-components_soda_soda__util.cc
index db3459ba20fb..f1d39557198a 100644
--- a/www/iridium/files/patch-components_soda_soda__util.cc
+++ b/www/iridium/files/patch-components_soda_soda__util.cc
@@ -1,6 +1,6 @@
---- components/soda/soda_util.cc.orig	2025-02-22 18:06:53 UTC
+--- components/soda/soda_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/soda/soda_util.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  #include "base/win/windows_version.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/cpu.h"
  #endif
  
-@@ -38,7 +38,7 @@ bool IsSupportedChromeOS() {
+@@ -39,7 +39,7 @@ bool IsSupportedChromeOS() {
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -18,7 +18,7 @@
  bool IsSupportedLinux() {
  #if defined(ARCH_CPU_X86_FAMILY)
    // Check if the CPU has the required instruction set to run the Speech
-@@ -69,7 +69,7 @@ bool IsSupportedWin() {
+@@ -70,7 +70,7 @@ bool IsSupportedWin() {
  bool IsOnDeviceSpeechRecognitionSupported() {
  #if BUILDFLAG(IS_CHROMEOS)
    return IsSupportedChromeOS();
diff --git a/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
index fe6f5b377944..a312b9999a3b 100644
--- a/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
+++ b/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
@@ -1,4 +1,4 @@
---- components/startup_metric_utils/common/startup_metric_utils.cc.orig	2024-08-27 06:28:16 UTC
+--- components/startup_metric_utils/common/startup_metric_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/startup_metric_utils/common/startup_metric_utils.cc
 @@ -94,7 +94,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi
    // Enabling this logic on OS X causes a significant performance regression.
diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn
index 50f8140380a9..63438e72eaa3 100644
--- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn
+++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn
@@ -1,6 +1,6 @@
---- components/storage_monitor/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- components/storage_monitor/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ components/storage_monitor/BUILD.gn
-@@ -71,7 +71,7 @@ static_library("storage_monitor") {
+@@ -73,7 +73,7 @@ component("storage_monitor") {
        deps += [ "//services/device/public/mojom" ]
      }
    } else if (is_linux) {
@@ -9,7 +9,7 @@
        sources += [
          "mtab_watcher_linux.cc",
          "mtab_watcher_linux.h",
-@@ -177,7 +177,7 @@ source_set("unit_tests") {
+@@ -182,7 +182,7 @@ source_set("unit_tests") {
          "storage_monitor_chromeos_unittest.cc",
        ]
      }
diff --git a/www/iridium/files/patch-components_storage__monitor_removable__device__constants.cc b/www/iridium/files/patch-components_storage__monitor_removable__device__constants.cc
index 52f24622dd5d..ea0204d7bff3 100644
--- a/www/iridium/files/patch-components_storage__monitor_removable__device__constants.cc
+++ b/www/iridium/files/patch-components_storage__monitor_removable__device__constants.cc
@@ -1,4 +1,4 @@
---- components/storage_monitor/removable_device_constants.cc.orig	2022-03-28 18:11:04 UTC
+--- components/storage_monitor/removable_device_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/storage_monitor/removable_device_constants.cc
 @@ -10,7 +10,7 @@ namespace storage_monitor {
  const char kFSUniqueIdPrefix[] = "UUID:";
diff --git a/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h b/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h
index bb2f6cc01e26..5f2003c7d9da 100644
--- a/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h
+++ b/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h
@@ -1,11 +1,11 @@
---- components/storage_monitor/removable_device_constants.h.orig	2022-03-28 18:11:04 UTC
+--- components/storage_monitor/removable_device_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ components/storage_monitor/removable_device_constants.h
-@@ -14,7 +14,7 @@ namespace storage_monitor {
- extern const char kFSUniqueIdPrefix[];
- extern const char kVendorModelSerialPrefix[];
+@@ -15,7 +15,7 @@ namespace storage_monitor {
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kFSUniqueIdPrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kVendorModelSerialPrefix[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kVendorModelVolumeStoragePrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const
+     char kVendorModelVolumeStoragePrefix[];
  #endif
- 
diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_list__family__members__service.h b/www/iridium/files/patch-components_supervised__user_core_browser_list__family__members__service.h
index 9aa69899e02b..2cde2330af4f 100644
--- a/www/iridium/files/patch-components_supervised__user_core_browser_list__family__members__service.h
+++ b/www/iridium/files/patch-components_supervised__user_core_browser_list__family__members__service.h
@@ -1,4 +1,4 @@
---- components/supervised_user/core/browser/list_family_members_service.h.orig	2025-02-22 18:06:53 UTC
+--- components/supervised_user/core/browser/list_family_members_service.h.orig	2025-05-07 06:48:23 UTC
 +++ components/supervised_user/core/browser/list_family_members_service.h
 @@ -33,7 +33,7 @@ namespace supervised_user {
  // If true, this fetcher is active for all users with CanFetchFamilyMemberInfo
diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
index 3f788336111d..d1e229406da7 100644
--- a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
+++ b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
@@ -1,4 +1,4 @@
---- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig	2024-08-01 05:47:53 UTC
+--- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/supervised_user/core/browser/supervised_user_metrics_service.cc
 @@ -47,7 +47,7 @@ SupervisedUserMetricsService::SupervisedUserMetricsSer
        extensions_metrics_delegate_(std::move(extensions_metrics_delegate)) {
diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
index 38e961999434..5b087dcf36cf 100644
--- a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
+++ b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
@@ -1,6 +1,6 @@
---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-02-22 18:06:53 UTC
+--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/supervised_user/core/browser/supervised_user_preferences.cc
-@@ -144,7 +144,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
+@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
    registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false);
    registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string());
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
diff --git a/www/iridium/files/patch-components_supervised__user_core_common_features.cc b/www/iridium/files/patch-components_supervised__user_core_common_features.cc
index 32549885c6f2..cd90df5573f7 100644
--- a/www/iridium/files/patch-components_supervised__user_core_common_features.cc
+++ b/www/iridium/files/patch-components_supervised__user_core_common_features.cc
@@ -1,4 +1,4 @@
---- components/supervised_user/core/common/features.cc.orig	2025-04-16 18:18:42 UTC
+--- components/supervised_user/core/common/features.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/supervised_user/core/common/features.cc
 @@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
  #endif
@@ -9,7 +9,16 @@
  const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
  
  const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{
-@@ -83,7 +83,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt
+@@ -45,7 +45,7 @@ const base::FeatureParam<int> kLocalWebApprovalBottomS
+ #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kEnableLocalWebApprovalErrorDialog,
+              "EnableLocalWebApprovalErrorDialog",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -97,7 +97,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt
               "UpdatedSupervisedUserExtensionApprovalStrings",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -18,7 +27,7 @@
  BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
               "EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -98,7 +98,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+@@ -112,7 +112,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
  #if BUILDFLAG(IS_CHROMEOS)
    return base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
@@ -27,7 +36,7 @@
    bool skipParentApprovalEnabled = base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
    bool permissionExtensionsForSupervisedUsersEnabled =
-@@ -115,7 +115,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+@@ -129,7 +129,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
  }
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -36,7 +45,7 @@
  BASE_FEATURE(kCustomProfileStringsForSupervisedUsers,
               "CustomProfileStringsForSupervisedUsers",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -127,13 +127,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers,
+@@ -141,13 +141,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers,
  
  BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers,
               "ForceSafeSearchForUnauthenticatedSupervisedUsers",
@@ -52,7 +61,7 @@
  BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog,
               "EnableSupervisedUserVersionSignOutDialog",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -155,7 +155,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking,
+@@ -169,7 +169,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking,
  // platform #defines.
  BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers,
               "UncredentialedFilteringFallbackForSupervisedUsers",
diff --git a/www/iridium/files/patch-components_supervised__user_core_common_features.h b/www/iridium/files/patch-components_supervised__user_core_common_features.h
index 325090c1f452..b04efb72faaf 100644
--- a/www/iridium/files/patch-components_supervised__user_core_common_features.h
+++ b/www/iridium/files/patch-components_supervised__user_core_common_features.h
@@ -1,6 +1,6 @@
---- components/supervised_user/core/common/features.h.orig	2025-04-16 18:18:42 UTC
+--- components/supervised_user/core/common/features.h.orig	2025-05-07 06:48:23 UTC
 +++ components/supervised_user/core/common/features.h
-@@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
+@@ -19,12 +19,12 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
  BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals);
  
  #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,13 @@
  extern const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs;
  #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_WIN)
-@@ -36,7 +36,7 @@ BASE_DECLARE_FEATURE(
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Whether we show an error screen in case of failure of a local web approval.
+ BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog);
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(
  // Applies new informative strings during the parental extension approval flow.
  BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings);
  
@@ -18,7 +24,7 @@
  BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
  #endif
  
-@@ -54,7 +54,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE
+@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE
  bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled();
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -27,7 +33,7 @@
  // Enable different web sign in interception behaviour for supervised users:
  //
  // 1. Supervised user signs in to existing signed out Profile: show modal
-@@ -72,7 +72,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers);
+@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers);
  // unauthenticated (e.g. signed out of the content area) account.
  BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers);
  
diff --git a/www/iridium/files/patch-components_supervised__user_core_common_pref__names.h b/www/iridium/files/patch-components_supervised__user_core_common_pref__names.h
index 13437ec203f2..14f6c3a0d379 100644
--- a/www/iridium/files/patch-components_supervised__user_core_common_pref__names.h
+++ b/www/iridium/files/patch-components_supervised__user_core_common_pref__names.h
@@ -1,4 +1,4 @@
---- components/supervised_user/core/common/pref_names.h.orig	2025-02-22 18:06:53 UTC
+--- components/supervised_user/core/common/pref_names.h.orig	2025-05-07 06:48:23 UTC
 +++ components/supervised_user/core/common/pref_names.h
 @@ -129,7 +129,7 @@ inline constexpr char kDefaultSupervisedUserFilteringB
      "profile.managed.default_filtering_behavior";
diff --git a/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc
index f3f6953e9b1c..5bde2d1e740f 100644
--- a/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc
+++ b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc
@@ -1,4 +1,4 @@
---- components/sync_device_info/local_device_info_util.cc.orig	2025-02-22 18:06:53 UTC
+--- components/sync_device_info/local_device_info_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/sync_device_info/local_device_info_util.cc
 @@ -84,7 +84,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na
  sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
diff --git a/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
index b71d677782d4..76d483a3c5ee 100644
--- a/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
+++ b/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
@@ -1,4 +1,4 @@
---- components/sync_device_info/local_device_info_util_linux.cc.orig	2022-10-05 07:34:01 UTC
+--- components/sync_device_info/local_device_info_util_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/sync_device_info/local_device_info_util_linux.cc
 @@ -9,6 +9,11 @@
  
diff --git a/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc b/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
index 5fa89efaeacc..2d2faf1ea29c 100644
--- a/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
+++ b/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
@@ -1,6 +1,6 @@
---- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-04-16 18:18:42 UTC
+--- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/sync_preferences/common_syncable_prefs_database.cc
-@@ -332,7 +332,7 @@ constexpr auto kCommonSyncablePrefsAllowlist =
+@@ -334,7 +334,7 @@ constexpr auto kCommonSyncablePrefsAllowlist =
            PrefSensitivity::kNone, MergeBehavior::kNone}},
  #endif  // BUILDFLAG(IS_ANDROID)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_system__cpu_cpu__probe.cc b/www/iridium/files/patch-components_system__cpu_cpu__probe.cc
index 1be44ef1b3ee..e25c08cd317d 100644
--- a/www/iridium/files/patch-components_system__cpu_cpu__probe.cc
+++ b/www/iridium/files/patch-components_system__cpu_cpu__probe.cc
@@ -1,4 +1,4 @@
---- components/system_cpu/cpu_probe.cc.orig	2024-06-25 12:08:48 UTC
+--- components/system_cpu/cpu_probe.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/system_cpu/cpu_probe.cc
 @@ -30,6 +30,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() {
    return CpuProbeWin::Create();
diff --git a/www/iridium/files/patch-components_translate_core_common_translate__util.cc b/www/iridium/files/patch-components_translate_core_common_translate__util.cc
index d2bd9b65b73b..b9e5c65db162 100644
--- a/www/iridium/files/patch-components_translate_core_common_translate__util.cc
+++ b/www/iridium/files/patch-components_translate_core_common_translate__util.cc
@@ -1,4 +1,4 @@
---- components/translate/core/common/translate_util.cc.orig	2023-10-21 11:51:27 UTC
+--- components/translate/core/common/translate_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/translate/core/common/translate_util.cc
 @@ -21,7 +21,7 @@ const char kSecurityOrigin[] = "trk:220:https://transl
  BASE_FEATURE(kTFLiteLanguageDetectionEnabled,
diff --git a/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
index e03b87adc137..0429ba8dce97 100644
--- a/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
+++ b/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
@@ -1,6 +1,6 @@
---- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2024-11-04 08:56:03 UTC
+--- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/trusted_vault/trusted_vault_connection_impl.cc
-@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() {
+@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() {
    // currently used or even built on all platforms.
  #if BUILDFLAG(IS_CHROMEOS)
    return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS;
diff --git a/www/iridium/files/patch-components_update__client_update__query__params.cc b/www/iridium/files/patch-components_update__client_update__query__params.cc
index 51e62a5bda97..dd7a657124d2 100644
--- a/www/iridium/files/patch-components_update__client_update__query__params.cc
+++ b/www/iridium/files/patch-components_update__client_update__query__params.cc
@@ -1,4 +1,4 @@
---- components/update_client/update_query_params.cc.orig	2025-02-22 18:06:53 UTC
+--- components/update_client/update_query_params.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/update_client/update_query_params.cc
 @@ -39,6 +39,8 @@ const char kOs[] =
      "fuchsia";
diff --git a/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
index a6dd207014b7..27af7d276aa2 100644
--- a/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ b/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
@@ -1,4 +1,4 @@
---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2025-03-18 16:46:04 UTC
+--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
 @@ -298,7 +298,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
    // The ideal fix would be to change the omnibox font used for Thai. In
diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc
index 208674f13577..aaa1a21f96af 100644
--- a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc
+++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc
@@ -1,6 +1,6 @@
---- components/user_education/views/help_bubble_view.cc.orig	2025-04-16 18:18:42 UTC
+--- components/user_education/views/help_bubble_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/user_education/views/help_bubble_view.cc
-@@ -299,7 +299,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, 
+@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, 
  // TODO(https://crbug.com/382611284): Temporarily handle the case when the
  // primary window is minimized by closing the help bubble. Remove this code when
  // the issue is solved at the Views framework level.
@@ -9,7 +9,7 @@
  class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver {
   public:
    explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble)
-@@ -774,7 +774,7 @@ HelpBubbleView::HelpBubbleView(
+@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView(
      event_relay_->Init(this);
    }
  
@@ -18,7 +18,7 @@
    primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this);
  #endif
  
-@@ -886,7 +886,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
+@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
  void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
                                                views::Widget* widget) const {
    BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.h b/www/iridium/files/patch-components_user__education_views_help__bubble__view.h
index fd2b547965a3..6f37f0a7bb79 100644
--- a/www/iridium/files/patch-components_user__education_views_help__bubble__view.h
+++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.h
@@ -1,6 +1,6 @@
---- components/user_education/views/help_bubble_view.h.orig	2025-02-22 18:06:53 UTC
+--- components/user_education/views/help_bubble_view.h.orig	2025-05-07 06:48:23 UTC
 +++ components/user_education/views/help_bubble_view.h
-@@ -162,7 +162,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg
+@@ -160,7 +160,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg
  // work around this problem by closing the bubble if the widget is minimized.
  // When the underlying issue is fixed at the framework level, this can be
  // removed.
diff --git a/www/iridium/files/patch-components_variations_service_variations__service.cc b/www/iridium/files/patch-components_variations_service_variations__service.cc
index 176ec8f5b919..f23290cb73d9 100644
--- a/www/iridium/files/patch-components_variations_service_variations__service.cc
+++ b/www/iridium/files/patch-components_variations_service_variations__service.cc
@@ -1,4 +1,4 @@
---- components/variations/service/variations_service.cc.orig	2025-03-18 16:46:04 UTC
+--- components/variations/service/variations_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/variations/service/variations_service.cc
 @@ -100,7 +100,7 @@ std::string GetPlatformString() {
    return "android";
diff --git a/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
index f97f4a0ac07e..7dc907f0275e 100644
--- a/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
+++ b/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
@@ -1,6 +1,6 @@
---- components/visited_url_ranking/public/url_visit_util.cc.orig	2024-11-04 08:56:03 UTC
+--- components/visited_url_ranking/public/url_visit_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/visited_url_ranking/public/url_visit_util.cc
-@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() {
+@@ -67,7 +67,7 @@ PlatformType GetPlatformInput() {
    return PlatformType::kWindows;
  #elif BUILDFLAG(IS_MAC)
    return PlatformType::kMac;
diff --git a/www/iridium/files/patch-components_viz_host_gpu__host__impl.cc b/www/iridium/files/patch-components_viz_host_gpu__host__impl.cc
index 9683abdc84cc..dfb8a2e6edd0 100644
--- a/www/iridium/files/patch-components_viz_host_gpu__host__impl.cc
+++ b/www/iridium/files/patch-components_viz_host_gpu__host__impl.cc
@@ -1,4 +1,4 @@
---- components/viz/host/gpu_host_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- components/viz/host/gpu_host_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/host/gpu_host_impl.cc
 @@ -135,7 +135,7 @@ GpuHostImpl::GpuHostImpl(Delegate* delegate,
        mojom::GpuServiceCreationParams::New();
diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.cc b/www/iridium/files/patch-components_viz_host_host__display__client.cc
index 6e0c3964b9d7..5f843b70b66d 100644
--- a/www/iridium/files/patch-components_viz_host_host__display__client.cc
+++ b/www/iridium/files/patch-components_viz_host_host__display__client.cc
@@ -1,4 +1,4 @@
---- components/viz/host/host_display_client.cc.orig	2024-06-25 12:08:48 UTC
+--- components/viz/host/host_display_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/host/host_display_client.cc
 @@ -65,7 +65,7 @@ void HostDisplayClient::AddChildWindowToBrowser(
  }
diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.h b/www/iridium/files/patch-components_viz_host_host__display__client.h
index cf805ef1cc48..cbade4578c85 100644
--- a/www/iridium/files/patch-components_viz_host_host__display__client.h
+++ b/www/iridium/files/patch-components_viz_host_host__display__client.h
@@ -1,4 +1,4 @@
---- components/viz/host/host_display_client.h.orig	2024-06-25 12:08:48 UTC
+--- components/viz/host/host_display_client.h.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/host/host_display_client.h
 @@ -52,7 +52,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
    void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index 3063e5cc4ab2..e5aa94e068ba 100644
--- a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1505,7 +1505,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1510,7 +1510,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
                                              ->GetVulkanPhysicalDevice(),
                                          VK_IMAGE_TILING_OPTIMAL, vk_format,
                                          si_format, yuv_color_space, ycbcr_info);
diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
index 25ed17d59f41..c6b0898d9c76 100644
--- a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,4 +1,4 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig	2025-02-22 18:06:53 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/service/display_embedder/software_output_surface.cc
 @@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
    base::TimeTicks now = base::TimeTicks::Now();
diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h
index 95e410ce4f22..7f8cf70d880b 100644
--- a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h
+++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h
@@ -1,4 +1,4 @@
---- components/viz/service/display_embedder/software_output_surface.h.orig	2025-02-22 18:06:53 UTC
+--- components/viz/service/display_embedder/software_output_surface.h.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/service/display_embedder/software_output_surface.h
 @@ -41,7 +41,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
        UpdateVSyncParametersCallback callback) override;
diff --git a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc
index 0492db85bb2d..0b59e93c923c 100644
--- a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc
+++ b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display/skia_renderer.cc.orig	2025-04-16 18:18:42 UTC
+--- components/viz/service/display/skia_renderer.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/service/display/skia_renderer.cc
-@@ -1383,7 +1383,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1391,7 +1391,7 @@ void SkiaRenderer::ClearFramebuffer() {
    if (current_frame()->current_render_pass->has_transparent_background) {
      ClearCanvas(SkColors::kTransparent);
    } else {
diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index d3208aeaa4ff..aac7bee8c4e8 100644
--- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -123,7 +123,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -126,7 +126,7 @@ RootCompositorFrameSinkImpl::Create(
    output_surface->SetNeedsSwapSizeNotifications(
        params->send_swap_size_notifications);
  
@@ -9,7 +9,7 @@
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -858,7 +858,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -884,7 +884,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
    if (display_client_ && enable_swap_completion_callback_) {
      display_client_->DidCompleteSwapWithSize(pixel_size);
    }
diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index d3c210ed66ac..d2fc6415f8ad 100644
--- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,8 +1,8 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-03-18 16:46:04 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -228,7 +228,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
-   // See comments on `EvictionHandler`.
-   EvictionHandler eviction_handler_;
+@@ -229,7 +229,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+   base::TimeDelta preferred_frame_interval_ =
+       FrameRateDecider::UnspecifiedFrameInterval();
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
diff --git a/www/iridium/files/patch-components_viz_test_fake__display__client.cc b/www/iridium/files/patch-components_viz_test_fake__display__client.cc
index 55c3ee8173d4..9e674dbc9254 100644
--- a/www/iridium/files/patch-components_viz_test_fake__display__client.cc
+++ b/www/iridium/files/patch-components_viz_test_fake__display__client.cc
@@ -1,4 +1,4 @@
---- components/viz/test/fake_display_client.cc.orig	2024-06-25 12:08:48 UTC
+--- components/viz/test/fake_display_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/test/fake_display_client.cc
 @@ -27,7 +27,7 @@ void FakeDisplayClient::AddChildWindowToBrowser(
      gpu::SurfaceHandle child_window) {}
diff --git a/www/iridium/files/patch-components_viz_test_fake__display__client.h b/www/iridium/files/patch-components_viz_test_fake__display__client.h
index 0d50aa0d2a1e..066bcf30a3ce 100644
--- a/www/iridium/files/patch-components_viz_test_fake__display__client.h
+++ b/www/iridium/files/patch-components_viz_test_fake__display__client.h
@@ -1,4 +1,4 @@
---- components/viz/test/fake_display_client.h.orig	2024-06-25 12:08:48 UTC
+--- components/viz/test/fake_display_client.h.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/test/fake_display_client.h
 @@ -36,7 +36,7 @@ class FakeDisplayClient : public mojom::DisplayClient 
    void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
diff --git a/www/iridium/files/patch-components_viz_test_mock__display__client.h b/www/iridium/files/patch-components_viz_test_mock__display__client.h
index 5847f175a4da..d6bb24d68054 100644
--- a/www/iridium/files/patch-components_viz_test_mock__display__client.h
+++ b/www/iridium/files/patch-components_viz_test_mock__display__client.h
@@ -1,4 +1,4 @@
---- components/viz/test/mock_display_client.h.orig	2025-02-22 18:06:53 UTC
+--- components/viz/test/mock_display_client.h.orig	2025-05-07 06:48:23 UTC
 +++ components/viz/test/mock_display_client.h
 @@ -45,7 +45,7 @@ class MockDisplayClient : public mojom::DisplayClient 
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-components_webui_flags_flags__state.cc b/www/iridium/files/patch-components_webui_flags_flags__state.cc
index e92b49ac4e56..be83c95f74e0 100644
--- a/www/iridium/files/patch-components_webui_flags_flags__state.cc
+++ b/www/iridium/files/patch-components_webui_flags_flags__state.cc
@@ -1,6 +1,6 @@
---- components/webui/flags/flags_state.cc.orig	2025-04-16 18:18:42 UTC
+--- components/webui/flags/flags_state.cc.orig	2025-05-07 06:48:23 UTC
 +++ components/webui/flags/flags_state.cc
-@@ -777,7 +777,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -782,7 +782,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
    return kOsWin;
  #elif BUILDFLAG(IS_CHROMEOS)
    return kOsCrOS;
diff --git a/www/iridium/files/patch-content_app_BUILD.gn b/www/iridium/files/patch-content_app_BUILD.gn
index e64861e6dc71..97b0d6827afa 100644
--- a/www/iridium/files/patch-content_app_BUILD.gn
+++ b/www/iridium/files/patch-content_app_BUILD.gn
@@ -1,6 +1,6 @@
---- content/app/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- content/app/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ content/app/BUILD.gn
-@@ -89,9 +89,9 @@ source_set("content_main_runner_app") {
+@@ -90,9 +90,9 @@ source_set("content_main_runner_app") {
             "//third_party/tflite:buildflags",
             "//tools/v8_context_snapshot:buildflags",
           ]
diff --git a/www/iridium/files/patch-content_app_content__main.cc b/www/iridium/files/patch-content_app_content__main.cc
index 55db251ddfc4..e9e338883167 100644
--- a/www/iridium/files/patch-content_app_content__main.cc
+++ b/www/iridium/files/patch-content_app_content__main.cc
@@ -1,4 +1,4 @@
---- content/app/content_main.cc.orig	2025-04-16 18:18:42 UTC
+--- content/app/content_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/app/content_main.cc
 @@ -227,7 +227,7 @@ NO_STACK_PROTECTOR int RunContentProcess(
      base::EnableTerminationOnOutOfMemory();
diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc
index b83df9724741..dd60fd276fa9 100644
--- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- content/app/content_main_runner_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/app/content_main_runner_impl.cc
-@@ -144,18 +144,20 @@
+@@ -146,18 +146,20 @@
  #include "content/browser/posix_file_descriptor_info_impl.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -23,7 +23,7 @@
  #include "third_party/boringssl/src/include/openssl/crypto.h"
  #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
  
-@@ -184,6 +186,10 @@
+@@ -186,6 +188,10 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -34,7 +34,7 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "content/browser/android/battery_metrics.h"
-@@ -382,7 +388,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE)
  
@@ -43,7 +43,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -420,7 +426,10 @@ void PreloadLibraryCdms() {
+@@ -422,7 +428,10 @@ void PreloadLibraryCdms() {
  
  void PreSandboxInit() {
    // Ensure the /dev/urandom is opened.
@@ -54,7 +54,7 @@
  
    // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
    // files.
-@@ -432,9 +441,16 @@ void PreSandboxInit() {
+@@ -434,9 +443,16 @@ void PreSandboxInit() {
    // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
    CRYPTO_pre_sandbox_init();
  
@@ -71,7 +71,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
    // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -748,7 +764,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain(
+@@ -750,7 +766,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain(
      unregister_thread_closure = base::HangWatcher::RegisterThread(
          base::HangWatcher::ThreadType::kMainThread);
      bool start_hang_watcher_now;
@@ -80,7 +80,7 @@
      // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is
      // initialized, because the sandbox can't be started with multiple threads.
      // TODO(mpdenton): start the HangWatcher after the sandbox is initialized.
-@@ -861,11 +877,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -863,11 +879,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
                   base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -94,7 +94,7 @@
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -1046,10 +1061,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1048,10 +1063,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
        process_type == switches::kZygoteProcess) {
      PreSandboxInit();
    }
@@ -117,7 +117,7 @@
    delegate_->SandboxInitialized(process_type);
  
  #if BUILDFLAG(USE_ZYGOTE)
-@@ -1146,6 +1173,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() {
+@@ -1148,6 +1175,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() {
    content_main_params_.reset();
  
    RegisterMainThreadFactories();
diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn
index e07b2897eaf4..7ba581093bd2 100644
--- a/www/iridium/files/patch-content_browser_BUILD.gn
+++ b/www/iridium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- content/browser/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/BUILD.gn
-@@ -2542,6 +2542,14 @@ source_set("browser") {
+@@ -2560,6 +2560,14 @@ source_set("browser") {
      ]
    }
  
@@ -15,10 +15,10 @@
    if (is_linux || is_chromeos) {
      sources -=
          [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
-@@ -2587,6 +2595,15 @@ source_set("browser") {
+@@ -2605,6 +2613,15 @@ source_set("browser") {
    if (allow_oop_video_decoder) {
-     sources += [ "media/stable_video_decoder_factory.cc" ]
-     deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
+     sources += [ "media/oop_video_decoder_factory.cc" ]
+     deps += [ "//media/mojo/mojom" ]
 +  }
 +
 +  if (is_bsd) {
diff --git a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
index 64fd3c30b759..f4fede709061 100644
--- a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
+++ b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/accessibility/browser_accessibility_state_impl.cc
-@@ -192,7 +192,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta
+@@ -180,7 +180,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta
  
  // On Android, Mac, Windows and Linux there are platform-specific subclasses.
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \
diff --git a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
index 7252afb6a346..1530960a0fe2 100644
--- a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
+++ b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
@@ -1,6 +1,6 @@
---- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc
-@@ -31,7 +31,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
+@@ -32,7 +32,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
    std::string cmdline;
    std::stringstream ss(cmdline_all);
    while (std::getline(ss, cmdline, '\0')) {
@@ -12,22 +12,22 @@
      if (re2::RE2::PartialMatch(cmdline, orca_regex)) {
        return true;  // Orca was found
      }
-@@ -57,7 +61,9 @@ class BrowserAccessibilityStateImplAuralinux
+@@ -42,6 +46,10 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
  
- void BrowserAccessibilityStateImplAuralinux::UpdateHistogramsOnOtherThread() {
-   BrowserAccessibilityStateImpl::UpdateHistogramsOnOtherThread();
--
+ // Returns true if Orca is active.
+ bool DiscoverOrca() {
 +#if BUILDFLAG(IS_BSD)
 +  NOTIMPLEMENTED();
++  return false;
 +#else
    // NOTE: this method is run from another thread to reduce jank, since
-   // there's no guarantee these system calls will return quickly. Code that
-   // needs to run in the UI thread can be run in
-@@ -105,6 +111,7 @@ void BrowserAccessibilityStateImplAuralinux::UpdateHis
-   } else {
-     base::debug::ClearCrashKeyString(ax_orca_crash_key);
+   // there's no guarantee these system calls will return quickly.
+   std::unique_ptr<DIR, decltype(&CloseDir)> proc_dir(opendir("/proc"),
+@@ -79,6 +87,7 @@ bool DiscoverOrca() {
    }
+ 
+   return is_orca_active;
 +#endif
  }
  
- void BrowserAccessibilityStateImplAuralinux::UpdateUniqueUserHistograms() {
+ }  // namespace
diff --git a/www/iridium/files/patch-content_browser_audio_audio__service.cc b/www/iridium/files/patch-content_browser_audio_audio__service.cc
index 9a23902a6922..96df806c7fae 100644
--- a/www/iridium/files/patch-content_browser_audio_audio__service.cc
+++ b/www/iridium/files/patch-content_browser_audio_audio__service.cc
@@ -1,4 +1,4 @@
---- content/browser/audio/audio_service.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/audio/audio_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/audio/audio_service.cc
 @@ -33,7 +33,7 @@
  #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
diff --git a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc
index cef384f05986..f1fa6a00f6ea 100644
--- a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc
+++ b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/browser_child_process_host_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/browser_child_process_host_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/browser_child_process_host_impl.cc
 @@ -326,6 +326,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
        switches::kLogBestEffortTasks,
diff --git a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h
index 0bc17c9fe8e6..8f40d8f95405 100644
--- a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h
+++ b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h
@@ -1,4 +1,4 @@
---- content/browser/browser_child_process_host_impl.h.orig	2025-03-18 16:46:04 UTC
+--- content/browser/browser_child_process_host_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/browser_child_process_host_impl.h
 @@ -36,7 +36,7 @@
  #include "base/win/object_watcher.h"
diff --git a/www/iridium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc b/www/iridium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
index 93c5ee12641c..ca25238a67a7 100644
--- a/www/iridium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
+++ b/www/iridium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
@@ -1,4 +1,4 @@
---- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/browser_child_process_host_impl_receiver_bindings.cc
 @@ -64,7 +64,7 @@ void BrowserChildProcessHostImpl::BindHostReceiver(
      }
diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc
index 8a1adc30766d..eb399ec10e00 100644
--- a/www/iridium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/browser_main_loop.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/browser_main_loop.cc
-@@ -247,6 +247,12 @@
+@@ -249,6 +249,12 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
  #endif
  
@@ -13,7 +13,7 @@
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -541,6 +547,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() {
    // by now since a thread to start the ServiceManager has been created
    // before the browser main loop starts.
    DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,7 +26,7 @@
  #endif
  
    // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() {
        base::ThreadType::kDisplayCritical);
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc b/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc
index f3f31e779f97..75854d10a06d 100644
--- a/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc
+++ b/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/browser_url_handler_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/browser_url_handler_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/browser_url_handler_impl.cc
 @@ -14,6 +14,7 @@
  #include "content/browser/webui/web_ui_impl.h"
diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper.h b/www/iridium/files/patch-content_browser_child__process__launcher__helper.h
index 47353f7ccf01..bc16bb926b59 100644
--- a/www/iridium/files/patch-content_browser_child__process__launcher__helper.h
+++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper.h
@@ -1,4 +1,4 @@
---- content/browser/child_process_launcher_helper.h.orig	2025-03-18 16:46:04 UTC
+--- content/browser/child_process_launcher_helper.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/child_process_launcher_helper.h
 @@ -308,7 +308,7 @@ class ChildProcessLauncherHelper
    std::optional<base::ProcessId> process_id_ = std::nullopt;
diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc
index 465a908c6652..543ac92b62ad 100644
--- a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/child_process_launcher_helper_linux.cc
 @@ -22,7 +22,9 @@
  #include "content/public/common/result_codes.h"
diff --git a/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc b/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc
index 5192bed2be9e..52d9453906d7 100644
--- a/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc
+++ b/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/child_thread_type_switcher_linux.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/child_thread_type_switcher_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/child_thread_type_switcher_linux.cc
 @@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee
                                     base::ThreadType thread_type) {
diff --git a/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.h b/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.h
index 29b89cbd46a1..36873a9c7bdb 100644
--- a/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.h
+++ b/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.h
@@ -1,4 +1,4 @@
---- content/browser/child_thread_type_switcher_linux.h.orig	2025-04-16 18:18:42 UTC
+--- content/browser/child_thread_type_switcher_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/child_thread_type_switcher_linux.h
 @@ -36,7 +36,7 @@ class ChildThreadTypeSwitcher : public mojom::ThreadTy
    void SetPid(base::ProcessId child_pid);
diff --git a/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
index d34d925d21ba..fee74b55100c 100644
--- a/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
+++ b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
@@ -1,6 +1,6 @@
---- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien
+@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien
    HostDisplayClient& operator=(const HostDisplayClient&) = delete;
  
    // viz::HostDisplayClient:
diff --git a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc
index 1c9234d2d8e8..781841966e3a 100644
--- a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc
+++ b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/devtools/devtools_frontend_host_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/devtools/devtools_frontend_host_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/devtools/devtools_frontend_host_impl.cc
 @@ -24,7 +24,7 @@
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
diff --git a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h
index aec9aa5d8085..58b8e32c2daa 100644
--- a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h
+++ b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h
@@ -1,4 +1,4 @@
---- content/browser/devtools/devtools_frontend_host_impl.h.orig	2024-06-25 12:08:48 UTC
+--- content/browser/devtools/devtools_frontend_host_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/devtools/devtools_frontend_host_impl.h
 @@ -34,7 +34,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte
  
diff --git a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
index 3727116f8f9b..8bbac07b2d25 100644
--- a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
+++ b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
@@ -1,4 +1,4 @@
---- content/browser/devtools/protocol/system_info_handler.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/devtools/protocol/system_info_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/devtools/protocol/system_info_handler.cc
 @@ -52,7 +52,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
  // 1046598, and 1153667.
diff --git a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
index a97b203a4c16..4aca86f76163 100644
--- a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
+++ b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
@@ -1,4 +1,4 @@
---- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig	2025-02-22 18:06:53 UTC
+--- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/file_system_access/file_path_watcher/file_path_watcher.h
 @@ -126,7 +126,7 @@ class CONTENT_EXPORT FilePathWatcher {
      Type type = Type::kNonRecursive;
diff --git a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
index 95c709e29c1d..9e1ea4315f9c 100644
--- a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
+++ b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
@@ -1,4 +1,4 @@
---- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc
 @@ -0,0 +1,60 @@
 +// Copyright 2024 The Chromium Authors
diff --git a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
index 2c6759ae3445..71039ce1470a 100644
--- a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
+++ b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
@@ -1,4 +1,4 @@
---- content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h.orig	2024-08-01 05:47:53 UTC
+--- content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h
 @@ -5,6 +5,7 @@
  #ifndef CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_
diff --git a/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
index f4b2b6b8e147..cf02f7ffe85c 100644
--- a/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
+++ b/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
@@ -1,4 +1,4 @@
---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc
 @@ -67,7 +67,7 @@ void FileSystemAccessLocalPathWatcher::Initialize(
        .type = scope().IsRecursive() ? FilePathWatcher::Type::kRecursive
diff --git a/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc b/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc
index 0984442420eb..120b2565661a 100644
--- a/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc
+++ b/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc
@@ -1,4 +1,4 @@
---- content/browser/font_access/font_enumeration_data_source.cc.orig	2023-11-22 14:00:11 UTC
+--- content/browser/font_access/font_enumeration_data_source.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/font_access/font_enumeration_data_source.cc
 @@ -16,7 +16,7 @@
  #include "content/browser/font_access/font_enumeration_data_source_win.h"
diff --git a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc
index a8d84469b3c9..5d04c8c30309 100644
--- a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc
+++ b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/compositor_util.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/gpu/compositor_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/gpu/compositor_util.cc
-@@ -147,7 +147,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+@@ -142,7 +142,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
        "video_decode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
@@ -9,7 +9,7 @@
            !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) ||
  #endif  // BUILDFLAG(IS_LINUX)
                command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)),
-@@ -159,7 +159,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
        "video_encode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE,
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
index 315a44d28490..a6120ee2f63d 100644
--- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.cc.orig	2024-08-27 06:28:16 UTC
+--- content/browser/gpu/gpu_data_manager_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.cc
-@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
+@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
    private_->OnDisplayMetricsChanged(display, changed_metrics);
  }
  
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
index 7fa6e85f0307..318fae1a7357 100644
--- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.h.orig	2024-08-27 06:28:16 UTC
+--- content/browser/gpu/gpu_data_manager_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.h
-@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
+@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics) override;
  
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index 8c3792a358fd..5c147ecbf3ea 100644
--- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1667,7 +1667,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
    UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
  }
  
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
index f3b301aeb13b..6a4a7f795abb 100644
--- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2024-12-22 12:24:29 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics);
  
@@ -9,7 +9,7 @@
    bool IsGpuMemoryBufferNV12Supported();
    void SetGpuMemoryBufferNV12Supported(bool supported);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    bool application_is_visible_ = true;
  
    bool disable_gpu_compositing_ = false;
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool is_gpu_memory_buffer_NV12_supported_ = false;
  #endif  // BUILDFLAG(IS_LINUX)
- };
+ 
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
index 1a5397ec5ae0..e83c100e65e2 100644
--- a/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
@@ -1,4 +1,4 @@
---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
 @@ -46,7 +46,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun
  #endif
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
index a53217a2e59e..01037d365c5d 100644
--- a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,4 +1,4 @@
---- content/browser/gpu/gpu_process_host.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/gpu/gpu_process_host.cc
 @@ -275,6 +275,7 @@ static const char* const kSwitchNames[] = {
      switches::kDisableSkiaGraphite,
diff --git a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h
index c64c1c4eebbb..729ae77fb63f 100644
--- a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h
+++ b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h
@@ -1,4 +1,4 @@
---- content/browser/media/frameless_media_interface_proxy.h.orig	2024-06-25 12:08:48 UTC
+--- content/browser/media/frameless_media_interface_proxy.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/media/frameless_media_interface_proxy.h
 @@ -19,7 +19,7 @@
  #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -6,15 +6,15 @@
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
+ #include "media/mojo/mojom/video_decoder.mojom.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final
+@@ -104,7 +104,7 @@ class FramelessMediaInterfaceProxy final
    // Connections to the renderer.
    mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Connection to the StableVideoDecoderFactory that lives in a utility
-   // process. This is only used for out-of-process video decoding and only when
-   // the FramelessMediaInterfaceProxy is created without a RenderProcessHost
+   // Connection to the InterfaceFactory that lives in a utility process.
+   // This is only used for out-of-process video decoding and only when the
+   // FramelessMediaInterfaceProxy is created without a RenderProcessHost
diff --git a/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
index b320c01c6514..11d9ab2ef799 100644
--- a/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
+++ b/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/media/media_keys_listener_manager_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/media/media_keys_listener_manager_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/media/media_keys_listener_manager_impl.cc
 @@ -332,7 +332,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
      return;
diff --git a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc
index 7fecf79686ac..d615664b2df3 100644
--- a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc
+++ b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/network_service_instance_impl.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/network_service_instance_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/network_service_instance_impl.cc
-@@ -84,7 +84,7 @@
+@@ -83,7 +83,7 @@
  #include "content/browser/network/network_service_process_tracker_win.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/browser/system_dns_resolution/system_dns_resolver.h"
  #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
  #endif
-@@ -367,7 +367,7 @@ void CreateInProcessNetworkService(
+@@ -341,7 +341,7 @@ void CreateInProcessNetworkService(
                                  std::move(receiver)));
  }
  
@@ -18,7 +18,7 @@
  // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
  // high-priority thread pool.
  void RunSystemDnsResolverOnThreadPool(
-@@ -436,7 +436,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -410,7 +410,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
    }
  #endif  // BUILDFLAG(IS_POSIX)
  
diff --git a/www/iridium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
index 8faa01c59d4a..5c4047a3614e 100644
--- a/www/iridium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
+++ b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
@@ -1,4 +1,4 @@
---- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2022-03-28 18:11:04 UTC
+--- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc
 @@ -8,7 +8,7 @@
  
diff --git a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
index 9173dac56506..1fafe11f4831 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -334,7 +334,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface(
  
    if (!primary_surface_id ||
        primary_surface_id->local_surface_id() != local_surface_id_) {
diff --git a/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
index e181e176e2ab..d47d1f427cf0 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc
 @@ -26,7 +26,7 @@
  #include "media/base/media_switches.h"
diff --git a/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
index 8af4acb05e47..34a9ed6e78cb 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2024-06-25 12:08:48 UTC
+--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
 @@ -462,7 +462,7 @@ void PepperFileIOHost::OnLocalFileOpened(
      ppapi::host::ReplyMessageContext reply_context,
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 25d301b5e511..4c35e5f480fb 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -224,7 +224,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
@@ -9,7 +9,7 @@
  #include <sys/resource.h>
  
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -1089,7 +1089,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1122,7 +1122,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1257,7 +1257,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost
+@@ -1317,7 +1317,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost
  
  void RenderProcessHostImpl::IOThreadHostImpl::SetPid(
      base::ProcessId child_pid) {
@@ -27,7 +27,7 @@
    child_thread_type_switcher_.SetPid(child_pid);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -3328,7 +3328,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3410,7 +3410,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
              base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
    }
  
@@ -36,7 +36,7 @@
    // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
    // for NV12 GPU memory buffer.
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3384,6 +3384,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3465,6 +3465,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
        switches::kDisableSpeechAPI,
        switches::kDisableThreadedCompositing,
        switches::kDisableTouchDragDrop,
@@ -45,7 +45,7 @@
        switches::kDisableV8IdleTasks,
        switches::kDisableVideoCaptureUseGpuMemoryBuffer,
        switches::kDisableWebGLImageChromium,
-@@ -5220,7 +5222,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr
+@@ -5310,7 +5312,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr
    // - Win: https://crbug.com/707022 .
    uint64_t total_size = 0;
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index 915c21fb704c..39f178115cd4 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig	2025-04-16 18:18:42 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/render_process_host_impl.h
 @@ -102,7 +102,7 @@
  #include "media/fuchsia_media_codec_provider_impl.h"
@@ -9,7 +9,7 @@
  #include "content/browser/child_thread_type_switcher_linux.h"
  #include "media/mojo/mojom/video_encode_accelerator.mojom.h"
  #endif
-@@ -988,7 +988,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -986,7 +986,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
      std::unique_ptr<service_manager::BinderRegistry> binders_;
      mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
  
@@ -18,7 +18,7 @@
      mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
          video_encode_accelerator_factory_remote_;
      ChildThreadTypeSwitcher child_thread_type_switcher_;
-@@ -1237,7 +1237,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -1235,7 +1235,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // if the request isn't handled on the IO thread.
    void OnBindHostReceiver(mojo::GenericPendingReceiver receiver);
  
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
index fa8027777615..152bd0896c77 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
 @@ -52,7 +52,7 @@
  #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h"
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index 714a67b1c6ca..6e392fc83a4f 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/render_view_host_impl.cc
 @@ -275,7 +275,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 1c5a6c94e492..81a925570ebf 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -121,7 +121,7 @@
  #include "ui/gfx/gdi_util.h"
@@ -18,7 +18,7 @@
    ui::BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1867,7 +1867,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
    return host() && host()->delegate() && host()->delegate()->ShouldDoLearning();
  }
  
@@ -27,7 +27,7 @@
  bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
      const gfx::Range& range,
      const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2843,7 +2843,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,12 +36,12 @@
    return NeedsInputGrab();
  #else
    return false;
-@@ -3027,7 +3027,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!event.skip_if_unhandled && linux_ui && event.os_event &&
+   if (!event.skip_if_unhandled && linux_ui && event.os_event) {
+     const auto command = linux_ui->GetTextEditCommandForEvent(
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
index 10fdec96bfd9..ee0c52130017 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.h.orig	2025-03-18 16:46:04 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.h
 @@ -276,7 +276,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
    ukm::SourceId GetClientSourceForMetrics() const override;
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index d175548a309e..08a7c31034c8 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2024-08-27 06:28:16 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
 @@ -602,7 +602,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
    if (event->type() == ui::EventType::kMouseExited) {
diff --git a/www/iridium/files/patch-content_browser_sandbox__host__linux.cc b/www/iridium/files/patch-content_browser_sandbox__host__linux.cc
index 9826a0ad44fa..3dc718e5b4af 100644
--- a/www/iridium/files/patch-content_browser_sandbox__host__linux.cc
+++ b/www/iridium/files/patch-content_browser_sandbox__host__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/sandbox_host_linux.cc.orig	2023-10-21 11:51:27 UTC
+--- content/browser/sandbox_host_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/sandbox_host_linux.cc
 @@ -45,6 +45,7 @@ void SandboxHostLinux::Init() {
    // Instead, it replies on a temporary socket provided by the caller.
diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
index a7e60c4dc764..02302b811a1a 100644
--- a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
+++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc
 @@ -337,7 +337,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask
      // in context menus, among others). Simply ignore the mismatches for now.
diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
index f17ced7c2b55..6ebdbcd515ce 100644
--- a/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
+++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
@@ -1,4 +1,4 @@
---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig	2022-03-28 18:11:04 UTC
+--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/scheduler/responsiveness/native_event_observer.cc
 @@ -15,7 +15,7 @@
  
diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
index 2128e734621c..781ad6b18be6 100644
--- a/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
+++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
@@ -1,4 +1,4 @@
---- content/browser/scheduler/responsiveness/native_event_observer.h.orig	2023-03-13 07:33:08 UTC
+--- content/browser/scheduler/responsiveness/native_event_observer.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/scheduler/responsiveness/native_event_observer.h
 @@ -16,7 +16,7 @@
  #include "content/public/browser/native_event_processor_observer_mac.h"
diff --git a/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc b/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc
index 98cdbf941d5d..f4c1cbfea511 100644
--- a/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc
+++ b/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/service_host/utility_process_host.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/service_host/utility_process_host.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/service_host/utility_process_host.cc
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
  #include "content/browser/v8_snapshot_files.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/files/file_util.h"
  #include "base/files/scoped_file.h"
  #include "base/pickle.h"
-@@ -95,7 +95,7 @@ namespace content {
+@@ -96,7 +96,7 @@ namespace content {
  
  namespace {
  
@@ -18,7 +18,7 @@
  base::ScopedFD PassNetworkContextParentDirs(
      std::vector<base::FilePath> network_context_parent_dirs) {
    base::Pickle pickle;
-@@ -425,7 +425,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() {
      file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line));
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -27,7 +27,7 @@
      // The network service should have access to the parent directories
      // necessary for its usage.
      if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -442,7 +442,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() {
      if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
        bool pass_gpu_buffer_flag =
            switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
diff --git a/www/iridium/files/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc b/www/iridium/files/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
index 46e13f22b7fe..c2276b5e893a 100644
--- a/www/iridium/files/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
+++ b/www/iridium/files/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
@@ -1,4 +1,4 @@
---- content/browser/service_host/utility_process_host_receiver_bindings.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/service_host/utility_process_host_receiver_bindings.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/service_host/utility_process_host_receiver_bindings.cc
 @@ -10,7 +10,7 @@
  #include "content/public/common/content_client.h"
diff --git a/www/iridium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc b/www/iridium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc
index 2a7a5906afc7..5835471fe71f 100644
--- a/www/iridium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc
+++ b/www/iridium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc
@@ -1,4 +1,4 @@
---- content/browser/service_host/utility_sandbox_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/service_host/utility_sandbox_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/service_host/utility_sandbox_delegate.cc
 @@ -77,7 +77,7 @@ UtilitySandboxedProcessLauncherDelegate::
  #if BUILDFLAG(IS_FUCHSIA)
diff --git a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc
index 4a6b7e2665df..55ebf01b7422 100644
--- a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc
+++ b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc
@@ -1,9 +1,9 @@
---- content/browser/v8_snapshot_files.cc.orig	2024-06-25 12:08:48 UTC
+--- content/browser/v8_snapshot_files.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/v8_snapshot_files.cc
-@@ -17,7 +17,7 @@ namespace content {
- std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>>
+@@ -19,7 +19,7 @@ namespace content {
+ std::map<std::string, std::variant<base::FilePath, base::ScopedFD>>
  GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) {
-   std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files;
+   std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> files;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT)
diff --git a/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc b/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc
index d9e01c377604..301f18aba461 100644
--- a/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc
+++ b/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc
@@ -1,4 +1,4 @@
---- content/browser/web_contents/slow_web_preference_cache.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/web_contents/slow_web_preference_cache.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/web_contents/slow_web_preference_cache.cc
 @@ -17,7 +17,7 @@
  
diff --git a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index 4a5f539f94fc..c476bd0cde20 100644
--- a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/web_contents/web_contents_view_aura.cc
 @@ -173,7 +173,7 @@ class WebDragSourceAura : public content::WebContentsO
    raw_ptr<aura::Window> window_;
diff --git a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
index 821acbb2ba44..10023056c3cd 100644
--- a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
+++ b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
@@ -1,4 +1,4 @@
---- content/browser/web_contents/web_contents_view_aura_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- content/browser/web_contents/web_contents_view_aura_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/web_contents/web_contents_view_aura_unittest.cc
 @@ -40,7 +40,7 @@
  #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
diff --git a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
index 46c11f6eb698..675a870953b3 100644
--- a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
@@ -1,4 +1,4 @@
---- content/browser/webui/web_ui_main_frame_observer.cc.orig	2025-02-22 18:06:53 UTC
+--- content/browser/webui/web_ui_main_frame_observer.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/webui/web_ui_main_frame_observer.cc
 @@ -47,7 +47,7 @@ std::string RedactURL(const GURL& url) {
  bool IsWebUIJavaScriptErrorReportingSupported() {
diff --git a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
index cd76921c94e7..5d4e9532f5f3 100644
--- a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
+++ b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2025-03-18 16:46:04 UTC
+--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/zygote_host/zygote_host_impl_linux.cc
 @@ -23,8 +23,10 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h
index 6e9a9cfa55f7..05a1644789b0 100644
--- a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h
+++ b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h
@@ -1,4 +1,4 @@
---- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2025-02-22 18:06:53 UTC
+--- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ content/browser/zygote_host/zygote_host_impl_linux.h
 @@ -46,12 +46,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos
                       base::ScopedFD* control_fd,
diff --git a/www/iridium/files/patch-content_child_BUILD.gn b/www/iridium/files/patch-content_child_BUILD.gn
index 07a640e36a2b..e19535d03f05 100644
--- a/www/iridium/files/patch-content_child_BUILD.gn
+++ b/www/iridium/files/patch-content_child_BUILD.gn
@@ -1,4 +1,4 @@
---- content/child/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- content/child/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ content/child/BUILD.gn
 @@ -135,6 +135,13 @@ target(link_target_type, "child") {
      ]
diff --git a/www/iridium/files/patch-content_child_child__process.cc b/www/iridium/files/patch-content_child_child__process.cc
index 6400386c38dc..73cf148406d1 100644
--- a/www/iridium/files/patch-content_child_child__process.cc
+++ b/www/iridium/files/patch-content_child_child__process.cc
@@ -1,4 +1,4 @@
---- content/child/child_process.cc.orig	2025-04-16 18:18:42 UTC
+--- content/child/child_process.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/child/child_process.cc
 @@ -31,7 +31,7 @@
  #include "content/common/android/cpu_time_metrics.h"
diff --git a/www/iridium/files/patch-content_child_child__process.h b/www/iridium/files/patch-content_child_child__process.h
index 1e56ef4818ef..c3a3be5ba6e5 100644
--- a/www/iridium/files/patch-content_child_child__process.h
+++ b/www/iridium/files/patch-content_child_child__process.h
@@ -1,4 +1,4 @@
---- content/child/child_process.h.orig	2024-08-01 05:47:53 UTC
+--- content/child/child_process.h.orig	2025-05-07 06:48:23 UTC
 +++ content/child/child_process.h
 @@ -79,7 +79,7 @@ class CONTENT_EXPORT ChildProcess {
      return io_thread_runner_.get();
diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn
index fe2326b9f0e2..1d84485ea0b6 100644
--- a/www/iridium/files/patch-content_common_BUILD.gn
+++ b/www/iridium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- content/common/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ content/common/BUILD.gn
-@@ -384,19 +384,28 @@ source_set("common") {
+@@ -382,19 +382,28 @@ source_set("common") {
    }
  
    if (is_linux || is_chromeos) {
diff --git a/www/iridium/files/patch-content_common_features.cc b/www/iridium/files/patch-content_common_features.cc
index 8b941e8620d9..0011eb0a7886 100644
--- a/www/iridium/files/patch-content_common_features.cc
+++ b/www/iridium/files/patch-content_common_features.cc
@@ -1,6 +1,6 @@
---- content/common/features.cc.orig	2025-03-18 16:46:04 UTC
+--- content/common/features.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/common/features.cc
-@@ -125,7 +125,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
+@@ -124,7 +124,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  // Enables error reporting for JS errors inside DevTools frontend host
diff --git a/www/iridium/files/patch-content_common_features.h b/www/iridium/files/patch-content_common_features.h
index 8e4707f5404c..8b5485db3296 100644
--- a/www/iridium/files/patch-content_common_features.h
+++ b/www/iridium/files/patch-content_common_features.h
@@ -1,6 +1,6 @@
---- content/common/features.h.orig	2025-03-18 16:46:04 UTC
+--- content/common/features.h.orig	2025-05-07 06:48:23 UTC
 +++ content/common/features.h
-@@ -28,7 +28,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn
+@@ -27,7 +27,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation);
diff --git a/www/iridium/files/patch-content_common_font__list__unittest.cc b/www/iridium/files/patch-content_common_font__list__unittest.cc
index e29e03beb25e..0b0d4f43dc58 100644
--- a/www/iridium/files/patch-content_common_font__list__unittest.cc
+++ b/www/iridium/files/patch-content_common_font__list__unittest.cc
@@ -1,4 +1,4 @@
---- content/common/font_list_unittest.cc.orig	2024-06-25 12:08:48 UTC
+--- content/common/font_list_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/common/font_list_unittest.cc
 @@ -48,7 +48,7 @@ TEST(FontList, GetFontList) {
          EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic"));
diff --git a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
index 7857ccbaa44d..0324b1dcd011 100644
--- a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
+++ b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
@@ -1,4 +1,4 @@
---- content/common/gpu_pre_sandbox_hook_bsd.cc.orig	2024-06-25 12:08:48 UTC
+--- content/common/gpu_pre_sandbox_hook_bsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/common/gpu_pre_sandbox_hook_bsd.cc
 @@ -0,0 +1,68 @@
 +// Copyright 2023 The Chromium Authors
diff --git a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.h b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.h
index 4bab3a4eb258..3b4dc6ac5427 100644
--- a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.h
+++ b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.h
@@ -1,4 +1,4 @@
---- content/common/gpu_pre_sandbox_hook_bsd.h.orig	2024-06-25 12:08:48 UTC
+--- content/common/gpu_pre_sandbox_hook_bsd.h.orig	2025-05-07 06:48:23 UTC
 +++ content/common/gpu_pre_sandbox_hook_bsd.h
 @@ -0,0 +1,20 @@
 +// Copyright 2017 The Chromium Authors
diff --git a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h
index 458336ec9594..fa5bc2a57af1 100644
--- a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- content/common/gpu_pre_sandbox_hook_linux.h.orig	2024-06-25 12:08:48 UTC
+--- content/common/gpu_pre_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ content/common/gpu_pre_sandbox_hook_linux.h
 @@ -5,8 +5,13 @@
  #ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-content_common_thread__type__switcher.mojom b/www/iridium/files/patch-content_common_thread__type__switcher.mojom
index b905ec1af81d..1b5cb6e116b8 100644
--- a/www/iridium/files/patch-content_common_thread__type__switcher.mojom
+++ b/www/iridium/files/patch-content_common_thread__type__switcher.mojom
@@ -1,4 +1,4 @@
---- content/common/thread_type_switcher.mojom.orig	2025-04-16 18:18:42 UTC
+--- content/common/thread_type_switcher.mojom.orig	2025-05-07 06:48:23 UTC
 +++ content/common/thread_type_switcher.mojom
 @@ -10,6 +10,6 @@ import "mojo/public/mojom/base/thread_type.mojom";
  // occur in a child process due to its sandbox, e.g. on Linux and ChromeOS.
diff --git a/www/iridium/files/patch-content_common_user__agent.cc b/www/iridium/files/patch-content_common_user__agent.cc
deleted file mode 100644
index 46e0ffd48988..000000000000
--- a/www/iridium/files/patch-content_common_user__agent.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- content/common/user_agent.cc.orig	2025-04-16 18:18:42 UTC
-+++ content/common/user_agent.cc
-@@ -50,7 +50,7 @@ std::string GetUserAgentPlatform() {
-   return "";
- #elif BUILDFLAG(IS_MAC)
-   return "Macintosh; ";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return "X11; ";  // strange, but that's what Firefox uses
- #elif BUILDFLAG(IS_ANDROID)
-   return "Linux; ";
-@@ -76,7 +76,7 @@ std::string GetUnifiedPlatform() {
-   return "Windows NT 10.0; Win64; x64";
- #elif BUILDFLAG(IS_FUCHSIA)
-   return "Fuchsia";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "X11; Linux x86_64";
- #elif BUILDFLAG(IS_IOS)
-   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
-@@ -305,6 +305,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
-                       "Android %s", os_version.c_str()
- #elif BUILDFLAG(IS_FUCHSIA)
-                       "Fuchsia"
-+#elif BUILDFLAG(IS_BSD)
-+#if defined(__x86_64__)
-+                      "Linux x86_64; %s %s",
-+#elif defined(__aarch64__)
-+                      "Linux aarch64; %s %s",
-+#else
-+                      "Linux i686; %s %s",
-+#endif
-+                      unixinfo.sysname,  // e.g. Linux
-+                      cpu_type.c_str()   // e.g. i686
- #elif BUILDFLAG(IS_IOS)
-                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
-                       os_version.c_str()
diff --git a/www/iridium/files/patch-content_gpu_gpu__child__thread.cc b/www/iridium/files/patch-content_gpu_gpu__child__thread.cc
index cb19d479b6b3..2b98aae2e6c2 100644
--- a/www/iridium/files/patch-content_gpu_gpu__child__thread.cc
+++ b/www/iridium/files/patch-content_gpu_gpu__child__thread.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_child_thread.cc.orig	2025-02-22 18:06:53 UTC
+--- content/gpu/gpu_child_thread.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/gpu/gpu_child_thread.cc
 @@ -57,7 +57,7 @@
  #include "third_party/skia/include/ports/SkFontConfigInterface.h"
diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc
index 557aeb32935a..61a4d6598759 100644
--- a/www/iridium/files/patch-content_gpu_gpu__main.cc
+++ b/www/iridium/files/patch-content_gpu_gpu__main.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_main.cc.orig	2025-04-16 18:18:42 UTC
+--- content/gpu/gpu_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/gpu/gpu_main.cc
 @@ -95,10 +95,14 @@
  #include "sandbox/win/src/sandbox.h"
diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
index c81a36d1a60f..73ad1cd28063 100644
--- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2024-06-25 12:08:48 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
 @@ -21,7 +21,7 @@
  
diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
index a921219c3c9f..20bbbd4b85fe 100644
--- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2024-08-01 05:47:53 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.h
 @@ -36,7 +36,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
    blink::WebString DefaultLocale() override;
diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc
index 0c9af8baf57c..c420df5771df 100644
--- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc
+++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_plugin_main.cc.orig	2025-03-18 16:46:04 UTC
+--- content/ppapi_plugin/ppapi_plugin_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/ppapi_plugin/ppapi_plugin_main.cc
 @@ -52,6 +52,11 @@
  #include "gin/v8_initializer.h"
diff --git a/www/iridium/files/patch-content_public_browser_content__browser__client.cc b/www/iridium/files/patch-content_public_browser_content__browser__client.cc
index cd67f021a1fb..7d9fd4c82627 100644
--- a/www/iridium/files/patch-content_public_browser_content__browser__client.cc
+++ b/www/iridium/files/patch-content_public_browser_content__browser__client.cc
@@ -1,6 +1,6 @@
---- content/public/browser/content_browser_client.cc.orig	2025-04-16 18:18:42 UTC
+--- content/public/browser/content_browser_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/public/browser/content_browser_client.cc
-@@ -1376,7 +1376,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
+@@ -1395,7 +1395,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
  // that can be adequately sandboxed.
  // Currently Android's network service will not run out of process or sandboxed,
  // so OutOfProcessSystemDnsResolution is not currently enabled on Android.
diff --git a/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h b/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h
index a7e1982d5b9f..bc2d5be0abaa 100644
--- a/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h
+++ b/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h
@@ -1,4 +1,4 @@
---- content/public/browser/zygote_host/zygote_host_linux.h.orig	2025-02-22 18:06:53 UTC
+--- content/public/browser/zygote_host/zygote_host_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ content/public/browser/zygote_host/zygote_host_linux.h
 @@ -34,11 +34,13 @@ class ZygoteHost {
    // after the first render has been forked.
diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc
index 60f6f8652f32..b9159d257193 100644
--- a/www/iridium/files/patch-content_public_common_content__features.cc
+++ b/www/iridium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig	2025-04-16 18:18:42 UTC
+--- content/public/common/content_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/public/common/content_features.cc
 @@ -75,7 +75,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup,
  // Runs the audio service in a separate process.
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1274,9 +1274,9 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1271,9 +1271,9 @@ BASE_FEATURE(kWebAssemblyTiering,
  BASE_FEATURE(kWebAssemblyTrapHandler,
               "WebAssemblyTrapHandler",
  #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ||  \
@@ -21,7 +21,7 @@
       defined(ARCH_CPU_ARM64))
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
-@@ -1329,7 +1329,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended,
+@@ -1330,7 +1330,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended,
  
  // Controls whether the WebUSB API is enabled:
  // https://wicg.github.io/webusb
diff --git a/www/iridium/files/patch-content_public_common_content__switches.cc b/www/iridium/files/patch-content_public_common_content__switches.cc
index 2f021342f950..d8109434f832 100644
--- a/www/iridium/files/patch-content_public_common_content__switches.cc
+++ b/www/iridium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig	2025-04-16 18:18:42 UTC
+--- content/public/common/content_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/public/common/content_switches.cc
-@@ -342,6 +342,10 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -339,6 +339,10 @@ const char kEnableIsolatedWebAppsInRenderer[] =
  // builds.
  const char kEnableLogging[]                 = "enable-logging";
  
@@ -11,7 +11,7 @@
  // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
  // triggering of change attribute of the NetInfo API when there is a change in
  // the connection type.
-@@ -949,7 +953,7 @@ const char kPreventResizingContentsForTesting[] =
+@@ -946,7 +950,7 @@ const char kPreventResizingContentsForTesting[] =
      "prevent-resizing-contents-for-testing";
  #endif
  
diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h
index 82c1a3cab7e9..1eff413bf882 100644
--- a/www/iridium/files/patch-content_public_common_content__switches.h
+++ b/www/iridium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig	2025-04-16 18:18:42 UTC
+--- content/public/common/content_switches.h.orig	2025-05-07 06:48:23 UTC
 +++ content/public/common/content_switches.h
-@@ -108,6 +108,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+@@ -107,6 +107,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
  CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
  CONTENT_EXPORT extern const char kEnableLCDText[];
  CONTENT_EXPORT extern const char kEnableLogging[];
@@ -9,7 +9,7 @@
  CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
  CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
  CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -259,7 +261,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -258,7 +260,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
  CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[];
  #endif
  
diff --git a/www/iridium/files/patch-content_public_common_zygote_features.gni b/www/iridium/files/patch-content_public_common_zygote_features.gni
index 4b3fe2e86b3d..e9f4aa2b43a9 100644
--- a/www/iridium/files/patch-content_public_common_zygote_features.gni
+++ b/www/iridium/files/patch-content_public_common_zygote_features.gni
@@ -1,4 +1,4 @@
---- content/public/common/zygote/features.gni.orig	2023-04-22 17:45:15 UTC
+--- content/public/common/zygote/features.gni.orig	2025-05-07 06:48:23 UTC
 +++ content/public/common/zygote/features.gni
 @@ -2,4 +2,4 @@
  # Use of this source code is governed by a BSD-style license that can be
diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc
index 73dc7f14d65d..8b81be16f1e0 100644
--- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- content/renderer/render_thread_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/renderer/render_thread_impl.cc
-@@ -212,6 +212,8 @@
+@@ -207,6 +207,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -9,7 +9,7 @@
  #else
  #include <malloc.h>
  #endif
-@@ -1050,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
                               kGpuStreamIdMedia, kGpuStreamPriorityMedia);
  
    const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
        base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) &&
  #endif  // BUILDFLAG(IS_LINUX)
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1059,7 +1061,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
         gpu::kGpuFeatureStatusEnabled);
  
    const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
        base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1855,7 +1857,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory(
+@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory(
      bool enable_video_encode_accelerator) {
    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
        vea_provider;
diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index de59a0660088..3287b7e4cbde 100644
--- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -129,7 +129,7 @@
+@@ -124,7 +124,7 @@
  
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
-@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -25,7 +25,7 @@
      mojo::PendingRemote<font_service::mojom::FontService> font_service;
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
-@@ -228,7 +228,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
    }
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -34,7 +34,7 @@
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -292,7 +292,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundledCodeCacheRes
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 1b02b07101ab..3f452e2b3a6e 100644
--- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2025-03-18 16:46:04 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
                                     const gpu::GPUInfo& gpu_info) const;
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
index 91f17d03c0d9..9f00112eec8b 100644
--- a/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
+++ b/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
@@ -1,4 +1,4 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2023-10-21 11:51:27 UTC
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/renderer/renderer_main_platform_delegate_linux.cc
 @@ -44,6 +44,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
    // any renderer has been started.
diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn
index f73ef1473975..872cfd0d36f7 100644
--- a/www/iridium/files/patch-content_shell_BUILD.gn
+++ b/www/iridium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- content/shell/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ content/shell/BUILD.gn
-@@ -1093,7 +1093,7 @@ group("content_shell_crash_test") {
+@@ -1099,7 +1099,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc
index ca4ad9ccb71d..e9fd7f4423b8 100644
--- a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc
+++ b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc
@@ -1,4 +1,4 @@
---- content/shell/app/shell_main_delegate.cc.orig	2024-12-22 12:24:29 UTC
+--- content/shell/app/shell_main_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/shell/app/shell_main_delegate.cc
 @@ -269,7 +269,7 @@ void ShellMainDelegate::PreSandboxStartup() {
      // Reporting for sub-processes will be initialized in ZygoteForked.
diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index 199b051ccace..26053d01ee8e 100644
--- a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig	2025-04-16 18:18:42 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/shell/browser/shell_browser_main_parts.cc
 @@ -50,7 +50,7 @@
  #include "net/base/network_change_notifier.h"
diff --git a/www/iridium/files/patch-content_shell_browser_shell__paths.cc b/www/iridium/files/patch-content_shell_browser_shell__paths.cc
index f1d29b599830..35a013b5a25b 100644
--- a/www/iridium/files/patch-content_shell_browser_shell__paths.cc
+++ b/www/iridium/files/patch-content_shell_browser_shell__paths.cc
@@ -1,4 +1,4 @@
---- content/shell/browser/shell_paths.cc.orig	2022-03-28 18:11:04 UTC
+--- content/shell/browser/shell_paths.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/shell/browser/shell_paths.cc
 @@ -13,7 +13,7 @@
  
diff --git a/www/iridium/files/patch-content_shell_browser_shell__platform__delegate__views.cc b/www/iridium/files/patch-content_shell_browser_shell__platform__delegate__views.cc
new file mode 100644
index 000000000000..2b2d3799bd07
--- /dev/null
+++ b/www/iridium/files/patch-content_shell_browser_shell__platform__delegate__views.cc
@@ -0,0 +1,11 @@
+--- content/shell/browser/shell_platform_delegate_views.cc.orig	2025-05-07 06:48:23 UTC
++++ content/shell/browser/shell_platform_delegate_views.cc
+@@ -373,7 +373,7 @@ void ShellPlatformDelegate::CreatePlatformWindow(
+       views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
+   params.bounds = gfx::Rect(initial_size);
+   params.delegate = delegate.release();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   params.wm_class_class = "chromium-content_shell";
+   params.wm_class_name = params.wm_class_class;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-content_shell_renderer_shell__content__renderer__client.cc b/www/iridium/files/patch-content_shell_renderer_shell__content__renderer__client.cc
index 03de70a620d0..5ad9042f1fc0 100644
--- a/www/iridium/files/patch-content_shell_renderer_shell__content__renderer__client.cc
+++ b/www/iridium/files/patch-content_shell_renderer_shell__content__renderer__client.cc
@@ -1,4 +1,4 @@
---- content/shell/renderer/shell_content_renderer_client.cc.orig	2025-02-22 18:06:53 UTC
+--- content/shell/renderer/shell_content_renderer_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/shell/renderer/shell_content_renderer_client.cc
 @@ -55,7 +55,7 @@
  #include "media/base/media_switches.h"
diff --git a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc
index 4dae77b4373c..b8499b55bf86 100644
--- a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc
+++ b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc
@@ -1,4 +1,4 @@
---- content/shell/utility/shell_content_utility_client.cc.orig	2025-03-18 16:46:04 UTC
+--- content/shell/utility/shell_content_utility_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/shell/utility/shell_content_utility_client.cc
 @@ -43,7 +43,7 @@
  #include "sandbox/policy/sandbox.h"
diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc
index 70dc575d2e36..1f4a66a636ce 100644
--- a/www/iridium/files/patch-content_utility_services.cc
+++ b/www/iridium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig	2025-02-22 18:06:53 UTC
+--- content/utility/services.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/utility/services.cc
 @@ -73,7 +73,7 @@
  extern sandbox::TargetServices* g_utility_target_services;
@@ -17,7 +17,7 @@
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  #include "content/common/features.h"
- #include "media/mojo/services/stable_video_decoder_factory_process_service.h"  // nogncheck
+ #include "media/mojo/services/oop_video_decoder_factory_process_service.h"  // nogncheck
 @@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
        << "task_policy_set TASK_QOS_POLICY";
  #endif
@@ -34,9 +34,9 @@
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- auto RunStableVideoDecoderFactoryProcessService(
-     mojo::PendingReceiver<
-@@ -392,7 +392,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+ auto RunOOPVideoDecoderFactoryProcessService(
+     mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) {
+@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessService(
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
@@ -45,16 +45,16 @@
  auto RunVideoEncodeAcceleratorProviderFactory(
      mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
          receiver) {
-@@ -415,7 +415,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
+@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
    // loop of type IO that can get notified when pipes have data.
    services.Add(RunNetworkService);
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
-   services.Add(RunStableVideoDecoderFactoryProcessService);
+   services.Add(RunOOPVideoDecoderFactoryProcessService);
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
-@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // BUILDFLAG(IS_CHROMEOS) && \
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
diff --git a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
index 7aa61249e91d..d40101838471 100644
--- a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/utility/speech/speech_recognition_sandbox_hook_linux.cc
 @@ -12,11 +12,14 @@
  #include "sandbox/linux/syscall_broker/broker_command.h"
diff --git a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
index b64adce3476a..a15b8e429727 100644
--- a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig	2023-10-21 11:51:27 UTC
+--- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ content/utility/speech/speech_recognition_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
index 3832a9e69de1..c4c845f9befb 100644
--- a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
+++ b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
 @@ -9,7 +9,7 @@
  
diff --git a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
index 93da84860616..0b8c42edba7e 100644
--- a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
+++ b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
@@ -1,4 +1,4 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2025-03-18 16:46:04 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h
 @@ -34,7 +34,7 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
  
diff --git a/www/iridium/files/patch-content_utility_utility__main.cc b/www/iridium/files/patch-content_utility_utility__main.cc
index b78adc819e1d..dbf0a5f9b210 100644
--- a/www/iridium/files/patch-content_utility_utility__main.cc
+++ b/www/iridium/files/patch-content_utility_utility__main.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_main.cc.orig	2025-02-22 18:06:53 UTC
+--- content/utility/utility_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/utility/utility_main.cc
 @@ -36,18 +36,22 @@
  #include "services/tracing/public/cpp/trace_startup.h"
@@ -28,15 +28,15 @@
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
--#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_BSD)
 +#include "sandbox/policy/sandbox.h"
 +#include "content/common/gpu_pre_sandbox_hook_bsd.h"
 +#endif
 +
-+#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "services/video_effects/video_effects_sandbox_hook_linux.h"  // nogncheck
- #endif  // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
+ #endif  // BUILDFLAG(IS_LINUX)
  
 @@ -101,7 +110,7 @@
  sandbox::TargetServices* g_utility_target_services = nullptr;
diff --git a/www/iridium/files/patch-content_utility_utility__thread__impl.cc b/www/iridium/files/patch-content_utility_utility__thread__impl.cc
index 7ca5d07cc0d7..375e5c2b0247 100644
--- a/www/iridium/files/patch-content_utility_utility__thread__impl.cc
+++ b/www/iridium/files/patch-content_utility_utility__thread__impl.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_thread_impl.cc.orig	2024-06-25 12:08:48 UTC
+--- content/utility/utility_thread_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/utility/utility_thread_impl.cc
 @@ -31,7 +31,7 @@
  #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/www/iridium/files/patch-content_zygote_BUILD.gn b/www/iridium/files/patch-content_zygote_BUILD.gn
index 9e0ceff177e8..78424cef4d8a 100644
--- a/www/iridium/files/patch-content_zygote_BUILD.gn
+++ b/www/iridium/files/patch-content_zygote_BUILD.gn
@@ -1,4 +1,4 @@
---- content/zygote/BUILD.gn.orig	2022-03-28 18:11:04 UTC
+--- content/zygote/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ content/zygote/BUILD.gn
 @@ -5,7 +5,7 @@
  import("//build/config/nacl/config.gni")
diff --git a/www/iridium/files/patch-content_zygote_zygote__linux.cc b/www/iridium/files/patch-content_zygote_zygote__linux.cc
index 1a58c268c382..3dc51f9df36d 100644
--- a/www/iridium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/iridium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig	2025-02-22 18:06:53 UTC
+--- content/zygote/zygote_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/zygote/zygote_linux.cc
 @@ -1,6 +1,7 @@
  // Copyright 2012 The Chromium Authors
@@ -6,9 +6,9 @@
  // found in the LICENSE file.
 +#if 0
  
- #ifdef UNSAFE_BUFFERS_BUILD
- // TODO(crbug.com/342213636): Remove this and spanify to fix the errors.
-@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
+ #include "content/zygote/zygote_linux.h"
+ 
+@@ -705,3 +706,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
  }
  
  }  // namespace content
diff --git a/www/iridium/files/patch-content_zygote_zygote__main__linux.cc b/www/iridium/files/patch-content_zygote_zygote__main__linux.cc
index 8de6d623f6a0..d1f4b96c6051 100644
--- a/www/iridium/files/patch-content_zygote_zygote__main__linux.cc
+++ b/www/iridium/files/patch-content_zygote_zygote__main__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_main_linux.cc.orig	2023-10-21 11:51:27 UTC
+--- content/zygote/zygote_main_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ content/zygote/zygote_main_linux.cc
 @@ -11,7 +11,9 @@
  #include <stddef.h>
diff --git a/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc b/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc
index aa309d9de541..eee3f74e5327 100644
--- a/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc
+++ b/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc
@@ -1,4 +1,4 @@
---- device/bluetooth/bluetooth_adapter.cc.orig	2024-06-25 12:08:48 UTC
+--- device/bluetooth/bluetooth_adapter.cc.orig	2025-05-07 06:48:23 UTC
 +++ device/bluetooth/bluetooth_adapter.cc
 @@ -32,7 +32,7 @@ namespace device {
  BluetoothAdapter::ServiceOptions::ServiceOptions() = default;
diff --git a/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni b/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni
index 6ac86368d4a7..e65482b3ff08 100644
--- a/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni
+++ b/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni
@@ -1,4 +1,4 @@
---- device/bluetooth/cast_bluetooth.gni.orig	2022-10-05 07:34:01 UTC
+--- device/bluetooth/cast_bluetooth.gni.orig	2025-05-07 06:48:23 UTC
 +++ device/bluetooth/cast_bluetooth.gni
 @@ -2,5 +2,5 @@ import("//build/config/features.gni")
  
diff --git a/www/iridium/files/patch-device_gamepad_BUILD.gn b/www/iridium/files/patch-device_gamepad_BUILD.gn
index 6a4c7e18cdc3..cdc80d1bf067 100644
--- a/www/iridium/files/patch-device_gamepad_BUILD.gn
+++ b/www/iridium/files/patch-device_gamepad_BUILD.gn
@@ -1,4 +1,4 @@
---- device/gamepad/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- device/gamepad/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ device/gamepad/BUILD.gn
 @@ -98,7 +98,7 @@ component("gamepad") {
        "hid_writer_linux.cc",
diff --git a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc
index 8e5161c410d6..d2bb300f35a5 100644
--- a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc
+++ b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc
@@ -1,4 +1,4 @@
---- device/gamepad/gamepad_provider.cc.orig	2025-02-22 18:06:53 UTC
+--- device/gamepad/gamepad_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ device/gamepad/gamepad_provider.cc
 @@ -159,7 +159,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
  
diff --git a/www/iridium/files/patch-device_gamepad_hid__writer__linux.cc b/www/iridium/files/patch-device_gamepad_hid__writer__linux.cc
index d034cb86cd9d..9d64d3480e8f 100644
--- a/www/iridium/files/patch-device_gamepad_hid__writer__linux.cc
+++ b/www/iridium/files/patch-device_gamepad_hid__writer__linux.cc
@@ -1,4 +1,4 @@
---- device/gamepad/hid_writer_linux.cc.orig	2022-03-28 18:11:04 UTC
+--- device/gamepad/hid_writer_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ device/gamepad/hid_writer_linux.cc
 @@ -2,6 +2,8 @@
  // Use of this source code is governed by a BSD-style license that can be
diff --git a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
index 605660ee890d..1352001ccfa2 100644
--- a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
@@ -1,8 +1,8 @@
---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-02-22 18:06:53 UTC
+--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
 @@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+   MediaPerceptionAPIManager::GetFactoryInstance();
  #endif
-   MessageService::GetFactoryInstance();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
diff --git a/www/iridium/files/patch-extensions_browser_api_management_management__api.cc b/www/iridium/files/patch-extensions_browser_api_management_management__api.cc
index aab1f269ed7e..82dd79c2df4e 100644
--- a/www/iridium/files/patch-extensions_browser_api_management_management__api.cc
+++ b/www/iridium/files/patch-extensions_browser_api_management_management__api.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/management/management_api.cc.orig	2024-08-27 06:28:16 UTC
+--- extensions/browser/api/management/management_api.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/browser/api/management/management_api.cc
-@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
+@@ -286,7 +286,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
  #if BUILDFLAG(IS_CHROMEOS)
    // ChromeOS devices have this feature already shipped.
    return true;
diff --git a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc
index 5f483fb9a072..f07d692f5405 100644
--- a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/messaging/message_service.cc.orig	2025-04-16 18:18:42 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/browser/api/messaging/message_service.cc
-@@ -77,7 +77,7 @@ namespace {
+@@ -81,7 +81,7 @@ namespace {
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -667,7 +667,7 @@ void MessageService::OpenChannelToNativeAppImpl(
+@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNativeAppImpl(
      return;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
index 23465b8b7959..46cb6b5eebea 100644
--- a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2025-02-22 18:06:53 UTC
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
 @@ -12,7 +12,7 @@
  
diff --git a/www/iridium/files/patch-extensions_common_api___permission__features.json b/www/iridium/files/patch-extensions_common_api___permission__features.json
index a6179a6c77fa..4e796587769e 100644
--- a/www/iridium/files/patch-extensions_common_api___permission__features.json
+++ b/www/iridium/files/patch-extensions_common_api___permission__features.json
@@ -1,4 +1,4 @@
---- extensions/common/api/_permission_features.json.orig	2025-04-16 18:18:42 UTC
+--- extensions/common/api/_permission_features.json.orig	2025-05-07 06:48:23 UTC
 +++ extensions/common/api/_permission_features.json
 @@ -134,7 +134,7 @@
      {
diff --git a/www/iridium/files/patch-extensions_common_api_runtime.json b/www/iridium/files/patch-extensions_common_api_runtime.json
index 508f662cfea0..ebf0e687387d 100644
--- a/www/iridium/files/patch-extensions_common_api_runtime.json
+++ b/www/iridium/files/patch-extensions_common_api_runtime.json
@@ -1,4 +1,4 @@
---- extensions/common/api/runtime.json.orig	2024-06-25 12:08:48 UTC
+--- extensions/common/api/runtime.json.orig	2025-05-07 06:48:23 UTC
 +++ extensions/common/api/runtime.json
 @@ -86,6 +86,7 @@
              {"name": "cros", "description": "Specifies the Chrome operating system."},
diff --git a/www/iridium/files/patch-extensions_common_command.cc b/www/iridium/files/patch-extensions_common_command.cc
index beae49a875e7..d8d30d4e844b 100644
--- a/www/iridium/files/patch-extensions_common_command.cc
+++ b/www/iridium/files/patch-extensions_common_command.cc
@@ -1,4 +1,4 @@
---- extensions/common/command.cc.orig	2025-03-18 16:46:04 UTC
+--- extensions/common/command.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/common/command.cc
 @@ -116,7 +116,7 @@ std::string Command::CommandPlatform() {
    return ui::kKeybindingPlatformMac;
diff --git a/www/iridium/files/patch-extensions_common_features_feature.cc b/www/iridium/files/patch-extensions_common_features_feature.cc
index c6657c5b8433..f136794d98c3 100644
--- a/www/iridium/files/patch-extensions_common_features_feature.cc
+++ b/www/iridium/files/patch-extensions_common_features_feature.cc
@@ -1,4 +1,4 @@
---- extensions/common/features/feature.cc.orig	2025-02-22 18:06:53 UTC
+--- extensions/common/features/feature.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/common/features/feature.cc
 @@ -29,6 +29,8 @@ Feature::Platform Feature::GetCurrentPlatform() {
    return WIN_PLATFORM;
diff --git a/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc
index a3c3c038b252..e7366d14a3ae 100644
--- a/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc
+++ b/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc
@@ -1,4 +1,4 @@
---- extensions/renderer/bindings/api_binding_util.cc.orig	2025-03-18 16:46:04 UTC
+--- extensions/renderer/bindings/api_binding_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/renderer/bindings/api_binding_util.cc
 @@ -129,7 +129,7 @@ void InvalidateContext(v8::Local<v8::Context> context)
  std::string GetPlatformString() {
diff --git a/www/iridium/files/patch-extensions_renderer_bindings_argument__spec.cc b/www/iridium/files/patch-extensions_renderer_bindings_argument__spec.cc
index 111cb54e06e4..eefaa8afe20b 100644
--- a/www/iridium/files/patch-extensions_renderer_bindings_argument__spec.cc
+++ b/www/iridium/files/patch-extensions_renderer_bindings_argument__spec.cc
@@ -1,4 +1,4 @@
---- extensions/renderer/bindings/argument_spec.cc.orig	2022-12-06 08:09:13 UTC
+--- extensions/renderer/bindings/argument_spec.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/renderer/bindings/argument_spec.cc
 @@ -18,6 +18,8 @@
  #include "gin/data_object_builder.h"
diff --git a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc
index ebbaeacfdb3f..77a83b26327d 100644
--- a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc
+++ b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc
@@ -1,4 +1,4 @@
---- extensions/shell/app/shell_main_delegate.cc.orig	2025-02-22 18:06:53 UTC
+--- extensions/shell/app/shell_main_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/shell/app/shell_main_delegate.cc
 @@ -40,7 +40,7 @@
  #if BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
index 988b9bc22f48..4fce27b6112f 100644
--- a/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
@@ -1,4 +1,4 @@
---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2025-02-22 18:06:53 UTC
+--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
 @@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
  bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc
index c143b272c986..ed2cf79bcfb9 100644
--- a/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc
+++ b/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- extensions/shell/browser/shell_browser_main_parts.cc.orig	2025-02-22 18:06:53 UTC
+--- extensions/shell/browser/shell_browser_main_parts.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/shell/browser/shell_browser_main_parts.cc
 @@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
        switches::kAppShellAllowRoaming)) {
diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
index ef2031d4d3f5..332975708314 100644
--- a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
+++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
@@ -1,4 +1,4 @@
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-02-22 18:06:53 UTC
+--- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.cc
 @@ -18,7 +18,7 @@
  #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
@@ -9,7 +9,7 @@
  #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
  #endif
  
-@@ -54,7 +54,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
+@@ -56,7 +56,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
    return std::make_unique<ShellDisplayInfoProvider>();
  }
  
diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
index 8e6573e05ceb..19ba593693a1 100644
--- a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
+++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
@@ -1,6 +1,6 @@
---- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-02-22 18:06:53 UTC
+--- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-05-07 06:48:23 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.h
-@@ -34,14 +34,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
+@@ -36,14 +36,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
        content::BrowserContext* browser_context) const override;
    std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider()
        const override;
diff --git a/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
index d92549ab6dca..310d78df907c 100644
--- a/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
+++ b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
@@ -1,4 +1,4 @@
---- google_apis/gcm/engine/heartbeat_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- google_apis/gcm/engine/heartbeat_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ google_apis/gcm/engine/heartbeat_manager.cc
 @@ -31,7 +31,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;  
  // Minimum time spent sleeping before we force a new heartbeat.
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
index 6df6d62f9add..5585733a38c0 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-03-18 16:46:04 UTC
+--- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/dawn_context_provider.cc
-@@ -341,7 +341,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
+@@ -377,7 +377,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
    return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
               ? wgpu::BackendType::D3D12
               : wgpu::BackendType::D3D11;
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
index f6da8af81793..a6b27c5c3309 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2025-03-18 16:46:04 UTC
+--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/gles2_cmd_decoder.cc
 @@ -2862,7 +2862,7 @@ GLES2Decoder* GLES2Decoder::Create(
    }
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc b/www/iridium/files/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
index d2dd26894886..21aede3f06f9 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc
 @@ -15,6 +15,18 @@ using ::testing::Return;
  using ::testing::SaveArg;
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc
index cc6413c5d628..6e59ac23555d 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_context_state.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/command_buffer/service/shared_context_state.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_context_state.cc
-@@ -65,7 +65,7 @@
+@@ -64,7 +64,7 @@
  #include "gpu/vulkan/vulkan_implementation.h"
  #include "gpu/vulkan/vulkan_util.h"
  
@@ -9,7 +9,7 @@
  #include "gpu/command_buffer/service/external_semaphore_pool.h"
  #endif
  
-@@ -334,7 +334,7 @@ SharedContextState::SharedContextState(
+@@ -322,7 +322,7 @@ SharedContextState::SharedContextState(
    if (gr_context_type_ == GrContextType::kVulkan) {
      if (vk_context_provider_) {
  #if BUILDFLAG(ENABLE_VULKAN) && \
@@ -18,7 +18,7 @@
        external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this);
  #endif
        use_virtualized_gl_contexts_ = false;
-@@ -371,7 +371,7 @@ SharedContextState::~SharedContextState() {
+@@ -359,7 +359,7 @@ SharedContextState::~SharedContextState() {
    }
  
  #if BUILDFLAG(ENABLE_VULKAN) && \
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h
index 7bd949b21d00..432e497464a9 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_context_state.h.orig	2025-04-16 18:18:42 UTC
+--- gpu/command_buffer/service/shared_context_state.h.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_context_state.h
 @@ -236,7 +236,7 @@ class GPU_GLES2_EXPORT SharedContextState
      return &memory_type_tracker_;
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index daeb936ce670..41c675fb556c 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2024-08-27 06:28:16 UTC
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
 @@ -20,7 +20,7 @@ namespace {
  // TODO(penghuang): verify the scanout is the right usage for video playback.
@@ -9,3 +9,12 @@
      SHARED_IMAGE_USAGE_SCANOUT |
  #endif
      SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE |
+@@ -121,7 +121,7 @@ bool AngleVulkanImageBackingFactory::IsGMBSupported(
+   switch (gmb_type) {
+     case gfx::EMPTY_BUFFER:
+       return true;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP: {
+       auto* vulkan_implementation =
+           context_state_->vk_context_provider()->GetVulkanImplementation();
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
index 98dd0d1fd290..4f0fdf231d72 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2025-02-22 18:06:53 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
 @@ -57,7 +57,7 @@
  #include "ui/gl/gl_version_info.h"
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
index 2085a8bc2203..06ba5a3374fa 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
 @@ -143,7 +143,7 @@ bool IsFormatSupported(viz::SharedImageFormat format,
  
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
index a0366215aa59..8d5c46268063 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
 @@ -48,7 +48,7 @@
  #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h"
@@ -9,7 +9,16 @@
  #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h"
  #endif
  
-@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
+@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t
+     case gfx::IO_SURFACE_BUFFER:
+       return "platform";
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
+       return "platform";
+ #endif
+@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
    return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
  #elif BUILDFLAG(IS_ANDROID)
    return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
@@ -18,7 +27,7 @@
    return gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
  #elif BUILDFLAG(IS_WIN)
    return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE;
-@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory(
+@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory(
          context_state_, workarounds_);
      factories_.push_back(std::move(ozone_factory));
    }
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
index 7ac78103b8c6..fc80e495bd6c 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
 @@ -756,7 +756,7 @@ bool SharedImageManager::SupportsScanoutImages() {
    return true;
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
index 804fa8d9529d..d30142dddb72 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig	2024-06-25 12:08:48 UTC
+--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
 @@ -214,7 +214,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri
  
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index fd7cf3a5bc7f..f5e8af979e5d 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1752,7 +1752,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte
+@@ -1754,7 +1754,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte
        backend_types = {wgpu::BackendType::D3D12};
  #elif BUILDFLAG(IS_MAC)
        backend_types = {wgpu::BackendType::Metal};
@@ -9,7 +9,7 @@
        if (shared_context_state_->GrContextIsVulkan() ||
            shared_context_state_->IsGraphiteDawnVulkan()) {
          backend_types = {wgpu::BackendType::Vulkan};
-@@ -1994,7 +1994,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+@@ -1996,7 +1996,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
    }
  
  #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
index e8cac3ac7969..c4082f255b1c 100644
--- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig	2024-11-04 08:56:03 UTC
+--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
 @@ -32,7 +32,7 @@
  #include "ui/gfx/half_float.h"
diff --git a/www/iridium/files/patch-gpu_config_gpu__control__list.cc b/www/iridium/files/patch-gpu_config_gpu__control__list.cc
index b403c9dcad82..6c050137e552 100644
--- a/www/iridium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/iridium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_control_list.cc.orig	2025-02-22 18:06:53 UTC
+--- gpu/config/gpu_control_list.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/config/gpu_control_list.cc
 @@ -831,7 +831,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
    return kOsAndroid;
diff --git a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc
index eef44131e8a5..59e4752cfad1 100644
--- a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc
+++ b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_finch_features.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/config/gpu_finch_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/config/gpu_finch_features.cc
 @@ -155,7 +155,8 @@ BASE_FEATURE(kAllowHardwareBufferUsageFlagsFromVulkanF
  BASE_FEATURE(kDefaultEnableGpuRasterization,
diff --git a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc
index 9a28fa117ab4..066a0bdfabd9 100644
--- a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc
+++ b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_info_collector.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/config/gpu_info_collector.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/config/gpu_info_collector.cc
-@@ -347,7 +347,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
+@@ -349,7 +349,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
  void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) {
    static BASE_FEATURE(kCollectWebGPUSupportMetrics,
                        "CollectWebGPUSupportMetrics",
diff --git a/www/iridium/files/patch-gpu_config_gpu__test__config.cc b/www/iridium/files/patch-gpu_config_gpu__test__config.cc
index 4718ac84df3c..79cfa3f273bf 100644
--- a/www/iridium/files/patch-gpu_config_gpu__test__config.cc
+++ b/www/iridium/files/patch-gpu_config_gpu__test__config.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_test_config.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/config/gpu_test_config.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/config/gpu_test_config.cc
 @@ -27,7 +27,7 @@ namespace {
  GPUTestConfig::OS GetCurrentOS() {
diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
index 99683556a785..81e5947d9f11 100644
--- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
+++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2024-11-04 08:56:03 UTC
+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/ipc/common/gpu_memory_buffer_support.cc
 @@ -26,7 +26,7 @@
  #include "ui/ozone/public/ozone_platform.h"
diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
index d95cc2449a72..0485f38a7c19 100644
--- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
+++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
@@ -1,4 +1,4 @@
---- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2023-08-28 20:17:35 UTC
+--- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2025-05-07 06:48:23 UTC
 +++ gpu/ipc/common/gpu_memory_buffer_support.h
 @@ -21,7 +21,7 @@
  #include "ui/gfx/geometry/size.h"
diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
index 10d909ad892e..905d8cd520e8 100644
--- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_init.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/ipc/service/gpu_init.cc
 @@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
  
@@ -9,7 +9,7 @@
    if (gpu_info.gpu.vendor_id != 0x10de ||  // NVIDIA
        gpu_info.gpu.driver_vendor != "NVIDIA")
      return true;
-@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    enable_watchdog = false;
  #endif
  
@@ -18,7 +18,7 @@
    bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
  #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
    // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -431,7 +431,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -27,7 +27,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      gpu_preferences_.gr_context_type = GrContextType::kGL;
    }
  
@@ -36,7 +36,7 @@
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -590,7 +590,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -586,7 +586,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -45,7 +45,7 @@
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -758,7 +758,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -754,7 +754,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
                ->GetSupportedFormatsForGLNativePixmapImport();
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -54,7 +54,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -810,7 +810,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -806,7 +806,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        }
      }
    }
@@ -63,7 +63,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1014,7 +1014,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1008,7 +1008,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
    }
    bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
  
@@ -72,7 +72,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1069,7 +1069,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1063,7 +1063,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
      }
    }
  
diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
index 292deb113cc6..85cb50760cb8 100644
--- a/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
+++ b/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2024-11-04 08:56:03 UTC
+--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/ipc/service/gpu_memory_buffer_factory.cc
 @@ -14,7 +14,7 @@
  #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
diff --git a/www/iridium/files/patch-gpu_ipc_service_x__util.h b/www/iridium/files/patch-gpu_ipc_service_x__util.h
index 6bce1d225131..a94a018f0ed3 100644
--- a/www/iridium/files/patch-gpu_ipc_service_x__util.h
+++ b/www/iridium/files/patch-gpu_ipc_service_x__util.h
@@ -1,4 +1,4 @@
---- gpu/ipc/service/x_util.h.orig	2024-06-25 12:08:48 UTC
+--- gpu/ipc/service/x_util.h.orig	2025-05-07 06:48:23 UTC
 +++ gpu/ipc/service/x_util.h
 @@ -12,7 +12,7 @@
  #include "gpu/ipc/service/gpu_config.h"
diff --git a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py
index 37a55ab051c8..d38760231276 100644
--- a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py
+++ b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py
@@ -1,4 +1,4 @@
---- gpu/vulkan/generate_bindings.py.orig	2024-06-25 12:08:48 UTC
+--- gpu/vulkan/generate_bindings.py.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/generate_bindings.py
 @@ -271,7 +271,7 @@ VULKAN_DEVICE_FUNCTIONS = [
      ]
diff --git a/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc b/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc
index 156b462b78a4..f4f4e355f087 100644
--- a/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc
+++ b/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc
@@ -1,4 +1,4 @@
---- gpu/vulkan/semaphore_handle.cc.orig	2023-11-22 14:00:11 UTC
+--- gpu/vulkan/semaphore_handle.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/semaphore_handle.cc
 @@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::GpuFenceHandle f
    // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc
index 59299f5fc570..3037dac7ff57 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc
@@ -1,4 +1,4 @@
---- gpu/vulkan/vulkan_device_queue.cc.orig	2025-03-18 16:46:04 UTC
+--- gpu/vulkan/vulkan_device_queue.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/vulkan_device_queue.cc
 @@ -156,7 +156,7 @@ bool VulkanDeviceQueue::Initialize(
  
diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h
index b6676b12a322..a07576e34cea 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h
@@ -1,4 +1,4 @@
---- gpu/vulkan/vulkan_device_queue.h.orig	2025-03-18 16:46:04 UTC
+--- gpu/vulkan/vulkan_device_queue.h.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/vulkan_device_queue.h
 @@ -182,7 +182,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue
  #endif
diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
index 5d1c081fe2c3..2f1f1d4f4715 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,4 +1,4 @@
---- gpu/vulkan/vulkan_function_pointers.cc.orig	2024-06-25 12:08:48 UTC
+--- gpu/vulkan/vulkan_function_pointers.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/vulkan_function_pointers.cc
 @@ -1297,7 +1297,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
      }
diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
index 6c515861575a..133528551b65 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig	2024-06-25 12:08:48 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -391,7 +391,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
    VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
    VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
  
@@ -9,7 +9,7 @@
    VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
        vkGetImageDrmFormatModifierPropertiesEXT;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1405,7 +1405,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
                                                               pPresentInfo);
  }
  
@@ -18,7 +18,7 @@
  ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
      VkDevice device,
      VkImage image,
-@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+@@ -1415,4 +1415,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__image.h b/www/iridium/files/patch-gpu_vulkan_vulkan__image.h
index 910287117bb1..182d907496ca 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__image.h
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__image.h
@@ -1,4 +1,4 @@
---- gpu/vulkan/vulkan_image.h.orig	2023-03-13 07:33:08 UTC
+--- gpu/vulkan/vulkan_image.h.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/vulkan_image.h
 @@ -87,7 +87,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage {
        VkImageUsageFlags usage,
diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc
index 4cf75cc73672..0b4730996da9 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc
@@ -1,4 +1,4 @@
---- gpu/vulkan/vulkan_util.cc.orig	2025-04-16 18:18:42 UTC
+--- gpu/vulkan/vulkan_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ gpu/vulkan/vulkan_util.cc
 @@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities(
      }
diff --git a/www/iridium/files/patch-headless_BUILD.gn b/www/iridium/files/patch-headless_BUILD.gn
index f184f3a006d9..14a45be6245a 100644
--- a/www/iridium/files/patch-headless_BUILD.gn
+++ b/www/iridium/files/patch-headless_BUILD.gn
@@ -1,6 +1,6 @@
---- headless/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- headless/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ headless/BUILD.gn
-@@ -474,7 +474,7 @@ component("headless_non_renderer") {
+@@ -475,7 +475,7 @@ component("headless_non_renderer") {
      }
    }
  
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
index 64ade5debfcc..02164792fa3c 100644
--- a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
+++ b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
@@ -1,4 +1,4 @@
---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ headless/lib/browser/headless_browser_main_parts_posix.cc
 @@ -26,13 +26,13 @@
  #include "content/public/browser/browser_thread.h"
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
index e08b0925f86a..d85f421daaa6 100644
--- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
+++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
@@ -1,4 +1,4 @@
---- headless/lib/browser/headless_content_browser_client.cc.orig	2025-04-16 18:18:42 UTC
+--- headless/lib/browser/headless_content_browser_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ headless/lib/browser/headless_content_browser_client.cc
 @@ -58,7 +58,7 @@
  #include "content/public/common/content_descriptors.h"
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
index c49cde274cf0..038723a66923 100644
--- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
+++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
@@ -1,4 +1,4 @@
---- headless/lib/browser/headless_content_browser_client.h.orig	2025-04-16 18:18:42 UTC
+--- headless/lib/browser/headless_content_browser_client.h.orig	2025-05-07 06:48:23 UTC
 +++ headless/lib/browser/headless_content_browser_client.h
 @@ -47,7 +47,7 @@ class HeadlessContentBrowserClient : public content::C
    CreateDevToolsManagerDelegate() override;
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
index def1189acdcb..32178af77221 100644
--- a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
+++ b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
@@ -1,4 +1,4 @@
---- headless/lib/browser/headless_web_contents_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- headless/lib/browser/headless_web_contents_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ headless/lib/browser/headless_web_contents_impl.cc
 @@ -70,7 +70,7 @@ BASE_FEATURE(kPrerender2InHeadlessMode,
  namespace {
diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
index 14f68f4da8fd..1a1cf168e966 100644
--- a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- headless/lib/headless_content_main_delegate.cc.orig	2025-03-18 16:46:04 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ headless/lib/headless_content_main_delegate.cc
-@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
    if (process_type != ::switches::kZygoteProcess) {
      g_headless_crash_client.Pointer()->set_crash_dumps_dir(
          command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/iridium/files/patch-ipc_ipc__channel.h b/www/iridium/files/patch-ipc_ipc__channel.h
index 10bcdb7d3e01..2623942d0f80 100644
--- a/www/iridium/files/patch-ipc_ipc__channel.h
+++ b/www/iridium/files/patch-ipc_ipc__channel.h
@@ -1,4 +1,4 @@
---- ipc/ipc_channel.h.orig	2024-06-25 12:08:48 UTC
+--- ipc/ipc_channel.h.orig	2025-05-07 06:48:23 UTC
 +++ ipc/ipc_channel.h
 @@ -218,7 +218,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
    static std::string GenerateUniqueRandomChannelID();
diff --git a/www/iridium/files/patch-ipc_ipc__channel__common.cc b/www/iridium/files/patch-ipc_ipc__channel__common.cc
index 9c887f40ede3..0cd750c6aafa 100644
--- a/www/iridium/files/patch-ipc_ipc__channel__common.cc
+++ b/www/iridium/files/patch-ipc_ipc__channel__common.cc
@@ -1,4 +1,4 @@
---- ipc/ipc_channel_common.cc.orig	2023-03-13 07:33:08 UTC
+--- ipc/ipc_channel_common.cc.orig	2025-05-07 06:48:23 UTC
 +++ ipc/ipc_channel_common.cc
 @@ -10,7 +10,7 @@
  
diff --git a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc
index 9e646b1bae54..ecaea7234d3a 100644
--- a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc
+++ b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc
@@ -1,4 +1,4 @@
---- ipc/ipc_channel_mojo.cc.orig	2023-03-13 07:33:08 UTC
+--- ipc/ipc_channel_mojo.cc.orig	2025-05-07 06:48:23 UTC
 +++ ipc/ipc_channel_mojo.cc
 @@ -105,7 +105,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe
  };
diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.cc b/www/iridium/files/patch-ipc_ipc__message__utils.cc
index 3fb09f553916..f4f992fc97c0 100644
--- a/www/iridium/files/patch-ipc_ipc__message__utils.cc
+++ b/www/iridium/files/patch-ipc_ipc__message__utils.cc
@@ -1,4 +1,4 @@
---- ipc/ipc_message_utils.cc.orig	2024-12-22 12:24:29 UTC
+--- ipc/ipc_message_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ ipc/ipc_message_utils.cc
 @@ -399,7 +399,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
  }
diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.h b/www/iridium/files/patch-ipc_ipc__message__utils.h
index af9aba1eabbd..51285f68af11 100644
--- a/www/iridium/files/patch-ipc_ipc__message__utils.h
+++ b/www/iridium/files/patch-ipc_ipc__message__utils.h
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.h.orig	2025-03-18 16:46:04 UTC
+--- ipc/ipc_message_utils.h.orig	2025-05-07 06:48:23 UTC
 +++ ipc/ipc_message_utils.h
-@@ -215,7 +215,7 @@ struct ParamTraits<unsigned int> {
+@@ -216,7 +216,7 @@ struct ParamTraits<unsigned int> {
  // Since we want to support Android 32<>64 bit IPC, as long as we don't have
  // these traits for 32 bit ARM then that'll catch any errors.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn
index 29d28b985ac7..0584658ebf27 100644
--- a/www/iridium/files/patch-media_BUILD.gn
+++ b/www/iridium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig	2025-03-18 16:46:04 UTC
+--- media/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ media/BUILD.gn
-@@ -94,6 +94,9 @@ config("media_config") {
+@@ -99,6 +99,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
      }
    }
diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn
index 1ca657e87e2d..632457614659 100644
--- a/www/iridium/files/patch-media_audio_BUILD.gn
+++ b/www/iridium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- media/audio/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/BUILD.gn
-@@ -271,9 +271,23 @@ source_set("audio") {
+@@ -275,9 +275,23 @@ source_set("audio") {
      deps += [ "//media/base/android:media_jni_headers" ]
    }
  
diff --git a/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc
index e91b1dec3daa..a9c7c313ad1b 100644
--- a/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc
+++ b/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc
@@ -1,4 +1,4 @@
---- media/audio/alsa/audio_manager_alsa.cc.orig	2025-03-18 16:46:04 UTC
+--- media/audio/alsa/audio_manager_alsa.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/alsa/audio_manager_alsa.cc
 @@ -106,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType 
    int card = -1;
diff --git a/www/iridium/files/patch-media_audio_audio__input__device.cc b/www/iridium/files/patch-media_audio_audio__input__device.cc
index 41727d5851c8..1a097e8bf92d 100644
--- a/www/iridium/files/patch-media_audio_audio__input__device.cc
+++ b/www/iridium/files/patch-media_audio_audio__input__device.cc
@@ -1,4 +1,4 @@
---- media/audio/audio_input_device.cc.orig	2025-02-22 18:06:53 UTC
+--- media/audio/audio_input_device.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/audio_input_device.cc
 @@ -275,7 +275,7 @@ void AudioInputDevice::OnStreamCreated(
  // here. See comments in AliveChecker and PowerObserverHelper for details and
diff --git a/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc b/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc
index fb80a0ad5023..4b78211fd102 100644
--- a/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc
+++ b/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc
@@ -1,4 +1,4 @@
---- media/audio/audio_output_proxy_unittest.cc.orig	2023-03-13 07:33:08 UTC
+--- media/audio/audio_output_proxy_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/audio_output_proxy_unittest.cc
 @@ -443,7 +443,11 @@ class AudioOutputProxyTest : public testing::Test {
      // |stream| is closed at this point. Start() should reopen it again.
diff --git a/www/iridium/files/patch-media_audio_pulse_pulse__util.cc b/www/iridium/files/patch-media_audio_pulse_pulse__util.cc
index 0d37a7ae2e8e..a660a2cb0869 100644
--- a/www/iridium/files/patch-media_audio_pulse_pulse__util.cc
+++ b/www/iridium/files/patch-media_audio_pulse_pulse__util.cc
@@ -1,4 +1,4 @@
---- media/audio/pulse/pulse_util.cc.orig	2024-11-04 08:56:03 UTC
+--- media/audio/pulse/pulse_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/pulse/pulse_util.cc
 @@ -50,7 +50,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows
  
diff --git a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc
index fb3135cbc20e..69792852be8d 100644
--- a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc
+++ b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc
@@ -1,4 +1,4 @@
---- media/audio/sndio/audio_manager_sndio.cc.orig	2024-08-01 05:47:53 UTC
+--- media/audio/sndio/audio_manager_sndio.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/sndio/audio_manager_sndio.cc
 @@ -0,0 +1,213 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.h b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.h
index 192ac27408cf..0bebefb3420c 100644
--- a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.h
+++ b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.h
@@ -1,4 +1,4 @@
---- media/audio/sndio/audio_manager_sndio.h.orig	2022-03-28 18:11:04 UTC
+--- media/audio/sndio/audio_manager_sndio.h.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/sndio/audio_manager_sndio.h
 @@ -0,0 +1,66 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-media_audio_sndio_sndio__input.cc b/www/iridium/files/patch-media_audio_sndio_sndio__input.cc
index e99b1c8a19bf..d8541f45308a 100644
--- a/www/iridium/files/patch-media_audio_sndio_sndio__input.cc
+++ b/www/iridium/files/patch-media_audio_sndio_sndio__input.cc
@@ -1,4 +1,4 @@
---- media/audio/sndio/sndio_input.cc.orig	2023-07-24 14:27:53 UTC
+--- media/audio/sndio/sndio_input.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/sndio/sndio_input.cc
 @@ -0,0 +1,200 @@
 +// Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-media_audio_sndio_sndio__input.h b/www/iridium/files/patch-media_audio_sndio_sndio__input.h
index 6ce82dab0318..55d8bff8a511 100644
--- a/www/iridium/files/patch-media_audio_sndio_sndio__input.h
+++ b/www/iridium/files/patch-media_audio_sndio_sndio__input.h
@@ -1,4 +1,4 @@
---- media/audio/sndio/sndio_input.h.orig	2022-03-28 18:11:04 UTC
+--- media/audio/sndio/sndio_input.h.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/sndio/sndio_input.h
 @@ -0,0 +1,91 @@
 +// Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-media_audio_sndio_sndio__output.cc b/www/iridium/files/patch-media_audio_sndio_sndio__output.cc
index 0111100cd59d..60100ec47704 100644
--- a/www/iridium/files/patch-media_audio_sndio_sndio__output.cc
+++ b/www/iridium/files/patch-media_audio_sndio_sndio__output.cc
@@ -1,4 +1,4 @@
---- media/audio/sndio/sndio_output.cc.orig	2023-03-13 07:33:08 UTC
+--- media/audio/sndio/sndio_output.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/sndio/sndio_output.cc
 @@ -0,0 +1,187 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-media_audio_sndio_sndio__output.h b/www/iridium/files/patch-media_audio_sndio_sndio__output.h
index 20fbe15f8951..486e8c1c08cd 100644
--- a/www/iridium/files/patch-media_audio_sndio_sndio__output.h
+++ b/www/iridium/files/patch-media_audio_sndio_sndio__output.h
@@ -1,4 +1,4 @@
---- media/audio/sndio/sndio_output.h.orig	2022-03-28 18:11:04 UTC
+--- media/audio/sndio/sndio_output.h.orig	2025-05-07 06:48:23 UTC
 +++ media/audio/sndio/sndio_output.h
 @@ -0,0 +1,88 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-media_base_audio__latency.cc b/www/iridium/files/patch-media_base_audio__latency.cc
index eef07ea8b18e..bc461bd5b453 100644
--- a/www/iridium/files/patch-media_base_audio__latency.cc
+++ b/www/iridium/files/patch-media_base_audio__latency.cc
@@ -1,4 +1,4 @@
---- media/base/audio_latency.cc.orig	2025-04-16 18:18:42 UTC
+--- media/base/audio_latency.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/base/audio_latency.cc
 @@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
    }
diff --git a/www/iridium/files/patch-media_base_libaom__thread__wrapper.cc b/www/iridium/files/patch-media_base_libaom__thread__wrapper.cc
index 53bd9e79b1f5..c48ec2e2d4d3 100644
--- a/www/iridium/files/patch-media_base_libaom__thread__wrapper.cc
+++ b/www/iridium/files/patch-media_base_libaom__thread__wrapper.cc
@@ -1,4 +1,4 @@
---- media/base/libaom_thread_wrapper.cc.orig	2024-06-25 12:08:48 UTC
+--- media/base/libaom_thread_wrapper.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/base/libaom_thread_wrapper.cc
 @@ -5,17 +5,21 @@
  #include "base/logging.h"
diff --git a/www/iridium/files/patch-media_base_libvpx__thread__wrapper.cc b/www/iridium/files/patch-media_base_libvpx__thread__wrapper.cc
index d06e5c479448..19cb05d67d88 100644
--- a/www/iridium/files/patch-media_base_libvpx__thread__wrapper.cc
+++ b/www/iridium/files/patch-media_base_libvpx__thread__wrapper.cc
@@ -1,4 +1,4 @@
---- media/base/libvpx_thread_wrapper.cc.orig	2024-06-25 12:08:48 UTC
+--- media/base/libvpx_thread_wrapper.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/base/libvpx_thread_wrapper.cc
 @@ -5,11 +5,14 @@
  #include "media/base/libvpx_thread_wrapper.h"
diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc
index 76f00dabd680..229c6d0f0a28 100644
--- a/www/iridium/files/patch-media_base_media__switches.cc
+++ b/www/iridium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig	2025-04-16 18:18:42 UTC
+--- media/base/media_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/base/media_switches.cc
 @@ -19,7 +19,7 @@
  #include "ui/gl/gl_features.h"
@@ -49,7 +49,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // When enabled, MediaCapabilities will check with GPU Video Accelerator
-@@ -611,7 +633,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture,
+@@ -636,7 +658,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture,
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
               "GlobalMediaControls",
@@ -58,7 +58,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -634,7 +656,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
+@@ -659,7 +681,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
               "MediaRemotingWithoutFullscreen",
@@ -67,7 +67,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -646,7 +668,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+@@ -671,7 +693,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -76,7 +76,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -675,7 +697,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -700,7 +722,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -85,7 +85,7 @@
  // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default
  // on chromeos, but needs an experiment on linux.
  BASE_FEATURE(kAcceleratedVideoDecodeLinux,
-@@ -775,7 +797,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
+@@ -800,7 +822,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
               "VSyncMjpegDecoding",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -94,8 +94,8 @@
  // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS.
  BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding,
               "V4L2H264TemporalLayerHWEncoding",
-@@ -1347,7 +1369,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1361,7 +1383,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
+ );
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -103,7 +103,7 @@
  // Spawn utility processes to perform hardware encode acceleration instead of
  // using the GPU process.
  BASE_FEATURE(kUseOutOfProcessVideoEncoding,
-@@ -1429,7 +1451,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
+@@ -1443,7 +1465,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
               "RecordWebAudioEngagement",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h
index 8c0d3f30921e..f8279fe482c1 100644
--- a/www/iridium/files/patch-media_base_media__switches.h
+++ b/www/iridium/files/patch-media_base_media__switches.h
@@ -1,6 +1,6 @@
---- media/base/media_switches.h.orig	2025-04-16 18:18:42 UTC
+--- media/base/media_switches.h.orig	2025-05-07 06:48:23 UTC
 +++ media/base/media_switches.h
-@@ -321,13 +321,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu
+@@ -329,13 +329,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
@@ -28,7 +28,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo);
-@@ -341,7 +353,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio);
+@@ -349,7 +361,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
@@ -37,7 +37,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux);
-@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
+@@ -371,7 +383,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -46,8 +46,8 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
-@@ -493,7 +505,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding);
+@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc
index de9cba1450f5..cd5221fa47aa 100644
--- a/www/iridium/files/patch-media_base_video__frame.cc
+++ b/www/iridium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig	2025-04-16 18:18:42 UTC
+--- media/base/video_frame.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/base/video_frame.cc
 @@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToString(
        return "OWNED_MEMORY";
diff --git a/www/iridium/files/patch-media_base_video__frame.h b/www/iridium/files/patch-media_base_video__frame.h
index 8934ca8f406e..ef808dda9221 100644
--- a/www/iridium/files/patch-media_base_video__frame.h
+++ b/www/iridium/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig	2025-04-16 18:18:42 UTC
+--- media/base/video_frame.h.orig	2025-05-07 06:48:23 UTC
 +++ media/base/video_frame.h
 @@ -42,7 +42,7 @@
  #include "ui/gfx/geometry/size.h"
diff --git a/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc
index b06306439271..494378fd13dd 100644
--- a/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc
+++ b/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc
@@ -1,4 +1,4 @@
---- media/capture/video/create_video_capture_device_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- media/capture/video/create_video_capture_device_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/create_video_capture_device_factory.cc
 @@ -12,7 +12,7 @@
  #include "media/capture/video/fake_video_capture_device_factory.h"
diff --git a/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
index 13de90cd045b..58c84606f7f1 100644
--- a/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ b/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
@@ -1,4 +1,4 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig	2024-06-25 12:08:48 UTC
+--- media/capture/video/fake_video_capture_device_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/fake_video_capture_device_factory.cc
 @@ -231,7 +231,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
    int entry_index = 0;
diff --git a/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
index 7429c462c0c2..8ac1039bced3 100644
--- a/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
+++ b/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
@@ -1,4 +1,4 @@
---- media/capture/video/file_video_capture_device_factory.cc.orig	2022-03-28 18:11:04 UTC
+--- media/capture/video/file_video_capture_device_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/file_video_capture_device_factory.cc
 @@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo(
        VideoCaptureApi::WIN_DIRECT_SHOW;
diff --git a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
index ea9015f2f342..fba607eef6c8 100644
--- a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
+++ b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/fake_v4l2_impl.cc.orig	2025-03-18 16:46:04 UTC
+--- media/capture/video/linux/fake_v4l2_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/fake_v4l2_impl.cc
 @@ -569,7 +569,7 @@ int FakeV4L2Impl::close(int fd) {
    return kSuccessReturnValue;
diff --git a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.h b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.h
index 46a60553bb8a..fbdc3644a319 100644
--- a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.h
+++ b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.h
@@ -1,4 +1,4 @@
---- media/capture/video/linux/fake_v4l2_impl.h.orig	2023-10-21 11:51:27 UTC
+--- media/capture/video/linux/fake_v4l2_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/fake_v4l2_impl.h
 @@ -8,7 +8,13 @@
  #include <map>
diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
index ffdb4d740fe2..da0078066125 100644
--- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2025-03-18 16:46:04 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/v4l2_capture_delegate.cc
 @@ -10,8 +10,10 @@
  #include "media/capture/video/linux/v4l2_capture_delegate.h"
diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
index 067dbfe61015..340f0bf13255 100644
--- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
+++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.h.orig	2025-02-22 18:06:53 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.h.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/v4l2_capture_delegate.h
 @@ -34,7 +34,7 @@ class Location;
  
diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h
index f586b096d2d3..480b70d44df0 100644
--- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h
+++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h
@@ -1,7 +1,7 @@
---- media/capture/video/linux/v4l2_capture_device.h.orig	2022-03-28 18:11:04 UTC
+--- media/capture/video/linux/v4l2_capture_device.h.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/v4l2_capture_device.h
-@@ -21,7 +21,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
-  public:
+@@ -23,7 +23,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
+ 
    virtual int open(const char* device_name, int flags) = 0;
    virtual int close(int fd) = 0;
 -  virtual int ioctl(int fd, int request, void* argp) = 0;
diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.cc b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
index 242550f55965..eb712e6a3148 100644
--- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
+++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_device_impl.cc.orig	2022-03-28 18:11:04 UTC
+--- media/capture/video/linux/v4l2_capture_device_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/v4l2_capture_device_impl.cc
 @@ -22,7 +22,7 @@ int V4L2CaptureDeviceImpl::close(int fd) {
    return ::close(fd);
diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.h b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.h
index 5269f6be6817..00ed40868bc0 100644
--- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.h
+++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device__impl.h
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_device_impl.h.orig	2022-03-28 18:11:04 UTC
+--- media/capture/video/linux/v4l2_capture_device_impl.h.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/v4l2_capture_device_impl.h
 @@ -19,7 +19,7 @@ class CAPTURE_EXPORT V4L2CaptureDeviceImpl : public V4
   public:
diff --git a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
index 437c377c8840..d0e190a08814 100644
--- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
+++ b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig	2025-03-18 16:46:04 UTC
+--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc
 @@ -43,6 +43,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf
    return a.descriptor < b.descriptor;
diff --git a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
index e4ae9c521194..42d3b6bd7131 100644
--- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
+++ b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
@@ -1,4 +1,4 @@
---- media/capture/video/linux/video_capture_device_factory_v4l2.h.orig	2023-04-22 17:45:15 UTC
+--- media/capture/video/linux/video_capture_device_factory_v4l2.h.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/linux/video_capture_device_factory_v4l2.h
 @@ -51,7 +51,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryV4L2
  
diff --git a/www/iridium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc b/www/iridium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
index 595f51ddc73f..7e1982fb6afb 100644
--- a/www/iridium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
+++ b/www/iridium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
@@ -1,4 +1,4 @@
---- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/video_capture_buffer_tracker_factory_impl.cc
 @@ -13,7 +13,7 @@
  #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h"
diff --git a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
index 8b85411e77a8..fb603fce8577 100644
--- a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,4 +1,4 @@
---- media/capture/video/video_capture_device_client.cc.orig	2025-04-16 18:18:42 UTC
+--- media/capture/video/video_capture_device_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/capture/video/video_capture_device_client.cc
 @@ -172,7 +172,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat(
        CHECK(!is_width_odd && !is_height_odd);
diff --git a/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc b/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc
index 3c0a55210c11..d35d5e2916a6 100644
--- a/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc
+++ b/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc
@@ -1,4 +1,4 @@
---- media/cdm/cdm_paths_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- media/cdm/cdm_paths_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/cdm/cdm_paths_unittest.cc
 @@ -26,7 +26,7 @@ const char kComponentPlatform[] =
      "win";
diff --git a/www/iridium/files/patch-media_cdm_library__cdm_cdm__paths.gni b/www/iridium/files/patch-media_cdm_library__cdm_cdm__paths.gni
index 59ffefb141e5..86f4bc40074d 100644
--- a/www/iridium/files/patch-media_cdm_library__cdm_cdm__paths.gni
+++ b/www/iridium/files/patch-media_cdm_library__cdm_cdm__paths.gni
@@ -1,4 +1,4 @@
---- media/cdm/library_cdm/cdm_paths.gni.orig	2025-04-16 18:18:42 UTC
+--- media/cdm/library_cdm/cdm_paths.gni.orig	2025-05-07 06:48:23 UTC
 +++ media/cdm/library_cdm/cdm_paths.gni
 @@ -14,7 +14,7 @@ assert(enable_library_cdms)
  # Explicitly define what we use to avoid confusion.
diff --git a/www/iridium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py b/www/iridium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py
index 1b2b49b2c861..833bac761f44 100644
--- a/www/iridium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py
+++ b/www/iridium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py
@@ -1,4 +1,4 @@
---- media/ffmpeg/scripts/build_ffmpeg.py.orig	2024-08-01 05:47:53 UTC
+--- media/ffmpeg/scripts/build_ffmpeg.py.orig	2025-05-07 06:48:23 UTC
 +++ media/ffmpeg/scripts/build_ffmpeg.py
 @@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath(
  SUCCESS_TOKEN = 'THIS_BUILD_WORKED'
diff --git a/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py b/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py
index 50e34455367b..b0f4a0ffe745 100644
--- a/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py
+++ b/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py
@@ -1,4 +1,4 @@
---- media/ffmpeg/scripts/robo_lib/config.py.orig	2025-02-22 18:06:53 UTC
+--- media/ffmpeg/scripts/robo_lib/config.py.orig	2025-05-07 06:48:23 UTC
 +++ media/ffmpeg/scripts/robo_lib/config.py
 @@ -56,19 +56,13 @@ class RoboConfiguration:
          self._llvm_path = os.path.join(self.chrome_src(), "third_party",
diff --git a/www/iridium/files/patch-media_gpu_buffer__validation.cc b/www/iridium/files/patch-media_gpu_buffer__validation.cc
deleted file mode 100644
index f599e5a9718f..000000000000
--- a/www/iridium/files/patch-media_gpu_buffer__validation.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- media/gpu/buffer_validation.cc.orig	2024-12-22 12:24:29 UTC
-+++ media/gpu/buffer_validation.cc
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/gpu_memory_buffer.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <sys/types.h>
- #include <unistd.h>
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -23,7 +23,7 @@
- namespace media {
- 
- bool GetFileSize(const int fd, size_t* size) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (fd < 0) {
-     VLOG(1) << "Invalid file descriptor";
-     return false;
-@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle(
-     VLOG(1) << "Unsupported: " << pixel_format;
-     return false;
-   }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
-   if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
-       num_planes == 0) {
diff --git a/www/iridium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc b/www/iridium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc
index 34c856c58baf..845c2d0496d9 100644
--- a/www/iridium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc
+++ b/www/iridium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc
@@ -1,4 +1,4 @@
---- media/gpu/chromeos/gl_image_processor_backend.cc.orig	2024-06-25 12:08:48 UTC
+--- media/gpu/chromeos/gl_image_processor_backend.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/chromeos/gl_image_processor_backend.cc
 @@ -28,6 +28,10 @@
  #include "ui/ozone/public/ozone_platform.h"
diff --git a/www/iridium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/iridium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
index d8a270964018..1d0222ae30d4 100644
--- a/www/iridium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
+++ b/www/iridium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
@@ -1,4 +1,4 @@
---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig	2024-12-22 12:24:29 UTC
+--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/chromeos/libyuv_image_processor_backend.cc
 @@ -53,7 +53,7 @@ static constexpr struct {
  #define CONV(in, out, trans, result) \
diff --git a/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
index 9afb7ea3dc29..aa5d17bdc1bf 100644
--- a/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
+++ b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2024-11-04 08:56:03 UTC
+--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/chromeos/mailbox_video_frame_converter.cc
-@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
+@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
                      << static_cast<int>(buffer_format);
        NOTREACHED();
    }
diff --git a/www/iridium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/www/iridium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc
index 0024fad11154..5275f33e004b 100644
--- a/www/iridium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc
+++ b/www/iridium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc
@@ -1,4 +1,4 @@
---- media/gpu/chromeos/platform_video_frame_utils.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/chromeos/platform_video_frame_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/chromeos/platform_video_frame_utils.cc
 @@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice(
      const base::FilePath dev_path(FILE_PATH_LITERAL(
diff --git a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index 3f6113150ed3..1f3eb4c3e9fa 100644
--- a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -1121,7 +1121,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1122,7 +1122,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    }
  #endif
  
@@ -9,7 +9,7 @@
    // Linux should always use a custom allocator (to allocate buffers using
    // libva) and a PlatformVideoFramePool.
    CHECK(allocator.has_value());
-@@ -1130,7 +1130,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1131,7 +1131,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
    main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
        *allocator, VideoFrame::STORAGE_DMABUFS);
@@ -18,7 +18,7 @@
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1304,7 +1304,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1305,7 +1305,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  
diff --git a/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc b/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
index c3a28ffb60eb..6af0aad32ad1 100644
--- a/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
+++ b/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
@@ -1,6 +1,6 @@
---- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/gpu_video_decode_accelerator_factory.cc
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
  #include "media/gpu/media_gpu_export.h"
  #include "media/media_buildflags.h"
  
@@ -9,7 +9,7 @@
  #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h"
  #include "media/gpu/v4l2/v4l2_device.h"
  #endif
-@@ -28,7 +28,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA(
+@@ -29,7 +29,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA(
    if (gpu_preferences.disable_accelerated_video_decode)
      return nullptr;
  
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  
    std::unique_ptr<VideoDecodeAccelerator> vda;
-   vda.reset(new V4L2VideoDecodeAccelerator(new V4L2Device()));
+   vda.reset(new V4L2VideoDecodeAccelerator(base::MakeRefCounted<V4L2Device>()));
diff --git a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
index 24df60c85a66..7f66aaf4dae4 100644
--- a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
+++ b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
@@ -1,20 +1,20 @@
---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -150,7 +150,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
-     return vea_factory_functions;
+@@ -160,7 +160,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+   }
  
  #if BUILDFLAG(USE_VAAPI)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
    }
-@@ -158,7 +158,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
-   vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+@@ -168,7 +168,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+   vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
  #endif
  #elif BUILDFLAG(USE_V4L2_CODEC)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateV4L2VEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA));
    }
diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
index 0eca5d7ab069..22ac6cf45db9 100644
--- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
 @@ -17,7 +17,9 @@
  #include "media/gpu/vaapi/vaapi_wrapper.h"
diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
index 32d4cb373f76..685c1bb3cb5e 100644
--- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig	2023-07-24 14:27:53 UTC
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
index 7b6208e93c03..80e64e3ae0de 100644
--- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig	2024-11-04 08:56:03 UTC
+--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc
 @@ -18,12 +18,15 @@
  #include "media/gpu/v4l2/v4l2_device.h"
diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
index a2a6fa501157..5d41e5f2814a 100644
--- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig	2023-07-24 14:27:53 UTC
+--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-media_gpu_test_raw__video.cc b/www/iridium/files/patch-media_gpu_test_raw__video.cc
index 6ae38df4973a..2f57c3e05c30 100644
--- a/www/iridium/files/patch-media_gpu_test_raw__video.cc
+++ b/www/iridium/files/patch-media_gpu_test_raw__video.cc
@@ -1,4 +1,4 @@
---- media/gpu/test/raw_video.cc.orig	2025-02-22 18:06:53 UTC
+--- media/gpu/test/raw_video.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/test/raw_video.cc
 @@ -61,7 +61,7 @@ std::unique_ptr<base::MemoryMappedFile> CreateMemoryMa
                               base::File::FLAG_READ | base::File::FLAG_WRITE
diff --git a/www/iridium/files/patch-media_gpu_test_video__frame__file__writer.cc b/www/iridium/files/patch-media_gpu_test_video__frame__file__writer.cc
index 53de53a26c16..f9307ae01958 100644
--- a/www/iridium/files/patch-media_gpu_test_video__frame__file__writer.cc
+++ b/www/iridium/files/patch-media_gpu_test_video__frame__file__writer.cc
@@ -1,4 +1,4 @@
---- media/gpu/test/video_frame_file_writer.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/test/video_frame_file_writer.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/test/video_frame_file_writer.cc
 @@ -25,7 +25,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
diff --git a/www/iridium/files/patch-media_gpu_test_video__frame__helpers.cc b/www/iridium/files/patch-media_gpu_test_video__frame__helpers.cc
index 58d6372d9720..117f699fdf2e 100644
--- a/www/iridium/files/patch-media_gpu_test_video__frame__helpers.cc
+++ b/www/iridium/files/patch-media_gpu_test_video__frame__helpers.cc
@@ -1,4 +1,4 @@
---- media/gpu/test/video_frame_helpers.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/test/video_frame_helpers.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/test/video_frame_helpers.cc
 @@ -23,7 +23,7 @@
  #include "ui/gfx/buffer_format_util.h"
diff --git a/www/iridium/files/patch-media_gpu_test_video__frame__validator.cc b/www/iridium/files/patch-media_gpu_test_video__frame__validator.cc
index 8a2740731535..a66a0adeaa51 100644
--- a/www/iridium/files/patch-media_gpu_test_video__frame__validator.cc
+++ b/www/iridium/files/patch-media_gpu_test_video__frame__validator.cc
@@ -1,4 +1,4 @@
---- media/gpu/test/video_frame_validator.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/test/video_frame_validator.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/test/video_frame_validator.cc
 @@ -34,7 +34,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
index 77700fea9b3c..6e7e5a970cbe 100644
--- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
    const gfx::Size decoder_natural_size =
        aspect_ratio_.GetNaturalSize(decoder_visible_rect);
  
diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
index 59e82ffd8bd0..358949b8dc8c 100644
--- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-04-16 18:18:42 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -79,7 +79,7 @@
+@@ -81,7 +81,7 @@
  using media_gpu_vaapi::kModuleVa_prot;
  #endif
  
diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni
index 70223c32d3c1..95afdb1e1c2d 100644
--- a/www/iridium/files/patch-media_media__options.gni
+++ b/www/iridium/files/patch-media_media__options.gni
@@ -1,4 +1,4 @@
---- media/media_options.gni.orig	2025-04-16 18:18:42 UTC
+--- media/media_options.gni.orig	2025-05-07 06:48:23 UTC
 +++ media/media_options.gni
 @@ -201,12 +201,15 @@ declare_args() {
    # Enables runtime selection of ALSA library for audio.
diff --git a/www/iridium/files/patch-media_mojo_mojom_BUILD.gn b/www/iridium/files/patch-media_mojo_mojom_BUILD.gn
new file mode 100644
index 000000000000..15f83cd6ada4
--- /dev/null
+++ b/www/iridium/files/patch-media_mojo_mojom_BUILD.gn
@@ -0,0 +1,11 @@
+--- media/mojo/mojom/BUILD.gn.orig	2025-05-07 06:48:23 UTC
++++ media/mojo/mojom/BUILD.gn
+@@ -959,7 +959,7 @@ source_set("test_support") {
+   sources = []
+   deps = []
+ 
+-  if (is_linux || is_chromeos) {
++  if (!is_bsd && (is_linux || is_chromeos)) {
+     sources += [
+       "buffer_handle_test_util.cc",
+       "buffer_handle_test_util.h",
diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_BUILD.gn b/www/iridium/files/patch-media_mojo_mojom_stable_BUILD.gn
deleted file mode 100644
index a367d4bc780a..000000000000
--- a/www/iridium/files/patch-media_mojo_mojom_stable_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/mojo/mojom/stable/BUILD.gn.orig	2025-04-16 18:18:42 UTC
-+++ media/mojo/mojom/stable/BUILD.gn
-@@ -191,7 +191,7 @@ source_set("unit_tests") {
-   } else if (use_v4l2_codec) {
-     deps += [ "//media/gpu/v4l2:v4l2_status" ]
-   }
--  if (is_linux || is_chromeos) {
-+  if (!is_bsd && (is_linux || is_chromeos)) {
-     sources += [
-       "mojom_traits_test_util.cc",
-       "mojom_traits_test_util.h",
diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
deleted file mode 100644
index 46ef18923eed..000000000000
--- a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig	2025-03-18 16:46:04 UTC
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -861,7 +861,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
-   return input.id;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- gfx::NativePixmapHandle StructTraits<
-     media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -882,7 +882,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
- 
-   output->type = gfx::NATIVE_PIXMAP;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!data.ReadPlatformHandle(&output->native_pixmap_handle))
-     return false;
-   return true;
diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
deleted file mode 100644
index c9c8d351c0be..000000000000
--- a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2025-02-22 18:06:53 UTC
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -704,7 +704,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
-   static const gfx::GpuMemoryBufferId& id(
-       const gfx::GpuMemoryBufferHandle& input);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static gfx::NativePixmapHandle platform_handle(
-       gfx::GpuMemoryBufferHandle& input);
- #else
diff --git a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
index 25d527457531..221f49950e79 100644
--- a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,4 +1,4 @@
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-04-16 18:18:42 UTC
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/mojo/mojom/video_frame_mojom_traits.cc
 @@ -24,7 +24,7 @@
  #include "ui/gfx/mojom/color_space_mojom_traits.h"
@@ -7,5 +7,32 @@
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/posix/eintr_wrapper.h"
+ #include "media/gpu/buffer_validation.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -166,7 +166,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+         media::mojom::OpaqueVideoFrameData::New());
+   }
  
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
+     // Duplicates the DMA buffer FDs to a new vector since this cannot take
+     // ownership of the FDs in |input| due to constness.
+@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+ 
+ }  // namespace
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // static
+ bool StructTraits<
+     media::mojom::ColorPlaneLayoutDataView,
+@@ -436,7 +436,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
+     frame = media::VideoFrame::WrapTrackingToken(
+         format, *metadata.tracking_token, coded_size, visible_rect,
+         natural_size, timestamp);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   } else if (data.is_dmabuf_data()) {
+     media::mojom::DmabufVideoFrameDataDataView dmabuf_data;
+     data.GetDmabufDataDataView(&dmabuf_data);
diff --git a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h
new file mode 100644
index 000000000000..6a26a4e6cb86
--- /dev/null
+++ b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h
@@ -0,0 +1,11 @@
+--- media/mojo/mojom/video_frame_mojom_traits.h.orig	2025-05-07 06:48:23 UTC
++++ media/mojo/mojom/video_frame_mojom_traits.h
+@@ -21,7 +21,7 @@
+ 
+ namespace mojo {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ template <>
+ struct StructTraits<media::mojom::ColorPlaneLayoutDataView,
+                     media::ColorPlaneLayout> {
diff --git a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc
index 7c313b770816..fb4cde5597af 100644
--- a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc
+++ b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc
@@ -1,4 +1,4 @@
---- media/video/fake_gpu_memory_buffer.cc.orig	2025-04-16 18:18:42 UTC
+--- media/video/fake_gpu_memory_buffer.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/video/fake_gpu_memory_buffer.cc
 @@ -14,7 +14,7 @@
  #include "media/base/format_utils.h"
@@ -18,21 +18,12 @@
  base::ScopedFD GetDummyFD() {
    base::ScopedFD fd(open("/dev/zero", O_RDWR));
    DCHECK(fd.is_valid());
-@@ -84,7 +84,7 @@ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTestin
-   static base::AtomicSequenceNumber buffer_id_generator;
-   handle.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext());
+@@ -73,7 +73,7 @@ static base::AtomicSequenceNumber buffer_id_generator;
+ 
+ }  // namespace
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   for (size_t i = 0; i < VideoFrame::NumPlanes(*video_pixel_format); i++) {
-     const gfx::Size plane_size_in_bytes =
-         VideoFrame::PlaneSize(*video_pixel_format, i, size);
-@@ -187,7 +187,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH
-   gfx::GpuMemoryBufferHandle handle;
-   handle.type = gfx::NATIVE_PIXMAP;
-   handle.id = handle_.id;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   handle.native_pixmap_handle =
-       gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
- #endif
+ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting(
+     const gfx::Size& size,
+     gfx::BufferFormat format,
diff --git a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.h b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.h
index dd8e1a035e27..abf2d866d36c 100644
--- a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.h
+++ b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.h
@@ -1,4 +1,4 @@
---- media/video/fake_gpu_memory_buffer.h.orig	2025-04-16 18:18:42 UTC
+--- media/video/fake_gpu_memory_buffer.h.orig	2025-05-07 06:48:23 UTC
 +++ media/video/fake_gpu_memory_buffer.h
 @@ -13,7 +13,7 @@
  
diff --git a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index b02423ea0f1d..af55d3f7f678 100644
--- a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-03-18 16:46:04 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -644,7 +644,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
  
    bool is_software_backed_video_frame = !video_frame->HasSharedImage();
@@ -9,7 +9,7 @@
    is_software_backed_video_frame &= !video_frame->HasDmaBufs();
  #endif
  
-@@ -1054,7 +1054,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1057,7 +1057,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
        media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get());
  #endif
  
@@ -18,7 +18,7 @@
    is_webgpu_compatible =
        handle.native_pixmap_handle.supports_zero_copy_webgpu_import;
  #endif
-@@ -1225,7 +1225,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr
+@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr
        si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
      }
  
diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc
index 40b87b431e83..1e2e20684391 100644
--- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter.cc.orig	2025-03-18 16:46:04 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/video/video_encode_accelerator_adapter.cc
-@@ -463,7 +463,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele
+@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele
  
    auto format = PIXEL_FORMAT_I420;
    auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem;
diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
index 0400fa07078d..53ddc2ea9ce1 100644
--- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
+++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
@@ -1,4 +1,4 @@
---- media/video/video_encode_accelerator_adapter_test.cc.orig	2025-03-18 16:46:04 UTC
+--- media/video/video_encode_accelerator_adapter_test.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/video/video_encode_accelerator_adapter_test.cc
 @@ -260,7 +260,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest, InitializeAf
        });
diff --git a/www/iridium/files/patch-media_webrtc_audio__processor.cc b/www/iridium/files/patch-media_webrtc_audio__processor.cc
index 785de6aef142..4c7c1d119c95 100644
--- a/www/iridium/files/patch-media_webrtc_audio__processor.cc
+++ b/www/iridium/files/patch-media_webrtc_audio__processor.cc
@@ -1,6 +1,6 @@
---- media/webrtc/audio_processor.cc.orig	2025-04-16 18:18:42 UTC
+--- media/webrtc/audio_processor.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/webrtc/audio_processor.cc
-@@ -507,7 +507,7 @@ std::optional<double> AudioProcessor::ProcessData(
+@@ -509,7 +509,7 @@ std::optional<double> AudioProcessor::ProcessData(
    // controller.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    DCHECK_LE(volume, 1.0);
diff --git a/www/iridium/files/patch-media_webrtc_helpers.cc b/www/iridium/files/patch-media_webrtc_helpers.cc
index b51a6ab4632c..ba157564cc6c 100644
--- a/www/iridium/files/patch-media_webrtc_helpers.cc
+++ b/www/iridium/files/patch-media_webrtc_helpers.cc
@@ -1,4 +1,4 @@
---- media/webrtc/helpers.cc.orig	2025-02-22 18:06:53 UTC
+--- media/webrtc/helpers.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/webrtc/helpers.cc
 @@ -43,14 +43,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS
      return;
diff --git a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc
index e73852475a4d..c7224c2ef6c1 100644
--- a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc
+++ b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc
@@ -1,4 +1,4 @@
---- media/webrtc/helpers_unittests.cc.orig	2025-02-22 18:06:53 UTC
+--- media/webrtc/helpers_unittests.cc.orig	2025-05-07 06:48:23 UTC
 +++ media/webrtc/helpers_unittests.cc
 @@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
    EXPECT_TRUE(config.echo_canceller.enabled);
diff --git a/www/iridium/files/patch-mojo_core_BUILD.gn b/www/iridium/files/patch-mojo_core_BUILD.gn
index 2ecbda1c8821..67e714d84f45 100644
--- a/www/iridium/files/patch-mojo_core_BUILD.gn
+++ b/www/iridium/files/patch-mojo_core_BUILD.gn
@@ -1,4 +1,4 @@
---- mojo/core/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- mojo/core/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ mojo/core/BUILD.gn
 @@ -163,7 +163,7 @@ source_set("impl_for_embedder") {
        ]
diff --git a/www/iridium/files/patch-mojo_core_channel.cc b/www/iridium/files/patch-mojo_core_channel.cc
index 2212c3bbb913..b67cecd0b5f4 100644
--- a/www/iridium/files/patch-mojo_core_channel.cc
+++ b/www/iridium/files/patch-mojo_core_channel.cc
@@ -1,4 +1,4 @@
---- mojo/core/channel.cc.orig	2025-02-22 18:06:53 UTC
+--- mojo/core/channel.cc.orig	2025-05-07 06:48:23 UTC
 +++ mojo/core/channel.cc
 @@ -83,7 +83,11 @@ const size_t kMaxAttachedHandles = 64;
  const size_t kMaxAttachedHandles = 253;
diff --git a/www/iridium/files/patch-mojo_core_embedder_features.h b/www/iridium/files/patch-mojo_core_embedder_features.h
index a87a5a809ca9..f51c267c43e6 100644
--- a/www/iridium/files/patch-mojo_core_embedder_features.h
+++ b/www/iridium/files/patch-mojo_core_embedder_features.h
@@ -1,4 +1,4 @@
---- mojo/core/embedder/features.h.orig	2023-07-24 14:27:53 UTC
+--- mojo/core/embedder/features.h.orig	2025-05-07 06:48:23 UTC
 +++ mojo/core/embedder/features.h
 @@ -16,7 +16,7 @@ namespace core {
  
diff --git a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni
index 7e45e7ac62d7..b836291974b8 100644
--- a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- mojo/public/tools/bindings/mojom.gni.orig	2025-04-16 18:18:42 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig	2025-05-07 06:48:23 UTC
 +++ mojo/public/tools/bindings/mojom.gni
-@@ -782,6 +782,16 @@ template("mojom") {
+@@ -774,6 +774,16 @@ template("mojom") {
        enabled_features += [ "is_apple" ]
      }
  
diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn
index dd4589ff6a93..b748a4e7df63 100644
--- a/www/iridium/files/patch-net_BUILD.gn
+++ b/www/iridium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- net/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ net/BUILD.gn
 @@ -125,7 +125,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1312,6 +1312,19 @@ component("net") {
+@@ -1320,6 +1320,19 @@ component("net") {
      ]
    }
  
@@ -29,7 +29,7 @@
    if (is_mac) {
      sources += [
        "base/network_notification_thread_mac.cc",
-@@ -1475,7 +1488,7 @@ component("net") {
+@@ -1483,7 +1496,7 @@ component("net") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
@@ -38,7 +38,7 @@
      sources += [
        "base/network_interfaces_getifaddrs.cc",
        "base/network_interfaces_getifaddrs.h",
-@@ -2174,7 +2187,7 @@ static_library("test_support") {
+@@ -2182,7 +2195,7 @@ static_library("test_support") {
      ]
    }
  
@@ -47,7 +47,7 @@
      sources += [
        "base/address_tracker_linux_test_util.cc",
        "base/address_tracker_linux_test_util.h",
-@@ -2985,14 +2998,14 @@ target(_test_target_type, "net_unittests") {
+@@ -3001,14 +3014,14 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -64,7 +64,7 @@
      sources += [
        "base/address_tracker_linux_unittest.cc",
        "base/network_interfaces_linux_unittest.cc",
-@@ -3086,6 +3099,10 @@ target(_test_target_type, "net_unittests") {
+@@ -3104,6 +3117,10 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -75,7 +75,7 @@
    if (enable_websockets) {
      sources += [
        "server/http_connection_unittest.cc",
-@@ -3152,7 +3169,7 @@ target(_test_target_type, "net_unittests") {
+@@ -3170,7 +3187,7 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -84,7 +84,7 @@
      sources += [ "tools/quic/quic_simple_server_test.cc" ]
    }
  
-@@ -3291,7 +3308,7 @@ target(_test_target_type, "net_unittests") {
+@@ -3309,7 +3326,7 @@ target(_test_target_type, "net_unittests") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/iridium/files/patch-net_base_features.cc b/www/iridium/files/patch-net_base_features.cc
index 6564144a327d..f183e1fe0ae7 100644
--- a/www/iridium/files/patch-net_base_features.cc
+++ b/www/iridium/files/patch-net_base_features.cc
@@ -1,4 +1,4 @@
---- net/base/features.cc.orig	2025-03-18 16:46:04 UTC
+--- net/base/features.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/base/features.cc
 @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin,
  BASE_FEATURE(kAsyncDns,
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -549,7 +549,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
+@@ -548,7 +548,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
               "SpdyHeadersToHttpResponseUseBuilder",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
diff --git a/www/iridium/files/patch-net_base_network__change__notifier.cc b/www/iridium/files/patch-net_base_network__change__notifier.cc
index ace4fcbd8b28..e8a559f53df6 100644
--- a/www/iridium/files/patch-net_base_network__change__notifier.cc
+++ b/www/iridium/files/patch-net_base_network__change__notifier.cc
@@ -1,4 +1,4 @@
---- net/base/network_change_notifier.cc.orig	2025-04-16 18:18:42 UTC
+--- net/base/network_change_notifier.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/base/network_change_notifier.cc
 @@ -36,7 +36,7 @@
  #include "net/base/network_change_notifier_linux.h"
diff --git a/www/iridium/files/patch-net_base_network__change__notifier__passive.cc b/www/iridium/files/patch-net_base_network__change__notifier__passive.cc
index b33ecf69de1d..4d1bc307f5f3 100644
--- a/www/iridium/files/patch-net_base_network__change__notifier__passive.cc
+++ b/www/iridium/files/patch-net_base_network__change__notifier__passive.cc
@@ -1,4 +1,4 @@
---- net/base/network_change_notifier_passive.cc.orig	2025-04-16 18:18:42 UTC
+--- net/base/network_change_notifier_passive.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/base/network_change_notifier_passive.cc
 @@ -106,7 +106,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern
  NetworkChangeNotifier::NetworkChangeCalculatorParams
diff --git a/www/iridium/files/patch-net_base_network__interfaces__posix.h b/www/iridium/files/patch-net_base_network__interfaces__posix.h
index f778a775c886..b83ccfd0d65a 100644
--- a/www/iridium/files/patch-net_base_network__interfaces__posix.h
+++ b/www/iridium/files/patch-net_base_network__interfaces__posix.h
@@ -1,4 +1,4 @@
---- net/base/network_interfaces_posix.h.orig	2022-03-28 18:11:04 UTC
+--- net/base/network_interfaces_posix.h.orig	2025-05-07 06:48:23 UTC
 +++ net/base/network_interfaces_posix.h
 @@ -8,6 +8,8 @@
  // This file provides some basic functionality shared between
diff --git a/www/iridium/files/patch-net_base_sockaddr__util__posix.cc b/www/iridium/files/patch-net_base_sockaddr__util__posix.cc
index d044d6235f0d..708426ba2667 100644
--- a/www/iridium/files/patch-net_base_sockaddr__util__posix.cc
+++ b/www/iridium/files/patch-net_base_sockaddr__util__posix.cc
@@ -1,4 +1,4 @@
---- net/base/sockaddr_util_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- net/base/sockaddr_util_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/base/sockaddr_util_posix.cc
 @@ -45,7 +45,8 @@ bool FillUnixAddress(const std::string& socket_path,
      return true;
diff --git a/www/iridium/files/patch-net_base_sockaddr__util__posix__unittest.cc b/www/iridium/files/patch-net_base_sockaddr__util__posix__unittest.cc
index 4661f6d13038..db843ae508fc 100644
--- a/www/iridium/files/patch-net_base_sockaddr__util__posix__unittest.cc
+++ b/www/iridium/files/patch-net_base_sockaddr__util__posix__unittest.cc
@@ -1,4 +1,4 @@
---- net/base/sockaddr_util_posix_unittest.cc.orig	2024-08-01 05:47:53 UTC
+--- net/base/sockaddr_util_posix_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/base/sockaddr_util_posix_unittest.cc
 @@ -88,7 +88,8 @@ TEST(FillUnixAddressTest, AbstractLinuxAddress) {
    size_t path_max = MaxPathLength(&storage);
diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc.h b/www/iridium/files/patch-net_cert_cert__verify__proc.h
index 84fcf2dbf85d..fd4ac1b6c7d8 100644
--- a/www/iridium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/iridium/files/patch-net_cert_cert__verify__proc.h
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.h.orig	2024-12-22 12:24:29 UTC
+--- net/cert/cert_verify_proc.h.orig	2025-05-07 06:48:23 UTC
 +++ net/cert/cert_verify_proc.h
-@@ -186,7 +186,7 @@ class NET_EXPORT CertVerifyProc
+@@ -182,7 +182,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
    };
  
diff --git a/www/iridium/files/patch-net_disk__cache_backend__experiment.h b/www/iridium/files/patch-net_disk__cache_backend__experiment.h
index 5bd8e53b3448..cfca471a68f6 100644
--- a/www/iridium/files/patch-net_disk__cache_backend__experiment.h
+++ b/www/iridium/files/patch-net_disk__cache_backend__experiment.h
@@ -1,4 +1,4 @@
---- net/disk_cache/backend_experiment.h.orig	2024-12-22 12:24:29 UTC
+--- net/disk_cache/backend_experiment.h.orig	2025-05-07 06:48:23 UTC
 +++ net/disk_cache/backend_experiment.h
 @@ -14,7 +14,7 @@ namespace disk_cache {
  // default.
diff --git a/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc
index 4c02b8382dbb..86a5b77a989d 100644
--- a/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc
+++ b/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc
@@ -1,4 +1,4 @@
---- net/disk_cache/simple/simple_file_tracker.cc.orig	2025-03-18 16:46:04 UTC
+--- net/disk_cache/simple/simple_file_tracker.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/disk_cache/simple/simple_file_tracker.cc
 @@ -37,7 +37,17 @@ bool SimpleFileTracker::TrackedFiles::InLRUList() cons
  }
diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn
index 70e403a4448c..3d4d9837d67a 100644
--- a/www/iridium/files/patch-net_dns_BUILD.gn
+++ b/www/iridium/files/patch-net_dns_BUILD.gn
@@ -1,4 +1,4 @@
---- net/dns/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- net/dns/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/BUILD.gn
 @@ -140,7 +140,7 @@ source_set("dns") {
        "dns_config_service_android.cc",
diff --git a/www/iridium/files/patch-net_dns_address__info.cc b/www/iridium/files/patch-net_dns_address__info.cc
index d3568be553b4..0fb081f0958d 100644
--- a/www/iridium/files/patch-net_dns_address__info.cc
+++ b/www/iridium/files/patch-net_dns_address__info.cc
@@ -1,4 +1,4 @@
---- net/dns/address_info.cc.orig	2024-08-01 05:47:53 UTC
+--- net/dns/address_info.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/address_info.cc
 @@ -83,8 +83,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
      // error.
diff --git a/www/iridium/files/patch-net_dns_address__sorter__posix.cc b/www/iridium/files/patch-net_dns_address__sorter__posix.cc
index 0bc07ca83cb9..de92425c9c68 100644
--- a/www/iridium/files/patch-net_dns_address__sorter__posix.cc
+++ b/www/iridium/files/patch-net_dns_address__sorter__posix.cc
@@ -1,4 +1,4 @@
---- net/dns/address_sorter_posix.cc.orig	2024-08-01 05:47:53 UTC
+--- net/dns/address_sorter_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/address_sorter_posix.cc
 @@ -32,6 +32,7 @@
  #include "net/dns/netinet_in_var_ios.h"
diff --git a/www/iridium/files/patch-net_dns_dns__config__service__posix.cc b/www/iridium/files/patch-net_dns_dns__config__service__posix.cc
index 059bd7f53038..baf57aede3c0 100644
--- a/www/iridium/files/patch-net_dns_dns__config__service__posix.cc
+++ b/www/iridium/files/patch-net_dns_dns__config__service__posix.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_config_service_posix.cc.orig	2024-08-01 05:47:53 UTC
+--- net/dns/dns_config_service_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/dns_config_service_posix.cc
 @@ -39,6 +39,11 @@
  #include "net/dns/dns_config_watcher_mac.h"
diff --git a/www/iridium/files/patch-net_dns_dns__reloader.cc b/www/iridium/files/patch-net_dns_dns__reloader.cc
index fd30a2efc4b4..c7e7f88074ac 100644
--- a/www/iridium/files/patch-net_dns_dns__reloader.cc
+++ b/www/iridium/files/patch-net_dns_dns__reloader.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_reloader.cc.orig	2023-04-22 17:45:15 UTC
+--- net/dns/dns_reloader.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/dns_reloader.cc
 @@ -10,6 +10,7 @@
  // - there's not guarantee it exists at all. :(
diff --git a/www/iridium/files/patch-net_dns_dns__util.cc b/www/iridium/files/patch-net_dns_dns__util.cc
index cdf9e1b563fd..5d057d67fd63 100644
--- a/www/iridium/files/patch-net_dns_dns__util.cc
+++ b/www/iridium/files/patch-net_dns_dns__util.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_util.cc.orig	2023-03-13 07:33:08 UTC
+--- net/dns/dns_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/dns_util.cc
 @@ -29,6 +29,8 @@
  #include "net/dns/public/util.h"
diff --git a/www/iridium/files/patch-net_dns_host__resolver__proc.cc b/www/iridium/files/patch-net_dns_host__resolver__proc.cc
index 4fdd727daede..40288c7d25ac 100644
--- a/www/iridium/files/patch-net_dns_host__resolver__proc.cc
+++ b/www/iridium/files/patch-net_dns_host__resolver__proc.cc
@@ -1,4 +1,4 @@
---- net/dns/host_resolver_proc.cc.orig	2022-12-06 08:09:13 UTC
+--- net/dns/host_resolver_proc.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/host_resolver_proc.cc
 @@ -15,10 +15,6 @@
  #include "net/base/net_errors.h"
diff --git a/www/iridium/files/patch-net_dns_public_BUILD.gn b/www/iridium/files/patch-net_dns_public_BUILD.gn
index 74de88fd1a41..32c48e931966 100644
--- a/www/iridium/files/patch-net_dns_public_BUILD.gn
+++ b/www/iridium/files/patch-net_dns_public_BUILD.gn
@@ -1,4 +1,4 @@
---- net/dns/public/BUILD.gn.orig	2024-06-25 12:08:48 UTC
+--- net/dns/public/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/public/BUILD.gn
 @@ -78,7 +78,7 @@ source_set("tests") {
      "doh_provider_entry_unittest.cc",
diff --git a/www/iridium/files/patch-net_dns_public_resolv__reader.h b/www/iridium/files/patch-net_dns_public_resolv__reader.h
index 898a1d5fe1de..61f200c3d2e0 100644
--- a/www/iridium/files/patch-net_dns_public_resolv__reader.h
+++ b/www/iridium/files/patch-net_dns_public_resolv__reader.h
@@ -1,4 +1,4 @@
---- net/dns/public/resolv_reader.h.orig	2022-03-28 18:11:04 UTC
+--- net/dns/public/resolv_reader.h.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/public/resolv_reader.h
 @@ -5,6 +5,7 @@
  #ifndef NET_DNS_PUBLIC_RESOLV_READER_H_
diff --git a/www/iridium/files/patch-net_dns_public_scoped__res__state.h b/www/iridium/files/patch-net_dns_public_scoped__res__state.h
index 3741eae536f8..d8a9f30611e2 100644
--- a/www/iridium/files/patch-net_dns_public_scoped__res__state.h
+++ b/www/iridium/files/patch-net_dns_public_scoped__res__state.h
@@ -1,4 +1,4 @@
---- net/dns/public/scoped_res_state.h.orig	2024-06-25 12:08:48 UTC
+--- net/dns/public/scoped_res_state.h.orig	2025-05-07 06:48:23 UTC
 +++ net/dns/public/scoped_res_state.h
 @@ -5,6 +5,7 @@
  #ifndef NET_DNS_PUBLIC_SCOPED_RES_STATE_H_
diff --git a/www/iridium/files/patch-net_filter_zstd__source__stream.cc b/www/iridium/files/patch-net_filter_zstd__source__stream.cc
index 49266ce0d3bc..5e91cb56a88d 100644
--- a/www/iridium/files/patch-net_filter_zstd__source__stream.cc
+++ b/www/iridium/files/patch-net_filter_zstd__source__stream.cc
@@ -1,4 +1,4 @@
---- net/filter/zstd_source_stream.cc.orig	2024-06-25 12:08:48 UTC
+--- net/filter/zstd_source_stream.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/filter/zstd_source_stream.cc
 @@ -7,6 +7,7 @@
  #include <algorithm>
diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
index 3e62bfe2c8ee..7db9301607ac 100644
--- a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,14 +1,13 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2024-08-01 05:47:53 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/http/http_auth_gssapi_posix.cc
-@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
-     static const char* const kDefaultLibraryNames[] = {
+@@ -366,7 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+   } else {
  #if BUILDFLAG(IS_APPLE)
-       "/System/Library/Frameworks/GSS.framework/GSS"
+     library_names.emplace_back("/System/Library/Frameworks/GSS.framework/GSS");
 -#elif BUILDFLAG(IS_OPENBSD)
--      "libgssapi.so"  // Heimdal - OpenBSD
 +#elif BUILDFLAG(IS_BSD)
-+      "libgssapi_krb5.so.2",  // MIT Kerberos - FreeBSD
-+      "libgssapi.so"          // Heimdal - OpenBSD, FreeBSD
++    // MIT Kerberos - FreeBSD
++    library_names.emplace_back("libgssapi_krb5.so.2");
+     // Heimdal - OpenBSD
+     library_names.emplace_back("libgssapi.so");
  #else
-       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
-       "libgssapi.so.4",       // Heimdal - Suse10, MDK
diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h
index ce5cf36e6b11..471c76ddb2cb 100644
--- a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h
+++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h
@@ -1,4 +1,4 @@
---- net/http/http_auth_gssapi_posix.h.orig	2022-10-05 07:34:01 UTC
+--- net/http/http_auth_gssapi_posix.h.orig	2025-05-07 06:48:23 UTC
 +++ net/http/http_auth_gssapi_posix.h
 @@ -21,6 +21,9 @@
  #if BUILDFLAG(IS_APPLE)
diff --git a/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc b/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc
index d9ae0fb981a7..61bcbe06cd1d 100644
--- a/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc
+++ b/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc
@@ -1,4 +1,4 @@
---- net/http/http_auth_handler_negotiate.cc.orig	2025-04-16 18:18:42 UTC
+--- net/http/http_auth_handler_negotiate.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/http/http_auth_handler_negotiate.cc
 @@ -119,7 +119,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl
  #elif BUILDFLAG(IS_POSIX)
diff --git a/www/iridium/files/patch-net_http_http__auth__preferences.cc b/www/iridium/files/patch-net_http_http__auth__preferences.cc
index 9893a3379346..01cc5ce69525 100644
--- a/www/iridium/files/patch-net_http_http__auth__preferences.cc
+++ b/www/iridium/files/patch-net_http_http__auth__preferences.cc
@@ -1,4 +1,4 @@
---- net/http/http_auth_preferences.cc.orig	2025-04-16 18:18:42 UTC
+--- net/http/http_auth_preferences.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/http/http_auth_preferences.cc
 @@ -38,7 +38,7 @@ std::string HttpAuthPreferences::AuthAndroidNegotiateA
  }
diff --git a/www/iridium/files/patch-net_http_http__auth__preferences.h b/www/iridium/files/patch-net_http_http__auth__preferences.h
index 637f32963aa0..f437953d92e3 100644
--- a/www/iridium/files/patch-net_http_http__auth__preferences.h
+++ b/www/iridium/files/patch-net_http_http__auth__preferences.h
@@ -1,4 +1,4 @@
---- net/http/http_auth_preferences.h.orig	2025-04-16 18:18:42 UTC
+--- net/http/http_auth_preferences.h.orig	2025-05-07 06:48:23 UTC
 +++ net/http/http_auth_preferences.h
 @@ -49,7 +49,7 @@ class NET_EXPORT HttpAuthPreferences {
  #if BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-net_http_http__network__session.cc b/www/iridium/files/patch-net_http_http__network__session.cc
index f0648d090cb5..9adf5aa2f05d 100644
--- a/www/iridium/files/patch-net_http_http__network__session.cc
+++ b/www/iridium/files/patch-net_http_http__network__session.cc
@@ -1,4 +1,4 @@
---- net/http/http_network_session.cc.orig	2024-11-04 08:56:03 UTC
+--- net/http/http_network_session.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/http/http_network_session.cc
 @@ -20,7 +20,9 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc
index 50b9e044181f..523a3393da25 100644
--- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc
+++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service.cc.orig	2023-03-13 07:33:08 UTC
+--- net/proxy_resolution/proxy_config_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/proxy_resolution/proxy_config_service.cc
 @@ -19,20 +19,20 @@
  #include "net/proxy_resolution/proxy_config_service_ios.h"
diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 81c8ecf85d65..761b6dccbe18 100644
--- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2024-08-01 05:47:53 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -11,7 +11,9 @@
  
@@ -18,7 +18,7 @@
  // Converts |value| from a decimal string to an int. If there was a failure
  // parsing, returns |default_value|.
  int StringToIntOrDefault(std::string_view value, int default_value) {
-@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1048,6 +1051,7 @@ class SettingGetterImplKDE : public ProxyConfigService
    // events on.
    scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
  };
@@ -26,7 +26,7 @@
  
  }  // namespace
  
-@@ -1256,9 +1260,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1266,9 +1270,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
      case base::nix::DESKTOP_ENVIRONMENT_KDE6:
diff --git a/www/iridium/files/patch-net_quic_quic__network__transaction__unittest.cc b/www/iridium/files/patch-net_quic_quic__network__transaction__unittest.cc
index f8290dda7a09..caf85f580c65 100644
--- a/www/iridium/files/patch-net_quic_quic__network__transaction__unittest.cc
+++ b/www/iridium/files/patch-net_quic_quic__network__transaction__unittest.cc
@@ -1,4 +1,4 @@
---- net/quic/quic_network_transaction_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- net/quic/quic_network_transaction_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/quic/quic_network_transaction_unittest.cc
 @@ -5202,10 +5202,10 @@ TEST_P(QuicNetworkTransactionTest, RstStreamBeforeHead
  
diff --git a/www/iridium/files/patch-net_socket_socks5__client__socket.cc b/www/iridium/files/patch-net_socket_socks5__client__socket.cc
index 2e3ba1348487..34adf2bc3bf0 100644
--- a/www/iridium/files/patch-net_socket_socks5__client__socket.cc
+++ b/www/iridium/files/patch-net_socket_socks5__client__socket.cc
@@ -1,4 +1,4 @@
---- net/socket/socks5_client_socket.cc.orig	2025-04-16 18:18:42 UTC
+--- net/socket/socks5_client_socket.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/socket/socks5_client_socket.cc
 @@ -23,6 +23,9 @@
  #include "net/log/net_log_event_type.h"
diff --git a/www/iridium/files/patch-net_socket_tcp__socket__posix.cc b/www/iridium/files/patch-net_socket_tcp__socket__posix.cc
index 66981f3eb75f..6917d3eb7e6e 100644
--- a/www/iridium/files/patch-net_socket_tcp__socket__posix.cc
+++ b/www/iridium/files/patch-net_socket_tcp__socket__posix.cc
@@ -1,4 +1,4 @@
---- net/socket/tcp_socket_posix.cc.orig	2024-11-04 08:56:03 UTC
+--- net/socket/tcp_socket_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/socket/tcp_socket_posix.cc
 @@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
        PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
diff --git a/www/iridium/files/patch-net_socket_udp__socket__posix.cc b/www/iridium/files/patch-net_socket_udp__socket__posix.cc
index bcc7cd5b25e0..7ce43eb13129 100644
--- a/www/iridium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/iridium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,4 +1,4 @@
---- net/socket/udp_socket_posix.cc.orig	2025-04-16 18:18:42 UTC
+--- net/socket/udp_socket_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/socket/udp_socket_posix.cc
 @@ -527,12 +527,17 @@ int UDPSocketPosix::SetRecvTos() {
  #endif  // BUILDFLAG(IS_APPLE)
diff --git a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc
index e966f7584e73..99e041cb3e12 100644
--- a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc
+++ b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc
@@ -1,4 +1,4 @@
---- net/socket/udp_socket_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- net/socket/udp_socket_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/socket/udp_socket_unittest.cc
 @@ -371,7 +371,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
    EXPECT_EQ(second_packet, received);
@@ -27,7 +27,7 @@
      // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #else
-@@ -763,7 +763,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
+@@ -770,7 +770,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
  
  // TODO(crbug.com/40620614): failing on device on iOS 12.2.
  // TODO(crbug.com/40189274): flaky on Mac 11.
@@ -36,7 +36,7 @@
  #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
  #else
  #define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -817,7 +817,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
+@@ -824,7 +824,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
                                  NetLogSource());
    ASSERT_THAT(client_socket.Connect(send_address), IsOk());
  
diff --git a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn
index 414b96ec9383..87c4e02d1819 100644
--- a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn
+++ b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn
@@ -1,4 +1,4 @@
---- net/third_party/quiche/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- net/third_party/quiche/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ net/third_party/quiche/BUILD.gn
 @@ -28,7 +28,7 @@ import("//net/third_party/quiche/src/build/source_list
  import("//testing/libfuzzer/fuzzer_test.gni")
diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index 76d63a3eee13..3ed9cbd0aa77 100644
--- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,4 +1,4 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2024-11-04 08:56:03 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
 @@ -35,7 +35,7 @@
  #include "third_party/boringssl/src/pki/trust_store.h"
@@ -18,7 +18,7 @@
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -580,7 +580,7 @@ int main(int argc, char** argv) {
+@@ -582,7 +582,7 @@ int main(int argc, char** argv) {
    std::string impls_str = command_line.GetSwitchValueASCII("impls");
    if (impls_str.empty()) {
      // Default value.
diff --git a/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc b/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc
index 8362e2e84bcb..e392002a3722 100644
--- a/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc
+++ b/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc
@@ -1,4 +1,4 @@
---- net/tools/net_watcher/net_watcher.cc.orig	2025-04-16 18:18:42 UTC
+--- net/tools/net_watcher/net_watcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/tools/net_watcher/net_watcher.cc
 @@ -31,7 +31,7 @@
  #include "net/proxy_resolution/proxy_config_service.h"
diff --git a/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h
index 64b5c87ad49e..417f7bdf66e4 100644
--- a/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h
+++ b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h
@@ -1,4 +1,4 @@
---- net/traffic_annotation/network_traffic_annotation.h.orig	2025-04-16 18:18:42 UTC
+--- net/traffic_annotation/network_traffic_annotation.h.orig	2025-05-07 06:48:23 UTC
 +++ net/traffic_annotation/network_traffic_annotation.h
 @@ -374,7 +374,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
  }  // namespace net
diff --git a/www/iridium/files/patch-net_url__request_url__request.cc b/www/iridium/files/patch-net_url__request_url__request.cc
index c28a33a6ae92..19bb489c965b 100644
--- a/www/iridium/files/patch-net_url__request_url__request.cc
+++ b/www/iridium/files/patch-net_url__request_url__request.cc
@@ -1,4 +1,4 @@
---- net/url_request/url_request.cc.orig	2025-04-16 18:18:42 UTC
+--- net/url_request/url_request.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/url_request/url_request.cc
 @@ -10,6 +10,7 @@
  #	include <unistd.h>
@@ -16,7 +16,7 @@
  #include "net/base/auth.h"
  #include "net/base/features.h"
  #include "net/base/io_buffer.h"
-@@ -63,7 +65,10 @@ namespace iridium {
+@@ -64,7 +66,10 @@ namespace iridium {
  
  void textlog_request(const char *caller, const GURL &url)
  {
diff --git a/www/iridium/files/patch-net_url__request_url__request__context.cc b/www/iridium/files/patch-net_url__request_url__request__context.cc
index 53e6ece4fa37..dc65ab2cfe8d 100644
--- a/www/iridium/files/patch-net_url__request_url__request__context.cc
+++ b/www/iridium/files/patch-net_url__request_url__request__context.cc
@@ -1,4 +1,4 @@
---- net/url_request/url_request_context.cc.orig	2025-04-16 18:18:42 UTC
+--- net/url_request/url_request_context.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/url_request/url_request_context.cc
 @@ -119,7 +119,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
    return &network_session->context();
diff --git a/www/iridium/files/patch-net_url__request_url__request__context.h b/www/iridium/files/patch-net_url__request_url__request__context.h
index 333b93cffc9a..dbf0b579fb38 100644
--- a/www/iridium/files/patch-net_url__request_url__request__context.h
+++ b/www/iridium/files/patch-net_url__request_url__request__context.h
@@ -1,4 +1,4 @@
---- net/url_request/url_request_context.h.orig	2025-04-16 18:18:42 UTC
+--- net/url_request/url_request_context.h.orig	2025-05-07 06:48:23 UTC
 +++ net/url_request/url_request_context.h
 @@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final {
    // session.
diff --git a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc
index 79da739b5728..ce8f97fd6a03 100644
--- a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig	2025-04-16 18:18:42 UTC
+--- net/url_request/url_request_context_builder.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/url_request/url_request_context_builder.cc
-@@ -440,7 +440,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
diff --git a/www/iridium/files/patch-net_websockets_websocket__basic__stream__adapters__test.cc b/www/iridium/files/patch-net_websockets_websocket__basic__stream__adapters__test.cc
index 6324e735d68b..954b057b4e46 100644
--- a/www/iridium/files/patch-net_websockets_websocket__basic__stream__adapters__test.cc
+++ b/www/iridium/files/patch-net_websockets_websocket__basic__stream__adapters__test.cc
@@ -1,4 +1,4 @@
---- net/websockets/websocket_basic_stream_adapters_test.cc.orig	2025-04-16 18:18:42 UTC
+--- net/websockets/websocket_basic_stream_adapters_test.cc.orig	2025-05-07 06:48:23 UTC
 +++ net/websockets/websocket_basic_stream_adapters_test.cc
 @@ -1098,10 +1098,10 @@ TEST_F(WebSocketSpdyStreamAdapterTest,
         OnCloseOkShouldBeTranslatedToConnectionClose) {
diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
index 57a37739dd9a..bebe760cbab0 100644
--- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2025-04-16 18:18:42 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2025-05-07 06:48:23 UTC
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -109,7 +109,7 @@
+@@ -111,7 +111,7 @@
  #include "ui/accessibility/ax_features.mojom-features.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -565,7 +565,7 @@ void InitializeSDK(bool enable_v8,
+@@ -567,7 +567,7 @@ void InitializeSDK(bool enable_v8,
  
    FPDF_InitLibraryWithConfig(&config);
  
diff --git a/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc b/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc
index 07a2e60ec071..895461afb670 100644
--- a/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc
+++ b/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc
@@ -1,4 +1,4 @@
---- printing/backend/cups_ipp_helper.cc.orig	2025-03-18 16:46:04 UTC
+--- printing/backend/cups_ipp_helper.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/backend/cups_ipp_helper.cc
 @@ -201,7 +201,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
    // Provide a default DPI if no valid DPI is found.
diff --git a/www/iridium/files/patch-printing_backend_print__backend__cups.cc b/www/iridium/files/patch-printing_backend_print__backend__cups.cc
index 64bb5c00d832..1a25e1b1ff06 100644
--- a/www/iridium/files/patch-printing_backend_print__backend__cups.cc
+++ b/www/iridium/files/patch-printing_backend_print__backend__cups.cc
@@ -1,4 +1,4 @@
---- printing/backend/print_backend_cups.cc.orig	2025-04-16 18:18:42 UTC
+--- printing/backend/print_backend_cups.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/backend/print_backend_cups.cc
 @@ -29,7 +29,7 @@
  #include "printing/mojom/print.mojom.h"
diff --git a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc
index d4165ef2b086..682601e14000 100644
--- a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc
+++ b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc
@@ -1,4 +1,4 @@
---- printing/mojom/printing_context_mojom_traits.cc.orig	2023-11-22 14:00:11 UTC
+--- printing/mojom/printing_context_mojom_traits.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/mojom/printing_context_mojom_traits.cc
 @@ -19,7 +19,7 @@
  #include "base/numerics/safe_conversions.h"
diff --git a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h
index ce44a32067f2..d3f22e8e85ba 100644
--- a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h
+++ b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h
@@ -1,4 +1,4 @@
---- printing/mojom/printing_context_mojom_traits.h.orig	2023-10-21 11:51:27 UTC
+--- printing/mojom/printing_context_mojom_traits.h.orig	2025-05-07 06:48:23 UTC
 +++ printing/mojom/printing_context_mojom_traits.h
 @@ -166,7 +166,7 @@ struct StructTraits<printing::mojom::PrintSettingsData
      return s.pages_per_sheet();
diff --git a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
index 776278202d5c..bf59eca5dfa5 100644
--- a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
+++ b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
@@ -1,4 +1,4 @@
---- printing/mojom/printing_context_mojom_traits_unittest.cc.orig	2025-04-16 18:18:42 UTC
+--- printing/mojom/printing_context_mojom_traits_unittest.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/mojom/printing_context_mojom_traits_unittest.cc
 @@ -79,7 +79,7 @@ base::Value::Dict GenerateSampleSystemPrintDialogData(
      data.Set(kMacSystemPrintDialogDataDestinationLocation, "/foo/bar.pdf");
diff --git a/www/iridium/files/patch-printing_print__settings.cc b/www/iridium/files/patch-printing_print__settings.cc
index 670f0affe9bd..ffbc66173394 100644
--- a/www/iridium/files/patch-printing_print__settings.cc
+++ b/www/iridium/files/patch-printing_print__settings.cc
@@ -1,4 +1,4 @@
---- printing/print_settings.cc.orig	2024-12-22 12:24:29 UTC
+--- printing/print_settings.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/print_settings.cc
 @@ -319,7 +319,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
  #endif
diff --git a/www/iridium/files/patch-printing_print__settings.h b/www/iridium/files/patch-printing_print__settings.h
index 7749226e0174..f1f5e15d4b7d 100644
--- a/www/iridium/files/patch-printing_print__settings.h
+++ b/www/iridium/files/patch-printing_print__settings.h
@@ -1,4 +1,4 @@
---- printing/print_settings.h.orig	2024-11-04 08:56:03 UTC
+--- printing/print_settings.h.orig	2025-05-07 06:48:23 UTC
 +++ printing/print_settings.h
 @@ -25,7 +25,7 @@
  #include "base/values.h"
diff --git a/www/iridium/files/patch-printing_print__settings__conversion.cc b/www/iridium/files/patch-printing_print__settings__conversion.cc
index e650576f9000..0b4e7a47d8a3 100644
--- a/www/iridium/files/patch-printing_print__settings__conversion.cc
+++ b/www/iridium/files/patch-printing_print__settings__conversion.cc
@@ -1,4 +1,4 @@
---- printing/print_settings_conversion.cc.orig	2024-06-25 12:08:48 UTC
+--- printing/print_settings_conversion.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/print_settings_conversion.cc
 @@ -285,7 +285,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
      settings->set_is_modifiable(is_modifiable.value());
diff --git a/www/iridium/files/patch-printing_printing__context__linux.cc b/www/iridium/files/patch-printing_printing__context__linux.cc
index be33d28c98cf..10590c43497e 100644
--- a/www/iridium/files/patch-printing_printing__context__linux.cc
+++ b/www/iridium/files/patch-printing_printing__context__linux.cc
@@ -1,4 +1,4 @@
---- printing/printing_context_linux.cc.orig	2024-12-22 12:24:29 UTC
+--- printing/printing_context_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/printing_context_linux.cc
 @@ -23,7 +23,7 @@
  #endif
diff --git a/www/iridium/files/patch-printing_printing__features.cc b/www/iridium/files/patch-printing_printing__features.cc
index 3b7e19c38071..d0276997445a 100644
--- a/www/iridium/files/patch-printing_printing__features.cc
+++ b/www/iridium/files/patch-printing_printing__features.cc
@@ -1,7 +1,7 @@
---- printing/printing_features.cc.orig	2025-02-22 18:06:53 UTC
+--- printing/printing_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/printing_features.cc
-@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr,
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -15,7 +15,7 @@
               base::FEATURE_DISABLED_BY_DEFAULT
  #else
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -69,7 +69,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
+@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
  // out-of-process.
  BASE_FEATURE(kEnableOopPrintDrivers,
               "EnableOopPrintDrivers",
diff --git a/www/iridium/files/patch-printing_printing__features.h b/www/iridium/files/patch-printing_printing__features.h
index 40856b0206cc..9f7e8d13e53b 100644
--- a/www/iridium/files/patch-printing_printing__features.h
+++ b/www/iridium/files/patch-printing_printing__features.h
@@ -1,7 +1,7 @@
---- printing/printing_features.h.orig	2024-08-01 05:47:53 UTC
+--- printing/printing_features.h.orig	2025-05-07 06:48:23 UTC
 +++ printing/printing_features.h
-@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
- BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr);
+@@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
+ BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
diff --git a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
index e8302ed55fc6..5fa377a79c06 100644
--- a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ printing/sandbox/print_backend_sandbox_hook_linux.cc
 @@ -10,20 +10,27 @@
  #include "base/path_service.h"
diff --git a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
index ff1a7382c3df..ce222611e103 100644
--- a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- printing/sandbox/print_backend_sandbox_hook_linux.h.orig	2023-10-21 11:51:27 UTC
+--- printing/sandbox/print_backend_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ printing/sandbox/print_backend_sandbox_hook_linux.h
 @@ -5,8 +5,13 @@
  #ifndef PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-remoting_base_chromoting__event.cc b/www/iridium/files/patch-remoting_base_chromoting__event.cc
index 61e16a336821..57048286fc15 100644
--- a/www/iridium/files/patch-remoting_base_chromoting__event.cc
+++ b/www/iridium/files/patch-remoting_base_chromoting__event.cc
@@ -1,4 +1,4 @@
---- remoting/base/chromoting_event.cc.orig	2025-03-18 16:46:04 UTC
+--- remoting/base/chromoting_event.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/base/chromoting_event.cc
 @@ -191,7 +191,7 @@ void ChromotingEvent::AddSystemInfo() {
    SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
diff --git a/www/iridium/files/patch-remoting_base_host__settings.cc b/www/iridium/files/patch-remoting_base_host__settings.cc
index 594d771d25bf..72a3e103c91b 100644
--- a/www/iridium/files/patch-remoting_base_host__settings.cc
+++ b/www/iridium/files/patch-remoting_base_host__settings.cc
@@ -1,4 +1,4 @@
---- remoting/base/host_settings.cc.orig	2022-03-28 18:11:04 UTC
+--- remoting/base/host_settings.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/base/host_settings.cc
 @@ -7,7 +7,7 @@
  #include "base/no_destructor.h"
diff --git a/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
index ea0adabbda94..d32adda37d50 100644
--- a/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
+++ b/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
@@ -1,4 +1,4 @@
---- remoting/codec/webrtc_video_encoder_vpx.cc.orig	2025-03-18 16:46:04 UTC
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/codec/webrtc_video_encoder_vpx.cc
 @@ -92,7 +92,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
                             const webrtc::DesktopSize& size) {
diff --git a/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc
index e78a7d9d2066..0c26dcf1c068 100644
--- a/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc
+++ b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc
@@ -1,6 +1,6 @@
---- remoting/host/base/desktop_environment_options.cc.orig	2024-11-04 08:56:03 UTC
+--- remoting/host/base/desktop_environment_options.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/base/desktop_environment_options.cc
-@@ -99,7 +99,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
+@@ -109,7 +109,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
    // TODO(joedow): Determine whether we can migrate additional platforms to
    // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then
    // clean up DesktopCapturerProxy::Core::CreateCapturer().
diff --git a/www/iridium/files/patch-remoting_host_base_switches.cc b/www/iridium/files/patch-remoting_host_base_switches.cc
index 39aac3aa0ef1..a7b337bac377 100644
--- a/www/iridium/files/patch-remoting_host_base_switches.cc
+++ b/www/iridium/files/patch-remoting_host_base_switches.cc
@@ -1,4 +1,4 @@
---- remoting/host/base/switches.cc.orig	2022-10-05 07:34:01 UTC
+--- remoting/host/base/switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/base/switches.cc
 @@ -23,13 +23,13 @@ const char kProcessTypeEvaluateCapability[] = "evaluat
  const char kProcessTypeFileChooser[] = "file_chooser";
diff --git a/www/iridium/files/patch-remoting_host_base_switches.h b/www/iridium/files/patch-remoting_host_base_switches.h
index b2abc0b8f72b..4205bba1835f 100644
--- a/www/iridium/files/patch-remoting_host_base_switches.h
+++ b/www/iridium/files/patch-remoting_host_base_switches.h
@@ -1,4 +1,4 @@
---- remoting/host/base/switches.h.orig	2022-10-05 07:34:01 UTC
+--- remoting/host/base/switches.h.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/base/switches.h
 @@ -35,13 +35,13 @@ extern const char kProcessTypeRdpDesktopSession[];
  extern const char kProcessTypeEvaluateCapability[];
diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.cc b/www/iridium/files/patch-remoting_host_chromoting__host.cc
index b5086b231605..4f85724fb7c9 100644
--- a/www/iridium/files/patch-remoting_host_chromoting__host.cc
+++ b/www/iridium/files/patch-remoting_host_chromoting__host.cc
@@ -1,6 +1,6 @@
---- remoting/host/chromoting_host.cc.orig	2025-02-22 18:06:53 UTC
+--- remoting/host/chromoting_host.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/chromoting_host.cc
-@@ -135,7 +135,7 @@ void ChromotingHost::Start(const std::string& host_own
+@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::string& host_own
        &ChromotingHost::OnIncomingSession, base::Unretained(this)));
  }
  
diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.h b/www/iridium/files/patch-remoting_host_chromoting__host.h
index 89c054366049..85529fb300c8 100644
--- a/www/iridium/files/patch-remoting_host_chromoting__host.h
+++ b/www/iridium/files/patch-remoting_host_chromoting__host.h
@@ -1,4 +1,4 @@
---- remoting/host/chromoting_host.h.orig	2025-02-22 18:06:53 UTC
+--- remoting/host/chromoting_host.h.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/chromoting_host.h
 @@ -36,7 +36,7 @@
  #include "remoting/protocol/session_manager.h"
@@ -18,7 +18,7 @@
    // Starts running the ChromotingHostServices server and listening for incoming
    // IPC binding requests.
    // Currently only Linux runs the ChromotingHostServices server on the host
-@@ -220,7 +220,7 @@ class ChromotingHost : public ClientSession::EventHand
+@@ -222,7 +222,7 @@ class ChromotingHost : public ClientSession::EventHand
    // List of host extensions.
    std::vector<std::unique_ptr<HostExtension>> extensions_;
  
diff --git a/www/iridium/files/patch-remoting_host_chromoting__host__context.cc b/www/iridium/files/patch-remoting_host_chromoting__host__context.cc
index 012a0007bf77..fef136f0a176 100644
--- a/www/iridium/files/patch-remoting_host_chromoting__host__context.cc
+++ b/www/iridium/files/patch-remoting_host_chromoting__host__context.cc
@@ -1,4 +1,4 @@
---- remoting/host/chromoting_host_context.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/chromoting_host_context.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/chromoting_host_context.cc
 @@ -335,7 +335,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC
    // on a UI thread.
diff --git a/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc
index 7200f90d05e4..3e8848fda974 100644
--- a/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc
+++ b/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc
@@ -1,4 +1,4 @@
---- remoting/host/chromoting_host_services_client.cc.orig	2023-10-21 11:51:27 UTC
+--- remoting/host/chromoting_host_services_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/chromoting_host_services_client.cc
 @@ -59,7 +59,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con
  
diff --git a/www/iridium/files/patch-remoting_host_client__session.cc b/www/iridium/files/patch-remoting_host_client__session.cc
index 40925c806b13..dab2b504767d 100644
--- a/www/iridium/files/patch-remoting_host_client__session.cc
+++ b/www/iridium/files/patch-remoting_host_client__session.cc
@@ -1,6 +1,6 @@
---- remoting/host/client_session.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/client_session.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/client_session.cc
-@@ -187,7 +187,7 @@ void ClientSession::NotifyClientResolution(
+@@ -188,7 +188,7 @@ void ClientSession::NotifyClientResolution(
    if (effective_policies_.curtain_required.value_or(false)) {
      dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
    }
diff --git a/www/iridium/files/patch-remoting_host_crash_crash__file__uploader.cc b/www/iridium/files/patch-remoting_host_crash_crash__file__uploader.cc
index 1328aefbdd89..b8897e06f6ab 100644
--- a/www/iridium/files/patch-remoting_host_crash_crash__file__uploader.cc
+++ b/www/iridium/files/patch-remoting_host_crash_crash__file__uploader.cc
@@ -1,4 +1,4 @@
---- remoting/host/crash/crash_file_uploader.cc.orig	2024-08-01 05:47:53 UTC
+--- remoting/host/crash/crash_file_uploader.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/crash/crash_file_uploader.cc
 @@ -44,7 +44,7 @@ constexpr char kMinidumpFileName[] = "dump";
  
diff --git a/www/iridium/files/patch-remoting_host_evaluate__capability.cc b/www/iridium/files/patch-remoting_host_evaluate__capability.cc
index 6de19755f73b..a1b0d65c4054 100644
--- a/www/iridium/files/patch-remoting_host_evaluate__capability.cc
+++ b/www/iridium/files/patch-remoting_host_evaluate__capability.cc
@@ -1,4 +1,4 @@
---- remoting/host/evaluate_capability.cc.orig	2024-06-25 12:08:48 UTC
+--- remoting/host/evaluate_capability.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/evaluate_capability.cc
 @@ -56,7 +56,7 @@ base::FilePath BuildHostBinaryPath() {
    }
diff --git a/www/iridium/files/patch-remoting_host_host__attributes.cc b/www/iridium/files/patch-remoting_host_host__attributes.cc
index ffddc137f5ac..674f01d6878a 100644
--- a/www/iridium/files/patch-remoting_host_host__attributes.cc
+++ b/www/iridium/files/patch-remoting_host_host__attributes.cc
@@ -1,6 +1,6 @@
---- remoting/host/host_attributes.cc.orig	2023-07-24 14:27:53 UTC
+--- remoting/host/host_attributes.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/host_attributes.cc
-@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
+@@ -103,7 +103,7 @@ std::string GetHostAttributes() {
    if (media::InitializeMediaFoundation()) {
      result.push_back("HWEncoder");
    }
diff --git a/www/iridium/files/patch-remoting_host_host__details.cc b/www/iridium/files/patch-remoting_host_host__details.cc
index 9497b0a35d89..19d2f60b0cd0 100644
--- a/www/iridium/files/patch-remoting_host_host__details.cc
+++ b/www/iridium/files/patch-remoting_host_host__details.cc
@@ -1,4 +1,4 @@
---- remoting/host/host_details.cc.orig	2025-03-18 16:46:04 UTC
+--- remoting/host/host_details.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/host_details.cc
 @@ -7,7 +7,7 @@
  #include "base/system/sys_info.h"
diff --git a/www/iridium/files/patch-remoting_host_host__main.cc b/www/iridium/files/patch-remoting_host_host__main.cc
index 4b07da56d3c7..6df540b34c86 100644
--- a/www/iridium/files/patch-remoting_host_host__main.cc
+++ b/www/iridium/files/patch-remoting_host_host__main.cc
@@ -1,4 +1,4 @@
---- remoting/host/host_main.cc.orig	2025-03-18 16:46:04 UTC
+--- remoting/host/host_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/host_main.cc
 @@ -55,7 +55,7 @@ int FileChooserMain();
  int RdpDesktopSessionMain();
diff --git a/www/iridium/files/patch-remoting_host_ipc__constants.cc b/www/iridium/files/patch-remoting_host_ipc__constants.cc
index 251fc367c693..39ea397a36f3 100644
--- a/www/iridium/files/patch-remoting_host_ipc__constants.cc
+++ b/www/iridium/files/patch-remoting_host_ipc__constants.cc
@@ -1,4 +1,4 @@
---- remoting/host/ipc_constants.cc.orig	2024-12-22 12:24:29 UTC
+--- remoting/host/ipc_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/ipc_constants.cc
 @@ -17,7 +17,7 @@ namespace remoting {
  
diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
index 3a6623ca36ec..f12e510786b4 100644
--- a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
+++ b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
@@ -1,4 +1,4 @@
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/it2me/it2me_native_messaging_host_main.cc
 @@ -30,7 +30,7 @@
  #include "remoting/host/resources.h"
diff --git a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
index 5e91ff16a9f1..f6d44722bb91 100644
--- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
+++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,4 +1,4 @@
---- remoting/host/me2me_desktop_environment.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/me2me_desktop_environment.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/me2me_desktop_environment.cc
 @@ -112,7 +112,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities()
      capabilities += protocol::kRemoteWebAuthnCapability;
diff --git a/www/iridium/files/patch-remoting_host_mojo__caller__security__checker.cc b/www/iridium/files/patch-remoting_host_mojo__caller__security__checker.cc
index 20b9dfbe4c8f..cbf73bca9c0f 100644
--- a/www/iridium/files/patch-remoting_host_mojo__caller__security__checker.cc
+++ b/www/iridium/files/patch-remoting_host_mojo__caller__security__checker.cc
@@ -1,4 +1,4 @@
---- remoting/host/mojo_caller_security_checker.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/mojo_caller_security_checker.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/mojo_caller_security_checker.cc
 @@ -37,7 +37,7 @@
  namespace remoting {
diff --git a/www/iridium/files/patch-remoting_host_policy__watcher.cc b/www/iridium/files/patch-remoting_host_policy__watcher.cc
index 485a83096ff3..f1954999c538 100644
--- a/www/iridium/files/patch-remoting_host_policy__watcher.cc
+++ b/www/iridium/files/patch-remoting_host_policy__watcher.cc
@@ -1,4 +1,4 @@
---- remoting/host/policy_watcher.cc.orig	2025-03-18 16:46:04 UTC
+--- remoting/host/policy_watcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/policy_watcher.cc
 @@ -177,7 +177,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() 
               true);
diff --git a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc
index 1294776e9954..49f80ced7afc 100644
--- a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc
+++ b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc
@@ -1,4 +1,4 @@
---- remoting/host/remote_open_url/remote_open_url_client.cc.orig	2022-10-05 07:34:01 UTC
+--- remoting/host/remote_open_url/remote_open_url_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/remote_open_url/remote_open_url_client.cc
 @@ -18,7 +18,7 @@
  #include "remoting/host/mojom/chromoting_host_services.mojom.h"
diff --git a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc
index bb324231f284..84d3fbe5ce60 100644
--- a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc
+++ b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc
@@ -1,4 +1,4 @@
---- remoting/host/remote_open_url/remote_open_url_util.cc.orig	2023-04-22 17:45:15 UTC
+--- remoting/host/remote_open_url/remote_open_url_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/remote_open_url/remote_open_url_util.cc
 @@ -29,7 +29,7 @@ const wchar_t kRegisteredApplicationsKeyName[] =
  #endif  // BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc b/www/iridium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
index 299928ec7940..d7f5ff47fd6f 100644
--- a/www/iridium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
+++ b/www/iridium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
@@ -1,4 +1,4 @@
---- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig	2022-03-28 18:11:04 UTC
+--- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/remote_open_url/url_forwarder_configurator.cc
 @@ -12,7 +12,7 @@ UrlForwarderConfigurator::UrlForwarderConfigurator() =
  
diff --git a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc
index e9e51388420a..f0d880ea1025 100644
--- a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc
+++ b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,4 +1,4 @@
---- remoting/host/remoting_me2me_host.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/remoting_me2me_host.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/remoting_me2me_host.cc
 @@ -138,7 +138,7 @@
  #include "remoting/host/mac/permission_utils.h"
@@ -36,7 +36,7 @@
  // The command line switch used to pass name of the pipe to capture audio on
  // linux.
  const char kAudioPipeSwitchName[] = "audio-pipe-name";
-@@ -440,7 +440,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -441,7 +441,7 @@ class HostProcess : public ConfigWatcher::Delegate,
    std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_;
  #endif
  
@@ -45,7 +45,7 @@
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -505,7 +505,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -506,7 +506,7 @@ class HostProcess : public ConfigWatcher::Delegate,
    std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_;
  
    std::unique_ptr<HostEventLogger> host_event_logger_;
@@ -54,7 +54,7 @@
    std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
  #endif
    std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -824,7 +824,7 @@ void HostProcess::StartOnNetworkThread() {
+@@ -825,7 +825,7 @@ void HostProcess::StartOnNetworkThread() {
  void HostProcess::ShutdownOnNetworkThread() {
    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
    config_watcher_.reset();
@@ -63,7 +63,7 @@
    cert_watcher_.reset();
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -901,7 +901,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -902,7 +902,7 @@ void HostProcess::CreateAuthenticatorFactory() {
              context_->create_client_cert_store_callback(),
              service_account_email_, oauth_refresh_token_));
  
@@ -72,7 +72,7 @@
      if (!cert_watcher_) {
        cert_watcher_ = std::make_unique<CertificateWatcher>(
            base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -1043,7 +1043,7 @@ void HostProcess::StartOnUiThread() {
+@@ -1044,7 +1044,7 @@ void HostProcess::StartOnUiThread() {
        base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
  
@@ -81,7 +81,7 @@
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name =
-@@ -1122,7 +1122,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1123,7 +1123,7 @@ void HostProcess::ShutdownOnUiThread() {
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -90,7 +90,7 @@
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1131,7 +1131,7 @@ void HostProcess::ShutdownOnUiThread() {
    AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -99,16 +99,16 @@
    context_->input_task_runner()->PostTask(
        FROM_HERE,
        base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
-@@ -1864,7 +1864,7 @@ void HostProcess::StartHost() {
+@@ -1873,7 +1873,7 @@ void HostProcess::StartHost() {
      corp_host_status_logger_->StartObserving(*session_manager);
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_);
+   desktop_environment_options_.set_enable_remote_webauthn(true);
  #endif
  #if BUILDFLAG(IS_WIN)
-@@ -1891,7 +1891,7 @@ void HostProcess::StartHost() {
+@@ -1900,7 +1900,7 @@ void HostProcess::StartHost() {
  
    host_->AddExtension(std::make_unique<TestEchoExtension>());
  
@@ -117,7 +117,7 @@
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->HasSwitch(kEnableUtempter)) {
      host_utmp_logger_ =
-@@ -1927,7 +1927,7 @@ void HostProcess::StartHost() {
+@@ -1936,7 +1936,7 @@ void HostProcess::StartHost() {
    // addresses.
    host_->Start(*host_owner_emails_.begin());
  
@@ -126,7 +126,7 @@
    // For Windows, ChromotingHostServices connections are handled by the daemon
    // process, then the message pipe is forwarded to the network process.
    host_->StartChromotingHostServices();
-@@ -2072,7 +2072,7 @@ int HostProcessMain() {
+@@ -2081,7 +2081,7 @@ int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
  
@@ -135,7 +135,7 @@
  #if defined(REMOTING_USE_X11)
    // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
    // use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -2135,7 +2135,7 @@ int HostProcessMain() {
+@@ -2144,7 +2144,7 @@ int HostProcessMain() {
    std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
        net::NetworkChangeNotifier::CreateIfNeeded());
  
diff --git a/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc b/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc
index b8b8a68e2dae..4447e45de248 100644
--- a/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc
+++ b/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc
@@ -1,11 +1,11 @@
---- remoting/host/session_policies_from_dict.cc.orig	2025-02-22 18:06:53 UTC
+--- remoting/host/session_policies_from_dict.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/session_policies_from_dict.cc
-@@ -76,7 +76,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict
-       .curtain_required =
-           dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain),
+@@ -75,7 +75,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict
+   session_policies.curtain_required =
+       dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain);
  #endif
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       .host_username_match_required =
-           dict.FindBool(policy::key::kRemoteAccessHostMatchUsername),
+   session_policies.host_username_match_required =
+       dict.FindBool(policy::key::kRemoteAccessHostMatchUsername);
  #endif
diff --git a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc
index 8846de08a004..9763ed5734f8 100644
--- a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc
+++ b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc
@@ -1,4 +1,4 @@
---- remoting/host/setup/start_host_main.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/setup/start_host_main.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/setup/start_host_main.cc
 @@ -45,7 +45,7 @@
  #include <unistd.h>
diff --git a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
index b3b07e2dc123..227dc422cb3b 100644
--- a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
+++ b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
@@ -1,4 +1,4 @@
---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig	2025-04-16 18:18:42 UTC
+--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
 @@ -10,7 +10,7 @@
  #include "base/strings/utf_string_conversions.h"
diff --git a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
index 9d4ffe8072c7..6fec4557ce39 100644
--- a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
+++ b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
@@ -1,4 +1,4 @@
---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig	2024-11-04 08:56:03 UTC
+--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc
 @@ -30,7 +30,7 @@
  #include "base/task/thread_pool.h"
diff --git a/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc
index 2d53dd6050b7..aaaac27f2f55 100644
--- a/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc
+++ b/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc
@@ -1,4 +1,4 @@
---- remoting/protocol/webrtc_video_stream.cc.orig	2025-03-18 16:46:04 UTC
+--- remoting/protocol/webrtc_video_stream.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/protocol/webrtc_video_stream.cc
 @@ -267,7 +267,7 @@ WebrtcVideoStream::WebrtcVideoStream(const SessionOpti
      : session_options_(session_options) {
diff --git a/www/iridium/files/patch-remoting_signaling_ftl__host__device__id__provider.cc b/www/iridium/files/patch-remoting_signaling_ftl__host__device__id__provider.cc
index c801c323d402..ab9e587cde00 100644
--- a/www/iridium/files/patch-remoting_signaling_ftl__host__device__id__provider.cc
+++ b/www/iridium/files/patch-remoting_signaling_ftl__host__device__id__provider.cc
@@ -1,4 +1,4 @@
---- remoting/signaling/ftl_host_device_id_provider.cc.orig	2025-03-18 16:46:04 UTC
+--- remoting/signaling/ftl_host_device_id_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ remoting/signaling/ftl_host_device_id_provider.cc
 @@ -16,7 +16,7 @@ constexpr char kDeviceIdPrefix[] = "crd-win-host-";
  constexpr char kDeviceIdPrefix[] = "crd-mac-host-";
diff --git a/www/iridium/files/patch-sandbox_BUILD.gn b/www/iridium/files/patch-sandbox_BUILD.gn
index f886ae7b3745..1ff9ef4bf85c 100644
--- a/www/iridium/files/patch-sandbox_BUILD.gn
+++ b/www/iridium/files/patch-sandbox_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/BUILD.gn.orig	2022-10-05 07:34:01 UTC
+--- sandbox/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/BUILD.gn
 @@ -49,7 +49,7 @@ group("sandbox") {
        "//sandbox/mac:system_services",
diff --git a/www/iridium/files/patch-sandbox_features.gni b/www/iridium/files/patch-sandbox_features.gni
index 1d0165058652..5c95dfcfbbe7 100644
--- a/www/iridium/files/patch-sandbox_features.gni
+++ b/www/iridium/files/patch-sandbox_features.gni
@@ -1,4 +1,4 @@
---- sandbox/features.gni.orig	2022-03-28 18:11:04 UTC
+--- sandbox/features.gni.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/features.gni
 @@ -6,7 +6,7 @@
  # currently.
diff --git a/www/iridium/files/patch-sandbox_linux_BUILD.gn b/www/iridium/files/patch-sandbox_linux_BUILD.gn
index 95cc365123a3..5c788285c6e6 100644
--- a/www/iridium/files/patch-sandbox_linux_BUILD.gn
+++ b/www/iridium/files/patch-sandbox_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/linux/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- sandbox/linux/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/linux/BUILD.gn
 @@ -12,11 +12,11 @@ if (is_android) {
  }
@@ -15,7 +15,7 @@
  
    # On Android, use plain GTest.
    use_base_test_suite = is_linux || is_chromeos
-@@ -378,6 +378,17 @@ component("sandbox_services") {
+@@ -369,6 +369,17 @@ component("sandbox_services") {
        "services/libc_interceptor.h",
      ]
    }
diff --git a/www/iridium/files/patch-sandbox_linux_services_init__process__reaper.cc b/www/iridium/files/patch-sandbox_linux_services_init__process__reaper.cc
index 6e485557b13f..700af7bafcab 100644
--- a/www/iridium/files/patch-sandbox_linux_services_init__process__reaper.cc
+++ b/www/iridium/files/patch-sandbox_linux_services_init__process__reaper.cc
@@ -1,4 +1,4 @@
---- sandbox/linux/services/init_process_reaper.cc.orig	2025-03-18 16:46:04 UTC
+--- sandbox/linux/services/init_process_reaper.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/linux/services/init_process_reaper.cc
 @@ -7,6 +7,7 @@
  #pragma allow_unsafe_libc_calls
diff --git a/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc
index d3f79b545f7b..4441596ed0a6 100644
--- a/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc
+++ b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc
@@ -1,4 +1,4 @@
---- sandbox/linux/services/libc_interceptor.cc.orig	2024-08-27 06:28:16 UTC
+--- sandbox/linux/services/libc_interceptor.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/linux/services/libc_interceptor.cc
 @@ -17,7 +17,9 @@
  #include <stddef.h>
diff --git a/www/iridium/files/patch-sandbox_policy_BUILD.gn b/www/iridium/files/patch-sandbox_policy_BUILD.gn
index e36d6c032121..025590621e1e 100644
--- a/www/iridium/files/patch-sandbox_policy_BUILD.gn
+++ b/www/iridium/files/patch-sandbox_policy_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/policy/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- sandbox/policy/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/BUILD.gn
 @@ -43,7 +43,7 @@ component("policy") {
        "//third_party/jni_zero",
diff --git a/www/iridium/files/patch-sandbox_policy_features.cc b/www/iridium/files/patch-sandbox_policy_features.cc
index 67a23e793459..3f9df4021829 100644
--- a/www/iridium/files/patch-sandbox_policy_features.cc
+++ b/www/iridium/files/patch-sandbox_policy_features.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/features.cc.orig	2025-04-16 18:18:42 UTC
+--- sandbox/policy/features.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/features.cc
 @@ -19,7 +19,11 @@ namespace sandbox::policy::features {
  // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
diff --git a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
index 1451b70be4be..43398493336b 100644
--- a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
+++ b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig	2024-12-22 12:24:29 UTC
+--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/freebsd/sandbox_freebsd.cc
 @@ -0,0 +1,211 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h
index f09780ee15fc..349dd78ea0b1 100644
--- a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h
+++ b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h
@@ -1,4 +1,4 @@
---- sandbox/policy/freebsd/sandbox_freebsd.h.orig	2024-12-22 12:24:29 UTC
+--- sandbox/policy/freebsd/sandbox_freebsd.h.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/freebsd/sandbox_freebsd.h
 @@ -0,0 +1,276 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom
index 4a15cc7da96d..297401c4fd12 100644
--- a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom
+++ b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom
@@ -1,4 +1,4 @@
---- sandbox/policy/mojom/sandbox.mojom.orig	2025-02-22 18:06:53 UTC
+--- sandbox/policy/mojom/sandbox.mojom.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/mojom/sandbox.mojom
 @@ -74,6 +74,12 @@ enum Sandbox {
    // Minimally privileged sandbox on Fuchsia.
diff --git a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
index e5552f938915..1ecdd0414294 100644
--- a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
+++ b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2024-12-22 12:24:29 UTC
+--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/openbsd/sandbox_openbsd.cc
 @@ -0,0 +1,392 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h
index 41b17652ae7e..e0cb48db622d 100644
--- a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h
+++ b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h
@@ -1,4 +1,4 @@
---- sandbox/policy/openbsd/sandbox_openbsd.h.orig	2024-12-22 12:24:29 UTC
+--- sandbox/policy/openbsd/sandbox_openbsd.h.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/openbsd/sandbox_openbsd.h
 @@ -0,0 +1,280 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-sandbox_policy_sandbox.cc b/www/iridium/files/patch-sandbox_policy_sandbox.cc
index 47a589fb1847..42c6cbb2fa1f 100644
--- a/www/iridium/files/patch-sandbox_policy_sandbox.cc
+++ b/www/iridium/files/patch-sandbox_policy_sandbox.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/sandbox.cc.orig	2024-06-25 12:08:48 UTC
+--- sandbox/policy/sandbox.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/sandbox.cc
 @@ -18,6 +18,10 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
diff --git a/www/iridium/files/patch-sandbox_policy_sandbox.h b/www/iridium/files/patch-sandbox_policy_sandbox.h
index de22b8126668..11d9055e7fca 100644
--- a/www/iridium/files/patch-sandbox_policy_sandbox.h
+++ b/www/iridium/files/patch-sandbox_policy_sandbox.h
@@ -1,4 +1,4 @@
---- sandbox/policy/sandbox.h.orig	2023-07-24 14:27:53 UTC
+--- sandbox/policy/sandbox.h.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/sandbox.h
 @@ -12,6 +12,12 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
diff --git a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc
index 425b68fc5f64..ae48a1c12bad 100644
--- a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc
+++ b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/sandbox_type.cc.orig	2025-04-16 18:18:42 UTC
+--- sandbox/policy/sandbox_type.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/sandbox_type.cc
 @@ -38,7 +38,7 @@ constexpr char kPpapiSandbox[] = "ppapi";
  #endif
diff --git a/www/iridium/files/patch-sandbox_policy_switches.cc b/www/iridium/files/patch-sandbox_policy_switches.cc
index d0fa60a06990..f5a8a39b7583 100644
--- a/www/iridium/files/patch-sandbox_policy_switches.cc
+++ b/www/iridium/files/patch-sandbox_policy_switches.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/switches.cc.orig	2025-04-16 18:18:42 UTC
+--- sandbox/policy/switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/switches.cc
 @@ -37,7 +37,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
  // Meant to be used as a browser-level switch for testing purposes only.
diff --git a/www/iridium/files/patch-sandbox_policy_switches.h b/www/iridium/files/patch-sandbox_policy_switches.h
index 0567f40662a7..1e01d143a074 100644
--- a/www/iridium/files/patch-sandbox_policy_switches.h
+++ b/www/iridium/files/patch-sandbox_policy_switches.h
@@ -1,4 +1,4 @@
---- sandbox/policy/switches.h.orig	2025-02-22 18:06:53 UTC
+--- sandbox/policy/switches.h.orig	2025-05-07 06:48:23 UTC
 +++ sandbox/policy/switches.h
 @@ -23,7 +23,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
diff --git a/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc
index 5704d570b6e0..d8a53e16c43c 100644
--- a/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- services/audio/audio_sandbox_hook_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- services/audio/audio_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/audio/audio_sandbox_hook_linux.cc
 @@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions(
  }
diff --git a/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h
index 0115be943d49..3e86964b41f9 100644
--- a/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- services/audio/audio_sandbox_hook_linux.h.orig	2023-10-21 11:51:27 UTC
+--- services/audio/audio_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ services/audio/audio_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-services_device_BUILD.gn b/www/iridium/files/patch-services_device_BUILD.gn
index 8d979b060050..be05421eae95 100644
--- a/www/iridium/files/patch-services_device_BUILD.gn
+++ b/www/iridium/files/patch-services_device_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- services/device/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/device/BUILD.gn
 @@ -13,7 +13,7 @@ if (is_android) {
  }
diff --git a/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc
index f782d75d6c67..55c514bcb5fe 100644
--- a/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc
+++ b/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc
@@ -1,8 +1,8 @@
---- services/device/geolocation/location_provider_manager.cc.orig	2025-02-22 18:06:53 UTC
+--- services/device/geolocation/location_provider_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/geolocation/location_provider_manager.cc
 @@ -91,7 +91,7 @@ LocationProviderManager::LocationProviderManager(
- #if BUILDFLAG(IS_ANDROID)
-   // On Android, default to using the platform location provider.
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+   // On Android and iOS, default to using the platform location provider.
    provider_manager_mode_ = kPlatformOnly;
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/iridium/files/patch-services_device_hid_BUILD.gn b/www/iridium/files/patch-services_device_hid_BUILD.gn
index f33cf0416e0c..4059213b7c4b 100644
--- a/www/iridium/files/patch-services_device_hid_BUILD.gn
+++ b/www/iridium/files/patch-services_device_hid_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/hid/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- services/device/hid/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/BUILD.gn
 @@ -34,7 +34,26 @@ source_set("hid") {
      "//services/device/public/mojom",
diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc
index db2fcb8158f2..d4ed45556fbf 100644
--- a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc
+++ b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_connection_fido.cc.orig	2024-06-25 12:08:48 UTC
+--- services/device/hid/hid_connection_fido.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_connection_fido.cc
 @@ -0,0 +1,216 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__fido.h b/www/iridium/files/patch-services_device_hid_hid__connection__fido.h
index eac5f5d783fc..6a46f5ee92e7 100644
--- a/www/iridium/files/patch-services_device_hid_hid__connection__fido.h
+++ b/www/iridium/files/patch-services_device_hid_hid__connection__fido.h
@@ -1,4 +1,4 @@
---- services/device/hid/hid_connection_fido.h.orig	2022-12-01 10:35:46 UTC
+--- services/device/hid/hid_connection_fido.h.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_connection_fido.h
 @@ -0,0 +1,60 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
index abfbe8e8a568..aa6a28cf61d1 100644
--- a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
+++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_connection_freebsd.cc.orig	2025-02-22 18:06:53 UTC
+--- services/device/hid/hid_connection_freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_connection_freebsd.cc
 @@ -0,0 +1,240 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
index 0931e040f30d..f8835a646b51 100644
--- a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
+++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
@@ -1,4 +1,4 @@
---- services/device/hid/hid_connection_freebsd.h.orig	2022-03-28 18:11:04 UTC
+--- services/device/hid/hid_connection_freebsd.h.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_connection_freebsd.h
 @@ -0,0 +1,67 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-services_device_hid_hid__service.cc b/www/iridium/files/patch-services_device_hid_hid__service.cc
index 17926cdf79f6..5b04ddb9c1c5 100644
--- a/www/iridium/files/patch-services_device_hid_hid__service.cc
+++ b/www/iridium/files/patch-services_device_hid_hid__service.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_service.cc.orig	2022-12-06 08:09:13 UTC
+--- services/device/hid/hid_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_service.cc
 @@ -20,6 +20,10 @@
  
diff --git a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc
index af1e4faee15f..7b519c7d2df6 100644
--- a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc
+++ b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_service_fido.cc.orig	2023-03-13 07:33:08 UTC
+--- services/device/hid/hid_service_fido.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_service_fido.cc
 @@ -0,0 +1,396 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/www/iridium/files/patch-services_device_hid_hid__service__fido.h b/www/iridium/files/patch-services_device_hid_hid__service__fido.h
index ee68895e6d64..0319556c27cb 100644
--- a/www/iridium/files/patch-services_device_hid_hid__service__fido.h
+++ b/www/iridium/files/patch-services_device_hid_hid__service__fido.h
@@ -1,4 +1,4 @@
---- services/device/hid/hid_service_fido.h.orig	2022-12-01 10:35:46 UTC
+--- services/device/hid/hid_service_fido.h.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_service_fido.h
 @@ -0,0 +1,65 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
index fc975361c1fb..1621185e3a7e 100644
--- a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
+++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_service_freebsd.cc.orig	2025-02-22 18:06:53 UTC
+--- services/device/hid/hid_service_freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_service_freebsd.cc
 @@ -0,0 +1,395 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h
index 9adf3ae8dab1..36dd492a4948 100644
--- a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h
+++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h
@@ -1,4 +1,4 @@
---- services/device/hid/hid_service_freebsd.h.orig	2022-03-28 18:11:04 UTC
+--- services/device/hid/hid_service_freebsd.h.orig	2025-05-07 06:48:23 UTC
 +++ services/device/hid/hid_service_freebsd.h
 @@ -0,0 +1,49 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-services_device_public_cpp_device__features.cc b/www/iridium/files/patch-services_device_public_cpp_device__features.cc
index 718c7c1d84ef..6e24d8dab855 100644
--- a/www/iridium/files/patch-services_device_public_cpp_device__features.cc
+++ b/www/iridium/files/patch-services_device_public_cpp_device__features.cc
@@ -1,6 +1,6 @@
---- services/device/public/cpp/device_features.cc.orig	2025-04-16 18:18:42 UTC
+--- services/device/public/cpp/device_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/public/cpp/device_features.cc
-@@ -120,7 +120,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
+@@ -135,7 +135,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
  
  // Controls whether Chrome will try to automatically detach kernel drivers when
  // a USB interface is busy.
diff --git a/www/iridium/files/patch-services_device_public_cpp_device__features.h b/www/iridium/files/patch-services_device_public_cpp_device__features.h
index 86663bc0e399..a54693d4a948 100644
--- a/www/iridium/files/patch-services_device_public_cpp_device__features.h
+++ b/www/iridium/files/patch-services_device_public_cpp_device__features.h
@@ -1,4 +1,4 @@
---- services/device/public/cpp/device_features.h.orig	2025-04-16 18:18:42 UTC
+--- services/device/public/cpp/device_features.h.orig	2025-05-07 06:48:23 UTC
 +++ services/device/public/cpp/device_features.h
 @@ -53,7 +53,7 @@ extern const DEVICE_FEATURES_EXPORT
  
diff --git a/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h b/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
index 87f0fc5ece45..f4b585b8ef0f 100644
--- a/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
+++ b/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
@@ -1,4 +1,4 @@
---- services/device/public/cpp/generic_sensor/sensor_reading.h.orig	2024-06-25 12:08:48 UTC
+--- services/device/public/cpp/generic_sensor/sensor_reading.h.orig	2025-05-07 06:48:23 UTC
 +++ services/device/public/cpp/generic_sensor/sensor_reading.h
 @@ -8,6 +8,8 @@
  #include <stddef.h>
diff --git a/www/iridium/files/patch-services_device_public_mojom_BUILD.gn b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn
index 470c8cec39e9..268ba7bf145b 100644
--- a/www/iridium/files/patch-services_device_public_mojom_BUILD.gn
+++ b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/public/mojom/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- services/device/public/mojom/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/device/public/mojom/BUILD.gn
 @@ -96,7 +96,7 @@ mojom("device_service") {
    enable_js_fuzzing = false
diff --git a/www/iridium/files/patch-services_device_serial_BUILD.gn b/www/iridium/files/patch-services_device_serial_BUILD.gn
index 8f9f7f7d7e56..75f71cea5f53 100644
--- a/www/iridium/files/patch-services_device_serial_BUILD.gn
+++ b/www/iridium/files/patch-services_device_serial_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/serial/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- services/device/serial/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/device/serial/BUILD.gn
 @@ -4,7 +4,7 @@
  
diff --git a/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc
index cf2038b961d3..65090c949ccc 100644
--- a/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc
+++ b/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc
@@ -1,4 +1,4 @@
---- services/device/serial/serial_device_enumerator.cc.orig	2025-04-16 18:18:42 UTC
+--- services/device/serial/serial_device_enumerator.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/serial/serial_device_enumerator.cc
 @@ -13,7 +13,7 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc
index 7a74ca30774d..ad1f687b4fe9 100644
--- a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc
+++ b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc
@@ -1,4 +1,4 @@
---- services/device/serial/serial_io_handler_posix.cc.orig	2024-08-27 06:28:16 UTC
+--- services/device/serial/serial_io_handler_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/serial/serial_io_handler_posix.cc
 @@ -73,7 +73,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
      BITRATE_TO_SPEED_CASE(9600)
diff --git a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
index ecf32a106c28..af1ebf10b267 100644
--- a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -1,4 +1,4 @@
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2025-03-18 16:46:04 UTC
+--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
 @@ -131,9 +131,12 @@ class TimeZoneMonitorLinuxImpl
      // false positives are harmless, assuming the false positive rate is
diff --git a/www/iridium/files/patch-services_device_usb_BUILD.gn b/www/iridium/files/patch-services_device_usb_BUILD.gn
index cabd9ddbee94..14505f455761 100644
--- a/www/iridium/files/patch-services_device_usb_BUILD.gn
+++ b/www/iridium/files/patch-services_device_usb_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/usb/BUILD.gn.orig	2025-03-18 16:46:04 UTC
+--- services/device/usb/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/device/usb/BUILD.gn
 @@ -90,7 +90,7 @@ static_library("usb") {
      deps += [ "//third_party/re2" ]
diff --git a/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.cc b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.cc
new file mode 100644
index 000000000000..3e49a5d0c62b
--- /dev/null
+++ b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.cc
@@ -0,0 +1,38 @@
+--- services/device/usb/usb_device_handle_usbfs.cc.orig	2025-05-07 06:48:23 UTC
++++ services/device/usb/usb_device_handle_usbfs.cc
+@@ -39,7 +39,7 @@
+ #include "chromeos/dbus/permission_broker/permission_broker_client.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/device/public/cpp/device_features.h"
+ #include "services/device/usb/usb_interface_detach_allowlist.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::R
+   return true;
+ }
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface(
+     int interface_number,
+     const CombinedInterfaceInfo& interface_info) {
+@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterface(int interfac
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     const mojom::UsbConfigurationInfo* config =
+         device_->GetActiveConfiguration();
+@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     helper_.AsyncCall(&BlockingTaskRunnerHelper::ReattachInterface)
+         .WithArgs(interface_number)
diff --git a/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.h b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.h
new file mode 100644
index 000000000000..b55e5874fd60
--- /dev/null
+++ b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.h
@@ -0,0 +1,38 @@
+--- services/device/usb/usb_device_handle_usbfs.h.orig	2025-05-07 06:48:23 UTC
++++ services/device/usb/usb_device_handle_usbfs.h
+@@ -19,7 +19,7 @@
+ #include "base/threading/sequence_bound.h"
+ #include "services/device/usb/usb_device_handle.h"
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/containers/flat_set.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+ 
+@@ -215,7 +215,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   bool ClearHalt(uint8_t endpoint_address);
+   void DiscardUrb(Transfer* transfer);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Detach the interface from a kernel driver before ClaimInterface
+   virtual bool DetachInterface(int interface_number,
+                                const CombinedInterfaceInfo& interfaceInfo);
+@@ -228,7 +228,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   // Called when |fd_| is writable without blocking.
+   void OnFileCanWriteWithoutBlocking();
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Called from |DetachInterface|.
+   std::string GetKernelDriver(int interface_number) const;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -240,7 +240,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   std::unique_ptr<base::FileDescriptorWatcher::Controller> watch_controller_;
+   SEQUENCE_CHECKER(sequence_checker_);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // All interfaces that have been detached from kernel drivers
+   base::flat_set<int> detached_interfaces_;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-services_device_usb_usb__service.cc b/www/iridium/files/patch-services_device_usb_usb__service.cc
index eed71f99bba0..73e3d153aa1d 100644
--- a/www/iridium/files/patch-services_device_usb_usb__service.cc
+++ b/www/iridium/files/patch-services_device_usb_usb__service.cc
@@ -1,4 +1,4 @@
---- services/device/usb/usb_service.cc.orig	2024-08-27 06:28:16 UTC
+--- services/device/usb/usb_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/usb/usb_service.cc
 @@ -21,12 +21,16 @@
  
diff --git a/www/iridium/files/patch-services_device_usb_usb__service__fake.cc b/www/iridium/files/patch-services_device_usb_usb__service__fake.cc
index 603a48247cc7..c04522d60e41 100644
--- a/www/iridium/files/patch-services_device_usb_usb__service__fake.cc
+++ b/www/iridium/files/patch-services_device_usb_usb__service__fake.cc
@@ -1,4 +1,4 @@
---- services/device/usb/usb_service_fake.cc.orig	2023-03-13 07:33:08 UTC
+--- services/device/usb/usb_service_fake.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/device/usb/usb_service_fake.cc
 @@ -0,0 +1,49 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/www/iridium/files/patch-services_device_usb_usb__service__fake.h b/www/iridium/files/patch-services_device_usb_usb__service__fake.h
index 334342219d97..0a5c9739abff 100644
--- a/www/iridium/files/patch-services_device_usb_usb__service__fake.h
+++ b/www/iridium/files/patch-services_device_usb_usb__service__fake.h
@@ -1,4 +1,4 @@
---- services/device/usb/usb_service_fake.h.orig	2022-12-01 10:35:46 UTC
+--- services/device/usb/usb_service_fake.h.orig	2025-05-07 06:48:23 UTC
 +++ services/device/usb/usb_service_fake.h
 @@ -0,0 +1,48 @@
 +// Copyright 2015 The Chromium Authors
diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn
index 42874ef9a046..ce4055c4f766 100644
--- a/www/iridium/files/patch-services_network_BUILD.gn
+++ b/www/iridium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- services/network/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/network/BUILD.gn
-@@ -397,7 +397,6 @@ if (is_linux || is_chromeos) {
+@@ -400,7 +400,6 @@ if (is_linux || is_chromeos) {
      ]
      deps = [
        "//base:base",
diff --git a/www/iridium/files/patch-services_network_network__context.cc b/www/iridium/files/patch-services_network_network__context.cc
index 6453d31d353b..98960645ba48 100644
--- a/www/iridium/files/patch-services_network_network__context.cc
+++ b/www/iridium/files/patch-services_network_network__context.cc
@@ -1,6 +1,6 @@
---- services/network/network_context.cc.orig	2025-04-16 18:18:42 UTC
+--- services/network/network_context.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/network/network_context.cc
-@@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
+@@ -607,7 +607,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
  NetworkContext::NetworkContextHttpAuthPreferences::
      ~NetworkContextHttpAuthPreferences() = default;
  
@@ -9,7 +9,7 @@
  bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
      const {
    if (network_service_) {
-@@ -2552,7 +2552,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
+@@ -2557,7 +2557,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
        http_auth_dynamic_network_service_params->android_negotiate_account_type);
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/www/iridium/files/patch-services_network_network__context.h b/www/iridium/files/patch-services_network_network__context.h
index 09fc7b75bea0..23b7fe21aec4 100644
--- a/www/iridium/files/patch-services_network_network__context.h
+++ b/www/iridium/files/patch-services_network_network__context.h
@@ -1,6 +1,6 @@
---- services/network/network_context.h.orig	2025-04-16 18:18:42 UTC
+--- services/network/network_context.h.orig	2025-05-07 06:48:23 UTC
 +++ services/network/network_context.h
-@@ -709,7 +709,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -715,7 +715,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
     public:
      explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
      ~NetworkContextHttpAuthPreferences() override;
diff --git a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc
index 2b5817d4d448..0b80905121cf 100644
--- a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- services/network/network_sandbox_hook_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- services/network/network_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/network/network_sandbox_hook_linux.cc
 @@ -15,11 +15,14 @@
  #include "sandbox/linux/syscall_broker/broker_file_permission.h"
diff --git a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h
index 11bc86da4291..597cd9f34b23 100644
--- a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- services/network/network_sandbox_hook_linux.h.orig	2023-07-24 14:27:53 UTC
+--- services/network/network_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ services/network/network_sandbox_hook_linux.h
 @@ -6,7 +6,11 @@
  #define SERVICES_NETWORK_NETWORK_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc
index 34a1dec4c4bd..e4f05509069d 100644
--- a/www/iridium/files/patch-services_network_network__service.cc
+++ b/www/iridium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig	2025-04-16 18:18:42 UTC
+--- services/network/network_service.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/network/network_service.cc
-@@ -102,11 +102,11 @@
+@@ -103,11 +103,11 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
@@ -14,7 +14,7 @@
  #include "services/network/network_change_notifier_passive_factory.h"
  #endif
  
-@@ -999,7 +999,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
+@@ -1016,7 +1016,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
    net::SetExplicitlyAllowedPorts(ports);
  }
  
@@ -23,7 +23,7 @@
  void NetworkService::SetGssapiLibraryLoadObserver(
      mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
          gssapi_library_load_observer) {
-@@ -1081,7 +1081,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
+@@ -1116,7 +1116,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
    );
  }
  
diff --git a/www/iridium/files/patch-services_network_network__service.h b/www/iridium/files/patch-services_network_network__service.h
index 73f6548ce1b3..983a7a0d33fa 100644
--- a/www/iridium/files/patch-services_network_network__service.h
+++ b/www/iridium/files/patch-services_network_network__service.h
@@ -1,6 +1,6 @@
---- services/network/network_service.h.orig	2025-04-16 18:18:42 UTC
+--- services/network/network_service.h.orig	2025-05-07 06:48:23 UTC
 +++ services/network/network_service.h
-@@ -249,7 +249,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -250,7 +250,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
        const std::vector<ContentSettingPatternSource>& settings) override;
  
    void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
@@ -9,7 +9,7 @@
    void SetGssapiLibraryLoadObserver(
        mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
            gssapi_library_load_observer) override;
-@@ -275,7 +275,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -291,7 +291,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
        NetworkContext* network_context);
  
@@ -18,7 +18,7 @@
    // This is called just before a GSSAPI library may be loaded.
    void OnBeforeGssapiLibraryLoad();
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -531,7 +531,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -547,7 +547,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    // leaking stale listeners between tests.
    std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
  
diff --git a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn
index dc01075f7b6a..0386c6b7c175 100644
--- a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn
+++ b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/cpp/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- services/network/public/cpp/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/network/public/cpp/BUILD.gn
-@@ -570,7 +570,7 @@ component("cpp_base") {
+@@ -621,7 +621,7 @@ component("cpp_base") {
      sources += [ "transferable_directory_fuchsia.cc" ]
    }
  
diff --git a/www/iridium/files/patch-services_network_public_cpp_features.cc b/www/iridium/files/patch-services_network_public_cpp_features.cc
index 7176085117c8..6a5d0fd08215 100644
--- a/www/iridium/files/patch-services_network_public_cpp_features.cc
+++ b/www/iridium/files/patch-services_network_public_cpp_features.cc
@@ -1,4 +1,4 @@
---- services/network/public/cpp/features.cc.orig	2025-02-22 18:06:53 UTC
+--- services/network/public/cpp/features.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/network/public/cpp/features.cc
 @@ -125,7 +125,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey,
  BASE_FEATURE(kDnsOverHttpsUpgrade,
diff --git a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn
index 639f79cf1915..f1aef0de829c 100644
--- a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn
+++ b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/mojom/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- services/network/public/mojom/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/network/public/mojom/BUILD.gn
-@@ -600,11 +600,11 @@ mojom("url_loader_base") {
+@@ -674,11 +674,11 @@ mojom("url_loader_base") {
    }
  
    enabled_features = []
@@ -14,7 +14,7 @@
      # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
      # not include lacros.
      enabled_features += [ "use_network_interface_change_listener" ]
-@@ -1672,7 +1672,7 @@ mojom("mojom") {
+@@ -1765,7 +1765,7 @@ mojom("mojom") {
      }
    }
  
diff --git a/www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
index 8956086da8bb..dbb111eed6f4 100644
--- a/www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
+++ b/www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
@@ -1,4 +1,4 @@
---- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig	2023-08-28 20:17:35 UTC
+--- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig	2025-05-07 06:48:23 UTC
 +++ services/network/shared_dictionary/shared_dictionary_writer_in_memory.h
 @@ -9,6 +9,8 @@
  #include <string>
diff --git a/www/iridium/files/patch-services_on__device__model_on__device__model__service.h b/www/iridium/files/patch-services_on__device__model_on__device__model__service.h
index 636293a8fbb4..8debc3b7a12d 100644
--- a/www/iridium/files/patch-services_on__device__model_on__device__model__service.h
+++ b/www/iridium/files/patch-services_on__device__model_on__device__model__service.h
@@ -1,4 +1,4 @@
---- services/on_device_model/on_device_model_service.h.orig	2024-12-22 12:24:29 UTC
+--- services/on_device_model/on_device_model_service.h.orig	2025-05-07 06:48:23 UTC
 +++ services/on_device_model/on_device_model_service.h
 @@ -31,6 +31,10 @@ class OnDeviceModelInternalImpl;
  class TsHolder;
diff --git a/www/iridium/files/patch-services_on__device__model_pre__sandbox__init.cc b/www/iridium/files/patch-services_on__device__model_pre__sandbox__init.cc
index c3800133d196..d43d6d37cc8f 100644
--- a/www/iridium/files/patch-services_on__device__model_pre__sandbox__init.cc
+++ b/www/iridium/files/patch-services_on__device__model_pre__sandbox__init.cc
@@ -1,4 +1,4 @@
---- services/on_device_model/pre_sandbox_init.cc.orig	2025-02-22 18:06:53 UTC
+--- services/on_device_model/pre_sandbox_init.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/on_device_model/pre_sandbox_init.cc
 @@ -14,7 +14,7 @@
  #include "services/on_device_model/ml/chrome_ml.h"  // nogncheck
diff --git a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
index 976977158b7d..405685d6170f 100644
--- a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
@@ -1,4 +1,4 @@
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-03-18 16:46:04 UTC
+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
 @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
                                       uint32_t shared_resident_kb) {
@@ -18,7 +18,7 @@
    os_dump->private_footprint_swap_kb =
        internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
    os_dump->mappings_count = internal_os_dump.mappings_count;
-@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // On most platforms each process can dump data about their own process
  // so ask each process to do so Linux is special see below.
@@ -27,7 +27,7 @@
      request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
      client->RequestOSMemoryDump(request->memory_map_option(),
                                  {base::kNullProcessId},
-@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // In some cases, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -36,7 +36,7 @@
    std::vector<base::ProcessId> pids;
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
+@@ -283,7 +283,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
      const OsCallback& os_callback) {
  // On Linux, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -45,7 +45,7 @@
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = 0;
    for (const auto& client_info : clients) {
-@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
+@@ -333,7 +333,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
      // each client process provides 1 OS dump, % the case where the client is
      // disconnected mid dump.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
@@ -54,7 +54,7 @@
      for (auto& kv : extra_os_dumps) {
        auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
        DCHECK(results.find(pid) == results.end());
-@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
+@@ -394,7 +394,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
      // crash). In the latter case (OS_LINUX) we expect the full map to come
      // from the browser process response.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
diff --git a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
index d2376e0a0e23..4988e1a00d66 100644
--- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
+++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
@@ -1,4 +1,4 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn
 @@ -27,8 +27,12 @@ component("memory_instrumentation") {
      sources += [ "os_metrics_win.cc" ]
diff --git a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
index d336db67f4ac..a78c6c3a2000 100644
--- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
+++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
@@ -1,4 +1,4 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2025-02-22 18:06:53 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2025-05-07 06:48:23 UTC
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
 @@ -57,7 +57,7 @@ class COMPONENT_EXPORT(
    static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(
diff --git a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
index 84f610ff8871..cfcd3b80cbcc 100644
--- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
+++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
@@ -1,4 +1,4 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig	2022-03-28 18:11:04 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc
 @@ -0,0 +1,58 @@
 +// Copyright 2022 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-services_screen__ai_public_cpp_utilities.cc b/www/iridium/files/patch-services_screen__ai_public_cpp_utilities.cc
index 8056fe9a177e..7ba44827760a 100644
--- a/www/iridium/files/patch-services_screen__ai_public_cpp_utilities.cc
+++ b/www/iridium/files/patch-services_screen__ai_public_cpp_utilities.cc
@@ -1,4 +1,4 @@
---- services/screen_ai/public/cpp/utilities.cc.orig	2024-08-27 06:28:16 UTC
+--- services/screen_ai/public/cpp/utilities.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/screen_ai/public/cpp/utilities.cc
 @@ -18,7 +18,7 @@ namespace screen_ai {
  
diff --git a/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
index b51e41b8e28c..194c0f8dfd4d 100644
--- a/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig	2025-03-18 16:46:04 UTC
+--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
 @@ -58,6 +58,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path
      }
diff --git a/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
index 8859ba1b82a9..429079309647 100644
--- a/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig	2024-06-25 12:08:48 UTC
+--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
 @@ -6,7 +6,13 @@
  #define SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-services_service__manager_BUILD.gn b/www/iridium/files/patch-services_service__manager_BUILD.gn
index 2246d012d7da..1db147769783 100644
--- a/www/iridium/files/patch-services_service__manager_BUILD.gn
+++ b/www/iridium/files/patch-services_service__manager_BUILD.gn
@@ -1,4 +1,4 @@
---- services/service_manager/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- services/service_manager/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/service_manager/BUILD.gn
 @@ -65,7 +65,7 @@ source_set("service_manager") {
      ]
diff --git a/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn b/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
index c74e2b98edd5..9db4e62fa2a8 100644
--- a/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
+++ b/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
@@ -1,4 +1,4 @@
---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2022-03-28 18:11:04 UTC
+--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/service_manager/public/cpp/service_executable/BUILD.gn
 @@ -22,7 +22,7 @@ source_set("support") {
      "//services/service_manager/public/mojom",
diff --git a/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
index f52f344129da..351c201c23e2 100644
--- a/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
+++ b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
@@ -1,4 +1,4 @@
---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2024-06-25 12:08:48 UTC
+--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
 @@ -38,7 +38,7 @@
  #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h"
diff --git a/www/iridium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc b/www/iridium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc
index d5d8d4ed31a0..9753652e9f20 100644
--- a/www/iridium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc
+++ b/www/iridium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc
@@ -1,4 +1,4 @@
---- services/tracing/public/cpp/system_metrics_sampler.cc.orig	2025-02-22 18:06:53 UTC
+--- services/tracing/public/cpp/system_metrics_sampler.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/tracing/public/cpp/system_metrics_sampler.cc
 @@ -176,8 +176,8 @@ void SystemMetricsSampler::ProcessSampler::SampleProce
      TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"),
diff --git a/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom b/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom
index 939b812b255b..bd4c807d964c 100644
--- a/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom
+++ b/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom
@@ -1,4 +1,4 @@
---- services/video_capture/public/mojom/video_capture_service.mojom.orig	2023-03-13 07:33:08 UTC
+--- services/video_capture/public/mojom/video_capture_service.mojom.orig	2025-05-07 06:48:23 UTC
 +++ services/video_capture/public/mojom/video_capture_service.mojom
 @@ -25,10 +25,10 @@ interface AcceleratorFactory {
        pending_receiver<chromeos_camera.mojom.MjpegDecodeAccelerator> jda);
diff --git a/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc b/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
index badd84543fba..96c557b420ca 100644
--- a/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- services/video_effects/video_effects_sandbox_hook_linux.cc.orig	2025-02-22 18:06:53 UTC
+--- services/video_effects/video_effects_sandbox_hook_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ services/video_effects/video_effects_sandbox_hook_linux.cc
 @@ -6,7 +6,13 @@
  
diff --git a/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.h b/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.h
index fb1fb9ec6135..3c90df573d76 100644
--- a/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- services/video_effects/video_effects_sandbox_hook_linux.h.orig	2024-12-22 12:24:29 UTC
+--- services/video_effects/video_effects_sandbox_hook_linux.h.orig	2025-05-07 06:48:23 UTC
 +++ services/video_effects/video_effects_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef SERVICES_VIDEO_EFFECTS_VIDEO_EFFECTS_SANDBOX_HOOK_LINUX_H_
diff --git a/www/iridium/files/patch-services_viz_public_mojom_BUILD.gn b/www/iridium/files/patch-services_viz_public_mojom_BUILD.gn
index ea3a8cdb66a9..ac66473f3848 100644
--- a/www/iridium/files/patch-services_viz_public_mojom_BUILD.gn
+++ b/www/iridium/files/patch-services_viz_public_mojom_BUILD.gn
@@ -1,4 +1,4 @@
---- services/viz/public/mojom/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- services/viz/public/mojom/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ services/viz/public/mojom/BUILD.gn
 @@ -56,7 +56,7 @@ mojom("mojom") {
  
diff --git a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
index 71373f0da4b1..f34f15640459 100644
--- a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
+++ b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
@@ -1,4 +1,4 @@
---- skia/ext/SkMemory_new_handler.cpp.orig	2025-03-18 16:46:04 UTC
+--- skia/ext/SkMemory_new_handler.cpp.orig	2025-05-07 06:48:23 UTC
 +++ skia/ext/SkMemory_new_handler.cpp
 @@ -24,7 +24,7 @@
  #include <windows.h>
diff --git a/www/iridium/files/patch-skia_ext_font__utils.cc b/www/iridium/files/patch-skia_ext_font__utils.cc
index 15b4530584ad..cb6434b27c55 100644
--- a/www/iridium/files/patch-skia_ext_font__utils.cc
+++ b/www/iridium/files/patch-skia_ext_font__utils.cc
@@ -1,6 +1,6 @@
---- skia/ext/font_utils.cc.orig	2025-04-16 18:18:42 UTC
+--- skia/ext/font_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ skia/ext/font_utils.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h"
  #endif
  
@@ -9,8 +9,8 @@
  #include "third_party/skia/include/ports/SkFontConfigInterface.h"
  #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
  #include "third_party/skia/include/ports/SkFontScanner_Fontations.h"
-@@ -62,7 +62,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() {
-   return SkFontMgr_New_Android(nullptr);
+@@ -67,7 +67,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() {
+   }
  #elif BUILDFLAG(IS_APPLE)
    return SkFontMgr_New_CoreText(nullptr);
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc
index 2c1bd4c26905..708e437e3a8f 100644
--- a/www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc
+++ b/www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc
@@ -1,4 +1,4 @@
---- skia/ext/skcolorspace_trfn.cc.orig	2025-03-18 16:46:04 UTC
+--- skia/ext/skcolorspace_trfn.cc.orig	2025-05-07 06:48:23 UTC
 +++ skia/ext/skcolorspace_trfn.cc
 @@ -2,6 +2,8 @@
  // Use of this source code is governed by a BSD-style license that can be
diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h
index 6f959d314e4a..2e7fa5255a98 100644
--- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h
+++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h
@@ -1,6 +1,6 @@
---- third_party/abseil-cpp/absl/base/config.h.orig	2025-04-16 18:18:42 UTC
+--- third_party/abseil-cpp/absl/base/config.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/abseil-cpp/absl/base/config.h
-@@ -411,7 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -409,7 +409,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  #ifdef ABSL_HAVE_SCHED_YIELD
  #error ABSL_HAVE_SCHED_YIELD cannot be directly set
  #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
@@ -9,7 +9,7 @@
  #define ABSL_HAVE_SCHED_YIELD 1
  #endif
  
-@@ -426,7 +426,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -424,7 +424,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  // platforms.
  #ifdef ABSL_HAVE_SEMAPHORE_H
  #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
index cd9ac0a969b8..79bca06b60f7 100644
--- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
+++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
@@ -1,4 +1,4 @@
---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig	2024-11-04 08:56:03 UTC
+--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc
 @@ -30,7 +30,7 @@
  #include <sys/syscall.h>
diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
index 8e9ea989a78f..ddb4c9032785 100644
--- a/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
+++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
@@ -1,4 +1,4 @@
---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig	2025-02-22 18:06:53 UTC
+--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
 @@ -35,7 +35,8 @@
  #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn
index 32f5be67cbc0..79e36589339f 100644
--- a/www/iridium/files/patch-third__party_angle_BUILD.gn
+++ b/www/iridium/files/patch-third__party_angle_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/angle/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- third_party/angle/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/BUILD.gn
 @@ -355,7 +355,6 @@ config("extra_warnings") {
        "-Wtautological-type-limit-compare",
diff --git a/www/iridium/files/patch-third__party_angle_src_common_platform.h b/www/iridium/files/patch-third__party_angle_src_common_platform.h
index c1ee58fca0f6..0f84d97e0d17 100644
--- a/www/iridium/files/patch-third__party_angle_src_common_platform.h
+++ b/www/iridium/files/patch-third__party_angle_src_common_platform.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/common/platform.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/angle/src/common/platform.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/common/platform.h
-@@ -26,7 +26,15 @@
+@@ -23,7 +23,15 @@
  #elif defined(__linux__) || defined(EMSCRIPTEN)
  #    define ANGLE_PLATFORM_LINUX 1
  #    define ANGLE_PLATFORM_POSIX 1
diff --git a/www/iridium/files/patch-third__party_angle_src_common_platform__helpers.h b/www/iridium/files/patch-third__party_angle_src_common_platform__helpers.h
index b045f0a21c6e..02fcf9d3a60c 100644
--- a/www/iridium/files/patch-third__party_angle_src_common_platform__helpers.h
+++ b/www/iridium/files/patch-third__party_angle_src_common_platform__helpers.h
@@ -1,4 +1,4 @@
---- third_party/angle/src/common/platform_helpers.h.orig	2023-10-21 11:51:27 UTC
+--- third_party/angle/src/common/platform_helpers.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/common/platform_helpers.h
 @@ -62,7 +62,7 @@ inline constexpr bool IsIOS()
  
diff --git a/www/iridium/files/patch-third__party_angle_src_common_system__utils.cpp b/www/iridium/files/patch-third__party_angle_src_common_system__utils.cpp
index 4e5d30eca3b4..e03b4ea7baa2 100644
--- a/www/iridium/files/patch-third__party_angle_src_common_system__utils.cpp
+++ b/www/iridium/files/patch-third__party_angle_src_common_system__utils.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/common/system_utils.cpp.orig	2024-06-25 12:08:48 UTC
+--- third_party/angle/src/common/system_utils.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/common/system_utils.cpp
 @@ -25,7 +25,7 @@ namespace angle
  {
diff --git a/www/iridium/files/patch-third__party_angle_src_common_system__utils__linux.cpp b/www/iridium/files/patch-third__party_angle_src_common_system__utils__linux.cpp
index e3d601b47fe8..a033df72c8db 100644
--- a/www/iridium/files/patch-third__party_angle_src_common_system__utils__linux.cpp
+++ b/www/iridium/files/patch-third__party_angle_src_common_system__utils__linux.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/common/system_utils_linux.cpp.orig	2025-02-22 18:06:53 UTC
+--- third_party/angle/src/common/system_utils_linux.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/common/system_utils_linux.cpp
 @@ -15,10 +15,15 @@
  #include <sys/types.h>
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
index fde782ac639d..13357d3d5358 100644
--- a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
+++ b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2023-07-24 14:27:53 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h
 @@ -15,6 +15,13 @@
  namespace angle
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
index 628da2ce3ed3..7b32d56283a3 100644
--- a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
+++ b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
 @@ -12,6 +12,11 @@
  #include <pci/pci.h>
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
index 30949c1b35f8..86fdad90ef20 100644
--- a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
+++ b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp
 @@ -71,6 +71,24 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo
  
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
index 1ce54be4143b..2141d6e2efd3 100644
--- a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
+++ b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp
 @@ -8,6 +8,10 @@
  
diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index cfbc66270493..7f960429c205 100644
--- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig	2025-03-18 16:46:04 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/libANGLE/Display.cpp
 @@ -58,7 +58,7 @@
  #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -36,7 +36,7 @@
  #        if defined(ANGLE_USE_GBM)
              if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
              {
-@@ -2139,7 +2139,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2133,7 +2133,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.platformWaylandEXT = true;
  #endif
  
@@ -45,7 +45,7 @@
      extensions.platformSurfacelessMESA = true;
  #endif
  
-@@ -2186,7 +2186,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2180,7 +2180,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.x11Visual = true;
  #endif
  
diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
index 493d46010447..9194739ba60e 100644
--- a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
+++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
 @@ -144,10 +144,10 @@ bool FunctionsGLX::initialize(Display *xDisplay, int s
      // which a GLXWindow was ever created.
diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
index ea7ce14a82c6..dd03d40e6f1e 100644
--- a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
+++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2022-10-05 07:34:01 UTC
+--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
 @@ -23,7 +23,7 @@ bool IsVulkanWin32DisplayAvailable();
  DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
diff --git a/www/iridium/files/patch-third__party_angle_util_BUILD.gn b/www/iridium/files/patch-third__party_angle_util_BUILD.gn
index 830cb716ebe6..8376d6f249a7 100644
--- a/www/iridium/files/patch-third__party_angle_util_BUILD.gn
+++ b/www/iridium/files/patch-third__party_angle_util_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/angle/util/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- third_party/angle/util/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/angle/util/BUILD.gn
 @@ -332,7 +332,7 @@ foreach(is_shared_library,
      ]
diff --git a/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
index cfd47617bf91..5ab786c3fd9c 100644
--- a/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
+++ b/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
@@ -1,4 +1,4 @@
---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc
 @@ -77,7 +77,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat
  
diff --git a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
index 7dd93b0fc3bc..ea9c76cd8837 100644
--- a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
+++ b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
@@ -1,4 +1,4 @@
---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2024-06-25 12:08:48 UTC
+--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h
 @@ -65,7 +65,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
    UserAgentOverride user_agent_override;
diff --git a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
index 5387d5587970..523743154661 100644
--- a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
+++ b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
@@ -1,4 +1,4 @@
---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h
 @@ -180,7 +180,7 @@ struct BLINK_COMMON_EXPORT
      return data.send_subresource_notification;
diff --git a/www/iridium/files/patch-third__party_blink_public_platform_platform.h b/www/iridium/files/patch-third__party_blink_public_platform_platform.h
index 689457f9b66f..36a1900f12ad 100644
--- a/www/iridium/files/patch-third__party_blink_public_platform_platform.h
+++ b/www/iridium/files/patch-third__party_blink_public_platform_platform.h
@@ -1,4 +1,4 @@
---- third_party/blink/public/platform/platform.h.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/public/platform/platform.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/public/platform/platform.h
 @@ -372,7 +372,7 @@ class BLINK_PLATFORM_EXPORT Platform {
      return nullptr;
diff --git a/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
index 3b26e7c12aaa..4929a4c78f4a 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
+++ b/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2024-06-25 12:08:48 UTC
+--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
 @@ -30,7 +30,7 @@ def init(root_src_dir, enable_style_format=True):
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/www/iridium/files/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 000000000000..6b1cbb0782c8
--- /dev/null
+++ b/www/iridium/files/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-05-07 06:48:23 UTC
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args
+         # https://savannah.gnu.org/bugs/index.php?53028
+         gperf_output = re.sub(r'\bregister ', '', gperf_output)
+         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
++        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++        if re.search(
++                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
++                gperf_output):
++            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
++                                                '  [[fallthrough]];')
+         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+         # Replace {(int)(long)&(foo), bar} with
+         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/www/iridium/files/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py b/www/iridium/files/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
index cf3dc4622f71..6515ec2eb6f5 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
+++ b/www/iridium/files/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/build/scripts/run_with_pythonpath.py.orig	2022-03-28 18:11:04 UTC
+--- third_party/blink/renderer/build/scripts/run_with_pythonpath.py.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/build/scripts/run_with_pythonpath.py
 @@ -22,6 +22,7 @@ def main():
          existing_pp = (
diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index 91cdb1a66e3b..5ac570805e4c 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/controller/blink_initializer.cc
 @@ -82,12 +82,12 @@
  #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
@@ -24,8 +24,8 @@
    binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
        ConvertToBaseRepeatingCallback(
            CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -305,7 +305,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
- #endif
+@@ -304,7 +304,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
+   MemorySaverController::Initialize();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
 -    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
index 74ddb67e3f11..9c3fc1cf7bec 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2025-03-18 16:46:04 UTC
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc
 @@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() {
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
index 887ca4d68236..9b01eb6d9a2c 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
+++ b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h
 @@ -13,7 +13,7 @@
  #include "third_party/blink/renderer/controller/controller_export.h"
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
index 9fe7996a7262..d4e28bf34ece 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2024-08-27 06:28:16 UTC
+--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/editing/editing_behavior.cc
 @@ -304,7 +304,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb
    // unexpected behaviour
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc b/www/iridium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
index 89fa7bccd9ab..18658df9b043 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig	2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/execution_context/navigator_base.cc
 @@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() {
    return "Win32";
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index f9d20b3ab398..6a6be1e896c4 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -427,7 +427,7 @@ void RecordPrerenderActivationSignalDelay(const String
+@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String
  #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN)
  SkFontHinting RendererPreferencesToSkiaHinting(
      const blink::RendererPreferences& prefs) {
@@ -9,7 +9,7 @@
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3426,7 +3426,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
        gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
    WebFontRenderStyle::SetSubpixelPositioning(
        renderer_preferences_.use_subpixel_positioning);
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
index 3049a3c30b46..6eef5d52aa32 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/frame/web_frame_test.cc
 @@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
  }
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index 6818cc684a45..866ed1c8496a 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
  
  /* The value is based on user statistics on Nov 2017. */
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
index 569d5330a9c3..fd09d413c711 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2025-03-18 16:46:04 UTC
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
 @@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index b09734e35319..01a77074a382 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/layout/layout_view.cc
 @@ -74,7 +74,7 @@
  #include "ui/display/screen_info.h"
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -784,7 +784,7 @@ void LayoutView::LayoutRoot() {
+@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() {
      intrinsic_logical_widths_ = LogicalWidth();
    }
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
index 63b8f283b10b..a76e1658baa5 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-03-18 16:46:04 UTC
+--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/loader/mixed_content_checker.cc
-@@ -484,7 +484,7 @@ bool MixedContentChecker::ShouldBlockFetch(
+@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFetch(
    switch (context_type) {
      case mojom::blink::MixedContentContextType::kOptionallyBlockable:
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc b/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
index 47c6957c54c0..c071660f140f 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
 @@ -573,7 +573,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const 
    }
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/www/iridium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
new file mode 100644
index 000000000000..aeacb3035811
--- /dev/null
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/page/context_menu_controller.cc.orig	2025-05-07 06:48:23 UTC
++++ third_party/blink/renderer/core/page/context_menu_controller.cc
+@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame
+     if (potential_image_node != nullptr &&
+         IsA<HTMLCanvasElement>(potential_image_node)) {
+       data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // TODO(crbug.com/40902474): Support reading from the WebGPU front buffer
+       // on Linux and remove the below code, which results in "Copy Image" and
+       // "Save Image To" being grayed out in the context menu.
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
index b357a1aa9c64..95be321b4546 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -123,7 +123,7 @@ namespace blink {
+@@ -124,7 +124,7 @@ namespace blink {
  
  namespace {
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index 86be36c1c010..8e2c12ba88c9 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
 @@ -146,7 +146,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
  // Disable snapback on desktop Linux to better integrate with the desktop
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
index 5a3129ba1275..20638df2efd3 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/xml/xslt_processor.h.orig	2024-06-25 12:08:48 UTC
+--- third_party/blink/renderer/core/xml/xslt_processor.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/xml/xslt_processor.h
 @@ -77,7 +77,11 @@ class XSLTProcessor final : public ScriptWrappable {
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
index c9fa73e49a56..b5a91db9e6b2 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
 @@ -68,7 +68,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char
    // It would be nice to do something with this error message.
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
index 82a5acf46013..d92080121d14 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc
 @@ -33,7 +33,7 @@ namespace {
  // Set when the default factory is overridden.
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
index a7bafdf10dfd..7ce1f183bf7f 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
-@@ -873,7 +873,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
+@@ -857,7 +857,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
              mixer->get_output_params_for_testing().sample_rate());
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
index e9f54a9a158c..2f7b23bca09d 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig	2024-12-22 12:24:29 UTC
+--- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc
 @@ -542,6 +542,7 @@ void RTCDataChannel::send(Blob* data, ExceptionState& 
    pending_messages_.push_back(message);
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
index ad7ae9456418..a2b10d8350df 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2024-11-04 08:56:03 UTC
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
 @@ -304,7 +304,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
    SetupRenderer(kDefaultOutputDeviceId);
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
index 18702c16c091..f3d5788d5d49 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
 @@ -465,7 +465,7 @@ class AudioWorkletThreadPriorityTest
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index 0e79b6556b22..dd79661ee3dd 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6343,7 +6343,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
    constexpr bool kAllowZeroCopyImages = true;
  #endif
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
new file mode 100644
index 000000000000..992fca53677a
--- /dev/null
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig	2025-05-07 06:48:23 UTC
++++ third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc
+@@ -207,7 +207,7 @@ bool GPUCanvasContext::PaintRenderingResultsToCanvas(
+ 
+   scoped_refptr<WebGPUMailboxTexture> front_buffer_texture;
+   if (source_buffer == kFrontBuffer) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // By returning false here the canvas will show up as black in the scenarios
+     // that copy the front buffer, such as printing.
+     // TODO(crbug.com/40902474): Support concurrent SharedImage reads via Dawn
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index e0a1d7df55d4..bc38ba320110 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-03-18 16:46:04 UTC
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -815,7 +815,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+@@ -812,7 +812,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
  // on linux platform.
  // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
  // backend is failing for unknown reasons.
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 9aea8226a4eb..2830285e1fcb 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -2034,7 +2034,7 @@ static_library("test_support") {
+@@ -2046,7 +2046,7 @@ static_library("test_support") {
    ]
  
    # fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
index a256ab08c6ec..640e82fee517 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/fonts/font_cache.cc
 @@ -82,7 +82,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
index 6983f523b30a..88519d4447c1 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2024-11-04 08:56:03 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/fonts/font_cache.h
 @@ -55,7 +55,7 @@
  #include "third_party/skia/include/core/SkFontMgr.h"
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index b7d6c4e6a1e7..e6d77c2628c4 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/fonts/font_description.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
  #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -279,7 +279,7 @@ FontCacheKey FontDescription::CacheKey(
+@@ -280,7 +280,7 @@ FontCacheKey FontDescription::CacheKey(
        static_cast<unsigned>(fields_.orientation_) << 1 |            // bit 2-3
        static_cast<unsigned>(fields_.subpixel_text_position_);       // bit 1
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
index caafbddf3ebf..e615cf759795 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2024-06-25 12:08:48 UTC
+--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/fonts/font_metrics.cc
 @@ -39,7 +39,7 @@
  namespace blink {
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
index 698fc073e2dc..0ee5f59eb26c 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2022-04-01 07:48:30 UTC
+--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
 @@ -9,7 +9,7 @@
  #if BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
index c48b7c0c5f97..a8d2f6b17bdc 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
 @@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) {
    return AtomicString::FromUTF8(std::string_view(str.begin(), str.end()));
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
index 2986f4a43452..f49cc1c13e7e 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig	2023-08-28 20:17:35 UTC
+--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
 @@ -71,8 +71,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
index 48e7a060b4fc..7e7fd33d44bf 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-@@ -48,7 +48,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated(
+@@ -47,7 +47,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated(
  
    const auto paint_image = source->PaintImageForCurrentFrame();
    const auto image_info = paint_image.GetSkImageInfo();
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index b567cae25ca5..afd81c112b98 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2025-03-18 16:46:04 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
 @@ -421,7 +421,7 @@ void VideoFrameSubmitter::OnBeginFrame(
      auto& details = timing_details.find(frame_token)->value;
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
index 293d7dff9243..a0aee8fc01ec 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig	2024-06-25 12:08:48 UTC
+--- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc
 @@ -14,7 +14,9 @@
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
index 62e24ae9d6b7..f771871db5c7 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -329,12 +329,12 @@ SupportedFormats GetSupportedFormatsInternal(
+@@ -324,12 +324,12 @@ SupportedFormats GetSupportedFormatsInternal(
        supported_formats.profiles.push_back(profile.profile);
        supported_formats.sdp_formats.push_back(std::move(*format));
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index 68b235c7dc19..4ffb0ebffc40 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -424,7 +424,7 @@
+@@ -434,7 +434,7 @@
        name: "AppTitle",
        status: "experimental",
        origin_trial_feature_name: "AppTitle",
@@ -9,7 +9,7 @@
        base_feature: "WebAppEnableAppTitle",
      },
      {
-@@ -1683,7 +1683,7 @@
+@@ -1698,7 +1698,7 @@
        name: "DocumentIsolationPolicy",
        status: "experimental",
        origin_trial_feature_name: "DocumentIsolationPolicy",
@@ -18,7 +18,7 @@
        base_feature: "none",
      },
      {
-@@ -1932,7 +1932,7 @@
+@@ -1943,7 +1943,7 @@
        base_feature: "none",
        public: true,
        origin_trial_feature_name: "FedCmMultipleIdentityProviders",
@@ -27,7 +27,7 @@
        origin_trial_allows_third_party: true,
      },
      {
-@@ -3335,7 +3335,7 @@
+@@ -3331,7 +3331,7 @@
        // Tracking bug for the implementation: https://crbug.com/1462930
        name: "PermissionElement",
        origin_trial_feature_name: "PermissionElement",
@@ -36,7 +36,7 @@
        status: "experimental",
        public: true,
        base_feature_status: "enabled",
-@@ -3459,7 +3459,7 @@
+@@ -3475,7 +3475,7 @@
      {
        name: "PrivateNetworkAccessPermissionPrompt",
        origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
@@ -45,7 +45,7 @@
        status: "stable",
        public: true,
        base_feature: "none",
-@@ -4580,7 +4580,7 @@
+@@ -4636,7 +4636,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -54,7 +54,7 @@
      },
      // Enables using policy-controlled feature "usb-unrestricted" to allow
      // isolated context to access protected USB interface classes and to
-@@ -4753,7 +4753,7 @@
+@@ -4811,7 +4811,7 @@
      {
        name: "WebAppScopeExtensions",
        origin_trial_feature_name: "WebAppScopeExtensions",
@@ -63,7 +63,7 @@
        status: "experimental",
        base_feature: "none",
      },
-@@ -5021,7 +5021,7 @@
+@@ -5086,7 +5086,7 @@
      {
        name: "WebIdentityDigitalCredentials",
        origin_trial_feature_name: "WebIdentityDigitalCredentials",
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
index 5bae05a6faab..729043aaf0d6 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2024-12-22 12:24:29 UTC
+--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/scheduler/common/thread.cc
 @@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() {
              "Compositor");
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
index d954d8f77d32..53517de33263 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig	2023-07-24 14:27:53 UTC
+--- third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc
 @@ -27,7 +27,7 @@ BlinkCategorizedWorkerPoolDelegate& BlinkCategorizedWo
  
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
index 24d9bf625e55..c70b31752054 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2025-04-16 18:18:42 UTC
+--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/wtf/container_annotations.h
 @@ -11,7 +11,7 @@
  // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h
index decacfbf365a..978773517689 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/wtf/math_extras.h.orig	2022-10-05 07:34:01 UTC
+--- third_party/blink/renderer/platform/wtf/math_extras.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/wtf/math_extras.h
 @@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) {
    return g * (1.0f / 400.0f);
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
index ef8745340c0e..f9bd5040c17a 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/blink/renderer/platform/wtf/stack_util.cc
 @@ -23,6 +23,11 @@
  extern "C" void* __libc_stack_end;  // NOLINT
diff --git a/www/iridium/files/patch-third__party_brotli_common_platform.h b/www/iridium/files/patch-third__party_brotli_common_platform.h
index 2703b7cc2444..aa03fbe7be41 100644
--- a/www/iridium/files/patch-third__party_brotli_common_platform.h
+++ b/www/iridium/files/patch-third__party_brotli_common_platform.h
@@ -1,4 +1,4 @@
---- third_party/brotli/common/platform.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/brotli/common/platform.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/brotli/common/platform.h
 @@ -28,7 +28,7 @@
  #include <brotli/port.h>
diff --git a/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni b/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni
index 43cce26433e5..7f7be13c4f18 100644
--- a/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni
+++ b/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni
@@ -1,4 +1,4 @@
---- third_party/cpuinfo/cpuinfo.gni.orig	2024-06-25 12:08:48 UTC
+--- third_party/cpuinfo/cpuinfo.gni.orig	2025-05-07 06:48:23 UTC
 +++ third_party/cpuinfo/cpuinfo.gni
 @@ -8,7 +8,7 @@ use_cpuinfo =
      current_cpu != "s390" && current_cpu != "s390x" &&
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
index e9ed1a59b5b2..0a7c9054430d 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig	2023-10-21 11:51:27 UTC
+--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni
 @@ -61,7 +61,7 @@ if (crashpad_is_in_chromium) {
    crashpad_is_ios = is_ios
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
index d336b1fbe059..6356850b9223 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/client/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- third_party/crashpad/crashpad/client/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/client/BUILD.gn
 @@ -134,6 +134,13 @@ static_library("common") {
    if (crashpad_is_win) {
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
index 4d084eea873c..a38a8c268c39 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2022-03-28 18:11:04 UTC
+--- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc
 @@ -0,0 +1,40 @@
 +// Copyright 2017 The Crashpad Authors. All rights reserved.
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
index a19b15c4cb55..36a375d79d8d 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig	2022-10-05 07:34:01 UTC
+--- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
 @@ -159,6 +159,10 @@ std::string MinidumpMiscInfoDebugBuildString() {
    static constexpr char kOS[] = "win";
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h
index 286758d8be72..ebb57ac0ef6a 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/misc/address_types.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/crashpad/crashpad/util/misc/address_types.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/misc/address_types.h
 @@ -25,7 +25,7 @@
  #include <mach/mach_types.h>
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
index 7db86096f90e..bacac0db1a83 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2023-10-21 11:51:27 UTC
+--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/misc/capture_context.h
 @@ -21,7 +21,8 @@
  #include <mach/mach.h>
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
index fe5915eb33f4..bc6ae3adbbbf 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/misc/metrics.cc.orig	2022-03-28 18:11:04 UTC
+--- third_party/crashpad/crashpad/util/misc/metrics.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/misc/metrics.cc
 @@ -25,7 +25,7 @@
  #define METRICS_OS_NAME "Win"
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
index 89b9245555c0..993c87232aa6 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2024-06-25 12:08:48 UTC
+--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/misc/uuid.cc
 @@ -110,7 +110,7 @@ bool UUID::InitializeWithNew() {
    InitializeFromBytes(uuid);
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
index 2ba0b90f2afd..278bdd8402ee 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2024-02-04 14:46:08 UTC
+--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc
 @@ -73,7 +73,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) {
  // This is an advantage over looping over all possible file descriptors, because
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
index e8c086417452..0f55a3be5c07 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig	2022-03-28 18:11:04 UTC
+--- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc
 @@ -25,7 +25,7 @@ void DropPrivileges() {
    gid_t gid = getgid();
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
index 859af7a54e22..13eefa1908ec 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2022-10-05 07:34:01 UTC
+--- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/posix/signals.cc
 @@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = {
  #if defined(SIGEMT)
diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
index 4a6bb39e5aa8..15dcd5562ed1 100644
--- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
+++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig	2024-08-27 06:28:16 UTC
+--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
 @@ -68,7 +68,7 @@ constexpr const char* kSignalNames[] = {
      "INFO",
diff --git a/www/iridium/files/patch-third__party_crc32c_BUILD.gn b/www/iridium/files/patch-third__party_crc32c_BUILD.gn
index e29693525269..afe0138cabce 100644
--- a/www/iridium/files/patch-third__party_crc32c_BUILD.gn
+++ b/www/iridium/files/patch-third__party_crc32c_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/crc32c/BUILD.gn.orig	2023-07-24 14:27:53 UTC
+--- third_party/crc32c/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/crc32c/BUILD.gn
 @@ -46,7 +46,7 @@ config("crc32c_config") {
    }
diff --git a/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
index de356b22a2b1..dd7187131d9e 100644
--- a/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
+++ b/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
@@ -1,4 +1,4 @@
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2024-06-25 12:08:48 UTC
+--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/dawn/include/dawn/native/VulkanBackend.h
 @@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
  };
diff --git a/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h b/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h
index ec5a7aca0efe..3dc362f0c3f8 100644
--- a/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h
+++ b/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h
@@ -1,4 +1,4 @@
---- third_party/dawn/src/dawn/common/Platform.h.orig	2025-04-16 18:18:42 UTC
+--- third_party/dawn/src/dawn/common/Platform.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/dawn/src/dawn/common/Platform.h
 @@ -60,6 +60,11 @@
  #error "Unsupported Windows platform."
diff --git a/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
index 60c2a3305b2c..c222f9bc848b 100644
--- a/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
+++ b/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
@@ -1,4 +1,4 @@
---- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig	2025-04-16 18:18:42 UTC
+--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp
 @@ -57,7 +57,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha
  #endif
diff --git a/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn b/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn
index e4d4a17785d2..c263f6906845 100644
--- a/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn
+++ b/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/BUILD.gn.orig	2024-11-04 08:56:03 UTC
+--- third_party/ffmpeg/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ffmpeg/BUILD.gn
 @@ -350,7 +350,6 @@ target(link_target_type, "ffmpeg_internal") {
        libs += [
diff --git a/www/iridium/files/patch-third__party_ffmpeg_configure b/www/iridium/files/patch-third__party_ffmpeg_configure
index b7885c032459..985d760a20cb 100644
--- a/www/iridium/files/patch-third__party_ffmpeg_configure
+++ b/www/iridium/files/patch-third__party_ffmpeg_configure
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/configure.orig	2025-04-16 18:18:42 UTC
+--- third_party/ffmpeg/configure.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ffmpeg/configure
 @@ -6855,8 +6855,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en
          if enabled pthread_np_h; then
diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_cabac.h b/www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
index 532194c579e2..4716e9605ccf 100644
--- a/www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
+++ b/www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/libavcodec/x86/cabac.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/ffmpeg/libavcodec/x86/cabac.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ffmpeg/libavcodec/x86/cabac.h
 @@ -31,7 +31,8 @@
  
diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c b/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c
index f7857f6eb341..798796402fba 100644
--- a/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c
+++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/libavutil/cpu.c.orig	2022-10-05 07:34:01 UTC
+--- third_party/ffmpeg/libavutil/cpu.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ffmpeg/libavutil/cpu.c
 @@ -38,10 +38,7 @@
  #if HAVE_GETPROCESSAFFINITYMASK || HAVE_WINRT
diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c
index 9af6bf1717dc..492322b73704 100644
--- a/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c
+++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/libavutil/mem.c.orig	2022-10-05 07:34:01 UTC
+--- third_party/ffmpeg/libavutil/mem.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ffmpeg/libavutil/mem.c
 @@ -33,9 +33,6 @@
  #include <stdlib.h>
diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_random__seed.c b/www/iridium/files/patch-third__party_ffmpeg_libavutil_random__seed.c
index 86fb526c4086..1920f6fc7766 100644
--- a/www/iridium/files/patch-third__party_ffmpeg_libavutil_random__seed.c
+++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_random__seed.c
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/libavutil/random_seed.c.orig	2023-10-21 11:51:27 UTC
+--- third_party/ffmpeg/libavutil/random_seed.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ffmpeg/libavutil/random_seed.c
 @@ -35,6 +35,11 @@
  #elif CONFIG_OPENSSL
diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
index 8a495e59d0a1..4fab817986a9 100644
--- a/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
+++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2024-06-25 12:08:48 UTC
+--- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ffmpeg/libavutil/x86/x86inc.asm
 @@ -46,6 +46,12 @@
      %endif
diff --git a/www/iridium/files/patch-third__party_fontconfig_include_config.h b/www/iridium/files/patch-third__party_fontconfig_include_config.h
index 54dfbea127b0..49d278240264 100644
--- a/www/iridium/files/patch-third__party_fontconfig_include_config.h
+++ b/www/iridium/files/patch-third__party_fontconfig_include_config.h
@@ -1,4 +1,4 @@
---- third_party/fontconfig/include/config.h.orig	2024-06-25 12:08:48 UTC
+--- third_party/fontconfig/include/config.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/fontconfig/include/config.h
 @@ -13,7 +13,7 @@
  
diff --git a/www/iridium/files/patch-third__party_fontconfig_src_src_fccompat.c b/www/iridium/files/patch-third__party_fontconfig_src_src_fccompat.c
index 11944b850102..d059747b97e9 100644
--- a/www/iridium/files/patch-third__party_fontconfig_src_src_fccompat.c
+++ b/www/iridium/files/patch-third__party_fontconfig_src_src_fccompat.c
@@ -1,4 +1,4 @@
---- third_party/fontconfig/src/src/fccompat.c.orig	2023-04-22 17:45:15 UTC
+--- third_party/fontconfig/src/src/fccompat.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/fontconfig/src/src/fccompat.c
 @@ -184,7 +184,9 @@ FcRandom(void)
  {
diff --git a/www/iridium/files/patch-third__party_ipcz_src_BUILD.gn b/www/iridium/files/patch-third__party_ipcz_src_BUILD.gn
index 65f063335e16..029ae7fb29fa 100644
--- a/www/iridium/files/patch-third__party_ipcz_src_BUILD.gn
+++ b/www/iridium/files/patch-third__party_ipcz_src_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/ipcz/src/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- third_party/ipcz/src/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ipcz/src/BUILD.gn
 @@ -7,7 +7,7 @@ import("//build_overrides/ipcz.gni")
  import("//testing/libfuzzer/fuzzer_test.gni")
diff --git a/www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc b/www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc
index 8e1900fe710c..37f2fb46ba67 100644
--- a/www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc
+++ b/www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc
@@ -1,4 +1,4 @@
---- third_party/ipcz/src/reference_drivers/random.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/ipcz/src/reference_drivers/random.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ipcz/src/reference_drivers/random.cc
 @@ -55,7 +55,7 @@ decltype(&ProcessPrng) GetProcessPrng() {
  }
diff --git a/www/iridium/files/patch-third__party_ipcz_src_standalone_base_logging.cc b/www/iridium/files/patch-third__party_ipcz_src_standalone_base_logging.cc
index 43b45e76fffd..cde6469214aa 100644
--- a/www/iridium/files/patch-third__party_ipcz_src_standalone_base_logging.cc
+++ b/www/iridium/files/patch-third__party_ipcz_src_standalone_base_logging.cc
@@ -1,4 +1,4 @@
---- third_party/ipcz/src/standalone/base/logging.cc.orig	2025-03-18 16:46:04 UTC
+--- third_party/ipcz/src/standalone/base/logging.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/ipcz/src/standalone/base/logging.cc
 @@ -55,6 +55,9 @@ LogMessage::LogMessage(const char* file, int line, Lev
  #elif BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc
index d51da51c3a0e..caff4dae5dd8 100644
--- a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc
+++ b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc
@@ -1,4 +1,4 @@
---- third_party/leveldatabase/env_chromium.cc.orig	2024-11-04 08:56:03 UTC
+--- third_party/leveldatabase/env_chromium.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/leveldatabase/env_chromium.cc
 @@ -329,7 +329,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std::
  
diff --git a/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
index 92cd9520d662..0a2fc57e2149 100644
--- a/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+++ b/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
@@ -1,4 +1,4 @@
---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2024-12-22 12:24:29 UTC
+--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
 @@ -127,9 +127,45 @@ static int arm_get_cpu_caps(void) {
    return flags;
diff --git a/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp b/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp
index c38ed97a9cd1..d08721c30eda 100644
--- a/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp
+++ b/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp
@@ -1,4 +1,4 @@
---- third_party/libc++/src/src/chrono.cpp.orig	2025-02-22 18:06:53 UTC
+--- third_party/libc++/src/src/chrono.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libc++/src/src/chrono.cpp
 @@ -38,7 +38,7 @@
  // OpenBSD and GPU do not have a fully conformant suite of POSIX timers, but
diff --git a/www/iridium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp b/www/iridium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
index eacf7b5a0e39..faf27430f378 100644
--- a/www/iridium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
+++ b/www/iridium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
@@ -1,4 +1,4 @@
---- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig	2025-02-22 18:06:53 UTC
+--- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp
 @@ -35,7 +35,7 @@
  #endif
diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
index 4cfa933c6ebc..8d63bd2e75f3 100644
--- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
+++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
@@ -1,4 +1,4 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2022-10-05 07:34:01 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h
 @@ -22,7 +22,7 @@
  #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
index cf920aa09227..9787af4082bd 100644
--- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
+++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
@@ -1,4 +1,4 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2022-10-05 07:34:01 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h
 @@ -22,7 +22,7 @@
  #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
index 03d9351e40ed..8b87e752bb1d 100644
--- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
+++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
@@ -1,4 +1,4 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2022-10-05 07:34:01 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h
 @@ -22,7 +22,7 @@
  // Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the
diff --git a/www/iridium/files/patch-third__party_libsync_src_include_sync_sync.h b/www/iridium/files/patch-third__party_libsync_src_include_sync_sync.h
index 4a817852abb1..f39adab21810 100644
--- a/www/iridium/files/patch-third__party_libsync_src_include_sync_sync.h
+++ b/www/iridium/files/patch-third__party_libsync_src_include_sync_sync.h
@@ -1,4 +1,4 @@
---- third_party/libsync/src/include/sync/sync.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/libsync/src/include/sync/sync.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libsync/src/include/sync/sync.h
 @@ -22,7 +22,9 @@
  #include <sys/cdefs.h>
diff --git a/www/iridium/files/patch-third__party_libsync_src_sync.c b/www/iridium/files/patch-third__party_libsync_src_sync.c
index 8c82f5cc7376..a344b6bb903f 100644
--- a/www/iridium/files/patch-third__party_libsync_src_sync.c
+++ b/www/iridium/files/patch-third__party_libsync_src_sync.c
@@ -1,4 +1,4 @@
---- third_party/libsync/src/sync.c.orig	2023-10-21 11:51:27 UTC
+--- third_party/libsync/src/sync.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libsync/src/sync.c
 @@ -17,8 +17,8 @@
   */
diff --git a/www/iridium/files/patch-third__party_libusb_BUILD.gn b/www/iridium/files/patch-third__party_libusb_BUILD.gn
index 2aaaf0baba68..3afc07e6a89d 100644
--- a/www/iridium/files/patch-third__party_libusb_BUILD.gn
+++ b/www/iridium/files/patch-third__party_libusb_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/libusb/BUILD.gn.orig	2023-10-21 11:51:27 UTC
+--- third_party/libusb/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libusb/BUILD.gn
 @@ -3,7 +3,7 @@
  # found in the LICENSE file.
diff --git a/www/iridium/files/patch-third__party_libusb_src_libusb_core.c b/www/iridium/files/patch-third__party_libusb_src_libusb_core.c
index 722518d48452..d7d5be2ab58c 100644
--- a/www/iridium/files/patch-third__party_libusb_src_libusb_core.c
+++ b/www/iridium/files/patch-third__party_libusb_src_libusb_core.c
@@ -1,4 +1,4 @@
---- third_party/libusb/src/libusb/core.c.orig	2022-03-28 18:11:04 UTC
+--- third_party/libusb/src/libusb/core.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libusb/src/libusb/core.c
 @@ -448,7 +448,7 @@ libusb_free_device_list(list, 1);
   * which grows when required. it can be freed once discovery has completed,
diff --git a/www/iridium/files/patch-third__party_libusb_src_libusb_os_threads__posix.c b/www/iridium/files/patch-third__party_libusb_src_libusb_os_threads__posix.c
index 20926fa54645..09977cad2caa 100644
--- a/www/iridium/files/patch-third__party_libusb_src_libusb_os_threads__posix.c
+++ b/www/iridium/files/patch-third__party_libusb_src_libusb_os_threads__posix.c
@@ -1,4 +1,4 @@
---- third_party/libusb/src/libusb/os/threads_posix.c.orig	2023-03-13 07:33:08 UTC
+--- third_party/libusb/src/libusb/os/threads_posix.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libusb/src/libusb/os/threads_posix.c
 @@ -19,9 +19,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c b/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
index fc9b86a3bf5e..0e8946ae3393 100644
--- a/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
+++ b/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
@@ -1,4 +1,4 @@
---- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig	2024-12-22 12:24:29 UTC
+--- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c
 @@ -120,9 +120,23 @@ static int arm_get_cpu_caps(void) {
    return flags;
diff --git a/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c b/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c
index 6a1bed820f4a..ba67cb798272 100644
--- a/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c
+++ b/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c
@@ -1,11 +1,11 @@
---- third_party/lzma_sdk/C/CpuArch.c.orig	2025-02-22 18:06:53 UTC
+--- third_party/lzma_sdk/C/CpuArch.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/lzma_sdk/C/CpuArch.c
-@@ -854,7 +854,35 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP
+@@ -854,6 +854,34 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP
  BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  
 +#elif defined(__OpenBSD__)
- 
++
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <machine/cpu.h>
@@ -32,20 +32,6 @@
 +MY_HWCAP_CHECK_FUNC (SHA1)
 +MY_HWCAP_CHECK_FUNC (SHA2)
 +MY_HWCAP_CHECK_FUNC (AES)
-+
- #else // __APPLE__
- 
- #if defined(__GLIBC__) && (__GLIBC__ * 100 + __GLIBC_MINOR__ >= 216)
-@@ -869,10 +897,12 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
-   #endif
- #endif
  
-+#if !defined(__FreeBSD__)
- #ifdef Z7_GETAUXV_AVAILABLE
- // #pragma message("=== Z7_GETAUXV_AVAILABLE === ")
- #include <sys/auxv.h>
- #define USE_HWCAP
-+#endif
- #endif
+ #else // __APPLE__
  
- #ifdef USE_HWCAP
diff --git a/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc b/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
index 5b759b63f3c4..85bb0a99122e 100644
--- a/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
+++ b/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
@@ -1,4 +1,4 @@
---- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig	2024-06-25 12:08:48 UTC
+--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/material_color_utilities/src/cpp/palettes/tones.cc
 @@ -14,6 +14,8 @@
   * limitations under the License.
diff --git a/www/iridium/files/patch-third__party_nasm_BUILD.gn b/www/iridium/files/patch-third__party_nasm_BUILD.gn
index 972f5a6a3831..0b85054625a4 100644
--- a/www/iridium/files/patch-third__party_nasm_BUILD.gn
+++ b/www/iridium/files/patch-third__party_nasm_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/nasm/BUILD.gn.orig	2024-06-24 21:00:43 UTC
+--- third_party/nasm/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/nasm/BUILD.gn
 @@ -63,6 +63,13 @@ config("nasm_config") {
  
diff --git a/www/iridium/files/patch-third__party_nasm_config_config-linux.h b/www/iridium/files/patch-third__party_nasm_config_config-linux.h
index 6cc968331f4e..a6966c45638c 100644
--- a/www/iridium/files/patch-third__party_nasm_config_config-linux.h
+++ b/www/iridium/files/patch-third__party_nasm_config_config-linux.h
@@ -1,4 +1,4 @@
---- third_party/nasm/config/config-linux.h.orig	2023-01-17 19:19:00 UTC
+--- third_party/nasm/config/config-linux.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/nasm/config/config-linux.h
 @@ -160,7 +160,7 @@
  
diff --git a/www/iridium/files/patch-third__party_node_node.gni b/www/iridium/files/patch-third__party_node_node.gni
index a2db610aab2f..d9514181eda2 100644
--- a/www/iridium/files/patch-third__party_node_node.gni
+++ b/www/iridium/files/patch-third__party_node_node.gni
@@ -1,4 +1,4 @@
---- third_party/node/node.gni.orig	2024-08-27 06:28:16 UTC
+--- third_party/node/node.gni.orig	2025-05-07 06:48:23 UTC
 +++ third_party/node/node.gni
 @@ -22,7 +22,7 @@ template("node") {
  
@@ -9,3 +9,21 @@
        inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ]
      }
      if (is_win && host_os == "win") {
+@@ -34,17 +34,6 @@ template("node") {
+       } else {
+         inputs += [ "//third_party/node/mac/node-darwin-x64/bin/node" ]
+       }
+-    }
+-
+-    # Automatically add a dependency to ":check_version" to ensure NodeJS is
+-    # always running the expected version, except when the ':check_version'
+-    # target itself is running in which case it shouldn't depend on itself.
+-    if (get_label_info(":" + target_name, "label_no_toolchain") !=
+-        "//third_party/node:check_version") {
+-      if (!defined(deps)) {
+-        deps = []
+-      }
+-      deps += [ "//third_party/node:check_version" ]
+     }
+   }
+ }
diff --git a/www/iridium/files/patch-third__party_node_node.py b/www/iridium/files/patch-third__party_node_node.py
index 7f2e7dc1e72c..3f0b4d0b29c7 100644
--- a/www/iridium/files/patch-third__party_node_node.py
+++ b/www/iridium/files/patch-third__party_node_node.py
@@ -1,4 +1,4 @@
---- third_party/node/node.py.orig	2025-04-16 18:18:42 UTC
+--- third_party/node/node.py.orig	2025-05-07 06:48:23 UTC
 +++ third_party/node/node.py
 @@ -20,6 +20,8 @@ def GetBinaryPath():
    return os_path.join(os_path.dirname(__file__), *{
diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
index 82847e4f6fd6..4b36d6a5ede7 100644
--- a/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
+++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2024-08-01 05:47:53 UTC
+--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp
 @@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = {
      {"ForteMT", "Forte"},
diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
index c412607fb3c7..05113567305d 100644
--- a/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
+++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2024-08-27 06:28:16 UTC
+--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
 @@ -20,7 +20,7 @@
  #include "core/fxge/fx_font.h"
diff --git a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
index a9925042ae94..0c0845c1309a 100644
--- a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
+++ b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2024-06-25 12:08:48 UTC
+--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/pdfium/fxjs/fx_date_helpers.cpp
 @@ -39,6 +39,11 @@ double GetLocalTZA() {
      return 0;
diff --git a/www/iridium/files/patch-third__party_pdfium_pdfium.gni b/www/iridium/files/patch-third__party_pdfium_pdfium.gni
index 91e02b17eb56..2fc9dc50e19c 100644
--- a/www/iridium/files/patch-third__party_pdfium_pdfium.gni
+++ b/www/iridium/files/patch-third__party_pdfium_pdfium.gni
@@ -1,4 +1,4 @@
---- third_party/pdfium/pdfium.gni.orig	2024-06-25 12:08:48 UTC
+--- third_party/pdfium/pdfium.gni.orig	2025-05-07 06:48:23 UTC
 +++ third_party/pdfium/pdfium.gni
 @@ -42,7 +42,7 @@ declare_args() {
    # PDFium will use PartitionAlloc partitions to separate strings, scalars,
diff --git a/www/iridium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp b/www/iridium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
index c6dc46c4001c..8922f64a101b 100644
--- a/www/iridium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
+++ b/www/iridium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp
 @@ -6,12 +6,16 @@
  
diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
index c0186503e32c..f55c8c5f05b0 100644
--- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
+++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/base/build_config.h.orig	2025-04-16 18:18:42 UTC
+--- third_party/perfetto/include/perfetto/base/build_config.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/include/perfetto/base/build_config.h
 @@ -27,6 +27,7 @@
  #if defined(__ANDROID__)
diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
index 7b461971711e..4a52c7711414 100644
--- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
+++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/include/perfetto/base/thread_utils.h
 @@ -37,6 +37,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre
  #include <sys/syscall.h>
diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h
index 36aab71bdc23..538327737563 100644
--- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h
+++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/base/time.h.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/include/perfetto/base/time.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/include/perfetto/base/time.h
 @@ -227,6 +227,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
  // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
index a53877ffd9b1..351e6503a8a8 100644
--- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
+++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/include/perfetto/ext/base/event_fd.h
 @@ -58,6 +58,8 @@ class EventFd {
    // On Mac and other non-Linux UNIX platforms a pipe-based fallback is used.
diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
index 3aba2726fda2..e0545dfd1aaf 100644
--- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
+++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2024-02-04 14:46:08 UTC
+--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
 @@ -41,9 +41,10 @@
  namespace perfetto {
diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
index f0d3d9c94d2c..fff0c9c9b13b 100644
--- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
+++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h.orig	2023-07-24 14:27:53 UTC
+--- third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h
 @@ -249,7 +249,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTraceId {
  // are different. E.g. on Mac size_t is considered a different type from
diff --git a/www/iridium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto b/www/iridium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
index 19941967ccb9..38bfa7ae2659 100644
--- a/www/iridium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
+++ b/www/iridium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
@@ -1,4 +1,4 @@
---- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig	2022-10-05 07:34:01 UTC
+--- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto
 @@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent {
    optional uint32 field = 2;
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc b/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc
index 1b2d1d792a57..3ac7bbc16dd2 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/clock_snapshots.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/base/clock_snapshots.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/clock_snapshots.cc
 @@ -27,6 +27,7 @@ ClockSnapshotVector CaptureClockSnapshots() {
  #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc b/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc
index fa5908009443..39cdb802c700 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/event_fd.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/base/event_fd.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/event_fd.cc
 @@ -24,7 +24,8 @@
  #include <synchapi.h>
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc b/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc
index 20b48e16caa2..cc287a063c6d 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/periodic_task.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/base/periodic_task.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/periodic_task.cc
 @@ -24,7 +24,7 @@
  #include "perfetto/base/time.h"
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc b/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc
index 987e8d252d3b..770c779cc3e8 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/string_utils.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/base/string_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/string_utils.cc
 @@ -39,7 +39,8 @@ namespace base {
  // Locale-independant as possible version of strtod.
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc b/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc
index c2a55df7d66e..80484f90ff37 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/subprocess_posix.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/base/subprocess_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/subprocess_posix.cc
 @@ -35,7 +35,8 @@
  #include <thread>
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
index 5c18b9e06764..59baafcd57d4 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/test/vm_test_utils.cc.orig	2022-10-05 07:34:01 UTC
+--- third_party/perfetto/src/base/test/vm_test_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/test/vm_test_utils.cc
 @@ -91,7 +91,7 @@ bool IsMapped(void* start, size_t size) {
    // Fuchsia doesn't yet support paging (b/119503290).
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc b/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc
index f5ca3a18ac08..31686f883358 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/thread_task_runner.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/base/thread_task_runner.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/thread_task_runner.cc
 @@ -27,7 +27,8 @@
  #include "perfetto/ext/base/thread_utils.h"
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc
index 633eea3eb72f..69f7e946de53 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/unix_socket.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/perfetto/src/base/unix_socket.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/unix_socket.cc
 @@ -45,7 +45,7 @@
  #include <unistd.h>
diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc b/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc
index e5b2b298096b..e2298ba7ee7e 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/utils.cc.orig	2025-04-16 18:18:42 UTC
+--- third_party/perfetto/src/base/utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/base/utils.cc
 @@ -38,7 +38,8 @@
  #include <mach/vm_page_size.h>
diff --git a/www/iridium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc b/www/iridium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
index 605ad1cd96cf..74572cde16d4 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc
 @@ -62,7 +62,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id,
      case FtraceEvent::kV4l2QbufFieldNumber: {
diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
index f2b45a8e5a9e..daa277cc8056 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/tracing/ipc/memfd.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/tracing/ipc/memfd.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/tracing/ipc/memfd.cc
 @@ -20,7 +20,8 @@
  
diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc
index 16e26d56b49d..4db5c75613b4 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/tracing/platform_posix.cc.orig	2024-12-22 12:24:29 UTC
+--- third_party/perfetto/src/tracing/platform_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/tracing/platform_posix.cc
 @@ -110,12 +110,13 @@ std::unique_ptr<base::TaskRunner> PlatformPosix::Creat
  }
diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc
index c3d545da0d54..b021ce4336d4 100644
--- a/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc
+++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/tracing/track.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/perfetto/src/tracing/track.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/perfetto/src/tracing/track.cc
 @@ -60,8 +60,9 @@ protos::gen::TrackDescriptor ProcessTrack::Serialize()
    auto desc = Track::Serialize();
diff --git a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
index 17450ff6db6c..3f4899e2a1ff 100644
--- a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
+++ b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
@@ -1,4 +1,4 @@
---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2025-04-16 18:18:42 UTC
+--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
 @@ -99,7 +99,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
  
diff --git a/www/iridium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp b/www/iridium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
index 928249397d42..929b23f6c118 100644
--- a/www/iridium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
+++ b/www/iridium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
@@ -1,4 +1,4 @@
---- third_party/skia/src/ports/SkMemory_malloc.cpp.orig	2024-06-25 12:08:48 UTC
+--- third_party/skia/src/ports/SkMemory_malloc.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/skia/src/ports/SkMemory_malloc.cpp
 @@ -15,7 +15,7 @@
  
diff --git a/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__posix.cpp b/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
index b30144383d89..22cff79d51c0 100644
--- a/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
+++ b/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
@@ -1,4 +1,4 @@
---- third_party/skia/src/ports/SkOSFile_posix.cpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/skia/src/ports/SkOSFile_posix.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/skia/src/ports/SkOSFile_posix.cpp
 @@ -25,7 +25,7 @@
  #endif
diff --git a/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h
index 595651480f55..9e2f340492e5 100644
--- a/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h
+++ b/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h
@@ -1,4 +1,4 @@
---- third_party/speech-dispatcher/libspeechd_version.h.orig	2025-04-16 18:18:42 UTC
+--- third_party/speech-dispatcher/libspeechd_version.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/speech-dispatcher/libspeechd_version.h
 @@ -0,0 +1,29 @@
 +/*
@@ -19,7 +19,7 @@
 + * You should have received a copy of the GNU Lesser General Public License
 + * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 + *
-+ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.10 2025/04/16 17:46:13 robert Exp $
++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.11 2025/05/06 18:54:42 robert Exp $
 + */
 +
 +#ifndef _LIBSPEECHD_VERSION_H
diff --git a/www/iridium/files/patch-third__party_speech-dispatcher_speechd__types.h b/www/iridium/files/patch-third__party_speech-dispatcher_speechd__types.h
index 25b3590531e9..d165802f6c44 100644
--- a/www/iridium/files/patch-third__party_speech-dispatcher_speechd__types.h
+++ b/www/iridium/files/patch-third__party_speech-dispatcher_speechd__types.h
@@ -1,4 +1,4 @@
---- third_party/speech-dispatcher/speechd_types.h.orig	2024-02-04 14:46:08 UTC
+--- third_party/speech-dispatcher/speechd_types.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/speech-dispatcher/speechd_types.h
 @@ -119,4 +119,139 @@ typedef struct {
  	SPDVoice voice;
diff --git a/www/iridium/files/patch-third__party_sqlite_BUILD.gn b/www/iridium/files/patch-third__party_sqlite_BUILD.gn
index 05ad8798c35a..0592a7211810 100644
--- a/www/iridium/files/patch-third__party_sqlite_BUILD.gn
+++ b/www/iridium/files/patch-third__party_sqlite_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/sqlite/BUILD.gn.orig	2025-03-18 16:46:04 UTC
+--- third_party/sqlite/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/sqlite/BUILD.gn
 @@ -155,7 +155,7 @@ config("sqlite_warnings") {
        ]
diff --git a/www/iridium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/www/iridium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
index f82cbc2dea60..3e4e838bfc14 100644
--- a/www/iridium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
+++ b/www/iridium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-02-22 18:06:53 UTC
+--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-05-08 06:33:24 UTC
 +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
diff --git a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
index 9dff21769c8c..6f5ce9d09c77 100644
--- a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-11-04 08:56:03 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2025-05-08 06:33:24 UTC
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
@@ -9,7 +9,7 @@
  #  define _XOPEN_SOURCE 600
  #endif
  
-@@ -45183,7 +45183,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45387,7 +45387,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -22,7 +22,7 @@
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
      if( fd<0 ){
-@@ -45198,6 +45203,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45402,6 +45407,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
        robust_close(0, fd, __LINE__);
      }
    }
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp b/www/iridium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
index 681ef286a607..628c50b3775b 100644
--- a/www/iridium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
+++ b/www/iridium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/src/Reactor/Debug.cpp
 @@ -46,7 +46,7 @@ namespace {
  
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_System_Configurator.cpp b/www/iridium/files/patch-third__party_swiftshader_src_System_Configurator.cpp
index 485ddcf65bb4..70478e5002fa 100644
--- a/www/iridium/files/patch-third__party_swiftshader_src_System_Configurator.cpp
+++ b/www/iridium/files/patch-third__party_swiftshader_src_System_Configurator.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/System/Configurator.cpp.orig	2022-10-05 07:34:01 UTC
+--- third_party/swiftshader/src/System/Configurator.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/src/System/Configurator.cpp
 @@ -38,6 +38,9 @@ namespace sw {
  
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp b/www/iridium/files/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
index 7cf123546346..db696f1cffee 100644
--- a/www/iridium/files/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
+++ b/www/iridium/files/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/System/Linux/MemFd.cpp.orig	2023-10-21 11:51:27 UTC
+--- third_party/swiftshader/src/System/Linux/MemFd.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/src/System/Linux/MemFd.cpp
 @@ -25,6 +25,7 @@
  #	define MFD_CLOEXEC 0x0001U
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp b/www/iridium/files/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
index 210975d98f22..6fb769a2b6da 100644
--- a/www/iridium/files/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
+++ b/www/iridium/files/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp.orig	2022-03-28 18:11:04 UTC
+--- third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp
 @@ -49,13 +49,17 @@ class SharedSemaphore (public)
  	{
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp b/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp
index 5aa010c4e7d2..c2cd972e454f 100644
--- a/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp
+++ b/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/WSI/libXCB.cpp.orig	2023-03-13 07:33:08 UTC
+--- third_party/swiftshader/src/WSI/libXCB.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/src/WSI/libXCB.cpp
 @@ -57,7 +57,7 @@ LibXcbExports *LibXCB::loadExports()
  		}
diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
index a25fe5194a2f..2ba167bfd3c2 100644
--- a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
+++ b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
@@ -1,4 +1,4 @@
---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2022-10-05 07:34:01 UTC
+--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
 @@ -29,7 +29,7 @@
  
diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
index 04fa1f796fac..7103023eab39 100644
--- a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
+++ b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
@@ -1,4 +1,4 @@
---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
 @@ -5,8 +5,6 @@
  #include "llvm/Config/llvm-config.h"
diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
index 65da636c74c6..8d663c8639d8 100644
--- a/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
+++ b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/third_party/marl/src/memory.cpp.orig	2023-08-28 20:17:35 UTC
+--- third_party/swiftshader/third_party/marl/src/memory.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/third_party/marl/src/memory.cpp
 @@ -19,7 +19,7 @@
  
diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
index 2c94e189dc3e..5582f467915d 100644
--- a/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
+++ b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/third_party/marl/src/thread.cpp.orig	2023-08-28 20:17:35 UTC
+--- third_party/swiftshader/third_party/marl/src/thread.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/swiftshader/third_party/marl/src/thread.cpp
 @@ -444,7 +444,7 @@ void Thread::setName(const char* fmt, ...) {
    pthread_setname_np(name);
diff --git a/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn b/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn
index 1ddc8f98df1e..d235278a832f 100644
--- a/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn
+++ b/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/test_fonts/fontconfig/BUILD.gn.orig	2025-02-22 18:06:53 UTC
+--- third_party/test_fonts/fontconfig/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/test_fonts/fontconfig/BUILD.gn
 @@ -26,7 +26,11 @@ if (is_linux || is_chromeos) {
  
diff --git a/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
index 90d679f6a85d..d1eab9eb178e 100644
--- a/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
+++ b/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
@@ -1,4 +1,4 @@
---- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig	2024-06-25 12:08:48 UTC
+--- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/test_fonts/fontconfig/fontconfig_util_linux.cc
 @@ -2,6 +2,8 @@
  // Use of this source code is governed by a BSD-style license that can be
diff --git a/www/iridium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/www/iridium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
index de2b2abe9966..b835c35d30ae 100644
--- a/www/iridium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
+++ b/www/iridium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
@@ -1,4 +1,4 @@
---- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig	2023-04-22 17:45:15 UTC
+--- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
 @@ -56,7 +56,7 @@ int main() {
    FcFini();
diff --git a/www/iridium/files/patch-third__party_tflite_features.gni b/www/iridium/files/patch-third__party_tflite_features.gni
index fbb4f4e159c4..6eb2ac9d599f 100644
--- a/www/iridium/files/patch-third__party_tflite_features.gni
+++ b/www/iridium/files/patch-third__party_tflite_features.gni
@@ -1,4 +1,4 @@
---- third_party/tflite/features.gni.orig	2024-08-01 05:47:53 UTC
+--- third_party/tflite/features.gni.orig	2025-05-07 06:48:23 UTC
 +++ third_party/tflite/features.gni
 @@ -9,8 +9,8 @@ declare_args() {
    # This enables building TFLite with XNNPACK. Currently only available for
diff --git a/www/iridium/files/patch-third__party_unrar_src_crypt.cpp b/www/iridium/files/patch-third__party_unrar_src_crypt.cpp
index 4b05b085c4c2..49eb1ccd51d6 100644
--- a/www/iridium/files/patch-third__party_unrar_src_crypt.cpp
+++ b/www/iridium/files/patch-third__party_unrar_src_crypt.cpp
@@ -1,4 +1,4 @@
---- third_party/unrar/src/crypt.cpp.orig	2024-08-01 05:47:53 UTC
+--- third_party/unrar/src/crypt.cpp.orig	2025-05-07 06:48:23 UTC
 +++ third_party/unrar/src/crypt.cpp
 @@ -116,6 +116,8 @@ void GetRnd(byte *RndBuf,size_t BufSize)
      Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) != FALSE;
diff --git a/www/iridium/files/patch-third__party_vulkan-loader_src_BUILD.gn b/www/iridium/files/patch-third__party_vulkan-loader_src_BUILD.gn
index 3085da4b83dc..00c626809fac 100644
--- a/www/iridium/files/patch-third__party_vulkan-loader_src_BUILD.gn
+++ b/www/iridium/files/patch-third__party_vulkan-loader_src_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/vulkan-loader/src/BUILD.gn.orig	2024-11-04 08:56:03 UTC
+--- third_party/vulkan-loader/src/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/vulkan-loader/src/BUILD.gn
 @@ -57,7 +57,7 @@ config("vulkan_internal_config") {
      defines += [
diff --git a/www/iridium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/iridium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h
index bb956b73eb66..c60b5dc4528d 100644
--- a/www/iridium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h
+++ b/www/iridium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h
@@ -1,4 +1,4 @@
---- third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig	2025-03-18 16:46:04 UTC
+--- third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/vulkan-loader/src/loader/vk_loader_platform.h
 @@ -353,7 +353,15 @@ static inline char *loader_platform_executable_path(ch
  
diff --git a/www/iridium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
index 65441b6bd291..fea28b35de65 100644
--- a/www/iridium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
+++ b/www/iridium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
@@ -1,4 +1,4 @@
---- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig	2025-03-18 16:46:04 UTC
+--- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
 @@ -2971,7 +2971,7 @@ static void* vma_aligned_alloc(size_t alignment, size_
  
diff --git a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
index 9d8ad286bc42..d1365c6a934e 100644
--- a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
+++ b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
@@ -1,4 +1,4 @@
---- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig	2024-02-04 14:46:08 UTC
+--- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
 @@ -2760,7 +2760,7 @@ void* vma_aligned_alloc(size_t alignment, size_t size)
  
diff --git a/www/iridium/files/patch-third__party_wayland_BUILD.gn b/www/iridium/files/patch-third__party_wayland_BUILD.gn
index cb79f578f273..c3c97ad254da 100644
--- a/www/iridium/files/patch-third__party_wayland_BUILD.gn
+++ b/www/iridium/files/patch-third__party_wayland_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/wayland/BUILD.gn.orig	2024-08-27 06:28:16 UTC
+--- third_party/wayland/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/wayland/BUILD.gn
 @@ -24,6 +24,11 @@ if (!use_system_libwayland) {
        "src/src",
diff --git a/www/iridium/files/patch-third__party_wayland_include_config.h b/www/iridium/files/patch-third__party_wayland_include_config.h
index 74f3c97f139e..d18cae48b2ef 100644
--- a/www/iridium/files/patch-third__party_wayland_include_config.h
+++ b/www/iridium/files/patch-third__party_wayland_include_config.h
@@ -1,4 +1,4 @@
---- third_party/wayland/include/config.h.orig	2024-02-04 14:46:08 UTC
+--- third_party/wayland/include/config.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/wayland/include/config.h
 @@ -9,7 +9,14 @@
  
diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn
index 853a999295cb..1a49805de158 100644
--- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn
+++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/webrtc/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- third_party/webrtc/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/BUILD.gn
 @@ -219,6 +219,9 @@ config("common_inherited_config") {
    if (is_linux || is_chromeos) {
diff --git a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index 320ae262a526..a7dfaa7709b4 100644
--- a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2024-11-04 08:56:03 UTC
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/modules/audio_device/BUILD.gn
 @@ -330,7 +330,7 @@ rtc_library("audio_device_impl") {
      if (rtc_use_dummy_audio_file_devices) {
diff --git a/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
index 5d545c5a5561..8ad54395a1f9 100644
--- a/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
+++ b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
@@ -1,18 +1,12 @@
---- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2023-08-28 20:17:35 UTC
+--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
-@@ -10,11 +10,15 @@
- 
+@@ -11,7 +11,9 @@
  #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
  
+ #include <EGL/eglext.h>
 +#if !defined(WEBRTC_BSD)
  #include <asm/ioctl.h>
 +#endif
  #include <dlfcn.h>
  #include <fcntl.h>
  #include <libdrm/drm_fourcc.h>
-+#if !defined(WEBRTC_BSD)
- #include <linux/types.h>
-+#endif
- #include <spa/param/video/format-utils.h>
- #include <unistd.h>
- #include <xf86drm.h>
diff --git a/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
index 7862edb6b19a..4d8f7be47062 100644
--- a/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
+++ b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2023-07-24 14:27:53 UTC
+--- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
 @@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
  void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) {
diff --git a/www/iridium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/iridium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc
deleted file mode 100644
index 33afacfc84c5..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig	2025-03-24 05:49:20 UTC
-+++ third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-       .param = OnNodeParam,
-   };
- 
--  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
- }
- 
- // static
-@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod
-       uint32_t id = info->params[i].id;
-       if (id == SPA_PARAM_EnumFormat &&
-           info->params[i].flags & SPA_PARAM_INFO_READ) {
--        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-         break;
-       }
-     }
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h
index 8a636a1479ee..dfdb3fb0e036 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/byte_order.h.orig	2023-03-13 07:33:08 UTC
+--- third_party/webrtc/rtc_base/byte_order.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/byte_order.h
 @@ -90,6 +90,8 @@
  #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined.
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc
index 787fe3236215..ae651b427310 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/ip_address.cc.orig	2024-11-04 08:56:03 UTC
+--- third_party/webrtc/rtc_base/ip_address.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/ip_address.cc
 @@ -14,7 +14,8 @@
  #include <cstring>
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
index bb9ec34fd341..1fd3bcc4e4fb 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/net_test_helpers.cc.orig	2023-10-21 11:51:27 UTC
+--- third_party/webrtc/rtc_base/net_test_helpers.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/net_test_helpers.cc
 @@ -21,6 +21,7 @@
  #endif
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc
index 34e637e36472..a31a1c4c4f96 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,14 +1,14 @@
---- third_party/webrtc/rtc_base/network.cc.orig	2024-06-25 12:08:48 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/network.cc
-@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
+@@ -314,7 +314,12 @@ webrtc::AdapterType GetAdapterTypeFromName(absl::strin
    }
  #endif
  
 +#if defined(WEBRTC_BSD)
 +  // Treat all other network interface names as ethernet on BSD
-+  return ADAPTER_TYPE_ETHERNET;
++  return webrtc::ADAPTER_TYPE_ETHERNET;
 +#else
-   return ADAPTER_TYPE_UNKNOWN;
+   return webrtc::ADAPTER_TYPE_UNKNOWN;
 +#endif
  }
  
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index e8ebea569240..804914e3e3f2 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-02-22 18:06:53 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
 @@ -55,7 +55,7 @@
  #include "rtc_base/time_utils.h"
@@ -18,7 +18,7 @@
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -330,7 +330,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
+@@ -331,7 +331,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
      return -1;
    }
    if (opt == OPT_DONTFRAGMENT) {
@@ -27,7 +27,7 @@
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -359,7 +359,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -360,7 +360,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -36,7 +36,7 @@
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -390,7 +390,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -391,7 +391,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
  int PhysicalSocket::Send(const void* pv, size_t cb) {
    int sent = DoSend(
        s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -45,7 +45,7 @@
        // Suppress SIGPIPE. Without this, attempting to send on a socket whose
        // other end is closed will result in a SIGPIPE signal being raised to
        // our process, which by default will terminate the process, which we
-@@ -419,7 +419,7 @@ int PhysicalSocket::SendTo(const void* buffer,
+@@ -420,7 +420,7 @@ int PhysicalSocket::SendTo(const void* buffer,
    size_t len = addr.ToSockAddrStorage(&saddr);
    int sent =
        DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -54,7 +54,7 @@
                 // Suppress SIGPIPE. See above for explanation.
                 MSG_NOSIGNAL,
  #else
-@@ -699,7 +699,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -698,7 +698,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
@@ -63,7 +63,7 @@
        RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
        return -1;
  #elif defined(WEBRTC_POSIX)
-@@ -748,7 +748,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -747,7 +747,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        return -1;
  #endif
      case OPT_RECV_ECN:
@@ -72,7 +72,7 @@
        if (family_ == AF_INET6) {
          *slevel = IPPROTO_IPV6;
          *sopt = IPV6_RECVTCLASS;
-@@ -768,10 +768,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -767,10 +767,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = SO_KEEPALIVE;
        break;
      case OPT_TCP_KEEPCNT:
@@ -92,7 +92,7 @@
        *slevel = IPPROTO_TCP;
  #if !defined(WEBRTC_MAC)
        *sopt = TCP_KEEPIDLE;
-@@ -779,12 +788,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -778,12 +787,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = TCP_KEEPALIVE;
  #endif
        break;
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
index e001d6d9ca6a..e17b44da452f 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.h.orig	2024-02-04 14:46:08 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.h
 @@ -18,7 +18,7 @@
  #include "rtc_base/third_party/sigslot/sigslot.h"
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
index 41def420756c..ee0b59ab52d6 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2023-03-13 07:33:08 UTC
+--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/platform_thread_types.cc
 @@ -11,7 +11,9 @@
  #include "rtc_base/platform_thread_types.h"
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
index 301b535f392a..eedbc8656cdb 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2022-03-28 18:11:04 UTC
+--- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h
 @@ -178,6 +178,10 @@ class multi_threaded_local {
  #endif  // _SIGSLOT_HAS_WIN32_THREADS
diff --git a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
index 16fbbb3674a9..b76b9de85de4 100644
--- a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2024-11-04 08:56:03 UTC
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/webrtc/system_wrappers/BUILD.gn
 @@ -62,8 +62,6 @@ rtc_library("system_wrappers") {
      if (!build_with_chromium) {
diff --git a/www/iridium/files/patch-third__party_widevine_cdm_widevine.gni b/www/iridium/files/patch-third__party_widevine_cdm_widevine.gni
index 4193d3ec7263..c1a8f4d17c42 100644
--- a/www/iridium/files/patch-third__party_widevine_cdm_widevine.gni
+++ b/www/iridium/files/patch-third__party_widevine_cdm_widevine.gni
@@ -1,4 +1,4 @@
---- third_party/widevine/cdm/widevine.gni.orig	2024-02-04 14:46:08 UTC
+--- third_party/widevine/cdm/widevine.gni.orig	2025-05-07 06:48:23 UTC
 +++ third_party/widevine/cdm/widevine.gni
 @@ -28,6 +28,8 @@ library_widevine_cdm_available =
      (is_chromeos &&
diff --git a/www/iridium/files/patch-third__party_zlib_BUILD.gn b/www/iridium/files/patch-third__party_zlib_BUILD.gn
index e5dba94ff5f5..c5a4d4a5a151 100644
--- a/www/iridium/files/patch-third__party_zlib_BUILD.gn
+++ b/www/iridium/files/patch-third__party_zlib_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/zlib/BUILD.gn.orig	2024-08-01 05:47:53 UTC
+--- third_party/zlib/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ third_party/zlib/BUILD.gn
 @@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) {
      defines = [ "CRC32_ARMV8_CRC32" ]
diff --git a/www/iridium/files/patch-third__party_zlib_cpu__features.c b/www/iridium/files/patch-third__party_zlib_cpu__features.c
index 1b03475a4e5f..12cce1f19249 100644
--- a/www/iridium/files/patch-third__party_zlib_cpu__features.c
+++ b/www/iridium/files/patch-third__party_zlib_cpu__features.c
@@ -1,4 +1,4 @@
---- third_party/zlib/cpu_features.c.orig	2024-06-25 12:08:48 UTC
+--- third_party/zlib/cpu_features.c.orig	2025-05-07 06:48:23 UTC
 +++ third_party/zlib/cpu_features.c
 @@ -39,7 +39,8 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0;
  #ifndef CPU_NO_SIMD
diff --git a/www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py b/www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py
index 5a52be506836..1c1c55c56b18 100644
--- a/www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py
+++ b/www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py
@@ -1,4 +1,4 @@
---- tools/generate_shim_headers/generate_shim_headers.py.orig	2023-07-24 14:27:53 UTC
+--- tools/generate_shim_headers/generate_shim_headers.py.orig	2025-05-07 06:48:23 UTC
 +++ tools/generate_shim_headers/generate_shim_headers.py
 @@ -18,7 +18,7 @@ import sys
  
diff --git a/www/iridium/files/patch-tools_generate__stubs_rules.gni b/www/iridium/files/patch-tools_generate__stubs_rules.gni
index 62f9ff55777e..4f93cee3434e 100644
--- a/www/iridium/files/patch-tools_generate__stubs_rules.gni
+++ b/www/iridium/files/patch-tools_generate__stubs_rules.gni
@@ -1,4 +1,4 @@
---- tools/generate_stubs/rules.gni.orig	2022-10-05 07:34:01 UTC
+--- tools/generate_stubs/rules.gni.orig	2025-05-07 06:48:23 UTC
 +++ tools/generate_stubs/rules.gni
 @@ -110,7 +110,6 @@ template("generate_stubs") {
        "${target_gen_dir}/${invoker.output_name}.cc",
diff --git a/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template b/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template
index 243caea9550e..da59dd27b01c 100644
--- a/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template
+++ b/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template
@@ -1,4 +1,4 @@
---- tools/gn/build/build_linux.ninja.template.orig	2024-06-25 12:08:48 UTC
+--- tools/gn/build/build_linux.ninja.template.orig	2025-05-07 06:48:23 UTC
 +++ tools/gn/build/build_linux.ninja.template
 @@ -5,7 +5,7 @@ rule cxx
    deps = gcc
diff --git a/www/iridium/files/patch-tools_gn_build_gen.py b/www/iridium/files/patch-tools_gn_build_gen.py
index f670fae93efe..84ce4a92d723 100644
--- a/www/iridium/files/patch-tools_gn_build_gen.py
+++ b/www/iridium/files/patch-tools_gn_build_gen.py
@@ -1,4 +1,4 @@
---- tools/gn/build/gen.py.orig	2024-06-25 12:08:48 UTC
+--- tools/gn/build/gen.py.orig	2025-05-07 06:48:23 UTC
 +++ tools/gn/build/gen.py
 @@ -94,6 +94,12 @@ class Platform(object):
    def is_solaris(self):
@@ -22,7 +22,7 @@
        'haiku': 'build_haiku.ninja.template',
        'solaris': 'build_linux.ninja.template',
        'netbsd': 'build_linux.ninja.template',
-@@ -539,6 +545,9 @@ def WriteGNNinja(path, platform, host, options, args_l
+@@ -542,6 +548,9 @@ def WriteGNNinja(path, platform, host, options, args_l
  
      if platform.is_posix() and not platform.is_haiku():
        ldflags.append('-pthread')
diff --git a/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc b/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc
index 0364154ae574..979b7f9ab7e0 100644
--- a/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc
+++ b/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc
@@ -1,4 +1,4 @@
---- tools/gn/src/base/files/file_posix.cc.orig	2024-11-04 08:56:03 UTC
+--- tools/gn/src/base/files/file_posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ tools/gn/src/base/files/file_posix.cc
 @@ -359,7 +359,7 @@ void File::DoInitialize(const FilePath& path, uint32_t
  bool File::Flush() {
diff --git a/www/iridium/files/patch-tools_gn_src_gn_version.h b/www/iridium/files/patch-tools_gn_src_gn_version.h
index 3ee9e4d30ba2..e1c8515967f6 100644
--- a/www/iridium/files/patch-tools_gn_src_gn_version.h
+++ b/www/iridium/files/patch-tools_gn_src_gn_version.h
@@ -1,4 +1,4 @@
---- tools/gn/src/gn/version.h.orig	2022-03-28 18:11:04 UTC
+--- tools/gn/src/gn/version.h.orig	2025-05-07 06:48:23 UTC
 +++ tools/gn/src/gn/version.h
 @@ -22,9 +22,9 @@ class Version {
  
diff --git a/www/iridium/files/patch-tools_gn_src_util_exe__path.cc b/www/iridium/files/patch-tools_gn_src_util_exe__path.cc
index 25f25b4cdff5..1c2f4bd05597 100644
--- a/www/iridium/files/patch-tools_gn_src_util_exe__path.cc
+++ b/www/iridium/files/patch-tools_gn_src_util_exe__path.cc
@@ -1,4 +1,4 @@
---- tools/gn/src/util/exe_path.cc.orig	2022-03-28 18:11:04 UTC
+--- tools/gn/src/util/exe_path.cc.orig	2025-05-07 06:48:23 UTC
 +++ tools/gn/src/util/exe_path.cc
 @@ -15,7 +15,7 @@
  #include <windows.h>
diff --git a/www/iridium/files/patch-tools_grit_grit_node_base.py b/www/iridium/files/patch-tools_grit_grit_node_base.py
index 5ec07260e406..8a25f3a4b8fa 100644
--- a/www/iridium/files/patch-tools_grit_grit_node_base.py
+++ b/www/iridium/files/patch-tools_grit_grit_node_base.py
@@ -1,4 +1,4 @@
---- tools/grit/grit/node/base.py.orig	2025-04-16 18:18:42 UTC
+--- tools/grit/grit/node/base.py.orig	2025-05-07 06:48:23 UTC
 +++ tools/grit/grit/node/base.py
 @@ -496,7 +496,8 @@ class Node:
          value = defs
diff --git a/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py
index ec12890d4f40..2522947cb025 100644
--- a/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py
+++ b/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py
@@ -1,4 +1,4 @@
---- tools/json_schema_compiler/cpp_bundle_generator.py.orig	2025-04-16 18:18:42 UTC
+--- tools/json_schema_compiler/cpp_bundle_generator.py.orig	2025-05-07 06:48:23 UTC
 +++ tools/json_schema_compiler/cpp_bundle_generator.py
 @@ -140,7 +140,7 @@ class CppBundleGenerator(object):
        elif platform == Platforms.FUCHSIA:
diff --git a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py
index e4b5c6623495..3ca293467d04 100644
--- a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,4 +1,4 @@
---- tools/json_schema_compiler/feature_compiler.py.orig	2025-04-16 18:18:42 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig	2025-05-07 06:48:23 UTC
 +++ tools/json_schema_compiler/feature_compiler.py
 @@ -289,6 +289,8 @@ FEATURE_GRAMMAR = ({
                  'linux': 'Feature::LINUX_PLATFORM',
diff --git a/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h b/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h
index d92ef47a596f..4afb36c40564 100644
--- a/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h
+++ b/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h
@@ -1,4 +1,4 @@
---- tools/memory/partition_allocator/inspect_utils.h.orig	2024-06-25 12:08:48 UTC
+--- tools/memory/partition_allocator/inspect_utils.h.orig	2025-05-07 06:48:23 UTC
 +++ tools/memory/partition_allocator/inspect_utils.h
 @@ -61,7 +61,7 @@ class RemoteProcessMemoryReader {
    const pid_t pid_;
diff --git a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index 3f5bc5b8fe7c..ce7be23ba56d 100644
--- a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -61,7 +61,7 @@ group("telemetry_chrome_test") {
+@@ -56,7 +56,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
@@ -9,7 +9,7 @@
      data_deps += [ "//third_party/breakpad:dump_syms" ]
  
      # CrOS currently has issues with the locally compiled version of
-@@ -215,7 +215,7 @@ group("telemetry_chrome_test_without_chrome") {
+@@ -210,7 +210,7 @@ group("telemetry_chrome_test_without_chrome") {
    ]
  
    # Cr-Fuchsia doesn't support breakpad.
diff --git a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py
index 5cbdebbabb5d..2ecbab30fa8e 100644
--- a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py
+++ b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py
@@ -1,4 +1,4 @@
---- tools/protoc_wrapper/protoc_wrapper.py.orig	2024-06-25 12:08:48 UTC
+--- tools/protoc_wrapper/protoc_wrapper.py.orig	2025-05-07 06:48:23 UTC
 +++ tools/protoc_wrapper/protoc_wrapper.py
 @@ -183,15 +183,19 @@ def main(argv):
      if not options.exclude_imports:
diff --git a/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
index f684ea111dd5..c5cd1f125f7b 100644
--- a/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
+++ b/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
@@ -1,4 +1,4 @@
---- tools/variations/fieldtrial_to_struct.py.orig	2022-03-28 18:11:04 UTC
+--- tools/variations/fieldtrial_to_struct.py.orig	2025-05-07 06:48:23 UTC
 +++ tools/variations/fieldtrial_to_struct.py
 @@ -41,6 +41,8 @@ _platforms = [
      'linux',
diff --git a/www/iridium/files/patch-ui_accessibility_accessibility__features.cc b/www/iridium/files/patch-ui_accessibility_accessibility__features.cc
index 41b624f2f80e..8502b5991b1a 100644
--- a/www/iridium/files/patch-ui_accessibility_accessibility__features.cc
+++ b/www/iridium/files/patch-ui_accessibility_accessibility__features.cc
@@ -1,6 +1,6 @@
---- ui/accessibility/accessibility_features.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/accessibility/accessibility_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/accessibility/accessibility_features.cc
-@@ -440,7 +440,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled
+@@ -472,7 +472,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled
  }
  #endif  // BUILDFLAG(IS_MAC)
  
diff --git a/www/iridium/files/patch-ui_accessibility_accessibility__features.h b/www/iridium/files/patch-ui_accessibility_accessibility__features.h
index c5a6b6c96e64..2bf2d7772049 100644
--- a/www/iridium/files/patch-ui_accessibility_accessibility__features.h
+++ b/www/iridium/files/patch-ui_accessibility_accessibility__features.h
@@ -1,6 +1,6 @@
---- ui/accessibility/accessibility_features.h.orig	2025-04-16 18:18:42 UTC
+--- ui/accessibility/accessibility_features.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/accessibility/accessibility_features.h
-@@ -306,7 +306,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc
+@@ -324,7 +324,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc
  AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled();
  #endif  // BUILDFLAG(IS_MAC)
  
diff --git a/www/iridium/files/patch-ui_accessibility_ax__node.cc b/www/iridium/files/patch-ui_accessibility_ax__node.cc
new file mode 100644
index 000000000000..a41136422685
--- /dev/null
+++ b/www/iridium/files/patch-ui_accessibility_ax__node.cc
@@ -0,0 +1,20 @@
+--- ui/accessibility/ax_node.cc.orig	2025-05-07 06:48:23 UTC
++++ ui/accessibility/ax_node.cc
+@@ -1553,7 +1553,7 @@ AXNode::GetExtraMacNodes() const {
+   return &table_info->extra_mac_nodes;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ AXNode* AXNode::GetExtraAnnouncementNode(
+     ax::mojom::AriaNotificationPriority priority_property) const {
+   if (!tree_->extra_announcement_nodes()) {
+@@ -1581,7 +1581,7 @@ bool AXNode::IsGenerated() const {
+       GetRole() == ax::mojom::Role::kColumn ||
+       GetRole() == ax::mojom::Role::kTableHeaderContainer;
+   DCHECK_EQ(is_generated_node, is_extra_mac_node_role);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   //  On Linux, generated nodes are always children of the root.
+   if (GetParent() && GetParent()->GetManager()) {
+     DCHECK(GetParent()->GetManager()->IsRoot());
diff --git a/www/iridium/files/patch-ui_accessibility_ax__node.h b/www/iridium/files/patch-ui_accessibility_ax__node.h
new file mode 100644
index 000000000000..e3c8dd52cc02
--- /dev/null
+++ b/www/iridium/files/patch-ui_accessibility_ax__node.h
@@ -0,0 +1,11 @@
+--- ui/accessibility/ax_node.h.orig	2025-05-07 06:48:23 UTC
++++ ui/accessibility/ax_node.h
+@@ -587,7 +587,7 @@ class AX_EXPORT AXNode final {
+   const std::vector<raw_ptr<AXNode, VectorExperimental>>* GetExtraMacNodes()
+       const;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   AXNode* GetExtraAnnouncementNode(
+       ax::mojom::AriaNotificationPriority priority_property) const;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-ui_accessibility_ax__tree.cc b/www/iridium/files/patch-ui_accessibility_ax__tree.cc
new file mode 100644
index 000000000000..100dd0b24323
--- /dev/null
+++ b/www/iridium/files/patch-ui_accessibility_ax__tree.cc
@@ -0,0 +1,38 @@
+--- ui/accessibility/ax_tree.cc.orig	2025-05-07 06:48:23 UTC
++++ ui/accessibility/ax_tree.cc
+@@ -824,7 +824,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged(
+   return old_node_is_ignored != new_node_is_ignored;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) {
+   assertive_node_ = CreateNode("assertive", root);
+   polite_node_ = CreateNode("polite", root);
+@@ -917,7 +917,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) const {
+ 
+ void AXTree::Destroy() {
+   base::ElapsedThreadTimer timer;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   ClearExtraAnnouncementNodes();
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -2104,7 +2104,7 @@ void AXTree::NotifyNodeAttributesWillChange(
+                     new_data);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void AXTree::ClearExtraAnnouncementNodes() {
+   if (!extra_announcement_nodes_) {
+     return;
+@@ -2493,7 +2493,7 @@ bool AXTree::CreateNewChildVector(
+     AXTreeUpdateState* update_state) {
+   DCHECK(GetTreeUpdateInProgressState());
+   bool success = true;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // If the root node has children added, clear the extra announcement nodes,
+   // which should always have their indices as the last two children of the root
+   // node. They will be recreated if needed, and given the correct indices.
diff --git a/www/iridium/files/patch-ui_accessibility_ax__tree.h b/www/iridium/files/patch-ui_accessibility_ax__tree.h
new file mode 100644
index 000000000000..b6987f98ed15
--- /dev/null
+++ b/www/iridium/files/patch-ui_accessibility_ax__tree.h
@@ -0,0 +1,29 @@
+--- ui/accessibility/ax_tree.h.orig	2025-05-07 06:48:23 UTC
++++ ui/accessibility/ax_tree.h
+@@ -62,7 +62,7 @@ enum class AXTreeUnserializeError {
+ };
+ // LINT.ThenChange(/tools/metrics/histograms/metadata/accessibility/enums.xml:AccessibilityTreeUnserializeError)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // To support AriaNotify on older versions of ATK, we need to use the ATK
+ // signal "Text::text-insert". This signal requires a node that is a
+ // text type, and it needs to have aria-live properties set in order for
+@@ -287,7 +287,7 @@ class AX_EXPORT AXTree {
+ 
+   void NotifyChildTreeConnectionChanged(AXNode* node, AXTree* child_tree);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void ClearExtraAnnouncementNodes();
+   void CreateExtraAnnouncementNodes();
+   ExtraAnnouncementNodes* extra_announcement_nodes() const {
+@@ -544,7 +544,7 @@ class AX_EXPORT AXTree {
+ 
+   std::unique_ptr<AXEvent> event_data_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<ExtraAnnouncementNodes> extra_announcement_nodes_ = nullptr;
+ #endif  // BUILDFLAG(IS_LINUX)
+ };
diff --git a/www/iridium/files/patch-ui_aura_client_drag__drop__client.h b/www/iridium/files/patch-ui_aura_client_drag__drop__client.h
index ad101eea2871..3ebb7ab64352 100644
--- a/www/iridium/files/patch-ui_aura_client_drag__drop__client.h
+++ b/www/iridium/files/patch-ui_aura_client_drag__drop__client.h
@@ -1,4 +1,4 @@
---- ui/aura/client/drag_drop_client.h.orig	2023-01-17 19:19:00 UTC
+--- ui/aura/client/drag_drop_client.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/aura/client/drag_drop_client.h
 @@ -44,7 +44,7 @@ class AURA_EXPORT DragDropClient {
        int allowed_operations,
diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.cc b/www/iridium/files/patch-ui_aura_screen__ozone.cc
index b461b0d0f3ca..698affc9e48f 100644
--- a/www/iridium/files/patch-ui_aura_screen__ozone.cc
+++ b/www/iridium/files/patch-ui_aura_screen__ozone.cc
@@ -1,4 +1,4 @@
---- ui/aura/screen_ozone.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/aura/screen_ozone.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/aura/screen_ozone.cc
 @@ -107,7 +107,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons
    return platform_screen_->GetPrimaryDisplay();
diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.h b/www/iridium/files/patch-ui_aura_screen__ozone.h
index 54debdd18237..3da2326e3e38 100644
--- a/www/iridium/files/patch-ui_aura_screen__ozone.h
+++ b/www/iridium/files/patch-ui_aura_screen__ozone.h
@@ -1,4 +1,4 @@
---- ui/aura/screen_ozone.h.orig	2025-02-22 18:06:53 UTC
+--- ui/aura/screen_ozone.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/aura/screen_ozone.h
 @@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen
    display::Display GetDisplayMatching(
diff --git a/www/iridium/files/patch-ui_base_accelerators_accelerator.cc b/www/iridium/files/patch-ui_base_accelerators_accelerator.cc
index da1acd4dde18..642e19f906f1 100644
--- a/www/iridium/files/patch-ui_base_accelerators_accelerator.cc
+++ b/www/iridium/files/patch-ui_base_accelerators_accelerator.cc
@@ -1,4 +1,4 @@
---- ui/base/accelerators/accelerator.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/base/accelerators/accelerator.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/accelerators/accelerator.cc
 @@ -336,7 +336,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
      result = ApplyModifierToAcceleratorString(result, IDS_APP_SEARCH_KEY);
diff --git a/www/iridium/files/patch-ui_base_accelerators_command.cc b/www/iridium/files/patch-ui_base_accelerators_command.cc
index 990c03dafc1b..7ab17312e2ff 100644
--- a/www/iridium/files/patch-ui_base_accelerators_command.cc
+++ b/www/iridium/files/patch-ui_base_accelerators_command.cc
@@ -1,4 +1,4 @@
---- ui/base/accelerators/command.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/base/accelerators/command.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/accelerators/command.cc
 @@ -81,7 +81,7 @@ std::string Command::CommandPlatform() {
    return ui::kKeybindingPlatformMac;
diff --git a/www/iridium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc b/www/iridium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
index ad8c6c955eeb..dd8b3df57ac6 100644
--- a/www/iridium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
+++ b/www/iridium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
@@ -1,4 +1,4 @@
---- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc
 @@ -12,7 +12,7 @@
  #include "ui/base/accelerators/accelerator.h"
diff --git a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc
index d95e55b91136..263033ce05eb 100644
--- a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc
+++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc
@@ -1,4 +1,4 @@
---- ui/base/clipboard/clipboard_constants.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/base/clipboard/clipboard_constants.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/clipboard/clipboard_constants.cc
 @@ -25,7 +25,7 @@ const char kMimeTypeOctetStream[] = "application/octet
  // Used for window dragging on some platforms.
diff --git a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h
index f63e5c30149d..1bc12434c5c5 100644
--- a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h
+++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h
@@ -1,4 +1,4 @@
---- ui/base/clipboard/clipboard_constants.h.orig	2025-02-22 18:06:53 UTC
+--- ui/base/clipboard/clipboard_constants.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/clipboard/clipboard_constants.h
 @@ -41,7 +41,7 @@ extern const char kMimeTypeWindowDrag[];
  
diff --git a/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc b/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc
index bd7f47f24621..b28d5ec000fe 100644
--- a/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc
+++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc
@@ -1,4 +1,4 @@
---- ui/base/clipboard/clipboard_non_backed.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/base/clipboard/clipboard_non_backed.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/clipboard/clipboard_non_backed.cc
 @@ -461,7 +461,7 @@ ClipboardNonBacked::ClipboardNonBacked() {
    // so create internal clipboards for platform supported clipboard buffers.
diff --git a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc
index 0821b6880c02..e12c3fcc01dc 100644
--- a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc
+++ b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc
@@ -1,4 +1,4 @@
---- ui/base/cursor/cursor_factory.cc.orig	2024-12-22 12:24:29 UTC
+--- ui/base/cursor/cursor_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/cursor/cursor_factory.cc
 @@ -96,7 +96,7 @@ void CursorFactory::ObserveThemeChanges() {
    NOTIMPLEMENTED();
diff --git a/www/iridium/files/patch-ui_base_cursor_cursor__factory.h b/www/iridium/files/patch-ui_base_cursor_cursor__factory.h
index 39e3dc8edc55..a3366a443173 100644
--- a/www/iridium/files/patch-ui_base_cursor_cursor__factory.h
+++ b/www/iridium/files/patch-ui_base_cursor_cursor__factory.h
@@ -1,4 +1,4 @@
---- ui/base/cursor/cursor_factory.h.orig	2023-10-21 11:51:27 UTC
+--- ui/base/cursor/cursor_factory.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/cursor/cursor_factory.h
 @@ -93,7 +93,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory {
    base::ObserverList<CursorFactoryObserver>::Unchecked observers_;
diff --git a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
index 6f2fd0a37615..12a16965a968 100644
--- a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
+++ b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
@@ -1,4 +1,4 @@
---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2022-03-28 18:11:04 UTC
+--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc
 @@ -7,7 +7,7 @@
  #include "base/notreached.h"
diff --git a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
index f4bfc2b01273..b6ae776ac5c5 100644
--- a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
+++ b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
@@ -1,6 +1,6 @@
---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
-@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
+@@ -101,7 +101,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
  
  std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString()
      const {
diff --git a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc
index 46acca3c6bac..b672b85feb72 100644
--- a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc
+++ b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc
@@ -1,4 +1,4 @@
---- ui/base/ime/dummy_text_input_client.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ime/dummy_text_input_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ime/dummy_text_input_client.cc
 @@ -175,7 +175,7 @@ bool DummyTextInputClient::ShouldDoLearning() {
    return false;
diff --git a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h
index b70e34a8890d..1abb52cacb98 100644
--- a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h
+++ b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h
@@ -1,4 +1,4 @@
---- ui/base/ime/dummy_text_input_client.h.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ime/dummy_text_input_client.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ime/dummy_text_input_client.h
 @@ -73,7 +73,7 @@ class DummyTextInputClient : public TextInputClient {
    ukm::SourceId GetClientSourceForMetrics() const override;
diff --git a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc
index 3caf69fdaf50..f0d773bc0adb 100644
--- a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc
+++ b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc
@@ -1,4 +1,4 @@
---- ui/base/ime/fake_text_input_client.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ime/fake_text_input_client.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ime/fake_text_input_client.cc
 @@ -227,7 +227,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
    return should_do_learning_;
diff --git a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h
index 25dce61f990f..340a75491fde 100644
--- a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h
+++ b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h
@@ -1,4 +1,4 @@
---- ui/base/ime/fake_text_input_client.h.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ime/fake_text_input_client.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ime/fake_text_input_client.h
 @@ -107,7 +107,7 @@ class FakeTextInputClient : public TextInputClient {
    void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override;
diff --git a/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc
index 6848c3047d09..81908f147ef3 100644
--- a/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc
+++ b/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc
@@ -1,4 +1,4 @@
---- ui/base/ime/init/input_method_initializer.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ime/init/input_method_initializer.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ime/init/input_method_initializer.cc
 @@ -9,7 +9,7 @@
  #include "base/trace_event/trace_event.h"
diff --git a/www/iridium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc b/www/iridium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
index 5aa8569844b0..4cac93c3ee18 100644
--- a/www/iridium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
+++ b/www/iridium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
@@ -1,4 +1,4 @@
---- ui/base/ime/linux/linux_input_method_context_factory.cc.orig	2022-10-05 07:34:01 UTC
+--- ui/base/ime/linux/linux_input_method_context_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ime/linux/linux_input_method_context_factory.cc
 @@ -9,7 +9,7 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-ui_base_ime_text__input__client.h b/www/iridium/files/patch-ui_base_ime_text__input__client.h
index 6f18f24f1507..108c36dd9999 100644
--- a/www/iridium/files/patch-ui_base_ime_text__input__client.h
+++ b/www/iridium/files/patch-ui_base_ime_text__input__client.h
@@ -1,4 +1,4 @@
---- ui/base/ime/text_input_client.h.orig	2025-03-18 16:46:04 UTC
+--- ui/base/ime/text_input_client.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ime/text_input_client.h
 @@ -337,7 +337,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient {
    // fields that are considered 'private' (e.g. in incognito tabs).
diff --git a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc
index 6b75be107eae..b15493afb646 100644
--- a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/base/resource/resource_bundle.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/resource/resource_bundle.cc
-@@ -930,7 +930,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -929,7 +929,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
diff --git a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
index 0bca58359591..eab341510253 100644
--- a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
+++ b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
@@ -1,4 +1,4 @@
---- ui/base/test/skia_gold_pixel_diff.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/base/test/skia_gold_pixel_diff.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/test/skia_gold_pixel_diff.cc
 @@ -117,7 +117,7 @@ const char* GetPlatformName() {
    return "windows";
diff --git a/www/iridium/files/patch-ui_base_test_ui__controls.h b/www/iridium/files/patch-ui_base_test_ui__controls.h
index 74ecdd5b95e5..787d8ebcc79d 100644
--- a/www/iridium/files/patch-ui_base_test_ui__controls.h
+++ b/www/iridium/files/patch-ui_base_test_ui__controls.h
@@ -1,6 +1,6 @@
---- ui/base/test/ui_controls.h.orig	2025-02-22 18:06:53 UTC
+--- ui/base/test/ui_controls.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/test/ui_controls.h
-@@ -184,7 +184,7 @@ bool SendTouchEventsNotifyWhenDone(int action,
+@@ -191,7 +191,7 @@ bool SendTouchEventsNotifyWhenDone(int action,
                                     base::OnceClosure task);
  #endif
  
diff --git a/www/iridium/files/patch-ui_base_ui__base__features.cc b/www/iridium/files/patch-ui_base_ui__base__features.cc
index 9acf5e220732..f5ea08dd12c2 100644
--- a/www/iridium/files/patch-ui_base_ui__base__features.cc
+++ b/www/iridium/files/patch-ui_base_ui__base__features.cc
@@ -1,4 +1,4 @@
---- ui/base/ui_base_features.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/base/ui_base_features.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ui_base_features.cc
 @@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj,
  // Controls whether support for Wayland's per-surface scaling is enabled.
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -138,7 +138,7 @@ BASE_FEATURE(kWaylandUiScale,
+@@ -143,7 +143,7 @@ BASE_FEATURE(kWaylandSessionManagement,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -18,7 +18,7 @@
  // If this feature is enabled, users not specify --ozone-platform-hint switch
  // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220.
  COMPONENT_EXPORT(UI_BASE_FEATURES)
-@@ -220,7 +220,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists,
+@@ -225,7 +225,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists,
  // native apps on Windows.
  BASE_FEATURE(kExperimentalFlingAnimation,
               "ExperimentalFlingAnimation",
@@ -27,7 +27,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -296,7 +296,7 @@ bool IsForcedColorsEnabled() {
+@@ -301,7 +301,7 @@ bool IsForcedColorsEnabled() {
  BASE_FEATURE(kEyeDropper,
               "EyeDropper",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-ui_base_ui__base__features.h b/www/iridium/files/patch-ui_base_ui__base__features.h
index f38f423a47bd..82525602227d 100644
--- a/www/iridium/files/patch-ui_base_ui__base__features.h
+++ b/www/iridium/files/patch-ui_base_ui__base__features.h
@@ -1,7 +1,7 @@
---- ui/base/ui_base_features.h.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ui_base_features.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ui_base_features.h
-@@ -124,7 +124,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kWaylandUiScale);
+@@ -126,7 +126,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ BASE_DECLARE_FEATURE(kWaylandSessionManagement);
  #endif  // BUILDFLAG(IS_OZONE)
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-ui_base_ui__base__switches.cc b/www/iridium/files/patch-ui_base_ui__base__switches.cc
index 443977b20e9d..4a15da53cc38 100644
--- a/www/iridium/files/patch-ui_base_ui__base__switches.cc
+++ b/www/iridium/files/patch-ui_base_ui__base__switches.cc
@@ -1,4 +1,4 @@
---- ui/base/ui_base_switches.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ui_base_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ui_base_switches.cc
 @@ -24,13 +24,13 @@ const char kDisableModalAnimations[] = "disable-modal-
  const char kShowMacOverlayBorders[] = "show-mac-overlay-borders";
diff --git a/www/iridium/files/patch-ui_base_ui__base__switches.h b/www/iridium/files/patch-ui_base_ui__base__switches.h
index fdab6deabad7..1efd48b1c635 100644
--- a/www/iridium/files/patch-ui_base_ui__base__switches.h
+++ b/www/iridium/files/patch-ui_base_ui__base__switches.h
@@ -1,4 +1,4 @@
---- ui/base/ui_base_switches.h.orig	2025-02-22 18:06:53 UTC
+--- ui/base/ui_base_switches.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/ui_base_switches.h
 @@ -22,11 +22,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kDisableMo
  COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOverlayBorders[];
diff --git a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc
index 774c2f815eda..c84962f8a6dc 100644
--- a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc
+++ b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,6 +1,6 @@
---- ui/base/webui/web_ui_util.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/base/webui/web_ui_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/webui/web_ui_util.cc
-@@ -43,7 +43,7 @@ namespace {
+@@ -46,7 +46,7 @@ namespace {
  constexpr float kMaxScaleFactor = 1000.0f;
  
  std::string GetFontFamilyMd() {
@@ -9,7 +9,7 @@
    return "Roboto, " + GetFontFamily();
  #else
    return GetFontFamily();
-@@ -218,7 +218,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
+@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
  std::string GetFontFamily() {
    std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY);
  
diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc
index ccec488f3450..7627ec998a4c 100644
--- a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc
+++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_cursor_factory.cc.orig	2023-11-22 14:00:11 UTC
+--- ui/base/x/x11_cursor_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/x/x11_cursor_factory.cc
 @@ -13,7 +13,7 @@
  #include "ui/gfx/geometry/point.h"
diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h
index b055b8294d2d..2077006854df 100644
--- a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h
+++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h
@@ -1,4 +1,4 @@
---- ui/base/x/x11_cursor_factory.h.orig	2023-11-22 14:00:11 UTC
+--- ui/base/x/x11_cursor_factory.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/x/x11_cursor_factory.h
 @@ -20,7 +20,7 @@ namespace ui {
  class X11Cursor;
diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc
index 0b3b1aa0fbb2..d6c0c1519b70 100644
--- a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc
+++ b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_cursor_loader.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/base/x/x11_cursor_loader.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/x/x11_cursor_loader.cc
 @@ -42,7 +42,7 @@
  #include "ui/gfx/x/connection.h"
diff --git a/www/iridium/files/patch-ui_base_x_x11__display__manager.cc b/www/iridium/files/patch-ui_base_x_x11__display__manager.cc
index aa0214227a2b..71a1689c21cf 100644
--- a/www/iridium/files/patch-ui_base_x_x11__display__manager.cc
+++ b/www/iridium/files/patch-ui_base_x_x11__display__manager.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_display_manager.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/base/x/x11_display_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/x/x11_display_manager.cc
 @@ -16,7 +16,7 @@
  #include "ui/gfx/x/randr.h"
diff --git a/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc b/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc
index 450c5b51cc14..571c57b495e2 100644
--- a/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc
+++ b/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_shm_image_pool.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/base/x/x11_shm_image_pool.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/base/x/x11_shm_image_pool.cc
 @@ -16,6 +16,7 @@
  #include "base/functional/callback.h"
diff --git a/www/iridium/files/patch-ui_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h
index dd88284477bf..251675f1df8b 100644
--- a/www/iridium/files/patch-ui_color_color__id.h
+++ b/www/iridium/files/patch-ui_color_color__id.h
@@ -1,6 +1,6 @@
---- ui/color/color_id.h.orig	2025-04-16 18:18:42 UTC
+--- ui/color/color_id.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/color/color_id.h
-@@ -622,7 +622,7 @@
+@@ -624,7 +624,7 @@
    E_CPONLY(kColorCrosSysPositive) \
    E_CPONLY(kColorCrosSysComplementVariant) \
    E_CPONLY(kColorCrosSysInputFieldOnBase)
diff --git a/www/iridium/files/patch-ui_color_color__provider__utils.cc b/www/iridium/files/patch-ui_color_color__provider__utils.cc
index 2bfbf831d4ef..079051f579b1 100644
--- a/www/iridium/files/patch-ui_color_color__provider__utils.cc
+++ b/www/iridium/files/patch-ui_color_color__provider__utils.cc
@@ -1,6 +1,6 @@
---- ui/color/color_provider_utils.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/color/color_provider_utils.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/color/color_provider_utils.cc
-@@ -189,7 +189,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste
+@@ -191,7 +191,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste
    switch (system_theme) {
      case ui::SystemTheme::kDefault:
        return "kDefault";
diff --git a/www/iridium/files/patch-ui_color_system__theme.h b/www/iridium/files/patch-ui_color_system__theme.h
index b146c9630a97..8cb40ecffe23 100644
--- a/www/iridium/files/patch-ui_color_system__theme.h
+++ b/www/iridium/files/patch-ui_color_system__theme.h
@@ -1,4 +1,4 @@
---- ui/color/system_theme.h.orig	2022-12-06 08:09:13 UTC
+--- ui/color/system_theme.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/color/system_theme.h
 @@ -15,7 +15,7 @@ namespace ui {
  enum class SystemTheme {
diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc
index f5c437febec5..763de7109d54 100644
--- a/www/iridium/files/patch-ui_compositor_compositor.cc
+++ b/www/iridium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/compositor/compositor.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/compositor/compositor.cc
-@@ -940,7 +940,7 @@ void Compositor::OnResume() {
+@@ -952,7 +952,7 @@ void Compositor::OnResume() {
      obs.ResetIfActive();
  }
  
diff --git a/www/iridium/files/patch-ui_compositor_compositor.h b/www/iridium/files/patch-ui_compositor_compositor.h
index 9d0a9f0277fa..7b852b14a3c2 100644
--- a/www/iridium/files/patch-ui_compositor_compositor.h
+++ b/www/iridium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig	2025-04-16 18:18:42 UTC
+--- ui/compositor/compositor.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/compositor/compositor.h
-@@ -467,7 +467,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -463,7 +463,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
    // base::PowerSuspendObserver:
    void OnResume() override;
  
diff --git a/www/iridium/files/patch-ui_compositor_compositor__observer.h b/www/iridium/files/patch-ui_compositor_compositor__observer.h
index 423ba8a1aafa..aa9c167141f4 100644
--- a/www/iridium/files/patch-ui_compositor_compositor__observer.h
+++ b/www/iridium/files/patch-ui_compositor_compositor__observer.h
@@ -1,4 +1,4 @@
---- ui/compositor/compositor_observer.h.orig	2025-02-22 18:06:53 UTC
+--- ui/compositor/compositor_observer.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/compositor/compositor_observer.h
 @@ -56,7 +56,7 @@ class COMPOSITOR_EXPORT CompositorObserver {
    // Called when a child of the compositor is resizing.
diff --git a/www/iridium/files/patch-ui_display_screen.cc b/www/iridium/files/patch-ui_display_screen.cc
index 78268a8e88ef..fdd4121d52cb 100644
--- a/www/iridium/files/patch-ui_display_screen.cc
+++ b/www/iridium/files/patch-ui_display_screen.cc
@@ -1,4 +1,4 @@
---- ui/display/screen.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/display/screen.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/display/screen.cc
 @@ -86,7 +86,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i
    display_id_for_new_windows_ = display_id;
diff --git a/www/iridium/files/patch-ui_display_screen.h b/www/iridium/files/patch-ui_display_screen.h
index d78d6080c6f5..632a66fef6dd 100644
--- a/www/iridium/files/patch-ui_display_screen.h
+++ b/www/iridium/files/patch-ui_display_screen.h
@@ -1,4 +1,4 @@
---- ui/display/screen.h.orig	2025-02-22 18:06:53 UTC
+--- ui/display/screen.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/display/screen.h
 @@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen {
    // (both of which may or may not be `nearest_id`).
@@ -9,7 +9,7 @@
    // Object which suspends the platform-specific screensaver for the duration of
    // its existence.
    class ScreenSaverSuspender {
-@@ -243,7 +243,7 @@ class DISPLAY_EXPORT Screen {
+@@ -246,7 +246,7 @@ class DISPLAY_EXPORT Screen {
    int64_t display_id_for_new_windows_;
    int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
  
diff --git a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
index 2f22656d8d1f..fa9d4103f0de 100644
--- a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
+++ b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
@@ -1,4 +1,4 @@
---- ui/events/devices/x11/device_data_manager_x11.cc.orig	2024-11-04 08:56:03 UTC
+--- ui/events/devices/x11/device_data_manager_x11.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/events/devices/x11/device_data_manager_x11.cc
 @@ -849,6 +849,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
  }
diff --git a/www/iridium/files/patch-ui_events_event.cc b/www/iridium/files/patch-ui_events_event.cc
index 07cea01c2eb7..447624010412 100644
--- a/www/iridium/files/patch-ui_events_event.cc
+++ b/www/iridium/files/patch-ui_events_event.cc
@@ -1,4 +1,4 @@
---- ui/events/event.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/events/event.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/events/event.cc
 @@ -373,7 +373,7 @@ std::string LocatedEvent::ToString() const {
  MouseEvent::MouseEvent(const PlatformEvent& native_event)
diff --git a/www/iridium/files/patch-ui_events_event__switches.cc b/www/iridium/files/patch-ui_events_event__switches.cc
index 2f7c3d3592b7..749dbf509a53 100644
--- a/www/iridium/files/patch-ui_events_event__switches.cc
+++ b/www/iridium/files/patch-ui_events_event__switches.cc
@@ -1,4 +1,4 @@
---- ui/events/event_switches.cc.orig	2022-10-05 07:34:01 UTC
+--- ui/events/event_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/events/event_switches.cc
 @@ -21,7 +21,7 @@ const char kCompensateForUnstablePinchZoom[] =
  // value is a floating point number that is interpreted as a distance in pixels.
diff --git a/www/iridium/files/patch-ui_events_event__switches.h b/www/iridium/files/patch-ui_events_event__switches.h
index aa6b0e76c228..af58046a1662 100644
--- a/www/iridium/files/patch-ui_events_event__switches.h
+++ b/www/iridium/files/patch-ui_events_event__switches.h
@@ -1,4 +1,4 @@
---- ui/events/event_switches.h.orig	2022-10-05 07:34:01 UTC
+--- ui/events/event_switches.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/events/event_switches.h
 @@ -13,7 +13,7 @@ namespace switches {
  EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
diff --git a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
index 0e3ebb694fa2..d0efd9909e9c 100644
--- a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
+++ b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
@@ -1,4 +1,4 @@
---- ui/events/keycodes/dom/keycode_converter.cc.orig	2024-11-04 08:56:03 UTC
+--- ui/events/keycodes/dom/keycode_converter.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/events/keycodes/dom/keycode_converter.cc
 @@ -18,7 +18,7 @@
  #include "ui/events/keycodes/dom/dom_code.h"
diff --git a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h
index a336e9ddfa47..40bb8d4975d8 100644
--- a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h
+++ b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h
@@ -1,4 +1,4 @@
---- ui/events/keycodes/dom/keycode_converter.h.orig	2022-10-05 07:34:01 UTC
+--- ui/events/keycodes/dom/keycode_converter.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/events/keycodes/dom/keycode_converter.h
 @@ -64,7 +64,7 @@ class KeycodeConverter {
    // Convert a DomCode into a native keycode.
diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn
index 88a102874f93..ed08860d35c9 100644
--- a/www/iridium/files/patch-ui_gfx_BUILD.gn
+++ b/www/iridium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- ui/gfx/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/BUILD.gn
-@@ -658,7 +658,7 @@ source_set("memory_buffer_sources") {
+@@ -661,7 +661,7 @@ source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/iridium/files/patch-ui_gfx_canvas__skia.cc b/www/iridium/files/patch-ui_gfx_canvas__skia.cc
index 80920ef8afde..43672f6546d1 100644
--- a/www/iridium/files/patch-ui_gfx_canvas__skia.cc
+++ b/www/iridium/files/patch-ui_gfx_canvas__skia.cc
@@ -1,4 +1,4 @@
---- ui/gfx/canvas_skia.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/gfx/canvas_skia.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/canvas_skia.cc
 @@ -219,7 +219,7 @@ void Canvas::DrawStringRectWithFlags(std::u16string_vi
      Range range = StripAcceleratorChars(flags, &adjusted_text);
diff --git a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc
index 2e4028ad4ac1..70d471f64574 100644
--- a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc
+++ b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc
@@ -1,4 +1,4 @@
---- ui/gfx/font_fallback_linux.cc.orig	2024-11-04 08:56:03 UTC
+--- ui/gfx/font_fallback_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/font_fallback_linux.cc
 @@ -32,6 +32,8 @@
  #include "ui/gfx/linux/fontconfig_util.h"
diff --git a/www/iridium/files/patch-ui_gfx_font__render__params.h b/www/iridium/files/patch-ui_gfx_font__render__params.h
index 0303de128c8a..3d3cc7f1b095 100644
--- a/www/iridium/files/patch-ui_gfx_font__render__params.h
+++ b/www/iridium/files/patch-ui_gfx_font__render__params.h
@@ -1,4 +1,4 @@
---- ui/gfx/font_render_params.h.orig	2025-02-22 18:06:53 UTC
+--- ui/gfx/font_render_params.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/font_render_params.h
 @@ -115,7 +115,7 @@ COMPONENT_EXPORT(GFX)
  FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
diff --git a/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc b/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc
index 6a140cffb44e..3d422e9bed6e 100644
--- a/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc
+++ b/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc
@@ -1,4 +1,4 @@
---- ui/gfx/font_render_params_linux.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/gfx/font_render_params_linux.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/font_render_params_linux.cc
 @@ -24,7 +24,7 @@
  #include "ui/gfx/linux/fontconfig_util.h"
diff --git a/www/iridium/files/patch-ui_gfx_font__util.cc b/www/iridium/files/patch-ui_gfx_font__util.cc
index 7d0e33c12421..210e67da1afa 100644
--- a/www/iridium/files/patch-ui_gfx_font__util.cc
+++ b/www/iridium/files/patch-ui_gfx_font__util.cc
@@ -1,4 +1,4 @@
---- ui/gfx/font_util.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/gfx/font_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/font_util.cc
 @@ -6,7 +6,7 @@
  
diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc
index 29b60a48f3f8..4171bfe94ae5 100644
--- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc
+++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/gfx/gpu_memory_buffer.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/gpu_memory_buffer.cc
 @@ -108,7 +108,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
    handle.id = id;
diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h
index 03da82710db5..a9bd925c8295 100644
--- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.h.orig	2025-03-18 16:46:04 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/gpu_memory_buffer.h
 @@ -17,7 +17,7 @@
  #include "ui/gfx/generic_shared_memory_id.h"
@@ -9,7 +9,16 @@
  #include "ui/gfx/native_pixmap_handle.h"
  #elif BUILDFLAG(IS_APPLE)
  #include "ui/gfx/mac/io_surface.h"
-@@ -205,7 +205,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle {
+@@ -47,7 +47,7 @@ enum GpuMemoryBufferType {
+ #if BUILDFLAG(IS_APPLE)
+   IO_SURFACE_BUFFER,
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   NATIVE_PIXMAP,
+ #endif
+ #if BUILDFLAG(IS_WIN)
+@@ -212,7 +212,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle {
  
    uint32_t offset = 0;
    uint32_t stride = 0;
diff --git a/www/iridium/files/patch-ui_gfx_linux_dmabuf__uapi.h b/www/iridium/files/patch-ui_gfx_linux_dmabuf__uapi.h
index 5ef9b0215dc8..84bbe3fa80f4 100644
--- a/www/iridium/files/patch-ui_gfx_linux_dmabuf__uapi.h
+++ b/www/iridium/files/patch-ui_gfx_linux_dmabuf__uapi.h
@@ -1,4 +1,4 @@
---- ui/gfx/linux/dmabuf_uapi.h.orig	2023-10-21 11:51:27 UTC
+--- ui/gfx/linux/dmabuf_uapi.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/linux/dmabuf_uapi.h
 @@ -5,12 +5,11 @@
  #ifndef UI_GFX_LINUX_DMABUF_UAPI_H_
diff --git a/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc b/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc
index 3af1c2cd04d1..85a4d0fe9129 100644
--- a/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc
+++ b/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc
@@ -1,4 +1,4 @@
---- ui/gfx/linux/gbm_wrapper.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/gfx/linux/gbm_wrapper.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/linux/gbm_wrapper.cc
 @@ -318,7 +318,7 @@ class Device final : public ui::GbmDevice {
      // of 1x1 BOs which are destroyed before creating the final BO creation used
diff --git a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
index 216008b46fbf..695f7202fa50 100644
--- a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
+++ b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
 @@ -14,7 +14,7 @@
  #include "ui/gfx/mac/io_surface.h"
@@ -41,16 +41,16 @@
    out->modifier = data.modifier();
    out->supports_zero_copy_webgpu_import =
        data.supports_zero_copy_webgpu_import();
-@@ -190,7 +190,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag
-       NOTREACHED();
+@@ -187,7 +187,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag
+     case gfx::IO_SURFACE_BUFFER:
+       return Tag::kMachPort;
  #endif  // BUILDFLAG(IS_APPLE)
-     case gfx::NATIVE_PIXMAP:
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
        return Tag::kNativePixmapHandle;
- #else
-       NOTREACHED();
-@@ -259,7 +259,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
+@@ -251,7 +251,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa
        }
        return true;
  #endif  // BUILDFLAG(IS_APPLE)
diff --git a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
index ea9b749ea36b..02928eade9b3 100644
--- a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
+++ b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2025-03-18 16:46:04 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.h
 @@ -18,7 +18,7 @@
  #include "ui/gfx/gpu_memory_buffer.h"
diff --git a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc
index 64688b42aceb..6f9c377f9621 100644
--- a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc
+++ b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc
@@ -1,4 +1,4 @@
---- ui/gfx/native_pixmap_handle.cc.orig	2022-12-06 08:09:13 UTC
+--- ui/gfx/native_pixmap_handle.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/native_pixmap_handle.cc
 @@ -11,7 +11,7 @@
  #include "ui/gfx/buffer_format_util.h"
diff --git a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h
index 34f1c58d815e..113db71d8476 100644
--- a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h
+++ b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h
@@ -1,4 +1,4 @@
---- ui/gfx/native_pixmap_handle.h.orig	2025-02-22 18:06:53 UTC
+--- ui/gfx/native_pixmap_handle.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/native_pixmap_handle.h
 @@ -14,7 +14,7 @@
  #include "build/build_config.h"
diff --git a/www/iridium/files/patch-ui_gfx_native__widget__types.h b/www/iridium/files/patch-ui_gfx_native__widget__types.h
index 5e6d55b31ae6..4678814379f2 100644
--- a/www/iridium/files/patch-ui_gfx_native__widget__types.h
+++ b/www/iridium/files/patch-ui_gfx_native__widget__types.h
@@ -1,6 +1,6 @@
---- ui/gfx/native_widget_types.h.orig	2025-02-22 18:06:53 UTC
+--- ui/gfx/native_widget_types.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/native_widget_types.h
-@@ -101,7 +101,7 @@ class ViewAndroid;
+@@ -104,7 +104,7 @@ class ViewAndroid;
  #endif
  class SkBitmap;
  
@@ -9,7 +9,7 @@
  extern "C" {
  struct _AtkObject;
  using AtkObject = struct _AtkObject;
-@@ -214,7 +214,7 @@ using NativeViewAccessible = id;
+@@ -194,7 +194,7 @@ using NativeViewAccessible = id;
  #else
  using NativeViewAccessible = struct objc_object*;
  #endif
diff --git a/www/iridium/files/patch-ui_gfx_platform__font__skia.cc b/www/iridium/files/patch-ui_gfx_platform__font__skia.cc
index ec7f28690a95..d8f756a2217c 100644
--- a/www/iridium/files/patch-ui_gfx_platform__font__skia.cc
+++ b/www/iridium/files/patch-ui_gfx_platform__font__skia.cc
@@ -1,4 +1,4 @@
---- ui/gfx/platform_font_skia.cc.orig	2024-08-27 06:28:16 UTC
+--- ui/gfx/platform_font_skia.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/platform_font_skia.cc
 @@ -29,7 +29,7 @@
  #include "ui/gfx/system_fonts_win.h"
diff --git a/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc b/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc
index 742cd454a15d..27f79901883b 100644
--- a/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc
+++ b/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc
@@ -1,4 +1,4 @@
---- ui/gfx/render_text_api_fuzzer.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/gfx/render_text_api_fuzzer.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/render_text_api_fuzzer.cc
 @@ -19,7 +19,7 @@
  #include "ui/gfx/font_util.h"
diff --git a/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc b/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc
index 6a37e32aff3d..7eb492f2c7ab 100644
--- a/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc
+++ b/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc
@@ -1,4 +1,4 @@
---- ui/gfx/render_text_fuzzer.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/gfx/render_text_fuzzer.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/render_text_fuzzer.cc
 @@ -17,7 +17,7 @@
  #include "ui/gfx/canvas.h"
diff --git a/www/iridium/files/patch-ui_gfx_switches.cc b/www/iridium/files/patch-ui_gfx_switches.cc
index 1d992b8e3114..efcb695caaf0 100644
--- a/www/iridium/files/patch-ui_gfx_switches.cc
+++ b/www/iridium/files/patch-ui_gfx_switches.cc
@@ -1,4 +1,4 @@
---- ui/gfx/switches.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/gfx/switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/switches.cc
 @@ -32,7 +32,7 @@ const char kForcePrefersNoReducedMotion[] = "force-pre
  // Run in headless mode, i.e., without a UI or display server dependencies.
diff --git a/www/iridium/files/patch-ui_gfx_switches.h b/www/iridium/files/patch-ui_gfx_switches.h
index 7e00565716c3..d5c3d1f00ac8 100644
--- a/www/iridium/files/patch-ui_gfx_switches.h
+++ b/www/iridium/files/patch-ui_gfx_switches.h
@@ -1,4 +1,4 @@
---- ui/gfx/switches.h.orig	2025-02-22 18:06:53 UTC
+--- ui/gfx/switches.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/switches.h
 @@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersRed
  GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[];
diff --git a/www/iridium/files/patch-ui_gfx_x_atom__cache.cc b/www/iridium/files/patch-ui_gfx_x_atom__cache.cc
index 12e1d9b08f0f..6291a469b33b 100644
--- a/www/iridium/files/patch-ui_gfx_x_atom__cache.cc
+++ b/www/iridium/files/patch-ui_gfx_x_atom__cache.cc
@@ -1,6 +1,6 @@
---- ui/gfx/x/atom_cache.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/gfx/x/atom_cache.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/x/atom_cache.cc
-@@ -156,6 +156,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
+@@ -157,6 +157,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
      "application/octet-stream",
      "application/vnd.chromium.test",
      "chromium/filename",
diff --git a/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc b/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc
index ce93e0d3db37..82aa2d03de17 100644
--- a/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc
+++ b/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc
@@ -1,4 +1,4 @@
---- ui/gfx/x/generated_protos/dri3.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/gfx/x/generated_protos/dri3.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/x/generated_protos/dri3.cc
 @@ -27,6 +27,8 @@
  #include <xcb/xcb.h>
diff --git a/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc b/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc
index 40af7df44a77..aeaa158db133 100644
--- a/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc
+++ b/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc
@@ -1,4 +1,4 @@
---- ui/gfx/x/generated_protos/shm.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/gfx/x/generated_protos/shm.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/x/generated_protos/shm.cc
 @@ -27,6 +27,8 @@
  #include <xcb/xcb.h>
diff --git a/www/iridium/files/patch-ui_gfx_x_xlib__support.cc b/www/iridium/files/patch-ui_gfx_x_xlib__support.cc
index 1aca72e4aa99..f4f0315bf572 100644
--- a/www/iridium/files/patch-ui_gfx_x_xlib__support.cc
+++ b/www/iridium/files/patch-ui_gfx_x_xlib__support.cc
@@ -1,4 +1,4 @@
---- ui/gfx/x/xlib_support.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/gfx/x/xlib_support.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gfx/x/xlib_support.cc
 @@ -39,10 +39,18 @@ void InitXlib() {
      return;
diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn
index 7ab0021af45e..f19c37748fc4 100644
--- a/www/iridium/files/patch-ui_gl_BUILD.gn
+++ b/www/iridium/files/patch-ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gl/BUILD.gn.orig	2025-03-18 16:46:04 UTC
+--- ui/gl/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ ui/gl/BUILD.gn
-@@ -169,7 +169,6 @@ component("gl") {
+@@ -174,7 +174,6 @@ component("gl") {
    public_deps = [
      ":gl_enums",
      "//base",
@@ -8,7 +8,7 @@
      "//ui/events/platform",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -323,7 +322,6 @@ component("gl") {
+@@ -328,7 +327,6 @@ component("gl") {
      data_deps += [
        "//third_party/angle:libEGL",
        "//third_party/angle:libGLESv2",
@@ -16,7 +16,7 @@
      ]
      if (enable_swiftshader) {
        data_deps += [
-@@ -548,7 +546,6 @@ test("gl_unittests") {
+@@ -554,7 +552,6 @@ test("gl_unittests") {
  
    data_deps = [
      "//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/iridium/files/patch-ui_gl_gl__context.cc b/www/iridium/files/patch-ui_gl_gl__context.cc
index c13ad889f01e..6030000f29dc 100644
--- a/www/iridium/files/patch-ui_gl_gl__context.cc
+++ b/www/iridium/files/patch-ui_gl_gl__context.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_context.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/gl/gl_context.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gl/gl_context.cc
 @@ -516,7 +516,7 @@ bool GLContext::MakeVirtuallyCurrent(
    DCHECK(virtual_context->IsCurrent(surface));
diff --git a/www/iridium/files/patch-ui_gl_gl__fence.cc b/www/iridium/files/patch-ui_gl_gl__fence.cc
index ecc1bafae63f..2f6e4cd17d25 100644
--- a/www/iridium/files/patch-ui_gl_gl__fence.cc
+++ b/www/iridium/files/patch-ui_gl_gl__fence.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_fence.cc.orig	2024-08-27 06:28:16 UTC
+--- ui/gl/gl_fence.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gl/gl_fence.cc
 @@ -17,7 +17,7 @@
  #include "ui/gl/gl_surface_egl.h"
diff --git a/www/iridium/files/patch-ui_gl_gl__implementation.cc b/www/iridium/files/patch-ui_gl_gl__implementation.cc
index fba398f705ff..a0336072ff3d 100644
--- a/www/iridium/files/patch-ui_gl_gl__implementation.cc
+++ b/www/iridium/files/patch-ui_gl_gl__implementation.cc
@@ -1,6 +1,6 @@
---- ui/gl/gl_implementation.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/gl/gl_implementation.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gl/gl_implementation.cc
-@@ -252,7 +252,7 @@ GetRequestedGLImplementationFromCommandLine(
+@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandLine(
      const base::CommandLine* command_line) {
    bool overrideUseSoftwareGL =
        command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/www/iridium/files/patch-ui_gl_gl__switches.cc b/www/iridium/files/patch-ui_gl_gl__switches.cc
index cbe340936317..4fd0148bdbeb 100644
--- a/www/iridium/files/patch-ui_gl_gl__switches.cc
+++ b/www/iridium/files/patch-ui_gl_gl__switches.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_switches.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/gl/gl_switches.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gl/gl_switches.cc
 @@ -13,7 +13,7 @@
  #include "base/android/build_info.h"
@@ -9,7 +9,7 @@
  #include <vulkan/vulkan_core.h>
  #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
  #endif
-@@ -314,7 +314,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -319,7 +319,7 @@ bool IsDefaultANGLEVulkan() {
      return false;
    }
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -18,7 +18,7 @@
    angle::SystemInfo system_info;
    {
      GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan");
-@@ -367,7 +367,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -372,7 +372,7 @@ bool IsDefaultANGLEVulkan() {
    }
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
index aab62300bf47..4731c1d496bb 100644
--- a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
+++ b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
@@ -1,4 +1,4 @@
---- ui/gl/sync_control_vsync_provider.cc.orig	2024-08-01 05:47:53 UTC
+--- ui/gl/sync_control_vsync_provider.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gl/sync_control_vsync_provider.cc
 @@ -11,7 +11,7 @@
  #include "base/trace_event/trace_event.h"
diff --git a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h
index 0874997432b8..df977a12505e 100644
--- a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h
+++ b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h
@@ -1,4 +1,4 @@
---- ui/gl/sync_control_vsync_provider.h.orig	2022-10-05 07:34:01 UTC
+--- ui/gl/sync_control_vsync_provider.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/gl/sync_control_vsync_provider.h
 @@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv
    bool SupportGetVSyncParametersIfAvailable() const override;
diff --git a/www/iridium/files/patch-ui_gtk_gtk__compat.cc b/www/iridium/files/patch-ui_gtk_gtk__compat.cc
index b1b433241c99..e718b91d4828 100644
--- a/www/iridium/files/patch-ui_gtk_gtk__compat.cc
+++ b/www/iridium/files/patch-ui_gtk_gtk__compat.cc
@@ -1,6 +1,6 @@
---- ui/gtk/gtk_compat.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/gtk/gtk_compat.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gtk/gtk_compat.cc
-@@ -64,27 +64,47 @@ auto DlCast(void* symbol) {
+@@ -65,27 +65,47 @@ auto DlCast(void* symbol) {
  }
  
  void* GetLibGio() {
diff --git a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
index f0ce86fb2e7f..163a1d5a52b1 100644
--- a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
+++ b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
@@ -1,4 +1,4 @@
---- ui/gtk/printing/print_dialog_gtk.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/gtk/printing/print_dialog_gtk.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/gtk/printing/print_dialog_gtk.cc
 @@ -438,7 +438,7 @@ void PrintDialogGtk::ShowDialog(
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
diff --git a/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc
index 67647c1f8428..31655ab29e9d 100644
--- a/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc
+++ b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc
@@ -1,4 +1,4 @@
---- ui/message_center/views/message_popup_view.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/message_center/views/message_popup_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/message_center/views/message_popup_view.cc
 @@ -153,7 +153,7 @@ std::unique_ptr<views::Widget> MessagePopupView::Show(
        views::Widget::InitParams::CLIENT_OWNS_WIDGET,
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__features.cc b/www/iridium/files/patch-ui_native__theme_features_native__theme__features.cc
index a5d8a6a204f8..4687e8bd62ed 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme__features.cc
+++ b/www/iridium/files/patch-ui_native__theme_features_native__theme__features.cc
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme_features.cc.orig	2025-03-05 08:14:56 UTC
-+++ ui/native_theme/native_theme_features.cc
-@@ -73,7 +73,7 @@ namespace ui {
+--- ui/native_theme/features/native_theme_features.cc.orig	2025-05-07 06:48:23 UTC
++++ ui/native_theme/features/native_theme_features.cc
+@@ -59,7 +59,7 @@ namespace ui {
  
  bool IsFluentOverlayScrollbarEnabled() {
  // Fluent scrollbars are only used for some OSes due to UI design guidelines.
@@ -9,7 +9,7 @@
    return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar);
  #else
    return false;
-@@ -82,7 +82,7 @@ bool IsFluentOverlayScrollbarEnabled() {
+@@ -68,7 +68,7 @@ bool IsFluentOverlayScrollbarEnabled() {
  
  bool IsFluentScrollbarEnabled() {
  // Fluent scrollbars are only used for some OSes due to UI design guidelines.
diff --git a/www/iridium/files/patch-ui_native__theme_native__theme.h b/www/iridium/files/patch-ui_native__theme_native__theme.h
index acbbc3665775..83ef8d751fe9 100644
--- a/www/iridium/files/patch-ui_native__theme_native__theme.h
+++ b/www/iridium/files/patch-ui_native__theme_native__theme.h
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme.h.orig	2025-02-22 18:06:53 UTC
+--- ui/native_theme/native_theme.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/native_theme/native_theme.h
-@@ -61,7 +61,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -61,7 +61,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
    // The part to be painted / sized.
    enum Part {
      kCheckbox,
diff --git a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc
index cc5c2c2e2aad..86e7d94e552b 100644
--- a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc
+++ b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc
@@ -1,11 +1,11 @@
---- ui/native_theme/native_theme_base.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/native_theme/native_theme_base.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/native_theme/native_theme_base.cc
-@@ -239,7 +239,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
-                     absl::get<ButtonExtraParams>(extra), color_scheme,
+@@ -240,7 +240,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+                     std::get<ButtonExtraParams>(extra), color_scheme,
                      accent_color_opaque);
        break;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      case kFrameTopArea:
        PaintFrameTopArea(canvas, state, rect,
-                         absl::get<FrameTopAreaExtraParams>(extra),
+                         std::get<FrameTopAreaExtraParams>(extra), color_scheme);
diff --git a/www/iridium/files/patch-ui_ozone_common_egl__util.cc b/www/iridium/files/patch-ui_ozone_common_egl__util.cc
index d23d42cd860c..fd0ec78d4dbe 100644
--- a/www/iridium/files/patch-ui_ozone_common_egl__util.cc
+++ b/www/iridium/files/patch-ui_ozone_common_egl__util.cc
@@ -1,4 +1,4 @@
---- ui/ozone/common/egl_util.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/ozone/common/egl_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/common/egl_util.cc
 @@ -27,9 +27,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] =
      FILE_PATH_LITERAL("libGLESv2.so");
diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc
index 7eb09dbfae85..c4d9beb4cd54 100644
--- a/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/headless/headless_surface_factory.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/ozone/platform/headless/headless_surface_factory.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/headless/headless_surface_factory.cc
 @@ -34,7 +34,7 @@
  #include "ui/ozone/platform/headless/headless_window_manager.h"
diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
index 3e52747b78c4..2fe25aaef13e 100644
--- a/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/headless/ozone_platform_headless.cc
-@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform {
+@@ -108,7 +108,7 @@ class OzonePlatformHeadlessImpl : public OzonePlatform
    }
  
  // Desktop Linux, not CastOS.
diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
index 247ba6345b5b..c8b1401888a3 100644
--- a/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc
 @@ -116,7 +116,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence(
  
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc
index c86909319468..db85c560b658 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/wayland/common/wayland_util.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/ozone/platform/wayland/common/wayland_util.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/wayland/common/wayland_util.cc
 @@ -424,6 +424,7 @@ void RecordConnectionMetrics(wl_display* display) {
          {"weston", WaylandCompositor::kWeston},
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
index ffd4f6bd8990..67e53454286b 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig	2022-04-01 07:48:30 UTC
+--- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc
 @@ -38,7 +38,11 @@ bool VulkanImplementationWayland::InitializeVulkanInst
  
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
index e49ac05621cf..f9fb250b1749 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
 @@ -261,6 +261,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText(
    // so if it exceeds 16 bits, it may be broken.
diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc b/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
index 5e37502677b0..e1b9b2cee2c8 100644
--- a/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig	2024-06-25 12:08:48 UTC
+--- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/x11/vulkan_implementation_x11.cc
 @@ -59,7 +59,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance
  
diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
index 2adb6e412adf..f26726cdc9ae 100644
--- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/x11/x11_screen_ozone.cc
 @@ -22,7 +22,7 @@
  #include "ui/ozone/platform/x11/x11_window.h"
diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h
index d14946a1bc97..c0fb3c990e2c 100644
--- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h
+++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h
@@ -1,4 +1,4 @@
---- ui/ozone/platform/x11/x11_screen_ozone.h.orig	2024-06-25 12:08:48 UTC
+--- ui/ozone/platform/x11/x11_screen_ozone.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/x11/x11_screen_ozone.h
 @@ -16,7 +16,7 @@
  #include "ui/gfx/x/event.h"
diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc
index 74b244b9c9dd..61f3a1ead49b 100644
--- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/x11/x11_window.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/ozone/platform/x11/x11_window.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/platform/x11/x11_window.cc
-@@ -1472,7 +1472,7 @@ void X11Window::OnXWindowStateChanged() {
+@@ -1459,7 +1459,7 @@ void X11Window::OnXWindowStateChanged() {
    WindowTiledEdges tiled_state = GetTiledState();
    if (tiled_state != tiled_state_) {
      tiled_state_ = tiled_state;
diff --git a/www/iridium/files/patch-ui_ozone_public_ozone__ui__controls__test__helper.h b/www/iridium/files/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
index 6ef1a11fb09f..e1ce06a94f1f 100644
--- a/www/iridium/files/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
+++ b/www/iridium/files/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
@@ -1,4 +1,4 @@
---- ui/ozone/public/ozone_ui_controls_test_helper.h.orig	2025-04-16 18:18:42 UTC
+--- ui/ozone/public/ozone_ui_controls_test_helper.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/public/ozone_ui_controls_test_helper.h
 @@ -62,7 +62,7 @@ class OzoneUIControlsTestHelper {
    // aura::Window.
diff --git a/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h
index 43a3109c0491..43d92d3a1252 100644
--- a/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h
+++ b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h
@@ -1,4 +1,4 @@
---- ui/ozone/test/mock_platform_window_delegate.h.orig	2024-06-25 12:08:48 UTC
+--- ui/ozone/test/mock_platform_window_delegate.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/ozone/test/mock_platform_window_delegate.h
 @@ -35,7 +35,7 @@ class MockPlatformWindowDelegate : public PlatformWind
    MOCK_METHOD2(OnWindowStateChanged,
diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc
index 05b2fdcf7fe9..7c842d159bc3 100644
--- a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc
+++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc
@@ -1,4 +1,4 @@
---- ui/platform_window/platform_window_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/platform_window/platform_window_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/platform_window/platform_window_delegate.cc
 @@ -56,7 +56,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD
    return gfx::Insets();
diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
index 1a23e7fbb1b5..f5eafee83249 100644
--- a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
+++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.h.orig	2025-04-16 18:18:42 UTC
+--- ui/platform_window/platform_window_delegate.h.orig	2025-05-08 06:33:24 UTC
 +++ ui/platform_window/platform_window_delegate.h
-@@ -140,7 +140,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  
diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h
index 45b7c75f25d8..0785728ea378 100644
--- a/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h
+++ b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,4 +1,4 @@
---- ui/platform_window/platform_window_init_properties.h.orig	2024-06-25 12:08:48 UTC
+--- ui/platform_window/platform_window_init_properties.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/platform_window/platform_window_init_properties.h
 @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate;
  class ScenicWindowDelegate;
@@ -9,7 +9,7 @@
  class X11ExtensionDelegate;
  #endif
  
-@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
+@@ -120,7 +120,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
  
    PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault;
  
diff --git a/www/iridium/files/patch-ui_qt_BUILD.gn b/www/iridium/files/patch-ui_qt_BUILD.gn
index aa180497e974..8d9719f983c7 100644
--- a/www/iridium/files/patch-ui_qt_BUILD.gn
+++ b/www/iridium/files/patch-ui_qt_BUILD.gn
@@ -1,4 +1,4 @@
---- ui/qt/BUILD.gn.orig	2024-06-25 12:08:48 UTC
+--- ui/qt/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ ui/qt/BUILD.gn
 @@ -20,7 +20,7 @@ config("qt_internal_config") {
  
diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb
index e43d310e2bbe..c2d650617f87 100644
--- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb
+++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb
@@ -1,4 +1,4 @@
---- ui/strings/translations/app_locale_settings_bn.xtb.orig	2022-10-05 07:34:01 UTC
+--- ui/strings/translations/app_locale_settings_bn.xtb.orig	2025-05-07 06:48:23 UTC
 +++ ui/strings/translations/app_locale_settings_bn.xtb
 @@ -10,7 +10,7 @@
    <translation id="IDS_WEB_FONT_FAMILY">Vrinda</translation>
diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb
index 5138cc96d472..68b8e2f6b790 100644
--- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb
+++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb
@@ -1,4 +1,4 @@
---- ui/strings/translations/app_locale_settings_ja.xtb.orig	2022-10-05 07:34:01 UTC
+--- ui/strings/translations/app_locale_settings_ja.xtb.orig	2025-05-07 06:48:23 UTC
 +++ ui/strings/translations/app_locale_settings_ja.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb
index 9d828da0cc26..7b17e7d9e62a 100644
--- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb
+++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb
@@ -1,4 +1,4 @@
---- ui/strings/translations/app_locale_settings_ko.xtb.orig	2022-10-05 07:34:01 UTC
+--- ui/strings/translations/app_locale_settings_ko.xtb.orig	2025-05-07 06:48:23 UTC
 +++ ui/strings/translations/app_locale_settings_ko.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb
index 3ce40a565bd2..20a12e23e0ab 100644
--- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb
+++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb
@@ -1,4 +1,4 @@
---- ui/strings/translations/app_locale_settings_ml.xtb.orig	2022-10-05 07:34:01 UTC
+--- ui/strings/translations/app_locale_settings_ml.xtb.orig	2025-05-07 06:48:23 UTC
 +++ ui/strings/translations/app_locale_settings_ml.xtb
 @@ -9,7 +9,7 @@
    <translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,AnjaliOldLipi,Rachana,Kartika</translation>
diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__th.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__th.xtb
index add8ff5f8936..53946d6d4b47 100644
--- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__th.xtb
+++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__th.xtb
@@ -1,4 +1,4 @@
---- ui/strings/translations/app_locale_settings_th.xtb.orig	2022-10-05 07:34:01 UTC
+--- ui/strings/translations/app_locale_settings_th.xtb.orig	2025-05-07 06:48:23 UTC
 +++ ui/strings/translations/app_locale_settings_th.xtb
 @@ -6,7 +6,7 @@
    <translation id="IDS_WEB_FONT_FAMILY">Tahoma,sans-serif</translation>
diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
index d7daf341c2cd..c8b04ba00429 100644
--- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
+++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
@@ -1,4 +1,4 @@
---- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig	2022-10-05 07:34:01 UTC
+--- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig	2025-05-07 06:48:23 UTC
 +++ ui/strings/translations/app_locale_settings_zh-CN.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
index b88350b8301f..c8502b5d00c7 100644
--- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
+++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
@@ -1,4 +1,4 @@
---- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig	2023-01-17 19:19:00 UTC
+--- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig	2025-05-07 06:48:23 UTC
 +++ ui/strings/translations/app_locale_settings_zh-TW.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/www/iridium/files/patch-ui_views_BUILD.gn b/www/iridium/files/patch-ui_views_BUILD.gn
index fb2baf71a88b..701975f08fea 100644
--- a/www/iridium/files/patch-ui_views_BUILD.gn
+++ b/www/iridium/files/patch-ui_views_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/views/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- ui/views/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/BUILD.gn
-@@ -836,7 +836,6 @@ component("views") {
+@@ -839,7 +839,6 @@ component("views") {
        sources += [ "accessibility/widget_ax_tree_id_map.cc" ]
      }
      deps += [
diff --git a/www/iridium/files/patch-ui_views_accessibility_view__accessibility.cc b/www/iridium/files/patch-ui_views_accessibility_view__accessibility.cc
index 881be48f2123..fcc6474c5f58 100644
--- a/www/iridium/files/patch-ui_views_accessibility_view__accessibility.cc
+++ b/www/iridium/files/patch-ui_views_accessibility_view__accessibility.cc
@@ -1,6 +1,6 @@
---- ui/views/accessibility/view_accessibility.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/views/accessibility/view_accessibility.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/accessibility/view_accessibility.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
  #include "ui/views/accessibility/view_ax_platform_node_delegate_win.h"
  #elif BUILDFLAG(IS_MAC)
  #include "ui/views/accessibility/view_ax_platform_node_delegate_mac.h"
@@ -9,7 +9,7 @@
  #include "ui/views/accessibility/view_ax_platform_node_delegate_auralinux.h"
  #endif
  
-@@ -100,7 +100,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility::
+@@ -101,7 +101,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility::
    return ViewAXPlatformNodeDelegateWin::CreatePlatformSpecific(view);
  #elif BUILDFLAG(IS_MAC)
    return ViewAXPlatformNodeDelegateMac::CreatePlatformSpecific(view);
diff --git a/www/iridium/files/patch-ui_views_controls_prefix__selector.cc b/www/iridium/files/patch-ui_views_controls_prefix__selector.cc
index 579142104961..12c397ee96fc 100644
--- a/www/iridium/files/patch-ui_views_controls_prefix__selector.cc
+++ b/www/iridium/files/patch-ui_views_controls_prefix__selector.cc
@@ -1,4 +1,4 @@
---- ui/views/controls/prefix_selector.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/views/controls/prefix_selector.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/controls/prefix_selector.cc
 @@ -192,7 +192,7 @@ bool PrefixSelector::ShouldDoLearning() {
    return false;
diff --git a/www/iridium/files/patch-ui_views_controls_prefix__selector.h b/www/iridium/files/patch-ui_views_controls_prefix__selector.h
index 6a38c2f25edf..0f756af397fd 100644
--- a/www/iridium/files/patch-ui_views_controls_prefix__selector.h
+++ b/www/iridium/files/patch-ui_views_controls_prefix__selector.h
@@ -1,4 +1,4 @@
---- ui/views/controls/prefix_selector.h.orig	2025-02-22 18:06:53 UTC
+--- ui/views/controls/prefix_selector.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/controls/prefix_selector.h
 @@ -91,7 +91,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp
    ukm::SourceId GetClientSourceForMetrics() const override;
diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
index dd2a89b02889..0892ea0df445 100644
--- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/controls/textfield/textfield.cc
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
  #include "base/win/win_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
-@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -184,7 +184,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -18,25 +18,25 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -790,7 +790,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -791,7 +791,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
      return handled;
    }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!handled && linux_ui &&
-@@ -975,7 +975,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+   if (!handled) {
+     if (auto* linux_ui = ui::LinuxUi::instance()) {
+       const auto command =
+@@ -976,7 +976,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Skip any accelerator handling that conflicts with custom keybindings.
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -2066,7 +2066,7 @@ bool Textfield::ShouldDoLearning() {
+   if (auto* linux_ui = ui::LinuxUi::instance()) {
+     if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent(
+@@ -2062,7 +2062,7 @@ bool Textfield::ShouldDoLearning() {
    return false;
  }
  
@@ -45,7 +45,7 @@
  // TODO(crbug.com/41452689): Implement this method to support Korean IME
  // reconversion feature on native text fields (e.g. find bar).
  bool Textfield::SetCompositionFromExistingText(
-@@ -2584,7 +2584,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2580,7 +2580,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
@@ -54,7 +54,7 @@
        // Only erase by line break on Linux and ChromeOS.
        if (shift) {
          return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
-@@ -2592,7 +2592,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2588,7 +2588,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
        return ui::TextEditCommand::DELETE_WORD_BACKWARD;
      case ui::VKEY_DELETE:
diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h
index 9d9b13ffc9ca..4be77ed23be7 100644
--- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h
+++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h
@@ -1,4 +1,4 @@
---- ui/views/controls/textfield/textfield.h.orig	2025-04-16 18:18:42 UTC
+--- ui/views/controls/textfield/textfield.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/controls/textfield/textfield.h
 @@ -48,7 +48,7 @@
  #include "ui/views/view_observer.h"
diff --git a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
index 92268c202bb2..536d1020ba48 100644
--- a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,6 +1,6 @@
---- ui/views/corewm/tooltip_aura.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/corewm/tooltip_aura.cc
-@@ -38,7 +38,7 @@ static constexpr int kTooltipMaxWidth = 800;
+@@ -42,7 +42,7 @@ static constexpr int kTooltipMaxWidth = 800;
  
  // TODO(varkha): Update if native widget can be transparent on Linux.
  bool CanUseTranslucentTooltipWidget() {
diff --git a/www/iridium/files/patch-ui_views_examples_widget__example.cc b/www/iridium/files/patch-ui_views_examples_widget__example.cc
index 21367faf583f..18d8d8bbb1f4 100644
--- a/www/iridium/files/patch-ui_views_examples_widget__example.cc
+++ b/www/iridium/files/patch-ui_views_examples_widget__example.cc
@@ -1,6 +1,6 @@
---- ui/views/examples/widget_example.cc.orig	2024-11-04 08:56:03 UTC
+--- ui/views/examples/widget_example.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/examples/widget_example.cc
-@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container)
+@@ -51,7 +51,7 @@ void WidgetExample::CreateExampleView(View* container)
    modal_button->SetCallback(
        base::BindRepeating(&WidgetExample::CreateDialogWidget,
                            base::Unretained(this), modal_button, true));
diff --git a/www/iridium/files/patch-ui_views_focus_focus__manager.cc b/www/iridium/files/patch-ui_views_focus_focus__manager.cc
index 3afc6b88b6da..74802b2e05d9 100644
--- a/www/iridium/files/patch-ui_views_focus_focus__manager.cc
+++ b/www/iridium/files/patch-ui_views_focus_focus__manager.cc
@@ -1,4 +1,4 @@
---- ui/views/focus/focus_manager.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/views/focus/focus_manager.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/focus/focus_manager.cc
 @@ -606,7 +606,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
      return false;
diff --git a/www/iridium/files/patch-ui_views_style_platform__style.cc b/www/iridium/files/patch-ui_views_style_platform__style.cc
index 97d8bc75dfa4..93fe10b0056c 100644
--- a/www/iridium/files/patch-ui_views_style_platform__style.cc
+++ b/www/iridium/files/patch-ui_views_style_platform__style.cc
@@ -1,4 +1,4 @@
---- ui/views/style/platform_style.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/views/style/platform_style.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/style/platform_style.cc
 @@ -23,7 +23,7 @@
  #include "ui/views/controls/focusable_border.h"
diff --git a/www/iridium/files/patch-ui_views_style_platform__style.h b/www/iridium/files/patch-ui_views_style_platform__style.h
index 7bb523827316..4c202f5594de 100644
--- a/www/iridium/files/patch-ui_views_style_platform__style.h
+++ b/www/iridium/files/patch-ui_views_style_platform__style.h
@@ -1,4 +1,4 @@
---- ui/views/style/platform_style.h.orig	2025-04-16 18:18:42 UTC
+--- ui/views/style/platform_style.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/style/platform_style.h
 @@ -84,7 +84,7 @@ class VIEWS_EXPORT PlatformStyle {
    // Default setting at bubble creation time for whether arrow will be adjusted
diff --git a/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc b/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
index 65e7fc7702d3..aa4da693d542 100644
--- a/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
+++ b/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
@@ -1,4 +1,4 @@
---- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
 @@ -237,7 +237,7 @@ bool SendMouseClick(MouseButton type, gfx::NativeWindo
                           window_hint);
diff --git a/www/iridium/files/patch-ui_views_views__delegate.cc b/www/iridium/files/patch-ui_views_views__delegate.cc
index 0a188e9130fb..411c34797f0a 100644
--- a/www/iridium/files/patch-ui_views_views__delegate.cc
+++ b/www/iridium/files/patch-ui_views_views__delegate.cc
@@ -1,4 +1,4 @@
---- ui/views/views_delegate.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/views/views_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/views_delegate.cc
 @@ -101,7 +101,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow 
    return false;
diff --git a/www/iridium/files/patch-ui_views_views__delegate.h b/www/iridium/files/patch-ui_views_views__delegate.h
index 6fc8fd044303..35b5de4fd3f7 100644
--- a/www/iridium/files/patch-ui_views_views__delegate.h
+++ b/www/iridium/files/patch-ui_views_views__delegate.h
@@ -1,4 +1,4 @@
---- ui/views/views_delegate.h.orig	2025-02-22 18:06:53 UTC
+--- ui/views/views_delegate.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/views_delegate.h
 @@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate {
    // environment.
diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
index 16043183292b..d28f36a835ed 100644
--- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
+++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
 @@ -203,7 +203,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
    return selected_operation_;
diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
index df95385524e8..73d89aa3b8a2 100644
--- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
+++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig	2024-12-22 12:24:29 UTC
+--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
 @@ -67,7 +67,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
      // The offset of |drag_widget_| relative to the mouse position.
diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index afccb1d1e9bd..e7537b4d396a 100644
--- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
 @@ -50,7 +50,7 @@
  #include "ui/wm/core/window_util.h"
@@ -9,7 +9,7 @@
  #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
  #endif
  
-@@ -347,7 +347,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -353,7 +353,7 @@ std::unique_ptr<aura::client::DragDropClient>
  DesktopWindowTreeHostPlatform::CreateDragDropClient() {
    ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
    std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -18,7 +18,7 @@
        std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
  #else
        std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1179,7 +1179,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
+@@ -1185,7 +1185,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/iridium/files/patch-ui_views_widget_root__view.cc b/www/iridium/files/patch-ui_views_widget_root__view.cc
index 4228349946eb..ed1eace5c6f2 100644
--- a/www/iridium/files/patch-ui_views_widget_root__view.cc
+++ b/www/iridium/files/patch-ui_views_widget_root__view.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/root_view.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/views/widget/root_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/widget/root_view.cc
 @@ -169,7 +169,7 @@ class AnnounceTextView : public View {
  #if BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-ui_views_widget_widget.cc b/www/iridium/files/patch-ui_views_widget_widget.cc
index d57584388c27..9496eea5220d 100644
--- a/www/iridium/files/patch-ui_views_widget_widget.cc
+++ b/www/iridium/files/patch-ui_views_widget_widget.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/widget.cc.orig	2025-04-16 18:18:42 UTC
+--- ui/views/widget/widget.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/widget/widget.cc
 @@ -63,7 +63,7 @@
  #include "ui/views/window/custom_frame_view.h"
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -2452,7 +2452,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
+@@ -2453,7 +2453,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
      return parent_->GetNativeTheme();
    }
  
diff --git a/www/iridium/files/patch-ui_views_widget_widget.h b/www/iridium/files/patch-ui_views_widget_widget.h
new file mode 100644
index 000000000000..10bb9d8bb2d5
--- /dev/null
+++ b/www/iridium/files/patch-ui_views_widget_widget.h
@@ -0,0 +1,11 @@
+--- ui/views/widget/widget.h.orig	2025-05-07 06:48:23 UTC
++++ ui/views/widget/widget.h
+@@ -487,7 +487,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
+     bool force_system_menu_for_frameless = false;
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Only used by X11, for root level windows. Specifies the res_name and
+     // res_class fields, respectively, of the WM_CLASS window property. Controls
+     // window grouping and desktop file matching in Linux window managers.
diff --git a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc
index 8b6e71fc725e..3bc4b668076f 100644
--- a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc
+++ b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc
@@ -1,4 +1,4 @@
---- ui/views/window/custom_frame_view.cc.orig	2025-02-22 18:06:53 UTC
+--- ui/views/window/custom_frame_view.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/window/custom_frame_view.cc
 @@ -279,7 +279,7 @@ int CustomFrameView::NonClientTopBorderHeight() const 
  int CustomFrameView::CaptionButtonY() const {
diff --git a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
index 730eeae49d3b..a0059e2cb635 100644
--- a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig	2025-03-18 16:46:04 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/window/dialog_delegate.cc
-@@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -106,7 +106,7 @@ Widget* DialogDelegate::CreateDialogWidget(
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/iridium/files/patch-ui_views_window_frame__background.cc b/www/iridium/files/patch-ui_views_window_frame__background.cc
index 344e838d4977..d1267d2661bd 100644
--- a/www/iridium/files/patch-ui_views_window_frame__background.cc
+++ b/www/iridium/files/patch-ui_views_window_frame__background.cc
@@ -1,4 +1,4 @@
---- ui/views/window/frame_background.cc.orig	2023-10-21 11:51:27 UTC
+--- ui/views/window/frame_background.cc.orig	2025-05-07 06:48:23 UTC
 +++ ui/views/window/frame_background.cc
 @@ -110,7 +110,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
                                       int width) const {
diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn
index 5fb0b5a9a1e6..c09debe7bde7 100644
--- a/www/iridium/files/patch-v8_BUILD.gn
+++ b/www/iridium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig	2025-04-16 18:18:42 UTC
+--- v8/BUILD.gn.orig	2025-05-07 06:48:23 UTC
 +++ v8/BUILD.gn
-@@ -974,6 +974,8 @@ external_v8_defines = [
+@@ -1000,6 +1000,8 @@ external_v8_defines = [
    "V8_TARGET_OS_MACOS",
    "V8_TARGET_OS_WIN",
    "V8_TARGET_OS_CHROMEOS",
@@ -9,7 +9,7 @@
  ]
  
  enabled_external_v8_defines = [
-@@ -1053,6 +1055,12 @@ if (target_os == "android") {
+@@ -1079,6 +1081,12 @@ if (target_os == "android") {
  } else if (target_os == "chromeos") {
    enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
    enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ]
@@ -22,7 +22,7 @@
  }
  
  disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines
-@@ -2479,6 +2487,12 @@ template("run_mksnapshot") {
+@@ -2537,6 +2545,12 @@ template("run_mksnapshot") {
        if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
          args += [ "--reorder-builtins" ]
        }
@@ -35,7 +35,7 @@
      }
  
      if (v8_enable_turboshaft_csa) {
-@@ -6565,7 +6579,7 @@ v8_component("v8_libbase") {
+@@ -6631,7 +6645,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -44,7 +44,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -6576,6 +6590,18 @@ v8_component("v8_libbase") {
+@@ -6642,6 +6656,18 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
diff --git a/www/iridium/files/patch-v8_include_v8-internal.h b/www/iridium/files/patch-v8_include_v8-internal.h
index 493d35e1caba..44cba8914a97 100644
--- a/www/iridium/files/patch-v8_include_v8-internal.h
+++ b/www/iridium/files/patch-v8_include_v8-internal.h
@@ -1,4 +1,4 @@
---- v8/include/v8-internal.h.orig	2025-02-22 18:06:53 UTC
+--- v8/include/v8-internal.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/include/v8-internal.h
 @@ -232,7 +232,7 @@ using SandboxedPointer_t = Address;
  #ifdef V8_ENABLE_SANDBOX
diff --git a/www/iridium/files/patch-v8_include_v8config.h b/www/iridium/files/patch-v8_include_v8config.h
index 49d3a4e11324..3a4144ce5549 100644
--- a/www/iridium/files/patch-v8_include_v8config.h
+++ b/www/iridium/files/patch-v8_include_v8config.h
@@ -1,4 +1,4 @@
---- v8/include/v8config.h.orig	2025-02-22 18:06:53 UTC
+--- v8/include/v8config.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/include/v8config.h
 @@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line
    && !defined(V8_TARGET_OS_FUCHSIA) \
@@ -35,7 +35,7 @@
  #ifdef V8_OS_MACOS
  # define V8_TARGET_OS_MACOS
  #endif
-@@ -382,6 +396,7 @@ path. Add it with -I<path> to the command line
+@@ -383,6 +397,7 @@ path. Add it with -I<path> to the command line
  #if (defined(_M_X64) || defined(__x86_64__)            /* x64 (everywhere) */  \
       || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */    \
           && !defined(_WIN32)))                         /* not on windows */    \
diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc
index 39dfe568bb09..6f440d8da9d7 100644
--- a/www/iridium/files/patch-v8_src_api_api.cc
+++ b/www/iridium/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
---- v8/src/api/api.cc.orig	2025-04-16 18:18:42 UTC
+--- v8/src/api/api.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/api/api.cc
 @@ -153,7 +153,7 @@
  #include "src/wasm/wasm-serialization.h"
@@ -9,7 +9,7 @@
  #include <signal.h>
  #include <unistd.h>
  
-@@ -6476,7 +6476,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6483,7 +6483,7 @@ bool v8::V8::Initialize(const int build_config) {
    return true;
  }
  
diff --git a/www/iridium/files/patch-v8_src_base_atomicops.h b/www/iridium/files/patch-v8_src_base_atomicops.h
index 9720f4866e88..24ac7a02381d 100644
--- a/www/iridium/files/patch-v8_src_base_atomicops.h
+++ b/www/iridium/files/patch-v8_src_base_atomicops.h
@@ -1,4 +1,4 @@
---- v8/src/base/atomicops.h.orig	2023-10-21 11:51:27 UTC
+--- v8/src/base/atomicops.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/base/atomicops.h
 @@ -57,10 +57,10 @@ using Atomic64 = SbAtomic64;
  using Atomic8 = char;
diff --git a/www/iridium/files/patch-v8_src_base_platform_memory.h b/www/iridium/files/patch-v8_src_base_platform_memory.h
index f6538054b5b9..7a9cee68a1eb 100644
--- a/www/iridium/files/patch-v8_src_base_platform_memory.h
+++ b/www/iridium/files/patch-v8_src_base_platform_memory.h
@@ -1,4 +1,4 @@
---- v8/src/base/platform/memory.h.orig	2024-11-04 08:56:03 UTC
+--- v8/src/base/platform/memory.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/base/platform/memory.h
 @@ -21,13 +21,13 @@
  #include <malloc/malloc.h>
diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/iridium/files/patch-v8_src_base_platform_platform-freebsd.cc
index b3ad5e976b3c..125440a23053 100644
--- a/www/iridium/files/patch-v8_src_base_platform_platform-freebsd.cc
+++ b/www/iridium/files/patch-v8_src_base_platform_platform-freebsd.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-freebsd.cc.orig	2022-03-28 18:11:04 UTC
+--- v8/src/base/platform/platform-freebsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/base/platform/platform-freebsd.cc
 @@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache() {
    return new PosixDefaultTimezoneCache();
diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc b/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc
index c97ab8a6d012..7dfe2bf94086 100644
--- a/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc
+++ b/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-openbsd.cc.orig	2024-08-01 05:47:53 UTC
+--- v8/src/base/platform/platform-openbsd.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/base/platform/platform-openbsd.cc
 @@ -6,6 +6,7 @@
  // POSIX-compatible parts, the implementation is in platform-posix.cc.
diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
index aec30e64037e..a6d1f1d70e94 100644
--- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
+++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-posix.cc.orig	2025-04-16 18:18:42 UTC
+--- v8/src/base/platform/platform-posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/base/platform/platform-posix.cc
 @@ -76,7 +76,7 @@
  #include <sys/syscall.h>
diff --git a/www/iridium/files/patch-v8_src_base_sys-info.cc b/www/iridium/files/patch-v8_src_base_sys-info.cc
index c1b7f0612c6c..7e24563e995a 100644
--- a/www/iridium/files/patch-v8_src_base_sys-info.cc
+++ b/www/iridium/files/patch-v8_src_base_sys-info.cc
@@ -1,4 +1,4 @@
---- v8/src/base/sys-info.cc.orig	2024-11-04 08:56:03 UTC
+--- v8/src/base/sys-info.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/base/sys-info.cc
 @@ -36,7 +36,7 @@ namespace base {
  // static
diff --git a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc
index b7ad78ca0e0b..e7c55bed5211 100644
--- a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc
+++ b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc
@@ -1,4 +1,4 @@
---- v8/src/diagnostics/perf-jit.cc.orig	2023-10-21 11:51:27 UTC
+--- v8/src/diagnostics/perf-jit.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/diagnostics/perf-jit.cc
 @@ -31,7 +31,7 @@
  #include "src/flags/flags.h"
diff --git a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h
index 1504da917937..ef883200bef9 100644
--- a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h
+++ b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h
@@ -1,4 +1,4 @@
---- v8/src/diagnostics/perf-jit.h.orig	2022-10-05 07:34:01 UTC
+--- v8/src/diagnostics/perf-jit.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/diagnostics/perf-jit.h
 @@ -31,7 +31,7 @@
  #include "include/v8config.h"
diff --git a/www/iridium/files/patch-v8_src_execution_isolate.cc b/www/iridium/files/patch-v8_src_execution_isolate.cc
index 86a6a76eee4c..e31899c4b1b9 100644
--- a/www/iridium/files/patch-v8_src_execution_isolate.cc
+++ b/www/iridium/files/patch-v8_src_execution_isolate.cc
@@ -1,6 +1,6 @@
---- v8/src/execution/isolate.cc.orig	2025-04-16 18:18:42 UTC
+--- v8/src/execution/isolate.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/execution/isolate.cc
-@@ -172,6 +172,10 @@
+@@ -173,6 +173,10 @@
  #include "src/execution/simulator-base.h"
  #endif
  
@@ -11,7 +11,7 @@
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -5062,6 +5066,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -5114,6 +5118,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
diff --git a/www/iridium/files/patch-v8_src_flags_flags.cc b/www/iridium/files/patch-v8_src_flags_flags.cc
index 2a5d51a2eb03..3b1fd580ca1a 100644
--- a/www/iridium/files/patch-v8_src_flags_flags.cc
+++ b/www/iridium/files/patch-v8_src_flags_flags.cc
@@ -1,4 +1,4 @@
---- v8/src/flags/flags.cc.orig	2025-03-18 16:46:04 UTC
+--- v8/src/flags/flags.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/flags/flags.cc
 @@ -16,6 +16,10 @@
  #include <set>
diff --git a/www/iridium/files/patch-v8_src_libsampler_sampler.cc b/www/iridium/files/patch-v8_src_libsampler_sampler.cc
index aae17a20e628..79f5e1c3680b 100644
--- a/www/iridium/files/patch-v8_src_libsampler_sampler.cc
+++ b/www/iridium/files/patch-v8_src_libsampler_sampler.cc
@@ -1,4 +1,4 @@
---- v8/src/libsampler/sampler.cc.orig	2025-04-16 18:18:42 UTC
+--- v8/src/libsampler/sampler.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/libsampler/sampler.cc
 @@ -520,6 +520,16 @@ void SignalHandler::FillRegisterState(void* context, R
    state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
diff --git a/www/iridium/files/patch-v8_src_sandbox_sandbox.cc b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc
index 64a992187bce..ee6231913f0b 100644
--- a/www/iridium/files/patch-v8_src_sandbox_sandbox.cc
+++ b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc
@@ -1,4 +1,4 @@
---- v8/src/sandbox/sandbox.cc.orig	2025-03-18 16:46:04 UTC
+--- v8/src/sandbox/sandbox.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/sandbox/sandbox.cc
 @@ -59,7 +59,7 @@ static Address DetermineAddressSpaceLimit() {
    }
diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
index fd570a65f832..cabd4be1d35b 100644
--- a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
+++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
@@ -1,4 +1,4 @@
---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig	2024-08-27 06:28:16 UTC
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
 @@ -148,6 +148,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) {
      return EmbeddedTargetOs::kStarboard;
diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
index 2c5faab1b029..13c58e79d457 100644
--- a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
+++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
@@ -1,4 +1,4 @@
---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig	2024-11-04 08:56:03 UTC
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.h
 @@ -36,6 +36,7 @@ enum class EmbeddedTargetOs {
    kWin,
diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
index a407d9d10b6f..b5d6bfd673fa 100644
--- a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
+++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
@@ -1,4 +1,4 @@
---- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig	2023-08-28 20:17:35 UTC
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
 @@ -9,6 +9,10 @@
  
diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
index 35ee5398710e..1008ed65b682 100644
--- a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
+++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
@@ -1,4 +1,4 @@
---- v8/src/trap-handler/handler-inside-posix.cc.orig	2024-06-25 12:08:48 UTC
+--- v8/src/trap-handler/handler-inside-posix.cc.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/trap-handler/handler-inside-posix.cc
 @@ -61,6 +61,8 @@ namespace trap_handler {
  #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg
diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h
index 13945e9718e5..04476215cd3a 100644
--- a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h
+++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h
@@ -1,4 +1,4 @@
---- v8/src/trap-handler/handler-inside-posix.h.orig	2022-10-05 07:34:01 UTC
+--- v8/src/trap-handler/handler-inside-posix.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/trap-handler/handler-inside-posix.h
 @@ -13,7 +13,7 @@ namespace v8 {
  namespace internal {
diff --git a/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h b/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h
index 5fa9e2479744..773b60489267 100644
--- a/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h
+++ b/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h
@@ -1,4 +1,4 @@
---- v8/src/trap-handler/trap-handler.h.orig	2025-02-22 18:06:53 UTC
+--- v8/src/trap-handler/trap-handler.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/trap-handler/trap-handler.h
 @@ -18,7 +18,7 @@ namespace v8::internal::trap_handler {
  // X64 on Linux, Windows, MacOS, FreeBSD.
diff --git a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
index d779774a207d..c4db857ee577 100644
--- a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
+++ b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
@@ -1,6 +1,6 @@
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-04-16 18:18:42 UTC
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-05-07 06:48:23 UTC
 +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
-@@ -575,7 +575,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
  }
  
  void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -9,7 +9,7 @@
                              LoadType type, uint32_t* protected_load_pc,
                              bool /* is_load_mem */, bool /* i64_offset */,
                              bool needs_shift) {
-@@ -655,7 +655,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
  }
  
  void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -18,7 +18,7 @@
                               StoreType type, LiftoffRegList pinned,
                               uint32_t* protected_store_pc,
                               bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -734,7 +734,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
  }
  
  void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
@@ -27,7 +27,7 @@
                                    LoadType type, LiftoffRegList /* pinned */,
                                    bool /* i64_offset */) {
    if (type.value() != LoadType::kI64Load) {
-@@ -752,7 +752,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
  }
  
  void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
@@ -36,7 +36,7 @@
                                     StoreType type, LiftoffRegList pinned,
                                     bool /* i64_offset */) {
    DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
-@@ -822,7 +822,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
  
  inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
                                         Register dst_addr, Register offset_reg,
@@ -45,7 +45,7 @@
                                         LiftoffRegister value,
                                         LiftoffRegister result, StoreType type) {
    DCHECK_EQ(value, result);
-@@ -890,7 +890,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
  }
  
  inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -54,7 +54,7 @@
                            LiftoffRegister value, LiftoffRegister result,
                            StoreType type) {
    DCHECK_EQ(value, result);
-@@ -1005,7 +1005,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
  }
  
  inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -63,7 +63,7 @@
                            LiftoffRegister value, LiftoffRegister result) {
    // We need {ebx} here, which is the root register. As the root register it
    // needs special treatment. As we use {ebx} directly in the code below, we
-@@ -1101,7 +1101,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
  }  // namespace liftoff
  
  void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
@@ -72,7 +72,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1115,7 +1115,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
@@ -81,7 +81,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1128,7 +1128,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
@@ -90,7 +90,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1142,7 +1142,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
@@ -99,7 +99,7 @@
                                  LiftoffRegister result, StoreType type,
                                  bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1156,7 +1156,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
  }
  
  void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
@@ -108,7 +108,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1170,7 +1170,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
@@ -117,7 +117,7 @@
                                        LiftoffRegister value,
                                        LiftoffRegister result, StoreType type,
                                        bool /* i64_offset */) {
-@@ -1185,7 +1185,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
  }
  
  void LiftoffAssembler::AtomicCompareExchange(
diff --git a/www/iridium/files/patch-v8_tools_run.py b/www/iridium/files/patch-v8_tools_run.py
index 197acf6d1d60..ded6264b29d2 100644
--- a/www/iridium/files/patch-v8_tools_run.py
+++ b/www/iridium/files/patch-v8_tools_run.py
@@ -1,4 +1,4 @@
---- v8/tools/run.py.orig	2024-11-04 08:56:03 UTC
+--- v8/tools/run.py.orig	2025-05-07 06:48:23 UTC
 +++ v8/tools/run.py
 @@ -21,7 +21,7 @@ if cmd and cmd[0] == '--redirect-stdout':
    kwargs = dict(stdout=subprocess.PIPE)
diff --git a/www/jetty12/Makefile b/www/jetty12/Makefile
index 4be274bfbd84..c7a888abcec2 100644
--- a/www/jetty12/Makefile
+++ b/www/jetty12/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	jetty
-PORTVERSION=	12.0.19
+PORTVERSION=	12.0.20
 CATEGORIES=	www java
 MASTER_SITES=	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${PORTVERSION}/
 PKGNAMESUFFIX=	12
diff --git a/www/jetty12/distinfo b/www/jetty12/distinfo
index ea14058505f2..9dcbf6aedcb1 100644
--- a/www/jetty12/distinfo
+++ b/www/jetty12/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745422917
-SHA256 (jetty-home-12.0.19.tar.gz) = ad446379b0c60d53482e3ae29bccc14e9e52bc816458ac690bea22f1be454e3f
-SIZE (jetty-home-12.0.19.tar.gz) = 34641612
+TIMESTAMP = 1746539559
+SHA256 (jetty-home-12.0.20.tar.gz) = b7c058fef45876b2878947f20e9f931cd158c87396d5d38bd528a5a5914adf6a
+SIZE (jetty-home-12.0.20.tar.gz) = 34653439
diff --git a/www/jetty12/pkg-plist b/www/jetty12/pkg-plist
index 4d13142bca3c..7e118577d62c 100644
--- a/www/jetty12/pkg-plist
+++ b/www/jetty12/pkg-plist
@@ -277,7 +277,7 @@
 %%APP_NAME%%/lib/%%APP_NAME%%-websocket-%%APP_NAME%%-common-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/%%APP_NAME%%-xml-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/logging/%%APP_NAME%%-slf4j-impl-%%PORTVERSION%%.jar
-%%APP_NAME%%/lib/logging/slf4j-api-2.0.16.jar
+%%APP_NAME%%/lib/logging/slf4j-api-2.0.17.jar
 %%APP_NAME%%/modules/acceptratelimit.mod
 %%APP_NAME%%/modules/accept-rate-limit.mod
 %%APP_NAME%%/modules/alpn-java.mod
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 9a474ce70828..4efff092e83b 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -10,6 +10,9 @@ WWW=		https://jmeter.apache.org/
 
 LICENSE=	APACHE20
 
+DEPRECATED=	Depends on expiring java/jdom
+EXPIRATION_DATE=2025-06-04
+
 # These are JAR-files installed by other ports. The list should keep
 # growing until all Java applications install just their own JARs -- not
 # the 3rd-party ones:
diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index d9799db6f5cb..ebd4edfe5e19 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	librewolf
 DISTVERSION=	138.0.1
-LWPATCH=	-1
+LWPATCH=	-2
 DISTVERSIONSUFFIX=	${LWPATCH}.source
+PORTREVISION=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}${LWPATCH}/
 
diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo
index b4de9740f408..31195b372818 100644
--- a/www/librewolf/distinfo
+++ b/www/librewolf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746264275
-SHA256 (librewolf-138.0.1-1.source.tar.gz) = 9e95f2c6380ba03d33f53af3157428cc9b65db388d701ba5c4daf8ee49eaa706
-SIZE (librewolf-138.0.1-1.source.tar.gz) = 1019024276
+TIMESTAMP = 1746445113
+SHA256 (librewolf-138.0.1-2.source.tar.gz) = 308ac7a2d890bb798d3058dcf89415ccfb37e80e951f141b13c2ca98a758efd2
+SIZE (librewolf-138.0.1-2.source.tar.gz) = 1019041631
diff --git a/www/litmus/Makefile b/www/litmus/Makefile
index b52406f7b6b2..177bf2599e31 100644
--- a/www/litmus/Makefile
+++ b/www/litmus/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl --with-neon=${LOCALBASE}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|25 26 27 28 29|& 30 31 32|g' \
+	@${REINPLACE_CMD} -e 's|25 26 27 28 29|& 30 31 32 34|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 511b74d18919..94b573765345 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mattermost
-PORTVERSION=	10.5.1
-PORTREVISION=	1
+PORTVERSION=	10.5.4
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/decke
 PKGNAMESUFFIX=	-server
diff --git a/www/mattermost-server/distinfo b/www/mattermost-server/distinfo
index 33f59b438728..aa89d6002287 100644
--- a/www/mattermost-server/distinfo
+++ b/www/mattermost-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741865592
-SHA256 (mattermost-10.5.1.tar.xz) = 404b671e53b2341b4bb9bac4a473c4254356dee23654bc8aad327f232fb552e7
-SIZE (mattermost-10.5.1.tar.xz) = 123914268
+TIMESTAMP = 1746643584
+SHA256 (mattermost-10.5.4.tar.xz) = 781178d145c1deae486e2c3f52e2a9700ced360ba018d1891e058eca10ba0871
+SIZE (mattermost-10.5.4.tar.xz) = 132372636
diff --git a/www/mattermost-webapp/Makefile b/www/mattermost-webapp/Makefile
index a5914e36be5b..5769dc7d06e7 100644
--- a/www/mattermost-webapp/Makefile
+++ b/www/mattermost-webapp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mattermost-webapp
-PORTVERSION=	10.5.1
+PORTVERSION=	10.5.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	https://releases.mattermost.com/${PORTVERSION}/
diff --git a/www/mattermost-webapp/distinfo b/www/mattermost-webapp/distinfo
index c31c149d7e56..0b47aa5683e6 100644
--- a/www/mattermost-webapp/distinfo
+++ b/www/mattermost-webapp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741866134
-SHA256 (mattermost-10.5.1-linux-amd64.tar.gz) = 95af0556d64525bbda4354eab91e36087026b751c3c895622d7e0dddd2cd7ee6
-SIZE (mattermost-10.5.1-linux-amd64.tar.gz) = 622535550
+TIMESTAMP = 1746644156
+SHA256 (mattermost-10.5.4-linux-amd64.tar.gz) = cb9804e89200df10689ece427329da9e1d1b0e49f8ac3819a44c77540ace9f05
+SIZE (mattermost-10.5.4-linux-amd64.tar.gz) = 625912970
diff --git a/www/mattermost-webapp/pkg-plist b/www/mattermost-webapp/pkg-plist
index ff18805bfdb7..1d5ee1cb41f0 100644
--- a/www/mattermost-webapp/pkg-plist
+++ b/www/mattermost-webapp/pkg-plist
@@ -6,8 +6,8 @@
 %%WWWDIR%%/client/1041.2572eda22344150544f1.js.map
 %%WWWDIR%%/client/1041.8dc2cfa7ead9a7c76659.css
 %%WWWDIR%%/client/1041.8dc2cfa7ead9a7c76659.css.map
-%%WWWDIR%%/client/1083.30842cea7ae7c3bfc296.js
-%%WWWDIR%%/client/1083.30842cea7ae7c3bfc296.js.map
+%%WWWDIR%%/client/1083.2a0ed5aff07991bcfe5d.js
+%%WWWDIR%%/client/1083.2a0ed5aff07991bcfe5d.js.map
 %%WWWDIR%%/client/11.5ada543d8439d319600a.css
 %%WWWDIR%%/client/11.5ada543d8439d319600a.css.map
 %%WWWDIR%%/client/11.88c2898b3db4047b1024.js
@@ -55,10 +55,6 @@
 %%WWWDIR%%/client/1959.88e09e6c98529a040c03.js
 %%WWWDIR%%/client/1959.88e09e6c98529a040c03.js.LICENSE.txt
 %%WWWDIR%%/client/1959.88e09e6c98529a040c03.js.map
-%%WWWDIR%%/client/226.0e4a288ca7c7b45acf03.js
-%%WWWDIR%%/client/226.0e4a288ca7c7b45acf03.js.map
-%%WWWDIR%%/client/226.5111981c8bf7a9ed9b08.css
-%%WWWDIR%%/client/226.5111981c8bf7a9ed9b08.css.map
 %%WWWDIR%%/client/2284.8572c40bd3e7438fa164.js
 %%WWWDIR%%/client/2284.8572c40bd3e7438fa164.js.LICENSE.txt
 %%WWWDIR%%/client/2284.8572c40bd3e7438fa164.js.map
@@ -81,9 +77,9 @@
 %%WWWDIR%%/client/2821.7035da3aa10f689e9522.js.map
 %%WWWDIR%%/client/2839.24ee2c5e66ef2fe0de3b.js
 %%WWWDIR%%/client/2839.24ee2c5e66ef2fe0de3b.js.map
-%%WWWDIR%%/client/2868.a7fc1d97c7113f394036.js
-%%WWWDIR%%/client/2868.a7fc1d97c7113f394036.js.LICENSE.txt
-%%WWWDIR%%/client/2868.a7fc1d97c7113f394036.js.map
+%%WWWDIR%%/client/2868.73140750bc07c6454fea.js
+%%WWWDIR%%/client/2868.73140750bc07c6454fea.js.LICENSE.txt
+%%WWWDIR%%/client/2868.73140750bc07c6454fea.js.map
 %%WWWDIR%%/client/2960.d9371c2a3f159ce1105e.js
 %%WWWDIR%%/client/2960.d9371c2a3f159ce1105e.js.LICENSE.txt
 %%WWWDIR%%/client/2960.d9371c2a3f159ce1105e.js.map
@@ -95,10 +91,10 @@
 %%WWWDIR%%/client/3076.b90c10d034c14d9eaac5.js.map
 %%WWWDIR%%/client/3094.70eb16cc1b3136feb23d.css
 %%WWWDIR%%/client/3094.70eb16cc1b3136feb23d.css.map
+%%WWWDIR%%/client/3147.06dcdaf6bfe14a12bbc7.js
+%%WWWDIR%%/client/3147.06dcdaf6bfe14a12bbc7.js.map
 %%WWWDIR%%/client/3147.1a23012bf6b81c1367c4.css
 %%WWWDIR%%/client/3147.1a23012bf6b81c1367c4.css.map
-%%WWWDIR%%/client/3147.66f984f962a4ccf35d7b.js
-%%WWWDIR%%/client/3147.66f984f962a4ccf35d7b.js.map
 %%WWWDIR%%/client/3161.224a2836a1ffbac1c3cb.js
 %%WWWDIR%%/client/3161.224a2836a1ffbac1c3cb.js.map
 %%WWWDIR%%/client/3320.c1a0c4b1bf388f50f580.js
@@ -113,8 +109,8 @@
 %%WWWDIR%%/client/3461.b2536127835134a39eb3.js.map
 %%WWWDIR%%/client/3559.70aac86b2334ea79cbab.js
 %%WWWDIR%%/client/3559.70aac86b2334ea79cbab.js.map
-%%WWWDIR%%/client/3560.562935c75a4b8bd7d627.css
-%%WWWDIR%%/client/3560.562935c75a4b8bd7d627.css.map
+%%WWWDIR%%/client/3560.49eabe7f0656fd794614.css
+%%WWWDIR%%/client/3560.49eabe7f0656fd794614.css.map
 %%WWWDIR%%/client/3560.e466e096ec714556e2da.js
 %%WWWDIR%%/client/3560.e466e096ec714556e2da.js.map
 %%WWWDIR%%/client/3572.0177e4027d7f325769dd.js
@@ -130,8 +126,8 @@
 %%WWWDIR%%/client/3696.2e2c23af771a280ca171.js.map
 %%WWWDIR%%/client/3785.091d75af0b942959e7aa.js
 %%WWWDIR%%/client/3785.091d75af0b942959e7aa.js.map
-%%WWWDIR%%/client/3797.5a5b17936f2d22e42035.js
-%%WWWDIR%%/client/3797.5a5b17936f2d22e42035.js.map
+%%WWWDIR%%/client/3797.1b6c0cf42258cb9d93de.js
+%%WWWDIR%%/client/3797.1b6c0cf42258cb9d93de.js.map
 %%WWWDIR%%/client/3836.e8e92d6b779c0297d0ea.css
 %%WWWDIR%%/client/3836.e8e92d6b779c0297d0ea.css.map
 %%WWWDIR%%/client/3836.ee86251e41028f68c3b0.js
@@ -188,8 +184,8 @@
 %%WWWDIR%%/client/4738.ab04bb28f0c3bef67da6.js.map
 %%WWWDIR%%/client/475.cad42cca85bb2cb02550.js
 %%WWWDIR%%/client/475.cad42cca85bb2cb02550.js.map
-%%WWWDIR%%/client/4823.b494245355c3faecb383.js
-%%WWWDIR%%/client/4823.b494245355c3faecb383.js.map
+%%WWWDIR%%/client/4823.b2e6de63dd6992879eca.js
+%%WWWDIR%%/client/4823.b2e6de63dd6992879eca.js.map
 %%WWWDIR%%/client/4839.c5f7909088970595b70a.js
 %%WWWDIR%%/client/4839.c5f7909088970595b70a.js.map
 %%WWWDIR%%/client/486.1c515a3980a4990e2da5.js
@@ -289,10 +285,14 @@
 %%WWWDIR%%/client/6898.45f2673a9f8595dd1765.js.map
 %%WWWDIR%%/client/6898.f9c41382e57246523c72.css
 %%WWWDIR%%/client/6898.f9c41382e57246523c72.css.map
-%%WWWDIR%%/client/7003.6517b4e85f0fe7344473.css
-%%WWWDIR%%/client/7003.6517b4e85f0fe7344473.css.map
+%%WWWDIR%%/client/6940.54aa737ccdf3af72332b.js
+%%WWWDIR%%/client/6940.54aa737ccdf3af72332b.js.map
+%%WWWDIR%%/client/6940.73369b09fed3e015df01.css
+%%WWWDIR%%/client/6940.73369b09fed3e015df01.css.map
 %%WWWDIR%%/client/7003.683926ac3591bd47b01b.js
 %%WWWDIR%%/client/7003.683926ac3591bd47b01b.js.map
+%%WWWDIR%%/client/7003.f95f502035aede55919e.css
+%%WWWDIR%%/client/7003.f95f502035aede55919e.css.map
 %%WWWDIR%%/client/7099.ef352319bd2dfacdf64d.js
 %%WWWDIR%%/client/7099.ef352319bd2dfacdf64d.js.map
 %%WWWDIR%%/client/7272.8f3cee1a179188a1deca.js
@@ -353,8 +353,8 @@
 %%WWWDIR%%/client/8348.bb69f03c33bc27a7b042.js.map
 %%WWWDIR%%/client/8360.841bf548522155de7948.js
 %%WWWDIR%%/client/8360.841bf548522155de7948.js.map
-%%WWWDIR%%/client/8461.9c674369b81874d0b807.js
-%%WWWDIR%%/client/8461.9c674369b81874d0b807.js.map
+%%WWWDIR%%/client/8461.d1f79d51415f27554279.js
+%%WWWDIR%%/client/8461.d1f79d51415f27554279.js.map
 %%WWWDIR%%/client/8508.9335b87e46db99391307.js
 %%WWWDIR%%/client/8508.9335b87e46db99391307.js.map
 %%WWWDIR%%/client/8508.e0dd00b105e5520488b9.css
@@ -4208,8 +4208,8 @@
 %%WWWDIR%%/client/images/payment_processing.png
 %%WWWDIR%%/client/images/purchase_alert.png
 %%WWWDIR%%/client/images/welcome_illustration_new.png
-%%WWWDIR%%/client/main.81b56ebac8513accd230.js
-%%WWWDIR%%/client/main.81b56ebac8513accd230.js.map
+%%WWWDIR%%/client/main.c0dd500c0c43733e31c6.js
+%%WWWDIR%%/client/main.c0dd500c0c43733e31c6.js.map
 %%WWWDIR%%/client/manifest.json
 %%WWWDIR%%/client/remote_entry.js
 %%WWWDIR%%/client/remote_entry.js.map
diff --git a/www/miniserve/Makefile b/www/miniserve/Makefile
index 65dea7019961..5fcbd8a8608d 100644
--- a/www/miniserve/Makefile
+++ b/www/miniserve/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.29.0
 PORTREVISION=	1
 CATEGORIES=	www
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Ad-hoc HTTP server for file sharing
 WWW=		https://github.com/svenstaro/miniserve
 
diff --git a/www/mod_qos/Makefile b/www/mod_qos/Makefile
index 98b18a4a8b77..c4a9e5fc4937 100644
--- a/www/mod_qos/Makefile
+++ b/www/mod_qos/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mod_qos
-DISTVERSION=	11.75
+DISTVERSION=	11.76
 CATEGORIES=	www
 MASTER_SITES=	SF/mod-qos
 DIST_SUBDIR=	apache2
@@ -10,8 +10,6 @@ WWW=		https://mod-qos.sourceforge.net/
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
-
 USES=		apache
 
 AP_FAST_BUILD=	yes
diff --git a/www/mod_qos/distinfo b/www/mod_qos/distinfo
index bfe9a03f6ba8..d9de26e9fb05 100644
--- a/www/mod_qos/distinfo
+++ b/www/mod_qos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723558432
-SHA256 (apache2/mod_qos-11.75.tar.gz) = acc7b457399a8a33e0e06638a98b40e5abf3139e09bd9eda85faf6cfb52030b2
-SIZE (apache2/mod_qos-11.75.tar.gz) = 1289194
+TIMESTAMP = 1746518698
+SHA256 (apache2/mod_qos-11.76.tar.gz) = f317bf01e4f459e1e2d4949e2578ad0d5cd97744ae79fd65522ce7df83b543fc
+SIZE (apache2/mod_qos-11.76.tar.gz) = 1233631
diff --git a/www/moodle41/Makefile b/www/moodle41/Makefile
deleted file mode 100644
index c3cd070322a0..000000000000
--- a/www/moodle41/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-PORTNAME=	moodle
-PORTVERSION=	4.1.18
-CATEGORIES=	www education
-MASTER_SITES=	https://packaging.moodle.org/stable401/ \
-		LOCAL/wen
-PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
-
-MAINTAINER=	wen@FreeBSD.org
-COMMENT=	Course management system based on social constructionism
-WWW=		https://www.moodle.org/
-
-LICENSE=	GPLv3
-
-DEPRECATED=	Outdated version
-EXPIRATION_DATE=2025-04-30
-
-CONFLICTS=	moodle43-4.3.[0-9]* moodle44-4.4.[0-9]* \
-		moodle45-4.5.[0-9]* moodle50-5.0
-
-USES=		cpe php:flavors tar:tgz
-USE_PHP=	ctype curl dom exif fileinfo filter gd \
-		iconv intl mbstring opcache \
-		session simplexml soap sodium tokenizer \
-		xml xmlreader xmlrpc zip zlib
-IGNORE_WITH_PHP=	82 83
-
-WRKSRC=		${WRKDIR}/moodle
-
-OPTIONS_SINGLE=		BACKEND
-OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
-OPTIONS_DEFINE=		LDAP
-OPTIONS_DEFAULT=	MYSQL
-
-MYSQL_USES=	mysql
-MYSQL_USE=	php=mysqli
-PGSQL_USE=	php=pgsql
-LDAP_USE=	php=ldap
-
-NO_BUILD=	yes
-PLIST=		${WRKDIR}/plist
-SUB_FILES=	pkg-message
-SUB_LIST=	MOODLEDIR=${MOODLEDIR} \
-		MOODLEDATADIR=${MOODLEDATADIR}
-
-MOODLEDIR?=	www/moodle
-MOODLEDATADIR?=	moodledata
-
-pre-install:
-	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
-	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
-	@${ECHO_CMD} "@mode 755" >> ${PLIST}
-	@${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST}
-	@${ECHO_CMD} "@mode" >> ${PLIST}
-	@${ECHO_CMD} "@group" >> ${PLIST}
-	@${ECHO_CMD} "@owner" >> ${PLIST}
-
-#  Here for safety I do not set moodle diretory 0755 permission
-#  It require user write config.php manually then.
-	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST}
-	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST}
-
-do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
-	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
-
-.include <bsd.port.mk>
diff --git a/www/moodle41/distinfo b/www/moodle41/distinfo
deleted file mode 100644
index ee51d1e5ebea..000000000000
--- a/www/moodle41/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1744613479
-SHA256 (moodle-4.1.18.tgz) = 44b9a2a8d00d1e739f60f897b67d9b5dfb39818560659c24d807a956ddb5697f
-SIZE (moodle-4.1.18.tgz) = 65146180
diff --git a/www/moodle41/files/pkg-message.in b/www/moodle41/files/pkg-message.in
deleted file mode 100644
index 5282847317fb..000000000000
--- a/www/moodle41/files/pkg-message.in
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-1) Create a user and a database for Moodle to store all
-   its tables in (or choose an existing database).
-   It doesn't matter what the database or user names are,
-   as this will be configured in a later step.
-   NOTE: this package assumes that either the phpX-pgsql,
-   phpX-mysql, or phpX-mssql packages are installed.
-
-2) Add the following to your Apache configuration file
-   httpd.conf, and restart the server:
-
-   Alias /moodle %%PREFIX%%/%%MOODLEDIR%%/
-   AcceptPathInfo On
-   <Directory %%PREFIX%%/%%MOODLEDIR%%/>
-      AllowOverride None
-      Require all granted
-   </Directory>
-
-3) Visit your Moodle site with a browser (i.e.,
-   http://your.server.com/moodle/), and you should
-   be taken to the install.php script, which will lead
-   you through creating a config.php file and then
-   setting up Moodle, creating an admin account, etc.
-
-   At one step, you will get a message saying that the
-   installer script was not able to automatically create
-   the config.php file. Just download it and copy it to
-   %%PREFIX%%/%%MOODLEDIR%%/config.php. Beware that it
-   will contain the database password in cleartext, so
-   set up whatever file permissions you deem more adequate.
-   For instance, user=root, group=www, mask=640.
-
-4) Set up a cron task to invoke the file admin/cron.php
-   every five minutes or so. For instance:
-   */5 * * * * fetch http://your.server.com/moodle/admin/cron.php
-
-For more information, see the INSTALL DOCUMENTATION:
-
-   http://docs.moodle.org/en/Installing_Moodle
-
-It may be worth reading the installation docs even if Moodle seems
-to be working at first, to ensure your PHP settings and database
-configuration will allow Moodle to operate properly.
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-If you are upgrading from an earlier version of Moodle, check out
-possible additional steps at:
-
-   https://docs.moodle.org/400/en/Upgrading
-
-If you have real trouble, please visit the Moodle course
-"Using Moodle" on moodle.org.
-EOM
-}
-]
diff --git a/www/moodle41/pkg-descr b/www/moodle41/pkg-descr
deleted file mode 100644
index 8d24b9357db9..000000000000
--- a/www/moodle41/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Moodle is a course management system (CMS) - a free, Open Source software
-package designed using sound pedagogical principles, to help educators
-create effective online learning communities. You can use it on any
-computer you have handy (including webhosts), yet it can scale from a
-single-teacher site to a 40,000-student University.
diff --git a/www/moodle43/Makefile b/www/moodle43/Makefile
deleted file mode 100644
index 0e521c121a86..000000000000
--- a/www/moodle43/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-PORTNAME=	moodle
-PORTVERSION=	4.3.12
-CATEGORIES=	www education
-MASTER_SITES=	https://packaging.moodle.org/stable403/ \
-		LOCAL/wen
-PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
-
-MAINTAINER=	wen@FreeBSD.org
-COMMENT=	Course management system based on social constructionism
-WWW=		https://www.moodle.org/
-
-LICENSE=	GPLv3
-
-DEPRECATED=     EOLed upstream
-EXPIRATION_DATE=2025-04-30
-
-CONFLICTS=	moodle41-4.1.[0-9]* moodle44-4.4.[0-9]* \
-		moodle45-4.5.[0-9]* moodle50-5.0
-
-USES=		cpe php:flavors tar:tgz
-USE_PHP=	ctype curl dom exif fileinfo filter gd \
-		iconv intl mbstring opcache \
-		session simplexml soap sodium tokenizer \
-		xml xmlreader xmlrpc zip zlib
-IGNORE_WITH_PHP=	83
-
-WRKSRC=		${WRKDIR}/moodle
-
-OPTIONS_SINGLE=		BACKEND
-OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
-OPTIONS_DEFINE=		LDAP
-OPTIONS_DEFAULT=	MYSQL
-
-MYSQL_USES=	mysql
-MYSQL_USE=	php=mysqli
-PGSQL_USE=	php=pgsql
-LDAP_USE=	php=ldap
-
-NO_BUILD=	yes
-PLIST=		${WRKDIR}/plist
-SUB_FILES=	pkg-message
-SUB_LIST=	MOODLEDIR=${MOODLEDIR} \
-		MOODLEDATADIR=${MOODLEDATADIR}
-
-MOODLEDIR?=	www/moodle
-MOODLEDATADIR?=	moodledata
-
-pre-install:
-	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
-	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
-	@${ECHO_CMD} "@mode 755" >> ${PLIST}
-	@${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST}
-	@${ECHO_CMD} "@mode" >> ${PLIST}
-	@${ECHO_CMD} "@group" >> ${PLIST}
-	@${ECHO_CMD} "@owner" >> ${PLIST}
-
-#  Here for safety I do not set moodle diretory 0755 permission
-#  It require user write config.php manually then.
-	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST}
-	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST}
-
-do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
-	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
-
-.include <bsd.port.mk>
diff --git a/www/moodle43/distinfo b/www/moodle43/distinfo
deleted file mode 100644
index b08c4a4d1736..000000000000
--- a/www/moodle43/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1744613700
-SHA256 (moodle-4.3.12.tgz) = 47eac5275098de9126f63685f4b3c5870df22bfee0c7de1460f0f8b9659fc120
-SIZE (moodle-4.3.12.tgz) = 68246296
diff --git a/www/moodle43/files/pkg-message.in b/www/moodle43/files/pkg-message.in
deleted file mode 100644
index 5282847317fb..000000000000
--- a/www/moodle43/files/pkg-message.in
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-1) Create a user and a database for Moodle to store all
-   its tables in (or choose an existing database).
-   It doesn't matter what the database or user names are,
-   as this will be configured in a later step.
-   NOTE: this package assumes that either the phpX-pgsql,
-   phpX-mysql, or phpX-mssql packages are installed.
-
-2) Add the following to your Apache configuration file
-   httpd.conf, and restart the server:
-
-   Alias /moodle %%PREFIX%%/%%MOODLEDIR%%/
-   AcceptPathInfo On
-   <Directory %%PREFIX%%/%%MOODLEDIR%%/>
-      AllowOverride None
-      Require all granted
-   </Directory>
-
-3) Visit your Moodle site with a browser (i.e.,
-   http://your.server.com/moodle/), and you should
-   be taken to the install.php script, which will lead
-   you through creating a config.php file and then
-   setting up Moodle, creating an admin account, etc.
-
-   At one step, you will get a message saying that the
-   installer script was not able to automatically create
-   the config.php file. Just download it and copy it to
-   %%PREFIX%%/%%MOODLEDIR%%/config.php. Beware that it
-   will contain the database password in cleartext, so
-   set up whatever file permissions you deem more adequate.
-   For instance, user=root, group=www, mask=640.
-
-4) Set up a cron task to invoke the file admin/cron.php
-   every five minutes or so. For instance:
-   */5 * * * * fetch http://your.server.com/moodle/admin/cron.php
-
-For more information, see the INSTALL DOCUMENTATION:
-
-   http://docs.moodle.org/en/Installing_Moodle
-
-It may be worth reading the installation docs even if Moodle seems
-to be working at first, to ensure your PHP settings and database
-configuration will allow Moodle to operate properly.
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-If you are upgrading from an earlier version of Moodle, check out
-possible additional steps at:
-
-   https://docs.moodle.org/400/en/Upgrading
-
-If you have real trouble, please visit the Moodle course
-"Using Moodle" on moodle.org.
-EOM
-}
-]
diff --git a/www/moodle43/pkg-descr b/www/moodle43/pkg-descr
deleted file mode 100644
index 8d24b9357db9..000000000000
--- a/www/moodle43/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Moodle is a course management system (CMS) - a free, Open Source software
-package designed using sound pedagogical principles, to help educators
-create effective online learning communities. You can use it on any
-computer you have handy (including webhosts), yet it can scale from a
-single-teacher site to a 40,000-student University.
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 48be6ed2ab12..6227bc7cc9a7 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	nginx
 PORTVERSION=	1.28.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
@@ -236,6 +236,10 @@ IGNORE=		required at least GSSAPI_HEIMDAL or \
 		'make config' again
 .endif
 
+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1305000 && ${OSVERSION} < 1400000)
+CFLAGS+=	-Wno-cast-function-type-mismatch
+.endif
+
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
@@ -251,7 +255,7 @@ LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
-NJS_CONFIGURE_ARGS=	--cc-opt="-I${LOCALBASE}/include/quickjs" \
+NJS_CONFIGURE_ARGS=	--cc-opt="${CFLAGS} -I${LOCALBASE}/include/quickjs" \
 			--ld-opt="-L${LOCALBASE}/lib" \
 			--with-quickjs
 .endif
diff --git a/www/nginx-full/Makefile b/www/nginx-full/Makefile
index 6e5e56a3ee69..32fc016270f4 100644
--- a/www/nginx-full/Makefile
+++ b/www/nginx-full/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nginx
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-full
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -20,7 +20,7 @@ OPTIONS_DEFAULT=DSO DEBUG DEBUGLOG FILE_AIO GOOGLE_PERFTOOLS \
 		HTTP_SLICE_AHEAD HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT \
 		MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL HTTPV2 HTTPV2_AUTOTUNE \
 		NJS STREAM STREAM_SSL STREAM_SSL_PREREAD THREADS WWW \
-		AJP AWS_AUTH CACHE_PURGE CLOJURE CT ECHO FASTDFS HEADERS_MORE \
+		AJP AWS_AUTH CACHE_PURGE CLOJURE ECHO FASTDFS HEADERS_MORE \
 		HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_JWT \
 		HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT \
 		HTTP_EVAL HTTP_FANCYINDEX HTTP_FOOTER HTTP_GEOIP2 \
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 1dc26d6b58b6..6fa332e2032c 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nginx
-PORTVERSION=	1.26.3
-PORTREVISION=	3
+PORTVERSION=	1.28.0
+PORTREVISION=	0
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -270,9 +270,6 @@ post-extract-NAXSI-on:
 	@${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection
 	@${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection
 
-pre-patch-HTTPV3-on:
-	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
-
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index b6e7184e343a..f57fbb3e5b08 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -2,7 +2,7 @@
 
 OPTIONS_GROUP+=	THIRDPARTYGRP
 # External modules (arrayvar MUST appear after devel_kit for build-dep)
-OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE CT \
+OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE \
 	DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \
 	FIPS_CHECK FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \
 	HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \
@@ -33,12 +33,6 @@ BROTLI_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_brotli_filter_config
 CACHE_PURGE_GH_TUPLE=	nginx-modules:ngx_cache_purge:a84b0f3:cache_purge
 CACHE_PURGE_VARS=	DSO_EXTMODS+=cache_purge
 
-CT_IMPLIES=		HTTP_SSL
-CT_GH_TUPLE=		grahamedgecombe:nginx-ct:93e9884:ct
-CT_VARS=		DSO_EXTMODS+=ct
-CT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-ct-LibreSSL \
-			${PATCHDIR}/extra-patch-ngx_stream_ssl_ct_module.c
-
 ECHO_GH_TUPLE=		openresty:echo-nginx-module:5a402aa:echo
 ECHO_VARS=		DSO_EXTMODS+=echo
 
@@ -217,7 +211,7 @@ LUASTREAM_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 LUASTREAM_RUN_DEPENDS=	lua-resty-core>0:www/lua-resty-core
 LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
 			LUAJIT_LIB=${LOCALBASE}/lib
-LUASTREAM_GH_TUPLE=	openresty:stream-lua-nginx-module:v0.0.15:luastream
+LUASTREAM_GH_TUPLE=	openresty:stream-lua-nginx-module:v0.0.16:luastream
 LUASTREAM_VARS=		DSO_EXTMODS+=luastream
 
 LINK_GH_TUPLE=		Taymindis:nginx-link-function:3.2.4:link
@@ -259,7 +253,7 @@ OTEL_LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 OTEL_BUILD_DEPENDS=	${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto
 OTEL_CONFIGURE_ENV+=	NGX_OTEL_PROTO_DIR=${PREFIX}/include
 
-PASSENGER_NGINX_VER=	6.0.23
+PASSENGER_NGINX_VER=	6.0.27
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USES=		ruby
 PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 058007352bb5..b53842396779 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1738868642
-SHA256 (nginx-1.26.3.tar.gz) = 69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa
-SIZE (nginx-1.26.3.tar.gz) = 1260179
+TIMESTAMP = 1746350853
+SHA256 (nginx-1.28.0.tar.gz) = c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a
+SIZE (nginx-1.28.0.tar.gz) = 1280111
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46
 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
-SHA256 (passenger-6.0.23.tar.gz) = 897555224fb11340677780d929b5099da62303b1ae15f2e7c65cd3f6d3e7920c
-SIZE (passenger-6.0.23.tar.gz) = 8298217
+SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f
+SIZE (passenger-6.0.27.tar.gz) = 7548637
 SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c
 SIZE (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807
 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
@@ -17,8 +17,6 @@ SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca
 SIZE (google-ngx_brotli-a71f931_GH0.tar.gz) = 16376
 SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f
 SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162
-SHA256 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2
-SIZE (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 7224
 SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b
 SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561
 SHA256 (openresty-drizzle-nginx-module-3504fc6_GH0.tar.gz) = 86076735597f14db28cffabc0ab1f233cd51aab7cf112c56e267783e7814fc65
@@ -95,8 +93,8 @@ SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f0
 SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
 SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20
 SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217
-SHA256 (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = dcd5bb189e0a99f8953d3143557ff79fac6e8ca2d58d5d0aeb5515fe72b87fc6
-SIZE (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = 394165
+SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d
+SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259
 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b
diff --git a/www/nginx/files/extra-patch-nginx-ct-LibreSSL b/www/nginx/files/extra-patch-nginx-ct-LibreSSL
deleted file mode 100644
index 9aa89a463a9d..000000000000
--- a/www/nginx/files/extra-patch-nginx-ct-LibreSSL
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../nginx-ct-93e9884/ngx_ssl_ct_module.c.orig	2017-07-23 08:03:35.000000000 -0400
-+++ ../nginx-ct-93e9884/ngx_ssl_ct_module.c	2018-04-24 16:58:27.698435000 -0400
-@@ -158,7 +158,7 @@
- #endif
-     }
- 
--#ifndef OPENSSL_IS_BORINGSSL
-+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-     /* add OpenSSL TLS extension */
- #  if OPENSSL_VERSION_NUMBER >= 0x10101000L
-     int context = SSL_EXT_CLIENT_HELLO
-@@ -183,7 +183,7 @@
-     return NGX_CONF_OK;
- }
- 
--#ifndef OPENSSL_IS_BORINGSSL
-+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- #  if OPENSSL_VERSION_NUMBER >= 0x10101000L
- int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, unsigned int context,
-     const unsigned char **out, size_t *outlen, X509 *x, size_t chainidx,
diff --git a/www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c b/www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c
deleted file mode 100644
index b3df57b24218..000000000000
--- a/www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c.orig	2024-04-18 12:32:44.086600000 -0400
-+++ ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c	2024-04-18 12:37:40.764525000 -0400
-@@ -70,7 +70,11 @@
- 
- static char *ngx_stream_ssl_ct_merge_srv_conf(ngx_conf_t *cf, void *parent,
-     void *child) {
-+#if nginx_version >= 1025005
-+    ngx_stream_ssl_srv_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf,
-+#else
-     ngx_stream_ssl_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf,
-+#endif
-         ngx_stream_ssl_module);
- 
-     ngx_array_t *certificates;
diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index 34ad92f207b2..73223329c8a7 100644
--- a/www/nginx/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-6.0.23/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-6.0.23/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-6.0.27/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-6.0.27/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/nginx/files/extra-patch-passenger-disable-telemetry b/www/nginx/files/extra-patch-passenger-disable-telemetry
index 302ae5bf765d..935f6a5425e5 100644
--- a/www/nginx/files/extra-patch-passenger-disable-telemetry
+++ b/www/nginx/files/extra-patch-passenger-disable-telemetry
@@ -1,5 +1,5 @@
---- ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb	2018-12-03 12:23:32.978924000 -0500
+--- ../passenger-6.0.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
++++ ../passenger-6.0.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb	2018-12-03 12:23:32.978924000 -0500
 @@ -204,7 +204,7 @@
      :name     => 'passenger_disable_anonymous_telemetry',
      :scope    => :global,
diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
index 466e656d60e0..516147771913 100644
--- a/www/nginx/pkg-plist
+++ b/www/nginx/pkg-plist
@@ -14,8 +14,6 @@
 %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_filter_module.so
 %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_static_module.so
 %%DSO%%%%CACHE_PURGE%%libexec/nginx/ngx_http_cache_purge_module.so
-%%DSO%%%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so
-%%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so
 %%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so
 %%DSO%%%%DRIZZLE%%libexec/nginx/ngx_http_drizzle_module.so
 %%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_http_dynamic_upstream_module.so
@@ -60,7 +58,6 @@
 %%DSO%%%%LINK%%libexec/nginx/ngx_http_link_func_module.so
 %%DSO%%%%LUA%%libexec/nginx/ngx_http_lua_module.so
 %%DSO%%%%LUASTREAM%%libexec/nginx/ngx_stream_lua_module.so
-%%DSO%%%%MAIL%%%%CT%%libexec/nginx/ngx_mail_ssl_ct_module.so
 %%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so
 %%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so
 %%DSO%%%%MODSECURITY3%%libexec/nginx/ngx_http_modsecurity_module.so
@@ -76,7 +73,6 @@
 %%DSO%%%%SHIBBOLETH%%libexec/nginx/ngx_http_shibboleth_module.so
 %%DSO%%%%SLOWFS_CACHE%%libexec/nginx/ngx_http_slowfs_module.so
 %%DSO%%%%SRCACHE%%libexec/nginx/ngx_http_srcache_filter_module.so
-%%DSO%%%%STREAM%%%%CT%%libexec/nginx/ngx_stream_ssl_ct_module.so
 %%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
 %%DSO%%%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_module.so
 %%DSO%%%%STREAM%%libexec/nginx/ngx_stream_module.so
diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
index 2dca3aedcb7c..e435c50e8743 100644
--- a/www/onlyoffice-documentserver/Makefile
+++ b/www/onlyoffice-documentserver/Makefile
@@ -11,7 +11,7 @@ DISTFILES+=	v8-8.9.255.25_all.tar.gz:source1 \
 		optipng-0.7.7.tar.gz:source4 \
 		${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz:source2
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure office and productivity apps
 WWW=		https://www.onlyoffice.com/
 
diff --git a/www/p5-Dancer-Plugin-Swagger/Makefile b/www/p5-Dancer-Plugin-Swagger/Makefile
index 558b4d1682e0..cafb68a7409f 100644
--- a/www/p5-Dancer-Plugin-Swagger/Makefile
+++ b/www/p5-Dancer-Plugin-Swagger/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	Dancer-Plugin-Swagger
 DISTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,6 +21,7 @@ RUN_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
 		p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
 		p5-File-ShareDir-Tarball>=0:devel/p5-File-ShareDir-Tarball \
 		p5-List-AllUtils>=0:devel/p5-List-AllUtils \
+		p5-Module-Version>=0:devel/p5-Module-Version \
 		p5-Moo>=0:devel/p5-Moo \
 		p5-MooseX-MungeHas>=0:devel/p5-MooseX-MungeHas \
 		p5-MooX-Singleton>=0:devel/p5-MooX-Singleton \
diff --git a/www/p5-HTML-Gumbo/Makefile b/www/p5-HTML-Gumbo/Makefile
index 90562fa8534b..765f64738372 100644
--- a/www/p5-HTML-Gumbo/Makefile
+++ b/www/p5-HTML-Gumbo/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML5 parser based on gumbo C library
 WWW=		https://metacpan.org/pod/HTML::Gumbo
 
diff --git a/www/proxygen/Makefile b/www/proxygen/Makefile
index e357f8740466..ec8f251d3069 100644
--- a/www/proxygen/Makefile
+++ b/www/proxygen/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	proxygen
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.04.28.00
+DISTVERSION=	2025.05.05.00
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/proxygen/distinfo b/www/proxygen/distinfo
index 08a97da212a9..01ccbe20b4ec 100644
--- a/www/proxygen/distinfo
+++ b/www/proxygen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745891840
-SHA256 (facebook-proxygen-v2025.04.28.00_GH0.tar.gz) = 120720a95a3e429e2b002cdea9d1015e793910dd310ce570c0217a82991cd6c3
-SIZE (facebook-proxygen-v2025.04.28.00_GH0.tar.gz) = 1217248
+TIMESTAMP = 1746504543
+SHA256 (facebook-proxygen-v2025.05.05.00_GH0.tar.gz) = 3f9e352e1f31ef994383e4800cc0d5768c56a9e0993da67f807e04b52a90200c
+SIZE (facebook-proxygen-v2025.05.05.00_GH0.tar.gz) = 1216793
diff --git a/www/publicfile/Makefile b/www/publicfile/Makefile
deleted file mode 100644
index fdc0cb24d936..000000000000
--- a/www/publicfile/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-PORTNAME=	publicfile
-PORTVERSION=	0.52
-PORTREVISION=	3
-CATEGORIES=	www ftp
-MASTER_SITES=	http://cr.yp.to/publicfile/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Secure, read-only, anonymous HTTP/FTP server
-WWW=		https://cr.yp.to/publicfile.html
-
-# Converted from LEGAL_TEXT
-LICENSE=	djb
-LICENSE_NAME=	djb
-LICENSE_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED=	Unmaintained for years upstream and in tree, consider using www/darkhttpd , www/miniserve and/or ftp/tnftpd , ftp/unftp 
-EXPIRATION_DATE=2025-04-30
-
-RUN_DEPENDS=	setuidgid:sysutils/daemontools \
-		tcpserver:sysutils/ucspi-tcp
-
-OPTIONS_DEFINE=	BASICAUTH COMMONLOG REDIRECT_SLASH ENV_FILETYPES SSL
-BASICAUTH_DESC=		basic HTTP authentication support
-COMMONLOG_DESC=		support for Apache common log format
-REDIRECT_SLASH_DESC=	do not require trailing slash on directories
-ENV_FILETYPES_DESC=	get mime types from the environment
-SSL_DESC=		provide SSL support through ucspi-ssl
-
-CONFLICTS=	xshttpd-3*
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBASICAUTH} && ${PORT_OPTIONS:MCOMMONLOG}
-BROKEN=	common log and auth patches are currently in conflict
-.endif
-
-.if ${PORT_OPTIONS:MBASICAUTH} && ${PORT_OPTIONS:MREDIRECT_SLASH}
-BROKEN=	redirect slash and auth patches are currently in conflict
-.endif
-
-.if ${PORT_OPTIONS:MREDIRECT_SLASH}
-pre-configure::
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${PATCHDIR}/redirect-slash-patch
-.endif
-
-.if ${PORT_OPTIONS:MENV_FILETYPES}
-pre-configure::
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${PATCHDIR}/publicfile-0.52-filetype-diff
-.endif
-
-.if ${PORT_OPTIONS:MSSL}
-pre-configure::
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${PATCHDIR}/publicfile.sslserver
-RUN_DEPENDS+=	sslserver:sysutils/ucspi-ssl
-.endif
-
-.if ${PORT_OPTIONS:MBASICAUTH}
-pre-configure::
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < \
-		${PATCHDIR}/publicfile-0.52_basicauth.patch
-PATCH_DEPENDS+=	${NONEXISTENT}:databases/cdb:extract
-PLIST_SUB+=	BASICAUTH=""
-.else
-PLIST_SUB+=	BASICAUTH="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCOMMONLOG}
-pre-configure::
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < \
-		${PATCHDIR}/publicfile-0.52-commonlog-2.patch
-.endif
-
-ALL_TARGET=	it
-INSTALL_TARGET=	setup check
-
-post-extract:
-.if ${PORT_OPTIONS:MBASICAUTH}
-	@${LN} -s $$(${MAKE} -C ${PORTSDIR}/databases/cdb -V WRKSRC) ${WRKSRC}/cdb
-.endif
-
-post-patch:
-	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	@${ECHO_CMD} "${CC} -s" > ${WRKSRC}/conf-ld
-	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
-	@${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-stage
-.if ${PORT_OPTIONS:MBASICAUTH}
-	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/cdb/conf-cc
-	@${ECHO_CMD} "${CC} -s" > ${WRKSRC}/cdb/conf-ld
-	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/cdb/conf-home
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/publicfile/distinfo b/www/publicfile/distinfo
deleted file mode 100644
index 061006887c05..000000000000
--- a/www/publicfile/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (publicfile-0.52.tar.gz) = 3f9fcf737bfe48910812cc357a31bf1f2e3da2490dbd175ce535830f251c08ef
-SIZE (publicfile-0.52.tar.gz) = 34892
diff --git a/www/publicfile/files/patch-Makefile b/www/publicfile/files/patch-Makefile
deleted file mode 100644
index 35ce26a1214b..000000000000
--- a/www/publicfile/files/patch-Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.orig	1999-11-09 07:23:46 UTC
-+++ Makefile
-@@ -32,6 +32,14 @@ compile auto_home.c
- compile auto_home.c
- 	./compile auto_home.c
- 
-+auto_home_stage.c: \
-+auto-str conf-stage
-+	./auto-str auto_home `head -1 conf-stage` > auto_home_stage.c
-+
-+auto_home_stage.o: \
-+compile auto_home_stage.c
-+	./compile auto_home_stage.c
-+
- byte_chr.o: \
- compile byte_chr.c byte.h
- 	./compile byte_chr.c
-@@ -231,7 +239,7 @@ hier.o: \
- 	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
- 
- hier.o: \
--compile hier.c auto_home.h
-+compile hier.c auto_home_stage.h
- 	./compile hier.c
- 
- httpd: \
-@@ -257,9 +265,9 @@ install: \
- 	./compile httpdate.c
- 
- install: \
--load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
-+load install.o hier.o auto_home_stage.o strerr.a substdio.a open.a error.a \
- str.a
--	./load install hier.o auto_home.o strerr.a substdio.a \
-+	./load install hier.o auto_home_stage.o strerr.a substdio.a \
- 	open.a error.a str.a 
- 
- install.o: \
-@@ -268,8 +276,8 @@ instcheck: \
- 	./compile install.c
- 
- instcheck: \
--load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
--	./load instcheck hier.o auto_home.o strerr.a substdio.a \
-+load instcheck.o hier.o auto_home_stage.o strerr.a substdio.a error.a str.a
-+	./load instcheck hier.o auto_home_stage.o strerr.a substdio.a \
- 	error.a str.a 
- 
- instcheck.o: \
diff --git a/www/publicfile/files/patch-auto_home_stage.h b/www/publicfile/files/patch-auto_home_stage.h
deleted file mode 100644
index 35880e55a9a9..000000000000
--- a/www/publicfile/files/patch-auto_home_stage.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- auto_home_stage.h.orig	2024-10-25 11:20:18 UTC
-+++ auto_home_stage.h
-@@ -0,0 +1,6 @@
-+#ifndef AUTO_HOME_STAGE_H_
-+#define AUTO_HOME_STAGE_H_
-+
-+extern char auto_home[];
-+
-+#endif
diff --git a/www/publicfile/files/patch-error.h b/www/publicfile/files/patch-error.h
deleted file mode 100644
index e466f6122d08..000000000000
--- a/www/publicfile/files/patch-error.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- error.h.orig	2024-10-25 11:21:26 UTC
-+++ error.h
-@@ -1,7 +1,7 @@
- #ifndef ERROR_H
- #define ERROR_H
- 
--extern int errno;
-+#include <errno.h>
- 
- extern int error_intr;
- extern int error_nomem;
diff --git a/www/publicfile/files/patch-fetch.c b/www/publicfile/files/patch-fetch.c
deleted file mode 100644
index be6f256cba76..000000000000
--- a/www/publicfile/files/patch-fetch.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- fetch.c.orig	1999-11-09 07:23:46 UTC
-+++ fetch.c
-@@ -82,7 +82,7 @@ static void list(char *fn,int flaglong)
-   substdio_puts(&ss,"\r\n");
- }
- 
--static int doit(char *fn,int fddata,int fdfile,int how)
-+static void doit(char *fn,int fddata,int fdfile,int how)
- {
-   DIR *dir;
-   direntry *d;
-@@ -122,7 +122,7 @@ static int doit(char *fn,int fddata,int fdfile,int how
-       for (;;) {
- 	r = read(fdfile,inbuf,sizeof inbuf);
- 	if (r == -1) {
--	  if (errno = error_intr) continue;
-+	  if (errno == error_intr) continue;
- 	  _exit(23);
- 	}
- 	if (r == 0)
diff --git a/www/publicfile/files/patch-hier.c b/www/publicfile/files/patch-hier.c
deleted file mode 100644
index be93922dd715..000000000000
--- a/www/publicfile/files/patch-hier.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- hier.c.orig	1999-11-09 07:23:46 UTC
-+++ hier.c
-@@ -2,9 +2,9 @@ void hier()
- 
- void hier()
- {
--  h(auto_home,-1,-1,02755);
-+  h(auto_home,-1,-1,0755);
- 
--  d(auto_home,"bin",-1,-1,02755);
-+  d(auto_home,"bin",-1,-1,0755);
- 
-   c(auto_home,"bin","configure",-1,-1,0755);
-   c(auto_home,"bin","httpd",-1,-1,0755);
diff --git a/www/publicfile/files/publicfile-0.52-commonlog-2.patch b/www/publicfile/files/publicfile-0.52-commonlog-2.patch
deleted file mode 100644
index ed14642b22e7..000000000000
--- a/www/publicfile/files/publicfile-0.52-commonlog-2.patch
+++ /dev/null
@@ -1,463 +0,0 @@
-diff -rNC3 publicfile-0.52.orig/Makefile publicfile-0.52/Makefile
-*** publicfile-0.52.orig/Makefile	Tue Nov  9 08:23:46 1999
---- publicfile-0.52/Makefile	Fri Nov  9 10:09:45 2001
-***************
-*** 450,460 ****
-  stralloc.a: \
-  makelib stralloc_cat.o stralloc_catb.o stralloc_cats.o \
-  stralloc_copy.o stralloc_eady.o stralloc_opyb.o stralloc_opys.o \
-! stralloc_pend.o stralloc_num.o
-  	./makelib stralloc.a stralloc_cat.o stralloc_catb.o \
-  	stralloc_cats.o stralloc_copy.o stralloc_eady.o \
-  	stralloc_opyb.o stralloc_opys.o stralloc_pend.o \
-! 	stralloc_num.o
-  
-  stralloc_cat.o: \
-  compile stralloc_cat.c byte.h stralloc.h gen_alloc.h
---- 450,460 ----
-  stralloc.a: \
-  makelib stralloc_cat.o stralloc_catb.o stralloc_cats.o \
-  stralloc_copy.o stralloc_eady.o stralloc_opyb.o stralloc_opys.o \
-! stralloc_pend.o stralloc_num.o stralloc_opytrim.o
-  	./makelib stralloc.a stralloc_cat.o stralloc_catb.o \
-  	stralloc_cats.o stralloc_copy.o stralloc_eady.o \
-  	stralloc_opyb.o stralloc_opys.o stralloc_pend.o \
-! 	stralloc_num.o stralloc_opytrim.o
-  
-  stralloc_cat.o: \
-  compile stralloc_cat.c byte.h stralloc.h gen_alloc.h
-***************
-*** 484,489 ****
---- 484,493 ----
-  stralloc_opyb.o: \
-  compile stralloc_opyb.c stralloc.h gen_alloc.h byte.h
-  	./compile stralloc_opyb.c
-+ 
-+ stralloc_opytrim.o: \
-+ compile stralloc_opytrim.c stralloc.h
-+ 	./compile stralloc_opytrim.c
-  
-  stralloc_opys.o: \
-  compile stralloc_opys.c byte.h str.h stralloc.h gen_alloc.h
-diff -rNC3 publicfile-0.52.orig/README.log_combined publicfile-0.52/README.log_combined
-*** publicfile-0.52.orig/README.log_combined	Thu Jan  1 01:00:00 1970
---- publicfile-0.52/README.log_combined	Fri Nov  9 10:09:45 2001
-***************
-*** 0 ****
---- 1,36 ----
-+ This version of publicfile has been patched to write *additional* log 
-+ information to STDERR. This additional information conforms to Apache's
-+ and Netscape's "common" or "combined" log formats, i. e. a line may look
-+ like this (common log format):
-+ 
-+ 127.0.0.1 - - [23/Oct/2001:14:04:56 +0200] "HEAD /~conrad/hello_world_gen.swf HTTP/1.0" 200 0
-+ 
-+ or like this (combined log format):
-+ 
-+ 127.0.0.1 - - [23/Oct/2001:14:04:56 +0200] "HEAD /~conrad/hello_world_gen.swf HTTP/1.0" 200 0 "http://localhost/~conrad/hello_world.html" "Mozilla 4"
-+ 
-+ The meaning of the (space-separated) fields is as follows:
-+ 
-+ 1. Client IP-address
-+ 2. Remote logname (from ident (RFC-...) lookup - always "-" in publicfile)
-+ 3. Authenticated username (from Basic-Auth - always "-" in publicfile)
-+ 4. Human-readable timestamp enclosed in []
-+ 5. The request line enclosed in ""
-+ 6. HTTP status code
-+ 7. Number of bytes sent excluding HTTP headers
-+ 8. Referrer information sent by the browser
-+ 9. User-Agent information sent by the browser
-+ 
-+ These log lines can easily be distinguished from other log lines using the
-+ second field: this will always be "-" for common and combined log lines,
-+ and "read" or "dir" for publicfile standard log lines (see
-+ http://cr.yp.to/publicfile/log.html). The script "splitPublicfileLog.pl"
-+ may serve as an example how to split the log into interesting parts.
-+ 
-+ The logformat to be used can be selected via environment variables:
-+ 
-+  - HTTPD_LOG_COMMON selects common log format
-+  - HTTPD_LOG_COMBINED selects combined log format
-+ 
-+ The latter takes precedence over the former.
-+ 
-diff -rNC3 publicfile-0.52.orig/httpd.c publicfile-0.52/httpd.c
-*** publicfile-0.52.orig/httpd.c	Tue Nov  9 08:23:46 1999
---- publicfile-0.52/httpd.c	Fri Nov  9 10:10:51 2001
-***************
-*** 15,20 ****
---- 15,102 ----
-  #include "substdio.h"
-  #include "error.h"
-  #include "getln.h"
-+ #include "caltime.h"
-+ #include "subfd.h"
-+ #include "env.h"
-+ 
-+ char logformat = 0;
-+ char *remoteip;
-+ char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-+ 		  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-+ stralloc referer = {0};
-+ stralloc agent = {0};
-+ 
-+ char strnum[FMT_ULONG];
-+ stralloc method = {0};
-+ stralloc url = {0};
-+ stralloc protocol = {0};
-+ stralloc host = {0};
-+ 
-+ void log(char *code, unsigned long length) {
-+   struct caltime ct;
-+   int dummy1, dummy2;
-+   struct tai now;
-+ 
-+   if (!logformat) return;
-+ 
-+   substdio_puts(subfderr,remoteip);
-+   substdio_puts(subfderr," - - [");
-+   tai_now(&now);
-+   caltime_utc(&ct, &now, &dummy1, &dummy2);
-+   if (ct.date.day < 10)
-+     substdio_puts(subfderr,"0");
-+   dummy1 = fmt_ulong(strnum,ct.date.day);
-+   substdio_put(subfderr,strnum,dummy1);
-+   substdio_puts(subfderr,"/");
-+   if (ct.date.month > 0 && ct.date.month < 13)
-+     substdio_puts(subfderr,months[ct.date.month-1]);
-+   substdio_puts(subfderr,"/");
-+   dummy1 = fmt_ulong(strnum,ct.date.year);
-+   substdio_put(subfderr,strnum,dummy1);
-+   substdio_puts(subfderr,":");
-+   if (ct.hour < 10)
-+     substdio_puts(subfderr,"0");
-+   dummy1 = fmt_ulong(strnum,ct.hour);
-+   substdio_put(subfderr,strnum,dummy1);
-+   substdio_puts(subfderr,":");
-+   if (ct.minute < 10)
-+     substdio_puts(subfderr,"0");
-+   dummy1 = fmt_ulong(strnum,ct.minute);
-+   substdio_put(subfderr,strnum,dummy1);
-+   substdio_puts(subfderr,":");
-+   if (ct.second < 10)
-+     substdio_puts(subfderr,"0");
-+   dummy1 = fmt_ulong(strnum,ct.second);
-+   substdio_put(subfderr,strnum,dummy1);
-+   substdio_puts(subfderr," +0000] \"");
-+   substdio_put(subfderr,method.s,method.len - 1); /* len includes \0 */
-+   substdio_puts(subfderr," ");
-+   substdio_put(subfderr,url.s,url.len);
-+   substdio_puts(subfderr," ");
-+   substdio_put(subfderr,protocol.s,protocol.len > 0 ? protocol.len - 1 : 0); /* len includes \0 */
-+   substdio_puts(subfderr,"\" ");
-+   substdio_put(subfderr,code,str_len(code) < 3 ? str_len(code) : 3);
-+   substdio_puts(subfderr," ");
-+   if (length > 0) {
-+     dummy1 = fmt_ulong(strnum,length);
-+     substdio_put(subfderr,strnum,dummy1);
-+   } else {
-+     substdio_puts(subfderr,"-");
-+   }
-+ 
-+   if (logformat > 1) {
-+     substdio_puts(subfderr," \"");
-+     substdio_put(subfderr,referer.s,referer.len);
-+     substdio_puts(subfderr,"\" \"");
-+     substdio_put(subfderr,agent.s,agent.len);
-+     substdio_puts(subfderr,"\"");
-+   }
-+ 
-+   substdio_puts(subfderr," \"");
-+   substdio_put(subfderr,host.s,host.len);
-+   substdio_puts(subfderr,"\"\n");
-+   substdio_flush(subfderr);
-+ }
-  
-  int safewrite(int fd,char *buf,int len)
-  {
-***************
-*** 42,54 ****
-    substdio_flush(&out);
-  }
-  
-- char strnum[FMT_ULONG];
-- 
-- stralloc protocol = {0};
-  int protocolnum = 0;
-- stralloc method = {0};
-- stralloc url = {0};
-- stralloc host = {0};
-  stralloc path = {0};
-  stralloc ims = {0};
-  int flagbody = 1;
---- 124,130 ----
-***************
-*** 93,98 ****
---- 169,175 ----
-      out_puts("</body></html>\r\n");
-    }
-    out_flush();
-+   log(code, str_len(message) + 28);
-    if (protocolnum >= 2) {
-      shutdown(1,1);
-      sleep(1); /* XXX */
-***************
-*** 105,108 ****
---- 182,186 ----
-  
-  void get(void)
-  {
-+   char *code;
-    unsigned long length;
-***************
-*** 133,143 ****
-      tai_now(&now);
-      if (!httpdate(&mtimestr,&mtime)) _exit(21);
-      if ((ims.len < mtimestr.len) || byte_diff(mtimestr.s,mtimestr.len,ims.s))
-!       header("200 ","OK");
-      else {
-!       header("304 ","OK");
-        flagbody = 0;
-      }
-      if (tai_less(&mtime,&now)) {
-        tai_sub(&mtimeage,&now,&mtime);
-        if (tai_approx(&mtimeage) >= 60.0) {
---- 211,222 ----
-      tai_now(&now);
-      if (!httpdate(&mtimestr,&mtime)) _exit(21);
-      if ((ims.len < mtimestr.len) || byte_diff(mtimestr.s,mtimestr.len,ims.s))
-!       code = "200 ";
-      else {
-!       code = "304 ";
-        flagbody = 0;
-      }
-+     header(code,"OK");
-      if (tai_less(&mtime,&now)) {
-        tai_sub(&mtimeage,&now,&mtime);
-        if (tai_approx(&mtimeage) >= 60.0) {
-***************
-*** 166,171 ****
---- 245,253 ----
-          if (r == 0) break;
-          out_put(filebuf,r);
-        }
-+     else
-+       length = 0;
-+     log(code,length);
-      out_flush();
-      _exit(0);
-    }
-***************
-*** 180,185 ****
---- 262,270 ----
-        out_put(filebuf,r);
-        out_puts("\r\n");
-      }
-+   else
-+     length = 0;
-+   log(code,length);
-  
-    close(fd);
-  }
-***************
-*** 216,221 ****
---- 301,314 ----
-  
-    sig_pipeignore();
-  
-+   if (env_get("HTTPD_LOG_COMMON"))
-+     logformat = 1;
-+   if (env_get("HTTPD_LOG_COMBINED"))
-+     logformat = 2;
-+   remoteip = env_get("TCPREMOTEIP");
-+   if (!remoteip)
-+     remoteip = "0";
-+ 
-    for (;;) {
-      readline();
-  
-***************
-*** 227,232 ****
---- 320,327 ----
-      if (!stralloc_copys(&path,"")) _exit(21);
-      if (!stralloc_copys(&protocol,"")) _exit(21);
-      if (!stralloc_copys(&ims,"")) _exit(21);
-+     if (!stralloc_copys(&referer,"")) _exit(21);
-+     if (!stralloc_copys(&agent,"")) _exit(21);
-      protocolnum = 2;
-  
-      spaces = 0;
-***************
-*** 294,299 ****
---- 389,398 ----
-              barf("412 ","I do not accept If-None-Match");
-            if (case_startb(field.s,field.len,"if-unmodified-since:"))
-              barf("412 ","I do not accept If-Unmodified-Since");
-+           if (case_startb(field.s,field.len,"referer:"))
-+ 	    if (!stralloc_copytrim(&referer,field.s + 8,field.len - 8)) _exit(21);
-+           if (case_startb(field.s,field.len,"user-agent:"))
-+ 	    if (!stralloc_copytrim(&agent,field.s + 11,field.len - 11)) _exit(21);
-            if (case_startb(field.s,field.len,"host:"))
-              if (!host.len)
-                for (i = 5;i < field.len;++i)
-diff -rNC3 publicfile-0.52.orig/splitPublicfileLog.pl publicfile-0.52/splitPublicfileLog.pl
-*** publicfile-0.52.orig/splitPublicfileLog.pl	Thu Jan  1 01:00:00 1970
---- publicfile-0.52/splitPublicfileLog.pl	Fri Nov  9 10:09:45 2001
-***************
-*** 0 ****
---- 1,119 ----
-+ #!/usr/bin/perl -w
-+ 
-+ # This script will read lines from stdin. All lines starting with
-+ # "a.b.c.d - " (for an IP-number a.b.c.d) will be written to the
-+ # "access logfile" given as the first argument. Anything else will be
-+ # prepended with a timestamp and
-+ # written to the "error logfile" given as the second argument.
-+ # Note that the messages usually are not really *error* messages, but
-+ # simply the standard publicfile output.
-+ 
-+ use strict;
-+ use Symbol;
-+ 
-+ if ($#ARGV < 0 || $#ARGV > 3) {
-+     &usage();
-+ }
-+ 
-+ local $main::logdir;
-+ local $main::accessfile;
-+ local $main::errorfile;
-+ local $main::multilog;
-+ local %main::handles = ();
-+ 
-+ if ($ARGV[0] eq "-m") {
-+     $main::multilog = 1;
-+     if ($#ARGV != 3) { &usage(); }
-+     $main::logdir = $ARGV[1]."/";
-+     $main::accessfile = $main::logdir.$ARGV[2];
-+     $main::errorfile = $main::logdir.$ARGV[3];
-+ } else {
-+     $main::multilog = 0;
-+     if ($#ARGV != 1) { &usage(); }
-+     $main::accessfile = $ARGV[0];
-+     $main::errorfile = $ARGV[1];
-+ }
-+ 
-+ #open(ACCESS, ">>".$ARGV[0]) || die("Can't open access logfile!");
-+ #open(ERROR, ">>".$ARGV[1]) || die("Can't open error logfile!");
-+ $SIG{PIPE} = \&closeAndExit;
-+ $SIG{TERM} = \&closeAndExit;
-+ $SIG{QUIT} = \&closeAndExit;
-+ $SIG{INT} = \&closeAndExit;
-+ $SIG{HUP} = \&closeAll;
-+ 
-+ while($_ = <STDIN>) {
-+     if (/^\d+\.\d+\.\d+\.\d+ - /) {
-+ 	my $host = "";
-+ 	if ($main::multilog && / \"([^\"\/]*)\"[\r\n]*$/) {
-+ 	    $_ = $`."\n";
-+ 	    $host = $1;
-+ 	}
-+ 	my $fh = &getHandle($host);
-+ 	print $fh $_;
-+     } else {
-+ 	my $fh = &getHandle($main::errorfile);
-+ 	print $fh time()." $_";
-+     }
-+ }
-+ 
-+ closeAndExit("End of input");
-+ 
-+ sub closeAll {
-+     foreach my $key (keys %main::handles) {
-+ 	my $fh = $main::handles{$key};
-+ 	close $fh;
-+ 	delete $main::handles{$key};
-+     }
-+ }
-+ 
-+ sub closeAndExit {
-+     my $reason = shift;
-+     my $now = time();
-+ 
-+     my $fh = &getHandle($main::errorfile);
-+     print $fh "$now $reason received\n";
-+     print STDERR "$now $reason received\n";
-+     &closeAll();
-+     exit 0;
-+ }
-+ 
-+ sub getHandle {
-+     my $key = shift;
-+     my $res = 0;
-+ 
-+     if (defined($main::handles{$key})) {
-+ 	return $main::handles{$key};
-+     }
-+ 
-+     my $fh = Symbol::gensym();
-+     if ($key eq $main::errorfile) {
-+ 	open($fh, ">>".$main::errorfile) || die("Can't open error logfile!");
-+     } else {
-+ 	if ($main::multilog) {
-+             my $fn = $main::logdir.$key;
-+             if (-f $fn && -w $fn) {
-+ 	        $res = open($fh, ">>$fn");
-+ 	    }
-+         }
-+ 	if (!$res) {
-+ 	    open($fh, ">>".$main::accessfile) || die("Can't open error logfile!");
-+ 	}
-+     }
-+ 
-+     $main::handles{$key} = $fh;
-+     return $fh;
-+ }
-+ 
-+ sub usage {
-+     print STDERR "Usage: $0 <access-path> <error-path>\n";
-+     print STDERR "   or: $0 -m <logdir> <access-file> <error-file>\n";
-+     print STDERR "The first form will separate publicfile standard messages from \"common\" log\n";
-+     print STDERR "lines. The second form will write \"common\" lines to <logdir>/<hostname>\n";
-+     print STDERR "where <hostname> is the host given in the request. The file <logdir>/<hostname>\n";
-+     print STDERR "must exist before it will be used. Anything for which no suitable logfile can\n";
-+     print STDERR "be found will be logged to <logdir>/<access-path>.\n";
-+ 
-+     exit 1;
-+ }
-+ 
-diff -rNC3 publicfile-0.52.orig/stralloc.h publicfile-0.52/stralloc.h
-*** publicfile-0.52.orig/stralloc.h	Tue Nov  9 08:23:46 1999
---- publicfile-0.52/stralloc.h	Fri Nov  9 10:09:45 2001
-***************
-*** 12,17 ****
---- 12,18 ----
-  extern int stralloc_copys();
-  extern int stralloc_cats();
-  extern int stralloc_copyb();
-+ extern int stralloc_copytrim();
-  extern int stralloc_catb();
-  extern int stralloc_append(); /* beware: this takes a pointer to 1 char */
-  extern int stralloc_starts();
-diff -rNC3 publicfile-0.52.orig/stralloc_opytrim.c publicfile-0.52/stralloc_opytrim.c
-*** publicfile-0.52.orig/stralloc_opytrim.c	Thu Jan  1 01:00:00 1970
---- publicfile-0.52/stralloc_opytrim.c	Fri Nov  9 10:09:45 2001
-***************
-*** 0 ****
---- 1,17 ----
-+ #include "stralloc.h"
-+ 
-+ int stralloc_copytrim(sa,s,n)
-+ stralloc *sa;
-+ char *s;
-+ unsigned int n;
-+ {
-+   while (n > 0 &&
-+ 	 (s[n] == ' ' || s[n] == '\t' || s[n] == '\n' || s[n] == '\r')) n--;
-+   while (n > 0 &&
-+ 	 (s[0] == ' ' || s[0] == '\t' || s[0] == '\n' || s[0] == '\r')) {
-+     n--;
-+     s++;
-+   }
-+ 
-+   return stralloc_copyb(sa,s,n);
-+ }
diff --git a/www/publicfile/files/publicfile-0.52-filetype-diff b/www/publicfile/files/publicfile-0.52-filetype-diff
deleted file mode 100644
index 3c963feca229..000000000000
--- a/www/publicfile/files/publicfile-0.52-filetype-diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- filetype.c.old	Mon Dec  6 10:43:36 1999
-+++ filetype.c	Mon Dec  6 10:50:36 1999
-@@ -1,5 +1,6 @@
- #include "filetype.h"
- #include "str.h"
-+#include "env.h"
- 
- void filetype(char *fn,stralloc *contenttype)
- {
-@@ -22,7 +23,7 @@
-       if (!stralloc_append(contenttype,&ch)) _exit(21);
-     }
-   else {
--    result = "text/plain";
-+    result = 0;
-     if (str_equal(x,".html")) result = "text/html";
-     else if (str_equal(x,".gz")) result = "application/x-gzip";
-     else if (str_equal(x,".dvi")) result = "application/x-dvi";
-@@ -32,6 +33,15 @@
-     else if (str_equal(x,".jpeg")) result = "image/jpeg";
-     else if (str_equal(x,".png")) result = "image/png";
-     else if (str_equal(x,".mpeg")) result = "video/mpeg";
-+	if (!result) {
-+		stralloc envname = {0};
-+		if (!stralloc_copys(&envname,"CT_")) _exit(21);
-+		if (!stralloc_cats(&envname,x+1)) _exit(21);
-+		if (!stralloc_0(&envname)) _exit(21);
-+		result=env_get(envname.s);
-+		alloc_free(envname.s); /* is this the right function */
-+	}
-+	if (!result) result="text/plain";
- 
-     if (!stralloc_cats(contenttype,result)) _exit(21);
-   }
diff --git a/www/publicfile/files/publicfile-0.52_basicauth.patch b/www/publicfile/files/publicfile-0.52_basicauth.patch
deleted file mode 100644
index 65bcc3a425c6..000000000000
--- a/www/publicfile/files/publicfile-0.52_basicauth.patch
+++ /dev/null
@@ -1,629 +0,0 @@
-diff -N -u -r publicfile-0.52.orig/Makefile publicfile-0.52/Makefile
---- publicfile-0.52.orig/Makefile	Mon Nov  8 23:23:46 1999
-+++ publicfile-0.52/Makefile	Wed Aug 29 20:27:09 2001
-@@ -234,21 +234,44 @@
- compile hier.c auto_home.h
- 	./compile hier.c
- 
-+htrules: \
-+load htrules.o base64.o
-+	./load htrules cdb.a base64.o byte.a getln.a stralloc.a alloc.a \
-+	substdio.a str.a buffer.a unix.a 
-+
-+htrules.o: \
-+compile htrules.c strerr.h stralloc.h gen_alloc.h getln.h buffer.h \
-+stralloc.h buffer.h exit.h fmt.h byte.h cdb_make.h buffer.h uint32.h \
-+base64.h
-+	./compile htrules.c
-+
-+base64.o: \
-+compile base64.c base64.h
-+	./compile base64.c
-+
- httpd: \
- load httpd.o main.o pathdecode.o file.o filetype.o httpdate.o \
- percent.o prot.o timeoutread.o timeoutwrite.o libtai.a case.a getln.a \
- stralloc.a alloc.a substdio.a error.a open.a sig.a env.a str.a fs.a \
--socket.lib
-+socket.lib readclose.o openreadclose.o
- 	./load httpd main.o pathdecode.o file.o filetype.o \
- 	httpdate.o percent.o prot.o timeoutread.o timeoutwrite.o \
- 	libtai.a case.a getln.a stralloc.a alloc.a substdio.a \
--	error.a open.a sig.a env.a str.a fs.a  `cat socket.lib`
-+	error.a open.a sig.a env.a str.a fs.a cdb.a byte.a seek_set.o \
-+	readclose.o openreadclose.o `cat socket.lib`
-+
-+.cdb:
-+	(cd cdb && \
-+	 ${MAKE} && \
-+	 cp -vp cdb_make.h buffer.h cdb.h uint32.h cdb.a byte.a seek_set.o \
-+	 cdb_make.o error.c buffer.a unix.a ${PWD}/ && touch ${PWD}/.cdb)
-+cdb buffer.h cdb_make.h cdb.h uint32.h cdb.a byte.a seek_set.o cdb_make.o error.c buffer.a unix.a: .cdb
- 
- httpd.o: \
- compile httpd.c pathdecode.h stralloc.h gen_alloc.h file.h tai.h \
- uint64.h filetype.h stralloc.h percent.h stralloc.h stralloc.h sig.h \
- exit.h fmt.h case.h str.h tai.h httpdate.h stralloc.h tai.h \
--timeoutread.h timeoutwrite.h substdio.h error.h getln.h
-+timeoutread.h timeoutwrite.h substdio.h error.h getln.h byte.h cdb.h
- 	./compile httpd.c
- 
- httpdate.o: \
-@@ -358,6 +381,11 @@
- compile open_trunc.c open.h
- 	./compile open_trunc.c
- 
-+openreadclose.o: \
-+compile openreadclose.c error.h open.h readclose.h stralloc.h \
-+gen_alloc.h openreadclose.h stralloc.h
-+	./compile openreadclose.c
-+
- pathdecode.o: \
- compile pathdecode.c pathdecode.h stralloc.h gen_alloc.h
- 	./compile pathdecode.c
-@@ -367,7 +395,7 @@
- 	./compile percent.c
- 
- prog: \
--configure httpd ftpd rts utime
-+cdb configure httpd ftpd rts utime htrules
- 
- prot.o: \
- compile prot.c hasshsgr.h prot.h
---- publicfile-0.52.orig/README.basicauth	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/README.basicauth	Wed Aug 29 22:16:02 2001
-@@ -0,0 +1,100 @@
-+Here is a patch for publicfile to allow for Basic Auth.
-+
-+Building Instructions:
-+
-+Save this patch as publicfile-0.52.basicauth.patch
-+Download publicfile-0.52
-+Download cdb-0.75
-+
-+gunzip publicfile-0.52.tar
-+gunzip cdb-0.75.tar
-+tar -xf publicfile-0.52.tar
-+cd publicfile-0.52
-+tar -xf ../cdb-0.75.tar
-+patch -p1 < publicfile-0.52.basicauth.patch
-+
-+Follow normal installation instructions for publicfile beginning with
-+'make setup check'
-+
-+Usage Instructions:
-+
-+Once this patch has been applied, httpd will check for a file
-+called '.access' in the current directory of any requested
-+file. e.g, if /public/file/0/path/to/file.html is requested, httpd
-+will first check for /public/file/0/path/to/.access.
-+
-+.access should have the format:
-+  realm_id:realm_txt
-+
-+realm_id is used as documented below. realm_txt is typically
-+presented by the user's browser. .access must be readable by httpd
-+and only protects a specific directory. Sub-directories are not
-+protected unless they also contain a .access file.
-+
-+An additional program will be installed in /usr/local/publicfile (or
-+whatever conf-home is) called htrules. Use this like tcprules:
-+
-+cd /public/file
-+htrules access.cdb access.tmp < access
-+
-+This may safely be run at any time.
-+
-+access should have the format:
-+
-+  # this is a comment. blank lines are allowed too.
-+  # the next line authorizes a user to a specific realm_id
-+  realm_id:username:password
-+  # the next line authorizes host class.
-+  realm_id:LOCALHOST
-+
-+access.cdb must be readable by httpd.
-+
-+realm_id corresponds to the realm_id in the .access file(s).
-+
-+Each realm_id line specifies either a username:password combination
-+or a host class. Note that the same username may have different 
-+passwords in different realm_id's.
-+
-+A host is mapped into a host class via the environment
-+variable HTTPCLIENT. This environment variable should be
-+set in tcpserver's rules.cdb. 
-+
-+Here is an example:
-+
-+  === /public/file/0/private1/.access ===
-+  realm1:Dr. Suess
-+
-+  === /public/file/0/private2/.access ===
-+  realm2:Sesame Street
-+
-+  === /public/file/access ===
-+  # realm1 are Dr Suess users/clients
-+  realm1:john:catinthehat
-+  realm1:mary:greeneggswithham
-+  realm1:LOCALHOST
-+  realm1:DR SUESS
-+  # realm1 are Sesame Street users/clients
-+  realm2:tom:bigbird
-+  realm2:abi:cookiemonster
-+  realm2:mary:earnie
-+  realm2:LOCALHOST
-+  realm2:SESAME STREET
-+
-+  === /etc/rules ===
-+  127.0.0.1:allow,HTTPCLIENT="LOCALHOST"
-+  10.0.0.:allow,HTTPCLIENT="DR SUESS"
-+  10.1.0.:allow,HTTPCLIENT="SESAME STREET"
-+  :allow
-+
-+The changes to the Makefile aren't very clean, but everything compiles
-+correctly.
-+
-+Thanks to Eric M. Johnston's for base64.{c,h} from YAQSAP
-+(Yet Another qmail SMTP AUTH Patch) -
-+http://qmail.goof.com/qmail-auth-20010105.tar.gz
-+
-+This patch available at
-+http://www.soffian.org/downloads/publicfile-0.52_basicauth.patch
-+
-+Jay Soffian <jay@soffian.org> 29 Aug 2001
-+
---- publicfile-0.52.orig/base64.c	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/base64.c	Wed Aug 22 22:17:39 2001
-@@ -0,0 +1,90 @@
-+#include "base64.h"
-+#include "stralloc.h"
-+#include "substdio.h"
-+#include "str.h"
-+
-+static char *b64alpha =
-+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+#define B64PAD '='
-+
-+/* returns 0 ok, 1 illegal, -1 problem */
-+
-+int b64decode(in,l,out)
-+const unsigned char *in;
-+int l;
-+stralloc *out; /* not null terminated */
-+{
-+  int i, j;
-+  unsigned char a[4];
-+  unsigned char b[3];
-+  char *s;
-+
-+  if (l == 0)
-+  {
-+    if (!stralloc_copys(out,"")) return -1;
-+    return 0;
-+  }
-+
-+  if (!stralloc_ready(out,l + 2)) return -1; /* XXX generous */
-+  s = out->s;
-+
-+  for (i = 0;i < l;i += 4) {
-+    for (j = 0;j < 4;j++)
-+      if ((i + j) < l && in[i + j] != B64PAD)
-+      {
-+        a[j] = str_chr(b64alpha,in[i + j]);
-+        if (a[j] > 63) return 1;
-+      }
-+      else a[j] = 0;
-+
-+    b[0] = (a[0] << 2) | (a[1] >> 4);
-+    b[1] = (a[1] << 4) | (a[2] >> 2);
-+    b[2] = (a[2] << 6) | (a[3]);
-+
-+    *s++ = b[0];
-+
-+    if (in[i + 1] == B64PAD) break;
-+    *s++ = b[1];
-+
-+    if (in[i + 2] == B64PAD) break;
-+    *s++ = b[2];
-+  }
-+  out->len = s - out->s;
-+  while (out->len && !out->s[out->len - 1]) --out->len; /* XXX avoid? */
-+  return 0;
-+}
-+
-+int b64encode(in,out)
-+stralloc *in;
-+stralloc *out; /* not null terminated */
-+{
-+  unsigned char a, b, c;
-+  int i;
-+  char *s;
-+
-+  if (in->len == 0)
-+  {
-+    if (!stralloc_copys(out,"")) return -1;
-+    return 0;
-+  }
-+
-+  if (!stralloc_ready(out,in->len / 3 * 4 + 4)) return -1;
-+  s = out->s;
-+
-+  for (i = 0;i < in->len;i += 3) {
-+    a = in->s[i];
-+    b = i + 1 < in->len ? in->s[i + 1] : 0;
-+    c = i + 2 < in->len ? in->s[i + 2] : 0;
-+
-+    *s++ = b64alpha[a >> 2];
-+    *s++ = b64alpha[((a & 3 ) << 4) | (b >> 4)];
-+
-+    if (i + 1 >= in->len) *s++ = B64PAD;
-+    else *s++ = b64alpha[((b & 15) << 2) | (c >> 6)];
-+
-+    if (i + 2 >= in->len) *s++ = B64PAD;
-+    else *s++ = b64alpha[c & 63];
-+  }
-+  out->len = s - out->s;
-+  return 0;
-+}
---- publicfile-0.52.orig/base64.h	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/base64.h	Wed Aug 22 22:17:39 2001
-@@ -0,0 +1,7 @@
-+#ifndef BASE64_H
-+#define BASE64_H
-+
-+extern int b64decode();
-+extern int b64encode();
-+
-+#endif
---- publicfile-0.52.orig/hier.c	Mon Nov  8 23:23:46 1999
-+++ publicfile-0.52/hier.c	Wed Aug 22 22:17:39 2001
-@@ -7,6 +7,7 @@
-   d(auto_home,"bin",-1,-1,02755);
- 
-   c(auto_home,"bin","configure",-1,-1,0755);
-+  c(auto_home,"bin","htrules",-1,-1,0755);
-   c(auto_home,"bin","httpd",-1,-1,0755);
-   c(auto_home,"bin","ftpd",-1,-1,0755);
- }
---- publicfile-0.52.orig/htrules.c	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/htrules.c	Wed Aug 29 21:27:42 2001
-@@ -0,0 +1,117 @@
-+#include "strerr.h"
-+#include "stralloc.h"
-+#include "getln.h"
-+#include "buffer.h"
-+#include "exit.h"
-+#include "fmt.h"
-+#include "byte.h"
-+#include "base64.h"
-+#include "cdb_make.h"
-+
-+#define FATAL "htrules: fatal: "
-+
-+unsigned long linenum = 0;
-+char *fntemp;
-+char *fn;
-+
-+stralloc line = {0};
-+int match = 1;
-+
-+stralloc base64 = {0};
-+stralloc key = {0};
-+stralloc realm = {0};
-+stralloc userpass = {0};
-+
-+struct cdb_make c;
-+
-+void nomem(void)
-+{
-+  strerr_die2x(111,FATAL,"out of memory");
-+}
-+void usage(void)
-+{
-+  strerr_die1x(100,"htrules: usage: htrules access.cdb access.tmp");
-+}
-+void die_bad(void)
-+{
-+  if (!stralloc_0(&line)) nomem();
-+  strerr_die3x(100,FATAL,"unable to parse this line: ",line.s);
-+}
-+void die_write(void)
-+{
-+  strerr_die4sys(111,FATAL,"unable to write to ",fntemp,": ");
-+}
-+
-+main(int argc,char **argv)
-+{
-+  int colon;
-+  char *x;
-+  int len;
-+  int fd;
-+  int i;
-+  char ch;
-+
-+  fn = argv[1];
-+  if (!fn) usage();
-+  fntemp = argv[2];
-+  if (!fntemp) usage();
-+
-+  fd = open_trunc(fntemp);
-+  if (fd == -1)
-+    strerr_die4sys(111,FATAL,"unable to create ",fntemp,": ");
-+  if (cdb_make_start(&c,fd) == -1) die_write();
-+
-+  while (match) {
-+    if (getln(buffer_0,&line,&match,'\n') == -1)
-+      strerr_die2sys(111,FATAL,"unable to read input: ");
-+
-+    x = line.s; len = line.len;
-+
-+    if (!len) break;
-+    if (x[0] == '#') continue;
-+    if (x[0] == '\n') continue;
-+
-+    while (len) {
-+      ch = x[len - 1];
-+      if (ch != '\n') if (ch != ' ') if (ch != '\t') break;
-+      --len;
-+    }
-+    line.len = len; /* for die_bad() */
-+    if (!len) continue;
-+
-+    colon = byte_chr(x,len,':');
-+    if (!colon || colon == len) die_bad();
-+    if (!stralloc_copyb(&realm,x,colon)) nomem();
-+    x += colon + 1; len -= colon + 1;
-+
-+    colon = byte_chr(x,len,':');
-+    if (colon == len) {
-+      if (!stralloc_copyb(&key,"C",1)) nomem();
-+      if (!stralloc_cat(&key,&realm)) nomem();
-+      if (!stralloc_catb(&key,":",1)) nomem();
-+      if (!stralloc_catb(&key,x,len)) nomem();
-+      if (cdb_make_add(&c,key.s,key.len,"",0) == -1) die_write();
-+    } else {
-+      if (!stralloc_copyb(&userpass,x,len)) nomem();
-+      if (b64encode(&userpass,&base64) == -1) nomem();
-+
-+      if (!stralloc_copyb(&key,"U",1)) nomem();
-+      if (!stralloc_cat(&key,&base64)) nomem();
-+      if (cdb_make_add(&c,key.s,key.len,"",0) == -1) die_write();
-+
-+      if (!stralloc_copyb(&key,"R",1)) nomem();
-+      if (!stralloc_cat(&key,&realm)) nomem();
-+      if (!stralloc_catb(&key,":",1)) nomem();
-+      if (!stralloc_cat(&key,&base64)) nomem();
-+      if (cdb_make_add(&c,key.s,key.len,"",0) == -1) die_write();
-+    } 
-+  }
-+
-+  if (cdb_make_finish(&c) == -1) die_write();
-+  if (fsync(fd) == -1) die_write();
-+  if (close(fd) == -1) die_write(); /* NFS stupidity */
-+  if (rename(fntemp,fn))
-+    strerr_die6sys(111,FATAL,"unable to move ",fntemp," to ",fn,": ");
-+
-+  _exit(0);
-+}
---- publicfile-0.52.orig/httpd.c	Mon Nov  8 23:23:46 1999
-+++ publicfile-0.52/httpd.c	Wed Aug 29 21:30:34 2001
-@@ -15,6 +15,10 @@
- #include "substdio.h"
- #include "error.h"
- #include "getln.h"
-+#include "byte.h"
-+#include "cdb.h"
-+#include "openreadclose.h"
-+#include "env.h"
- 
- int safewrite(int fd,char *buf,int len)
- {
-@@ -51,6 +55,7 @@
- stralloc host = {0};
- stralloc path = {0};
- stralloc ims = {0};
-+stralloc basic_auth = {0};
- int flagbody = 1;
- 
- char filebuf[1024];
-@@ -75,11 +80,16 @@
-   out_puts("\r\n");
- }
- 
--void barf(char *code,char *message)
-+void barf2(char *code,char *message,char *realm)
- {
-   if (protocolnum > 0) {
-     tai_now(&now);
-     header(code,message);
-+    if(realm) {
-+      out_puts("WWW-Authenticate: Basic realm=\"");
-+      out_puts(realm);
-+      out_puts("\"\r\n");
-+    }
-     out_puts("Content-Length: ");
-     out_put(strnum,fmt_ulong(strnum,str_len(message) + 28));
-     out_puts("\r\n");
-@@ -100,8 +110,81 @@
-   _exit(0);
- }
- 
-+void barf(char *code,char *message)
-+{
-+  barf2(code,message,(char *)0);
-+}
-+
- stralloc fn = {0};
-+stralloc accessfn = {0};
- stralloc contenttype = {0};
-+stralloc realm = {0};
-+stralloc realmtxt = {0};
-+stralloc key = {0};
-+
-+void checkauth(void)
-+{
-+  int len;
-+  int fd;
-+  int colon;
-+  static struct cdb c;
-+  char *x;
-+ 
-+  len = byte_rchr(fn.s,fn.len,'/');
-+  if (!stralloc_copyb(&accessfn,fn.s,len)) _exit(21);
-+  if (!stralloc_cats(&accessfn,"/.access")) _exit(21);
-+  if (!stralloc_0(&accessfn)) _exit(21);
-+
-+  if (openreadclose(accessfn.s,&realm,256) == 0) return;
-+  if (!realm.len) _exit(23); /* no realm */
-+  realm.len = byte_chr(realm.s,realm.len,'\n');
-+  while (realm.len) {
-+    if (realm.s[realm.len - 1] != ' ')
-+      if (realm.s[realm.len - 1] != '\t')
-+        break;
-+    --realm.len;
-+  }
-+  colon = byte_chr(realm.s,realm.len,':');
-+  if (!colon) _exit(23); /* no realm */
-+  if (colon == realm.len) {
-+    if (!stralloc_copys(&realmtxt,"restricted access")) _exit(21);
-+  } else {
-+    if (!stralloc_copyb(&realmtxt,realm.s+colon+1,realm.len-(colon+1))) _exit(21);
-+    realm.len = colon;
-+  }
-+  if (!stralloc_0(&realmtxt)) _exit(21);
-+
-+  fd = open_read("/access.cdb");
-+  if (fd == -1) _exit(23);
-+  cdb_init(&c,fd);
-+
-+  x = env_get("HTTPCLIENT");
-+  if (x) {
-+    if (!stralloc_copyb(&key,"C",1)) _exit(21);
-+    if (!stralloc_cat(&key,&realm)) _exit(21);
-+    if (!stralloc_catb(&key,":",1)) _exit(21);
-+    if (!stralloc_cats(&key,x)) _exit(21);
-+    if (cdb_find(&c,key.s,key.len) == 1) goto AUTH_OK;
-+  }
-+
-+  if (!basic_auth.len) barf2("401 ","Authorization Required", realmtxt.s);
-+
-+  if (!stralloc_copyb(&key,"U",1)) _exit(21);
-+  if (!stralloc_cat(&key,&basic_auth)) _exit(21);
-+  if (cdb_find(&c,key.s,key.len) != 1)
-+    barf2("401 ","Authorization Required",realmtxt.s);
-+
-+  if (!stralloc_copyb(&key,"R",1)) _exit(21);
-+  if (!stralloc_cat(&key,&realm)) _exit(21);
-+  if (!stralloc_catb(&key,":",1)) _exit(21);
-+  if (!stralloc_cat(&key,&basic_auth)) _exit(21);
-+  if (cdb_find(&c,key.s,key.len) != 1) barf("403 ","Forbidden");
-+
-+  AUTH_OK:
-+  alloc_free(key);
-+  cdb_free(&c);
-+  close(fd);
-+}
- 
- void get(void)
- {
-@@ -124,6 +207,8 @@
-   if (!stralloc_cat(&fn,&path)) _exit(21);
-   pathdecode(&fn);
-   if (!stralloc_0(&fn)) _exit(21);
-+  
-+  checkauth();
- 
-   fd = file_open(fn.s,&mtime,&length,1);
-   if (fd == -1)
-@@ -227,6 +312,7 @@
-     if (!stralloc_copys(&path,"")) _exit(21);
-     if (!stralloc_copys(&protocol,"")) _exit(21);
-     if (!stralloc_copys(&ims,"")) _exit(21);
-+    if (!stralloc_copys(&basic_auth,"")) _exit(21);
-     protocolnum = 2;
- 
-     spaces = 0;
-@@ -302,6 +388,8 @@
-                     if (!stralloc_append(&host,&field.s[i])) _exit(21);
-           if (case_startb(field.s,field.len,"if-modified-since:"))
- 	    if (!stralloc_copyb(&ims,field.s + 18,field.len - 18)) _exit(21);
-+	  if (case_startb(field.s,field.len,"authorization: basic "))
-+	    if (!stralloc_copyb(&basic_auth,field.s + 21,field.len - 21)) _exit(21);
-           field.len = 0;
-         }
-         if (!line.len) break;
---- publicfile-0.52.orig/openreadclose.c	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/openreadclose.c	Wed Aug 29 14:24:21 2001
-@@ -0,0 +1,18 @@
-+/* Public domain. */
-+
-+#include "error.h"
-+#include "open.h"
-+#include "readclose.h"
-+#include "openreadclose.h"
-+
-+int openreadclose(const char *fn,stralloc *sa,unsigned int bufsize)
-+{
-+  int fd;
-+  fd = open_read(fn);
-+  if (fd == -1) {
-+    if (errno == error_noent) return 0;
-+    return -1;
-+  }
-+  if (readclose(fd,sa,bufsize) == -1) return -1;
-+  return 1;
-+}
---- publicfile-0.52.orig/openreadclose.h	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/openreadclose.h	Wed Aug 29 14:24:21 2001
-@@ -0,0 +1,10 @@
-+/* Public domain. */
-+
-+#ifndef OPENREADCLOSE_H
-+#define OPENREADCLOSE_H
-+
-+#include "stralloc.h"
-+
-+extern int openreadclose(const char *,stralloc *,unsigned int);
-+
-+#endif
---- publicfile-0.52.orig/readclose.c	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/readclose.c	Wed Aug 29 14:30:52 2001
-@@ -0,0 +1,23 @@
-+/* Public domain. */
-+
-+#include <unistd.h>
-+#include "error.h"
-+#include "readclose.h"
-+
-+int readclose_append(int fd,stralloc *sa,unsigned int bufsize)
-+{
-+  int r;
-+  for (;;) {
-+    if (!stralloc_readyplus(sa,bufsize)) { close(fd); return -1; }
-+    r = read(fd,sa->s + sa->len,bufsize);
-+    if (r == -1) if (errno == error_intr) continue;
-+    if (r <= 0) { close(fd); return r; }
-+    sa->len += r;
-+  }
-+}
-+
-+int readclose(int fd,stralloc *sa,unsigned int bufsize)
-+{
-+  if (!stralloc_copys(sa,"")) { close(fd); return -1; }
-+  return readclose_append(fd,sa,bufsize);
-+}
---- publicfile-0.52.orig/readclose.h	Wed Dec 31 16:00:00 1969
-+++ publicfile-0.52/readclose.h	Wed Aug 29 14:30:52 2001
-@@ -0,0 +1,11 @@
-+/* Public domain. */
-+
-+#ifndef READCLOSE_H
-+#define READCLOSE_H
-+
-+#include "stralloc.h"
-+
-+extern int readclose_append(int,stralloc *,unsigned int);
-+extern int readclose(int,stralloc *,unsigned int);
-+
-+#endif
diff --git a/www/publicfile/files/publicfile.sslserver b/www/publicfile/files/publicfile.sslserver
deleted file mode 100644
index 23b3c8778141..000000000000
--- a/www/publicfile/files/publicfile.sslserver
+++ /dev/null
@@ -1,36 +0,0 @@
---- httpd.c.orig	Tue Nov  9 02:23:46 1999
-+++ httpd.c	Sun Dec  9 21:30:59 2001
-@@ -271,8 +271,16 @@
-       if (!stralloc_copyb(&path,host.s + i,host.len - i)) _exit(21);
-       host.len = i;
-     }
--    else
--      if (!stralloc_copy(&path,&url)) _exit(21);
-+    else {
-+      if (case_startb(url.s,url.len,"https://")) {
-+	if (!stralloc_copyb(&host,url.s + 8,url.len - 8)) _exit(21);
-+	i = byte_chr(host.s,host.len,'/');
-+	if (!stralloc_copyb(&path,host.s + i,host.len - i)) _exit(21);
-+	host.len = i;
-+      }
-+      else
-+	if (!stralloc_copy(&path,&url)) _exit(21);
-+    }
- 
-     if (!path.len || (path.s[path.len - 1] == '/'))
-       if (!stralloc_cats(&path,"index.html")) _exit(21);
---- file.c.orig	Wed Dec 12 07:09:57 2001
-+++ file.c	Wed Dec 12 07:09:33 2001
-@@ -15,7 +15,11 @@
-   char *x;
- 
-   x = env_get("TCPREMOTEIP");
--  if (!x) x = "0";
-+  if (!x) {
-+    x = env_get("SSLREMOTEIP");
-+    if (!x)
-+      x = "0";
-+  }
-   substdio_puts(subfderr,x);
-   substdio_puts(subfderr,flagread ? " read ": " dir ");
- 
diff --git a/www/publicfile/files/redirect-slash-patch b/www/publicfile/files/redirect-slash-patch
deleted file mode 100644
index 38c936cae8e6..000000000000
--- a/www/publicfile/files/redirect-slash-patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From: Giles Lean <giles@nemeton.com.au>
-To: publicfile@list.cr.yp.to
-Subject: redirect patch for publicfile-0.52
-Date: Sun, 05 Dec 1999 08:43:14 +1100
-
-------- =_aaaaaaaaaa0
-Content-Type: text/plain; charset="us-ascii"
-Content-ID: <23894.944342900.1@nemeton.com.au>
-
-I have a patch for publicfile-0.52 that will make it send redirects
-instead of "404 access denied" when directories are requested
-without a trailing slash.
-
-Comments and suggestions are welcome, particularly if someone can
-see where I've either done something wrong protocol-wise or if the
-integration with Dan's code can be improved.
-
-This patch is only appropriate for publicfile installations where
-an existing server is being replaced or where lots of third party
-HTML is installed without editing.  This is not the target market
-Dan Bernstein claims for publicfile, but some of us will use it
-anyway.  (My #1 reason? The low memory requirement.)
-
-After this patch is applied log messages about "is a directory"
-will show up if the redirect code is used:
-
-@4000000038490b1f26a03cac 127.0.0.1 read ./localhost.nemeton.com.au/cr.yp.to/publicfile: is a directory
-@40000000384973483712ee2c 127.0.0.1 read ./localhost.nemeton.com.au/susv2: is a directory
-
-Regards,
-
-Giles
-
-
-------- =_aaaaaaaaaa0
-Content-Type: text/plain; name="diff"; charset="us-ascii"
-Content-ID: <23894.944342900.2@nemeton.com.au>
-
-Index: error.c
-===================================================================
-RCS file: /a/CVS/net/publicfile/error.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.2.1
-diff -c -r1.1.1.1 -r1.1.1.1.2.1
-*** error.c	1999/12/01 19:38:15	1.1.1.1
---- error.c	1999/12/04 21:15:37	1.1.1.1.2.1
-***************
-*** 100,102 ****
---- 100,109 ----
-  #else
-  -14;
-  #endif
-+ 
-+ int error_isdir =
-+ #ifdef EISDIR
-+ EISDIR;
-+ #else
-+ -15;
-+ #endif
-Index: error.h
-===================================================================
-RCS file: /a/CVS/net/publicfile/error.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.2.1
-diff -c -r1.1.1.1 -r1.1.1.1.2.1
-*** error.h	1999/12/01 19:38:15	1.1.1.1
---- error.h	1999/12/04 21:15:37	1.1.1.1.2.1
-***************
-*** 17,22 ****
---- 17,23 ----
-  extern int error_perm;
-  extern int error_acces;
-  extern int error_nodevice;
-+ extern int error_isdir;
-  
-  extern char *error_str();
-  extern int error_temp();
-Index: error_str.c
-===================================================================
-RCS file: /a/CVS/net/publicfile/error_str.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.2.1
-diff -c -r1.1.1.1 -r1.1.1.1.2.1
-*** error_str.c	1999/12/01 19:38:15	1.1.1.1
---- error_str.c	1999/12/04 21:15:38	1.1.1.1.2.1
-***************
-*** 21,26 ****
---- 21,27 ----
-    X(error_perm,"permission denied")
-    X(error_acces,"access denied")
-    X(error_nodevice,"device not configured")
-+   X(error_isdir,"is a directory")
-  #ifdef ESRCH
-    X(ESRCH,"no such process")
-  #endif
-Index: file.c
-===================================================================
-RCS file: /a/CVS/net/publicfile/file.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.2.1
-diff -c -r1.1.1.1 -r1.1.1.1.2.1
-*** file.c	1999/12/01 19:38:14	1.1.1.1
---- file.c	1999/12/04 21:15:38	1.1.1.1.2.1
-***************
-*** 65,77 ****
-      errno = error_acces;
-      return -1;
-    }
-!   if (flagread)
-!     if ((st.st_mode & S_IFMT) != S_IFREG) {
-        log(fn,": ","not a regular file",flagread);
-        close(fd);
-        errno = error_acces;
--       return -1;
-      }
-  
-    log(fn,": ","success",flagread);
-  
---- 65,83 ----
-      errno = error_acces;
-      return -1;
-    }
-!   if (flagread && (st.st_mode & S_IFMT) != S_IFREG) {
-!     if ((st.st_mode & S_IFMT) == S_IFDIR) {
-!       log(fn,": ",error_str(error_isdir),flagread);
-!       close(fd);
-!       errno = error_isdir;
-!     }
-!     else {
-        log(fn,": ","not a regular file",flagread);
-        close(fd);
-        errno = error_acces;
-      }
-+     return -1;
-+   }
-  
-    log(fn,": ","success",flagread);
-  
-Index: httpd.c
-===================================================================
-RCS file: /a/CVS/net/publicfile/httpd.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.2.1
-diff -c -r1.1.1.1 -r1.1.1.1.2.1
-*** httpd.c	1999/12/01 19:38:14	1.1.1.1
---- httpd.c	1999/12/04 21:15:38	1.1.1.1.2.1
-***************
-*** 103,114 ****
---- 103,142 ----
-  stralloc fn = {0};
-  stralloc contenttype = {0};
-  
-+ void redirect(void)
-+ {
-+   if (!stralloc_cats(&url, "/")) _exit(21);
-+   if (protocolnum > 0) {
-+     tai_now(&now);
-+     header("301 ", "Moved Permanently");
-+     out_puts("Content-Length: ");
-+     out_put(strnum,fmt_ulong(strnum,url.len * 2 + 127));
-+     out_puts("\r\nLocation: ");
-+     out_put(url.s, url.len);
-+     out_puts("\r\nContent-Type: text/html\r\n\r\n");
-+   }
-+   if (flagbody) {
-+     out_puts("<html><body>The document you requested is a directory.  Try adding a trailing slash to the URL: <A HREF=\"");
-+     out_put(url.s,url.len);
-+     out_puts("\">");
-+     out_put(url.s,url.len);
-+     out_puts("</A></body></html>\r\n");
-+   }
-+   out_flush();
-+ }
-+ 
-  void get(void)
-  {
-    unsigned long length;
-    int fd;
-    int r;
-  
-+   if (!case_startb(url.s,url.len,"http://")) {
-+     if (!stralloc_copys(&url,"http://")) _exit(21);
-+     if (!stralloc_cat(&url,&host)) _exit(21);
-+     if (!stralloc_cat(&url,&path)) _exit(21);
-+   }
-+ 
-    host.len = byte_chr(host.s,host.len,':');
-    if (!host.len) {
-      if (protocolnum > 1)
-***************
-*** 126,133 ****
-    if (!stralloc_0(&fn)) _exit(21);
-  
-    fd = file_open(fn.s,&mtime,&length,1);
-!   if (fd == -1)
-      barf("404 ",error_str(errno));
-  
-    if (protocolnum > 0) {
-      tai_now(&now);
---- 154,167 ----
-    if (!stralloc_0(&fn)) _exit(21);
-  
-    fd = file_open(fn.s,&mtime,&length,1);
-!   if (fd == -1) {
-!     if (errno == error_isdir) {
-!       redirect();
-!       if (protocolnum < 2) _exit(0);
-!       return;
-!     }
-      barf("404 ",error_str(errno));
-+   }
-  
-    if (protocolnum > 0) {
-      tai_now(&now);
-
-------- =_aaaaaaaaaa0--
-
diff --git a/www/publicfile/pkg-descr b/www/publicfile/pkg-descr
deleted file mode 100644
index cbbfd9d8220b..000000000000
--- a/www/publicfile/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-publicfile supplies files to the public through HTTP and FTP.
-
-Security features:
-       publicfile chroot()s to the public file area and sheds root privileges.
-       publicfile never attempts to modify the public file area.
-       publicfile never runs any other programs.
-
-HTTP features:
-       publicfile supports virtual hosts through the Host field.
-       publicfile supports virtual hosts through absolute URLs.
-       publicfile supports HTTP/1.1 persistent connections.
-       publicfile supports HTTP/1.1 chunked responses.
-       publicfile supports user-controlled content types.
-       publicfile supports exact-prefix If-Modified-Since.
-
-FTP features:
-       publicfile has built-in LIST and NLST commands.
-       publicfile provides EPLF LIST responses.
-       publicfile supports restarted transfers.
-       publicfile supports pipelining.
diff --git a/www/publicfile/pkg-plist b/www/publicfile/pkg-plist
deleted file mode 100644
index 8b7b66177460..000000000000
--- a/www/publicfile/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/configure
-bin/httpd
-bin/ftpd
-%%BASICAUTH%%bin/htrules
diff --git a/www/py-dj51-channels-redis/Makefile b/www/py-dj51-channels-redis/Makefile
new file mode 100644
index 000000000000..6dfb16384889
--- /dev/null
+++ b/www/py-dj51-channels-redis/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	channels-redis
+PORTVERSION=	4.2.1
+PORTREVISION=	1
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Redis-backed asgi channel layer implementation
+WWW=		http://github.com/django/channels_redis/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=5.0.1:databases/py-redis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msgpack>=1:devel/py-msgpack@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}asgiref>=3.7.2:www/py-asgiref@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-channels>=4:www/py-dj51-channels@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-channels-redis/distinfo b/www/py-dj51-channels-redis/distinfo
new file mode 100644
index 000000000000..24f9de6f6968
--- /dev/null
+++ b/www/py-dj51-channels-redis/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1738052794
+SHA256 (channels_redis-4.2.1.tar.gz) = 8375e81493e684792efe6e6eca60ef3d7782ef76c6664057d2e5c31e80d636dd
+SIZE (channels_redis-4.2.1.tar.gz) = 31152
diff --git a/www/py-dj51-channels-redis/pkg-descr b/www/py-dj51-channels-redis/pkg-descr
new file mode 100644
index 000000000000..8cd2d32f3a39
--- /dev/null
+++ b/www/py-dj51-channels-redis/pkg-descr
@@ -0,0 +1,12 @@
+Provides Django Channels channel layers that use Redis as a backing store.
+
+There are two available implementations:
+
+RedisChannelLayer is the original layer, and implements channel and group
+handling itself.
+
+RedisPubSubChannelLayer is newer and leverages Redis Pub/Sub for message
+dispatch.  This layer is currently at Beta status, meaning it may be subject
+to breaking changes whilst it matures.
+
+Both layers support a single-server and sharded configurations.
diff --git a/www/py-dj51-django-allauth/Makefile b/www/py-dj51-django-allauth/Makefile
new file mode 100644
index 000000000000..0a78a28e282f
--- /dev/null
+++ b/www/py-dj51-django-allauth/Makefile
@@ -0,0 +1,45 @@
+PORTNAME=	django-allauth
+PORTVERSION=	65.7.0
+PORTREVISION=	1
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	User registration with social account authentication
+WWW=		https://allauth.org/ \
+		https://docs.allauth.org/en/latest/ \
+		https://github.com/pennersr/django-allauth
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=40.8.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fido2>=0:security/py-fido2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=	MFA OPENID SAML SOCIALACCOUNT STEAM
+OPTIONS_DEFAULT=MFA OPENID SOCIALACCOUNT
+MFA_DESC=		Multi-Factor Authentication support
+OPENID_DESC=		OpenID authentication support
+SAML_DESC=		Security Assertion Markup Language support
+SOCIALACCOUNT_DESC=	Social network account support
+STEAM_DESC=		Steam OpenID authentication support
+
+MFA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qrcode>=7.0.0:textproc/py-qrcode@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}fido2>=0:security/py-fido2@${PY_FLAVOR}
+OPENID_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.8:security/py-python3-openid@${PY_FLAVOR}
+SAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python3-saml>=1.15.0<2.0.0:security/py-python3-saml@${PY_FLAVOR}
+SOCIALACCOUNT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyjwt>=1.7:www/py-pyjwt@${PY_FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.0:www/py-requests-oauthlib@${PY_FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
+STEAM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.8:security/py-python3-openid@${PY_FLAVOR}
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-allauth/distinfo b/www/py-dj51-django-allauth/distinfo
new file mode 100644
index 000000000000..b6869332c540
--- /dev/null
+++ b/www/py-dj51-django-allauth/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746458445
+SHA256 (django_allauth-65.7.0.tar.gz) = eb060692150f39e1529893c2de5f9b46e1dab51153ff6cca7ad72c7c125259ea
+SIZE (django_allauth-65.7.0.tar.gz) = 1640126
diff --git a/www/py-dj51-django-allauth/pkg-descr b/www/py-dj51-django-allauth/pkg-descr
new file mode 100644
index 000000000000..83cdfd8f3fe9
--- /dev/null
+++ b/www/py-dj51-django-allauth/pkg-descr
@@ -0,0 +1,2 @@
+django-allauth is a reusable Django app that allows for both local and social
+authentication, with flows that just work.
diff --git a/www/py-dj51-django-auditlog/Makefile b/www/py-dj51-django-auditlog/Makefile
new file mode 100644
index 000000000000..89efcda73866
--- /dev/null
+++ b/www/py-dj51-django-auditlog/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	django-auditlog
+PORTVERSION=	3.0.0
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Django app that keeps a log of changes made to an object
+WWW=		https://github.com/jazzband/django-auditlog
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.4.2:devel/py-python-dateutil@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist pep517
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-auditlog/distinfo b/www/py-dj51-django-auditlog/distinfo
new file mode 100644
index 000000000000..33f87d7f7591
--- /dev/null
+++ b/www/py-dj51-django-auditlog/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1730641287
+SHA256 (django-auditlog-3.0.0.tar.gz) = 9de49f80a4911135d136017123cd73461f869b4947eec14d5e76db4b88182f3f
+SIZE (django-auditlog-3.0.0.tar.gz) = 65475
diff --git a/www/py-dj51-django-auditlog/pkg-descr b/www/py-dj51-django-auditlog/pkg-descr
new file mode 100644
index 000000000000..3287e3ab624d
--- /dev/null
+++ b/www/py-dj51-django-auditlog/pkg-descr
@@ -0,0 +1,4 @@
+Auditlog is a reusable app for Django that makes logging object changes a
+breeze. Auditlog tries to use as much as Python and Django's built in
+functionality to keep the list of dependencies as short as possible. Also,
+Auditlog aims to be fast and simple to use.
diff --git a/www/py-dj51-django-celery-results/Makefile b/www/py-dj51-django-celery-results/Makefile
new file mode 100644
index 000000000000..250b0a9013e8
--- /dev/null
+++ b/www/py-dj51-django-celery-results/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	django-celery-results
+PORTVERSION=	2.6.0
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+DISTNAME=	${PORTNAME:S/-/_/g}-${PORTVERSION}
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Celery result backends for django
+WWW=		https://github.com/celery/django-celery-results
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}celery>=5.3.6:devel/py-celery@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-celery-results/distinfo b/www/py-dj51-django-celery-results/distinfo
new file mode 100644
index 000000000000..9f7f11775c75
--- /dev/null
+++ b/www/py-dj51-django-celery-results/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746372914
+SHA256 (django_celery_results-2.6.0.tar.gz) = 9abcd836ae6b61063779244d8887a88fe80bbfaba143df36d3cb07034671277c
+SIZE (django_celery_results-2.6.0.tar.gz) = 83985
diff --git a/www/py-dj51-django-celery-results/pkg-descr b/www/py-dj51-django-celery-results/pkg-descr
new file mode 100644
index 000000000000..da24ab97a379
--- /dev/null
+++ b/www/py-dj51-django-celery-results/pkg-descr
@@ -0,0 +1,6 @@
+Celery Result Backends using the Django ORM/Cache framework.
+
+This extension enables you to store Celery task results using the Django
+ORM. It defines a single model (django_celery_results.models.TaskResult)
+used to store task results, and you can query this database table like any
+other Django model.
diff --git a/www/py-dj51-django-compression-middleware/Makefile b/www/py-dj51-django-compression-middleware/Makefile
new file mode 100644
index 000000000000..afe7212e3147
--- /dev/null
+++ b/www/py-dj51-django-compression-middleware/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	django-compression-middleware
+PORTVERSION=	0.5.0
+PORTREVISION=	1
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Django middleware to compress responses using several algorithms
+WWW=		https://github.com/friedelwolff/django-compression-middleware
+
+LICENSE=	MPL20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zstandard>=0.22.0:archivers/py-zstandard@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}brotli>=1.1.0:archivers/py-brotli@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-compression-middleware/distinfo b/www/py-dj51-django-compression-middleware/distinfo
new file mode 100644
index 000000000000..5dd1c04b8ec1
--- /dev/null
+++ b/www/py-dj51-django-compression-middleware/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707589744
+SHA256 (django-compression-middleware-0.5.0.tar.gz) = 0df50f12d774659abc8bbc88e4c794f2785a8f11f30b5bb267c314b85d941b73
+SIZE (django-compression-middleware-0.5.0.tar.gz) = 20060
diff --git a/www/py-dj51-django-compression-middleware/pkg-descr b/www/py-dj51-django-compression-middleware/pkg-descr
new file mode 100644
index 000000000000..fe4861de4bcb
--- /dev/null
+++ b/www/py-dj51-django-compression-middleware/pkg-descr
@@ -0,0 +1,6 @@
+Django Compression Middleware
+
+This middleware implements compressed content encoding for HTTP. It is similar
+to Django's GZipMiddleware, but additionally supports other compression methods.
+
+It is meant to be a drop-in replacement for Django's GZipMiddleware.
diff --git a/www/py-dj51-django-extensions/Makefile b/www/py-dj51-django-extensions/Makefile
new file mode 100644
index 000000000000..80f3e4411018
--- /dev/null
+++ b/www/py-dj51-django-extensions/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	django-extensions
+PORTVERSION=	3.2.3
+PORTREVISION=	2
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Global custom management extensions for the Django Framework
+WWW=		https://github.com/django-extensions/django-extensions
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-extensions/distinfo b/www/py-dj51-django-extensions/distinfo
new file mode 100644
index 000000000000..1c8f21f580f1
--- /dev/null
+++ b/www/py-dj51-django-extensions/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704625201
+SHA256 (django-extensions-3.2.3.tar.gz) = 44d27919d04e23b3f40231c4ab7af4e61ce832ef46d610cc650d53e68328410a
+SIZE (django-extensions-3.2.3.tar.gz) = 277216
diff --git a/www/py-dj51-django-extensions/pkg-descr b/www/py-dj51-django-extensions/pkg-descr
new file mode 100644
index 000000000000..ec24f4abfeb2
--- /dev/null
+++ b/www/py-dj51-django-extensions/pkg-descr
@@ -0,0 +1 @@
+Global custom management extensions for the Django Framework.
diff --git a/www/py-dj51-django-guardian/Makefile b/www/py-dj51-django-guardian/Makefile
new file mode 100644
index 000000000000..b5281df43e30
--- /dev/null
+++ b/www/py-dj51-django-guardian/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	django-guardian
+PORTVERSION=	2.4.0
+PORTREVISION=	2
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Implementation of per object permissions for Django
+WWW=		https://github.com/django-guardian/django-guardian
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-guardian/distinfo b/www/py-dj51-django-guardian/distinfo
new file mode 100644
index 000000000000..8280c82993be
--- /dev/null
+++ b/www/py-dj51-django-guardian/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1654276001
+SHA256 (django-guardian-2.4.0.tar.gz) = c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0
+SIZE (django-guardian-2.4.0.tar.gz) = 159008
diff --git a/www/py-dj51-django-guardian/pkg-descr b/www/py-dj51-django-guardian/pkg-descr
new file mode 100644
index 000000000000..9c4ac2d92cf9
--- /dev/null
+++ b/www/py-dj51-django-guardian/pkg-descr
@@ -0,0 +1,2 @@
+django-guardian is an implementation of object permissions for Django
+providing extra authentication backend.
diff --git a/www/py-dj51-django-multiselectfield/Makefile b/www/py-dj51-django-multiselectfield/Makefile
new file mode 100644
index 000000000000..de1b638fba4b
--- /dev/null
+++ b/www/py-dj51-django-multiselectfield/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	django-multiselectfield
+PORTVERSION=	0.1.13
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Django multiple select field
+WWW=		https://github.com/goinnn/django-multiselectfield
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/COPYING.LGPLv3
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-multiselectfield/distinfo b/www/py-dj51-django-multiselectfield/distinfo
new file mode 100644
index 000000000000..060fd2e82424
--- /dev/null
+++ b/www/py-dj51-django-multiselectfield/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746550940
+SHA256 (django_multiselectfield-0.1.13.tar.gz) = 437d72632f4c0ca416951917632529c3d1d42b62bb6c3c03e3396fa50265be94
+SIZE (django_multiselectfield-0.1.13.tar.gz) = 11704
diff --git a/www/py-dj51-django-multiselectfield/pkg-descr b/www/py-dj51-django-multiselectfield/pkg-descr
new file mode 100644
index 000000000000..7a72b1755b70
--- /dev/null
+++ b/www/py-dj51-django-multiselectfield/pkg-descr
@@ -0,0 +1,3 @@
+A new model field and form field.  With this you can get a multiple select
+from a choices. Stores to the database as a CharField of comma-separated
+values.
diff --git a/www/py-dj51-django-soft-delete/Makefile b/www/py-dj51-django-soft-delete/Makefile
new file mode 100644
index 000000000000..547c18b49d1d
--- /dev/null
+++ b/www/py-dj51-django-soft-delete/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	django-soft-delete
+PORTVERSION=	1.0.16
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Soft delete models, managers, queryset for Django
+WWW=		https://github.com/san4ezy/django_softdelete
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist pep517
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-django-soft-delete/distinfo b/www/py-dj51-django-soft-delete/distinfo
new file mode 100644
index 000000000000..d17bbd4a5e89
--- /dev/null
+++ b/www/py-dj51-django-soft-delete/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1738052096
+SHA256 (django-soft-delete-1.0.16.tar.gz) = cc40398ccd869c75a6d6ba7f526e16c4afe2b0c0811c213a318d96bb4c58a787
+SIZE (django-soft-delete-1.0.16.tar.gz) = 12135
diff --git a/www/py-dj51-django-soft-delete/pkg-descr b/www/py-dj51-django-soft-delete/pkg-descr
new file mode 100644
index 000000000000..7de7c9bbff50
--- /dev/null
+++ b/www/py-dj51-django-soft-delete/pkg-descr
@@ -0,0 +1 @@
+This is a set of small classes to make soft deletion of objects.
diff --git a/www/py-dj51-djangorestframework-guardian/Makefile b/www/py-dj51-djangorestframework-guardian/Makefile
new file mode 100644
index 000000000000..a5c71426cc36
--- /dev/null
+++ b/www/py-dj51-djangorestframework-guardian/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	djangorestframework-guardian
+PORTVERSION=	0.3.0
+PORTREVISION=	1
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Django Guardian support for Django REST Framework
+WWW=		https://github.com/rpkilby/django-rest-framework-guardian
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-djangorestframework>=3.16.0:www/py-dj51-djangorestframework@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-django-guardian>=2.4.0:www/py-dj51-django-guardian@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-djangorestframework-guardian/distinfo b/www/py-dj51-djangorestframework-guardian/distinfo
new file mode 100644
index 000000000000..eb5b72f6c861
--- /dev/null
+++ b/www/py-dj51-djangorestframework-guardian/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707575793
+SHA256 (djangorestframework-guardian-0.3.0.tar.gz) = 1883756452d9bfcc2a51fb4e039a6837a8f6697c756447aa83af085749b59330
+SIZE (djangorestframework-guardian-0.3.0.tar.gz) = 8647
diff --git a/www/py-dj51-djangorestframework-guardian/pkg-descr b/www/py-dj51-djangorestframework-guardian/pkg-descr
new file mode 100644
index 000000000000..4fd5ed7e7602
--- /dev/null
+++ b/www/py-dj51-djangorestframework-guardian/pkg-descr
@@ -0,0 +1,2 @@
+Django-rest-framework-guardian provides django-guardian integrations for
+Django REST Framework.
diff --git a/www/py-dj51-drf-writable-nested/Makefile b/www/py-dj51-drf-writable-nested/Makefile
new file mode 100644
index 000000000000..0a08d4599ef0
--- /dev/null
+++ b/www/py-dj51-drf-writable-nested/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	drf-writable-nested
+PORTVERSION=	0.7.2
+DISTVERSIONPREFIX=	v
+CATEGORIES=	www python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj51-
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Writable nested model serializer for Django REST framework
+WWW=		https://github.com/beda-software/drf-writable-nested
+
+LICENSE=	BSD2CLAUSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django51>=5.1:www/py-django51@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj51-djangorestframework>0:www/py-dj51-djangorestframework@${PY_FLAVOR}
+
+USES=		python
+USE_GITHUB=	yes
+GH_ACCOUNT=	beda-software
+USE_PYTHON=	autoplist distutils
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/www/py-dj51-drf-writable-nested/distinfo b/www/py-dj51-drf-writable-nested/distinfo
new file mode 100644
index 000000000000..aaaeaf39a4e7
--- /dev/null
+++ b/www/py-dj51-drf-writable-nested/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746380617
+SHA256 (beda-software-drf-writable-nested-v0.7.2_GH0.tar.gz) = f5553adbda96d3b604b8f9533ff21fa2e9cadb8fc538bac01c495752314b4bdb
+SIZE (beda-software-drf-writable-nested-v0.7.2_GH0.tar.gz) = 21229
diff --git a/www/py-dj51-drf-writable-nested/pkg-descr b/www/py-dj51-drf-writable-nested/pkg-descr
new file mode 100644
index 000000000000..36f9ed56df82
--- /dev/null
+++ b/www/py-dj51-drf-writable-nested/pkg-descr
@@ -0,0 +1,9 @@
+This is a writable nested model serializer for Django REST Framework which
+allows you to create/update your models with related nested data.
+
+The following relations are supported:
+
+- OneToOne (direct/reverse)
+- ForeignKey (direct/reverse)
+- ManyToMany (direct/reverse excluding m2m relations with through model)
+- GenericRelation (this is always only reverse)
diff --git a/www/py-django-celery-results/Makefile b/www/py-django-celery-results/Makefile
index 17e4d46f2c63..7f9e6638dbe3 100644
--- a/www/py-django-celery-results/Makefile
+++ b/www/py-django-celery-results/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	django-celery-results
-PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-celery-results/distinfo b/www/py-django-celery-results/distinfo
index 89582fc7649d..48732a220a52 100644
--- a/www/py-django-celery-results/distinfo
+++ b/www/py-django-celery-results/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707610742
-SHA256 (django_celery_results-2.5.1.tar.gz) = 3ecb7147f773f34d0381bac6246337ce4cf88a2ea7b82774ed48e518b67bb8fd
-SIZE (django_celery_results-2.5.1.tar.gz) = 80944
+TIMESTAMP = 1746349632
+SHA256 (django_celery_results-2.6.0.tar.gz) = 9abcd836ae6b61063779244d8887a88fe80bbfaba143df36d3cb07034671277c
+SIZE (django_celery_results-2.6.0.tar.gz) = 83985
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 69f2290f6471..ceb746724eb2 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	django-cms
-PORTVERSION=	4.1.5
+PORTVERSION=	4.1.6
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo
index 8a555505a9eb..c6203f9de516 100644
--- a/www/py-django-cms/distinfo
+++ b/www/py-django-cms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743842083
-SHA256 (django_cms-4.1.5.tar.gz) = 4efa64e1fd5293666d00cb58c982d598bb902aea1b0a943ef7bce6b82063e1e2
-SIZE (django_cms-4.1.5.tar.gz) = 5106765
+TIMESTAMP = 1746605285
+SHA256 (django_cms-4.1.6.tar.gz) = fdba4b4468c32937151ff91eea71d8067e352ddddcecbdac2724cd5d9c31920f
+SIZE (django_cms-4.1.6.tar.gz) = 5107485
diff --git a/www/py-django51/Makefile b/www/py-django51/Makefile
index d86e9bed2c52..6260bf9335a7 100644
--- a/www/py-django51/Makefile
+++ b/www/py-django51/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django
 PORTVERSION=	5.1.8
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
@@ -8,6 +9,9 @@ PKGNAMESUFFIX=	51
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
+PATCH_SITES=	https://github.com/django/django/commit/
+PATCHFILES+=	8b9a2bf34e132ccf0ab0a074440dc55f90c76598.patch:-p1
+
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	High-level Python Web Framework
 WWW=		https://www.djangoproject.com/
diff --git a/www/py-django51/distinfo b/www/py-django51/distinfo
index 51f86d55e443..8f4a338c7a4f 100644
--- a/www/py-django51/distinfo
+++ b/www/py-django51/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1743684756
+TIMESTAMP = 1746511986
 SHA256 (python/Django-5.1.8.tar.gz) = 42e92a1dd2810072bcc40a39a212b693f94406d0ba0749e68eb642f31dc770b4
 SIZE (python/Django-5.1.8.tar.gz) = 10723602
+SHA256 (python/8b9a2bf34e132ccf0ab0a074440dc55f90c76598.patch) = cb9cde01b6ba13ceaba6de3d9315832b7a4ee4d3bf3d38028ef9169e99310495
+SIZE (python/8b9a2bf34e132ccf0ab0a074440dc55f90c76598.patch) = 1803
diff --git a/www/py-drf-writable-nested/Makefile b/www/py-drf-writable-nested/Makefile
index de437b998948..d408c000be02 100644
--- a/www/py-drf-writable-nested/Makefile
+++ b/www/py-drf-writable-nested/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	drf-writable-nested
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.7.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-drf-writable-nested/distinfo b/www/py-drf-writable-nested/distinfo
index 8a07b5235cd9..b59f9d3f6afc 100644
--- a/www/py-drf-writable-nested/distinfo
+++ b/www/py-drf-writable-nested/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730641673
-SHA256 (beda-software-drf-writable-nested-v0.7.1_GH0.tar.gz) = 8932686472ae67fb42c856ebc40801d46bd75569f15b4354ad83d1f7ca29ee78
-SIZE (beda-software-drf-writable-nested-v0.7.1_GH0.tar.gz) = 21158
+TIMESTAMP = 1746349512
+SHA256 (beda-software-drf-writable-nested-v0.7.2_GH0.tar.gz) = f5553adbda96d3b604b8f9533ff21fa2e9cadb8fc538bac01c495752314b4bdb
+SIZE (beda-software-drf-writable-nested-v0.7.2_GH0.tar.gz) = 21229
diff --git a/www/py-granian/Makefile b/www/py-granian/Makefile
new file mode 100644
index 000000000000..1619385b08c3
--- /dev/null
+++ b/www/py-granian/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	granian
+PORTVERSION=	2.2.5
+CATEGORIES=	www python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+# Workaround to use both the PyPI tarball and the cargo crates.
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Rust HTTP server for Python applications
+WWW=		https://github.com/emmett-framework/granian
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}maturin>=1.7<2.0:devel/py-maturin@${PY_FLAVOR}
+
+USES=		cargo python
+USE_PYTHON=	autoplist concurrent pep517
+
+CARGO_BUILD=	no
+CARGO_INSTALL=	no
+
+.include <bsd.port.mk>
diff --git a/www/py-granian/Makefile.crates b/www/py-granian/Makefile.crates
new file mode 100644
index 000000000000..2926e865f188
--- /dev/null
+++ b/www/py-granian/Makefile.crates
@@ -0,0 +1,157 @@
+CARGO_CRATES=	addr2line-0.24.2 \
+		adler2-2.0.0 \
+		aes-0.8.4 \
+		anyhow-1.0.97 \
+		arc-swap-1.7.1 \
+		atomic-waker-1.1.2 \
+		autocfg-1.4.0 \
+		backtrace-0.3.74 \
+		base64-0.22.1 \
+		base64ct-1.7.3 \
+		bitflags-2.9.0 \
+		block-buffer-0.10.4 \
+		block-padding-0.3.3 \
+		bus-2.4.1 \
+		bytes-1.10.1 \
+		cbc-0.1.2 \
+		cc-1.2.19 \
+		cfg-if-1.0.0 \
+		cipher-0.4.4 \
+		const-oid-0.9.6 \
+		cpufeatures-0.2.17 \
+		crossbeam-channel-0.5.15 \
+		crossbeam-utils-0.8.21 \
+		crypto-common-0.1.6 \
+		data-encoding-2.8.0 \
+		der-0.7.9 \
+		digest-0.10.7 \
+		either-1.15.0 \
+		equivalent-1.0.2 \
+		fnv-1.0.7 \
+		futures-0.3.31 \
+		futures-channel-0.3.31 \
+		futures-core-0.3.31 \
+		futures-executor-0.3.31 \
+		futures-io-0.3.31 \
+		futures-macro-0.3.31 \
+		futures-sink-0.3.31 \
+		futures-task-0.3.31 \
+		futures-util-0.3.31 \
+		generic-array-0.14.7 \
+		getrandom-0.2.15 \
+		getrandom-0.3.2 \
+		gimli-0.31.1 \
+		h2-0.4.8 \
+		hashbrown-0.14.5 \
+		hashbrown-0.15.2 \
+		heck-0.5.0 \
+		hermit-abi-0.3.9 \
+		hmac-0.12.1 \
+		http-1.3.1 \
+		http-body-1.0.1 \
+		http-body-util-0.1.3 \
+		httparse-1.10.1 \
+		httpdate-1.0.3 \
+		hyper-1.6.0 \
+		hyper-util-0.1.11 \
+		indexmap-2.9.0 \
+		indoc-2.0.6 \
+		inout-0.1.4 \
+		itertools-0.14.0 \
+		itoa-1.0.15 \
+		libc-0.2.171 \
+		libmimalloc-sys-0.1.42 \
+		lock_api-0.4.12 \
+		log-0.4.27 \
+		memchr-2.7.4 \
+		memoffset-0.9.1 \
+		mimalloc-0.1.46 \
+		miniz_oxide-0.8.8 \
+		mio-1.0.3 \
+		num_cpus-1.16.0 \
+		object-0.36.7 \
+		once_cell-1.21.3 \
+		parking_lot-0.12.3 \
+		parking_lot_core-0.9.10 \
+		pbkdf2-0.12.2 \
+		pem-3.0.5 \
+		percent-encoding-2.3.1 \
+		pin-project-lite-0.2.16 \
+		pin-utils-0.1.0 \
+		pkcs5-0.7.1 \
+		pkcs8-0.10.2 \
+		portable-atomic-1.11.0 \
+		ppv-lite86-0.2.21 \
+		proc-macro2-1.0.94 \
+		pyo3-0.24.1 \
+		pyo3-build-config-0.24.1 \
+		pyo3-ffi-0.24.1 \
+		pyo3-log-0.12.3 \
+		pyo3-macros-0.24.1 \
+		pyo3-macros-backend-0.24.1 \
+		python3-dll-a-0.2.13 \
+		quote-1.0.40 \
+		r-efi-5.2.0 \
+		rand-0.9.0 \
+		rand_chacha-0.9.0 \
+		rand_core-0.6.4 \
+		rand_core-0.9.3 \
+		redox_syscall-0.5.11 \
+		ring-0.17.14 \
+		rustc-demangle-0.1.24 \
+		rustls-0.23.26 \
+		rustls-pemfile-2.2.0 \
+		rustls-pki-types-1.11.0 \
+		rustls-webpki-0.103.1 \
+		salsa20-0.10.2 \
+		scopeguard-1.2.0 \
+		scrypt-0.11.0 \
+		serde-1.0.219 \
+		serde_derive-1.0.219 \
+		sha1-0.10.6 \
+		sha2-0.10.8 \
+		shlex-1.3.0 \
+		signal-hook-registry-1.4.2 \
+		slab-0.4.9 \
+		smallvec-1.15.0 \
+		socket2-0.5.8 \
+		spki-0.7.3 \
+		subtle-2.6.1 \
+		syn-2.0.100 \
+		target-lexicon-0.13.2 \
+		thiserror-2.0.12 \
+		thiserror-impl-2.0.12 \
+		tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7 \
+		tikv-jemallocator-0.6.0 \
+		tls-listener-0.11.0 \
+		tokio-1.44.2 \
+		tokio-macros-2.5.0 \
+		tokio-rustls-0.26.2 \
+		tokio-stream-0.1.17 \
+		tokio-tungstenite-0.26.2 \
+		tokio-util-0.7.14 \
+		tracing-0.1.41 \
+		tracing-core-0.1.33 \
+		tungstenite-0.26.2 \
+		typenum-1.18.0 \
+		unicode-ident-1.0.18 \
+		unindent-0.2.4 \
+		untrusted-0.9.0 \
+		utf-8-0.7.6 \
+		version_check-0.9.5 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasi-0.14.2+wasi-0.2.4 \
+		windows-sys-0.52.0 \
+		windows-targets-0.52.6 \
+		windows_aarch64_gnullvm-0.52.6 \
+		windows_aarch64_msvc-0.52.6 \
+		windows_i686_gnu-0.52.6 \
+		windows_i686_gnullvm-0.52.6 \
+		windows_i686_msvc-0.52.6 \
+		windows_x86_64_gnu-0.52.6 \
+		windows_x86_64_gnullvm-0.52.6 \
+		windows_x86_64_msvc-0.52.6 \
+		wit-bindgen-rt-0.39.0 \
+		zerocopy-0.8.24 \
+		zerocopy-derive-0.8.24 \
+		zeroize-1.8.1
diff --git a/www/py-granian/distinfo b/www/py-granian/distinfo
new file mode 100644
index 000000000000..4ee79ceceed6
--- /dev/null
+++ b/www/py-granian/distinfo
@@ -0,0 +1,317 @@
+TIMESTAMP = 1746353302
+SHA256 (granian-2.2.5.tar.gz) = 90b832270b6b03a41b1706051113a3ffcca307860d5c864dc1f47ea290fc4b58
+SIZE (granian-2.2.5.tar.gz) = 94178
+SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
+SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
+SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
+SIZE (rust/crates/adler2-2.0.0.crate) = 13529
+SHA256 (rust/crates/aes-0.8.4.crate) = b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0
+SIZE (rust/crates/aes-0.8.4.crate) = 124812
+SHA256 (rust/crates/anyhow-1.0.97.crate) = dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f
+SIZE (rust/crates/anyhow-1.0.97.crate) = 52221
+SHA256 (rust/crates/arc-swap-1.7.1.crate) = 69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457
+SIZE (rust/crates/arc-swap-1.7.1.crate) = 68512
+SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0
+SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
+SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
+SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
+SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
+SIZE (rust/crates/backtrace-0.3.74.crate) = 88516
+SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
+SIZE (rust/crates/base64-0.22.1.crate) = 81597
+SHA256 (rust/crates/base64ct-1.7.3.crate) = 89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3
+SIZE (rust/crates/base64ct-1.7.3.crate) = 31175
+SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd
+SIZE (rust/crates/bitflags-2.9.0.crate) = 47654
+SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
+SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/block-padding-0.3.3.crate) = a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93
+SIZE (rust/crates/block-padding-0.3.3.crate) = 8504
+SHA256 (rust/crates/bus-2.4.1.crate) = 4b7118d0221d84fada881b657c2ddb7cd55108db79c8764c9ee212c0c259b783
+SIZE (rust/crates/bus-2.4.1.crate) = 19397
+SHA256 (rust/crates/bytes-1.10.1.crate) = d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a
+SIZE (rust/crates/bytes-1.10.1.crate) = 76779
+SHA256 (rust/crates/cbc-0.1.2.crate) = 26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6
+SIZE (rust/crates/cbc-0.1.2.crate) = 23501
+SHA256 (rust/crates/cc-1.2.19.crate) = 8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362
+SIZE (rust/crates/cc-1.2.19.crate) = 105910
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad
+SIZE (rust/crates/cipher-0.4.4.crate) = 19073
+SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8
+SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
+SHA256 (rust/crates/cpufeatures-0.2.17.crate) = 59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280
+SIZE (rust/crates/cpufeatures-0.2.17.crate) = 13466
+SHA256 (rust/crates/crossbeam-channel-0.5.15.crate) = 82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2
+SIZE (rust/crates/crossbeam-channel-0.5.15.crate) = 92716
+SHA256 (rust/crates/crossbeam-utils-0.8.21.crate) = d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28
+SIZE (rust/crates/crossbeam-utils-0.8.21.crate) = 42691
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/data-encoding-2.8.0.crate) = 575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010
+SIZE (rust/crates/data-encoding-2.8.0.crate) = 21394
+SHA256 (rust/crates/der-0.7.9.crate) = f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0
+SIZE (rust/crates/der-0.7.9.crate) = 85173
+SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
+SIZE (rust/crates/digest-0.10.7.crate) = 19557
+SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719
+SIZE (rust/crates/either-1.15.0.crate) = 20114
+SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
+SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/futures-0.3.31.crate) = 65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876
+SIZE (rust/crates/futures-0.3.31.crate) = 54953
+SHA256 (rust/crates/futures-channel-0.3.31.crate) = 2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10
+SIZE (rust/crates/futures-channel-0.3.31.crate) = 31971
+SHA256 (rust/crates/futures-core-0.3.31.crate) = 05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e
+SIZE (rust/crates/futures-core-0.3.31.crate) = 14318
+SHA256 (rust/crates/futures-executor-0.3.31.crate) = 1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f
+SIZE (rust/crates/futures-executor-0.3.31.crate) = 17965
+SHA256 (rust/crates/futures-io-0.3.31.crate) = 9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6
+SIZE (rust/crates/futures-io-0.3.31.crate) = 9047
+SHA256 (rust/crates/futures-macro-0.3.31.crate) = 162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650
+SIZE (rust/crates/futures-macro-0.3.31.crate) = 11341
+SHA256 (rust/crates/futures-sink-0.3.31.crate) = e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7
+SIZE (rust/crates/futures-sink-0.3.31.crate) = 7958
+SHA256 (rust/crates/futures-task-0.3.31.crate) = f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988
+SIZE (rust/crates/futures-task-0.3.31.crate) = 11217
+SHA256 (rust/crates/futures-util-0.3.31.crate) = 9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81
+SIZE (rust/crates/futures-util-0.3.31.crate) = 162124
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
+SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
+SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0
+SIZE (rust/crates/getrandom-0.3.2.crate) = 49140
+SHA256 (rust/crates/gimli-0.31.1.crate) = 07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f
+SIZE (rust/crates/gimli-0.31.1.crate) = 279515
+SHA256 (rust/crates/h2-0.4.8.crate) = 5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2
+SIZE (rust/crates/h2-0.4.8.crate) = 174535
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
+SHA256 (rust/crates/hashbrown-0.15.2.crate) = bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289
+SIZE (rust/crates/hashbrown-0.15.2.crate) = 138478
+SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
+SIZE (rust/crates/heck-0.5.0.crate) = 11517
+SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
+SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/http-1.3.1.crate) = f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565
+SIZE (rust/crates/http-1.3.1.crate) = 106063
+SHA256 (rust/crates/http-body-1.0.1.crate) = 1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184
+SIZE (rust/crates/http-body-1.0.1.crate) = 6125
+SHA256 (rust/crates/http-body-util-0.1.3.crate) = b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a
+SIZE (rust/crates/http-body-util-0.1.3.crate) = 16975
+SHA256 (rust/crates/httparse-1.10.1.crate) = 6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87
+SIZE (rust/crates/httparse-1.10.1.crate) = 45190
+SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
+SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
+SHA256 (rust/crates/hyper-1.6.0.crate) = cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80
+SIZE (rust/crates/hyper-1.6.0.crate) = 153923
+SHA256 (rust/crates/hyper-util-0.1.11.crate) = 497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2
+SIZE (rust/crates/hyper-util-0.1.11.crate) = 75973
+SHA256 (rust/crates/indexmap-2.9.0.crate) = cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e
+SIZE (rust/crates/indexmap-2.9.0.crate) = 91214
+SHA256 (rust/crates/indoc-2.0.6.crate) = f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd
+SIZE (rust/crates/indoc-2.0.6.crate) = 17164
+SHA256 (rust/crates/inout-0.1.4.crate) = 879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01
+SIZE (rust/crates/inout-0.1.4.crate) = 11280
+SHA256 (rust/crates/itertools-0.14.0.crate) = 2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285
+SIZE (rust/crates/itertools-0.14.0.crate) = 152715
+SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
+SIZE (rust/crates/itoa-1.0.15.crate) = 11231
+SHA256 (rust/crates/libc-0.2.171.crate) = c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6
+SIZE (rust/crates/libc-0.2.171.crate) = 785246
+SHA256 (rust/crates/libmimalloc-sys-0.1.42.crate) = ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4
+SIZE (rust/crates/libmimalloc-sys-0.1.42.crate) = 224614
+SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
+SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
+SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
+SIZE (rust/crates/log-0.4.27.crate) = 48120
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
+SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a
+SIZE (rust/crates/memoffset-0.9.1.crate) = 9032
+SHA256 (rust/crates/mimalloc-0.1.46.crate) = 995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af
+SIZE (rust/crates/mimalloc-0.1.46.crate) = 4601
+SHA256 (rust/crates/miniz_oxide-0.8.8.crate) = 3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a
+SIZE (rust/crates/miniz_oxide-0.8.8.crate) = 67065
+SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
+SIZE (rust/crates/mio-1.0.3.crate) = 103703
+SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
+SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
+SHA256 (rust/crates/object-0.36.7.crate) = 62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87
+SIZE (rust/crates/object-0.36.7.crate) = 329938
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
+SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
+SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
+SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
+SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
+SHA256 (rust/crates/pbkdf2-0.12.2.crate) = f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2
+SIZE (rust/crates/pbkdf2-0.12.2.crate) = 13906
+SHA256 (rust/crates/pem-3.0.5.crate) = 38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3
+SIZE (rust/crates/pem-3.0.5.crate) = 18140
+SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
+SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/pin-project-lite-0.2.16.crate) = 3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b
+SIZE (rust/crates/pin-project-lite-0.2.16.crate) = 30504
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkcs5-0.7.1.crate) = e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6
+SIZE (rust/crates/pkcs5-0.7.1.crate) = 41902
+SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7
+SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360
+SHA256 (rust/crates/portable-atomic-1.11.0.crate) = 350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e
+SIZE (rust/crates/portable-atomic-1.11.0.crate) = 181258
+SHA256 (rust/crates/ppv-lite86-0.2.21.crate) = 85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9
+SIZE (rust/crates/ppv-lite86-0.2.21.crate) = 22522
+SHA256 (rust/crates/proc-macro2-1.0.94.crate) = a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84
+SIZE (rust/crates/proc-macro2-1.0.94.crate) = 52391
+SHA256 (rust/crates/pyo3-0.24.1.crate) = 17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229
+SIZE (rust/crates/pyo3-0.24.1.crate) = 1113050
+SHA256 (rust/crates/pyo3-build-config-0.24.1.crate) = e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1
+SIZE (rust/crates/pyo3-build-config-0.24.1.crate) = 34020
+SHA256 (rust/crates/pyo3-ffi-0.24.1.crate) = 05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc
+SIZE (rust/crates/pyo3-ffi-0.24.1.crate) = 76435
+SHA256 (rust/crates/pyo3-log-0.12.3.crate) = 7079e412e909af5d6be7c04a7f29f6a2837a080410e1c529c9dee2c367383db4
+SIZE (rust/crates/pyo3-log-0.12.3.crate) = 16706
+SHA256 (rust/crates/pyo3-macros-0.24.1.crate) = 5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44
+SIZE (rust/crates/pyo3-macros-0.24.1.crate) = 8866
+SHA256 (rust/crates/pyo3-macros-backend-0.24.1.crate) = f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855
+SIZE (rust/crates/pyo3-macros-backend-0.24.1.crate) = 72588
+SHA256 (rust/crates/python3-dll-a-0.2.13.crate) = 49fe4227a288cf9493942ad0220ea3f185f4d1f2a14f197f7344d6d02f4ed4ed
+SIZE (rust/crates/python3-dll-a-0.2.13.crate) = 85018
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
+SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5
+SIZE (rust/crates/r-efi-5.2.0.crate) = 64764
+SHA256 (rust/crates/rand-0.9.0.crate) = 3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94
+SIZE (rust/crates/rand-0.9.0.crate) = 97798
+SHA256 (rust/crates/rand_chacha-0.9.0.crate) = d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb
+SIZE (rust/crates/rand_chacha-0.9.0.crate) = 18258
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rand_core-0.9.3.crate) = 99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38
+SIZE (rust/crates/rand_core-0.9.3.crate) = 24543
+SHA256 (rust/crates/redox_syscall-0.5.11.crate) = d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3
+SIZE (rust/crates/redox_syscall-0.5.11.crate) = 30300
+SHA256 (rust/crates/ring-0.17.14.crate) = a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7
+SIZE (rust/crates/ring-0.17.14.crate) = 1502610
+SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
+SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
+SHA256 (rust/crates/rustls-0.23.26.crate) = df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0
+SIZE (rust/crates/rustls-0.23.26.crate) = 347849
+SHA256 (rust/crates/rustls-pemfile-2.2.0.crate) = dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50
+SIZE (rust/crates/rustls-pemfile-2.2.0.crate) = 25849
+SHA256 (rust/crates/rustls-pki-types-1.11.0.crate) = 917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c
+SIZE (rust/crates/rustls-pki-types-1.11.0.crate) = 63933
+SHA256 (rust/crates/rustls-webpki-0.103.1.crate) = fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03
+SIZE (rust/crates/rustls-webpki-0.103.1.crate) = 820273
+SHA256 (rust/crates/salsa20-0.10.2.crate) = 97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213
+SIZE (rust/crates/salsa20-0.10.2.crate) = 12780
+SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
+SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
+SHA256 (rust/crates/scrypt-0.11.0.crate) = 0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f
+SIZE (rust/crates/scrypt-0.11.0.crate) = 13440
+SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
+SIZE (rust/crates/serde-1.0.219.crate) = 78983
+SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
+SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798
+SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
+SIZE (rust/crates/sha1-0.10.6.crate) = 13517
+SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
+SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
+SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
+SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
+SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
+SIZE (rust/crates/slab-0.4.9.crate) = 17108
+SHA256 (rust/crates/smallvec-1.15.0.crate) = 8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9
+SIZE (rust/crates/smallvec-1.15.0.crate) = 38113
+SHA256 (rust/crates/socket2-0.5.8.crate) = c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8
+SIZE (rust/crates/socket2-0.5.8.crate) = 56309
+SHA256 (rust/crates/spki-0.7.3.crate) = d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d
+SIZE (rust/crates/spki-0.7.3.crate) = 16409
+SHA256 (rust/crates/subtle-2.6.1.crate) = 13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292
+SIZE (rust/crates/subtle-2.6.1.crate) = 14562
+SHA256 (rust/crates/syn-2.0.100.crate) = b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0
+SIZE (rust/crates/syn-2.0.100.crate) = 297947
+SHA256 (rust/crates/target-lexicon-0.13.2.crate) = e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a
+SIZE (rust/crates/target-lexicon-0.13.2.crate) = 27923
+SHA256 (rust/crates/thiserror-2.0.12.crate) = 567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708
+SIZE (rust/crates/thiserror-2.0.12.crate) = 28693
+SHA256 (rust/crates/thiserror-impl-2.0.12.crate) = 7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d
+SIZE (rust/crates/thiserror-impl-2.0.12.crate) = 21141
+SHA256 (rust/crates/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate) = cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d
+SIZE (rust/crates/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate) = 897133
+SHA256 (rust/crates/tikv-jemallocator-0.6.0.crate) = 4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865
+SIZE (rust/crates/tikv-jemallocator-0.6.0.crate) = 13700
+SHA256 (rust/crates/tls-listener-0.11.0.crate) = ab41256c16d6fc2b3021545f20bf77a73200b18bd54040ac656dddfca6205bfa
+SIZE (rust/crates/tls-listener-0.11.0.crate) = 48235
+SHA256 (rust/crates/tokio-1.44.2.crate) = e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48
+SIZE (rust/crates/tokio-1.44.2.crate) = 841618
+SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
+SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
+SHA256 (rust/crates/tokio-rustls-0.26.2.crate) = 8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b
+SIZE (rust/crates/tokio-rustls-0.26.2.crate) = 31655
+SHA256 (rust/crates/tokio-stream-0.1.17.crate) = eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047
+SIZE (rust/crates/tokio-stream-0.1.17.crate) = 38477
+SHA256 (rust/crates/tokio-tungstenite-0.26.2.crate) = 7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084
+SIZE (rust/crates/tokio-tungstenite-0.26.2.crate) = 29868
+SHA256 (rust/crates/tokio-util-0.7.14.crate) = 6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034
+SIZE (rust/crates/tokio-util-0.7.14.crate) = 118861
+SHA256 (rust/crates/tracing-0.1.41.crate) = 784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0
+SIZE (rust/crates/tracing-0.1.41.crate) = 82448
+SHA256 (rust/crates/tracing-core-0.1.33.crate) = e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c
+SIZE (rust/crates/tracing-core-0.1.33.crate) = 63434
+SHA256 (rust/crates/tungstenite-0.26.2.crate) = 4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13
+SIZE (rust/crates/tungstenite-0.26.2.crate) = 65315
+SHA256 (rust/crates/typenum-1.18.0.crate) = 1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f
+SIZE (rust/crates/typenum-1.18.0.crate) = 74871
+SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
+SIZE (rust/crates/unicode-ident-1.0.18.crate) = 47743
+SHA256 (rust/crates/unindent-0.2.4.crate) = 7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3
+SIZE (rust/crates/unindent-0.2.4.crate) = 7422
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
+SHA256 (rust/crates/utf-8-0.7.6.crate) = 09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9
+SIZE (rust/crates/utf-8-0.7.6.crate) = 10422
+SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
+SIZE (rust/crates/version_check-0.9.5.crate) = 15554
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3
+SIZE (rust/crates/wasi-0.14.2+wasi-0.2.4.crate) = 140921
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
+SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
+SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
+SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
+SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
+SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
+SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
+SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
+SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
+SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
+SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1
+SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241
+SHA256 (rust/crates/zerocopy-0.8.24.crate) = 2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879
+SIZE (rust/crates/zerocopy-0.8.24.crate) = 243777
+SHA256 (rust/crates/zerocopy-derive-0.8.24.crate) = a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be
+SIZE (rust/crates/zerocopy-derive-0.8.24.crate) = 86487
+SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
+SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
diff --git a/www/py-granian/pkg-descr b/www/py-granian/pkg-descr
new file mode 100644
index 000000000000..71ac5818d9e7
--- /dev/null
+++ b/www/py-granian/pkg-descr
@@ -0,0 +1,8 @@
+A Rust HTTP server for Python applications built on top of the
+Hyper crate.
+
+Features:
+- Supports ASGI/3, RSGI and WSGI interface applications
+- Implements HTTP/1 and HTTP/2 protocols
+- Supports HTTPS
+- Supports Websockets
diff --git a/www/py-streamlit/Makefile b/www/py-streamlit/Makefile
index 9ee2ef0bdf71..3a3196b8dd33 100644
--- a/www/py-streamlit/Makefile
+++ b/www/py-streamlit/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	streamlit
-DISTVERSION=	1.44.1
+DISTVERSION=	1.45.0
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-streamlit/distinfo b/www/py-streamlit/distinfo
index 877f7f8b5edb..e431066c4866 100644
--- a/www/py-streamlit/distinfo
+++ b/www/py-streamlit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745740975
-SHA256 (streamlit-1.44.1.tar.gz) = c6914ed6d5b76870b461510476806db370f36425ae0e6654d227c988288198d3
-SIZE (streamlit-1.44.1.tar.gz) = 9423685
+TIMESTAMP = 1746443599
+SHA256 (streamlit-1.45.0.tar.gz) = 4e99014e113a11a7163b9da5ac079efb1ae5f8575a09c5a6a9c43cd6877a2a88
+SIZE (streamlit-1.45.0.tar.gz) = 9462166
diff --git a/www/rt44/Makefile b/www/rt44/Makefile
index ec221fd93008..3e9f55f6988a 100644
--- a/www/rt44/Makefile
+++ b/www/rt44/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	rt
-DISTVERSION=	4.4.7
-PORTREVISION=	1
+DISTVERSION=	4.4.8
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	44
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Industrial-grade ticketing system written in Perl
 WWW=		https://www.bestpractical.com/rt/
 
diff --git a/www/rt44/distinfo b/www/rt44/distinfo
index 8480f7f2f596..bbb903bfb94b 100644
--- a/www/rt44/distinfo
+++ b/www/rt44/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697794413
-SHA256 (rt-4.4.7.tar.gz) = 47af1651d5df3f25b6374ff6c1da71c66202d61919d9431c17259fa3df69ae59
-SIZE (rt-4.4.7.tar.gz) = 10858315
+TIMESTAMP = 1746433524
+SHA256 (rt-4.4.8.tar.gz) = b5ea3d861549f18ae144caacb37b2f1d7c231c18c0352fe657095e32af48ab4a
+SIZE (rt-4.4.8.tar.gz) = 10873419
diff --git a/www/rt50/Makefile b/www/rt50/Makefile
index 07d13e4b5ad7..91d6a414754b 100644
--- a/www/rt50/Makefile
+++ b/www/rt50/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rt
-DISTVERSION=	5.0.7
+DISTVERSION=	5.0.8
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	50
diff --git a/www/rt50/distinfo b/www/rt50/distinfo
index 580586fb9d1e..bb9328af857d 100644
--- a/www/rt50/distinfo
+++ b/www/rt50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718092458
-SHA256 (rt-5.0.7.tar.gz) = 1a1a4838979f08c58e67642686e4fd980e1f4ee98e144ff8a56f870f37162cce
-SIZE (rt-5.0.7.tar.gz) = 19782235
+TIMESTAMP = 1746430716
+SHA256 (rt-5.0.8.tar.gz) = 0a12419c6111c37384e912432cec872109d528657079e363bbe4ddf613e42286
+SIZE (rt-5.0.8.tar.gz) = 20268018
diff --git a/www/rt50/files/patch-Makefile.in b/www/rt50/files/patch-Makefile.in
index d91ce6a1a0ec..fc8be23134bc 100644
--- a/www/rt50/files/patch-Makefile.in
+++ b/www/rt50/files/patch-Makefile.in
@@ -1,6 +1,6 @@
 --- Makefile.in.orig	2020-07-14 20:59:31.000000000 +0200
 +++ Makefile.in	2020-07-17 09:19:21.008884000 +0200
-@@ -59,7 +59,7 @@ RT_LAYOUT		=	@rt_layout_name@
+@@ -59,7 +59,7 @@ CONFIG_FILE		=	$(CONFIG_FILE_PATH)/RT_Config.pm
  
  CONFIG_FILE_PATH	=	@CONFIG_FILE_PATH_R@
  CONFIG_FILE		=	$(CONFIG_FILE_PATH)/RT_Config.pm
@@ -9,16 +9,7 @@
  
  
  RT_VERSION_MAJOR	=	@RT_VERSION_MAJOR@
-@@ -106,7 +106,7 @@ RT_FONT_PATH		=	@RT_FONT_PATH_R@
- RT_LEXICON_PATH		=	@RT_LEXICON_PATH_R@
- RT_STATIC_PATH		=	@RT_STATIC_PATH_R@
- RT_LOCAL_PATH		=	@RT_LOCAL_PATH_R@
--LOCAL_PLUGIN_PATH	=	@RT_LOCAL_PATH_R@/plugins
-+LOCAL_PLUGIN_PATH	=	@RT_LOCAL_PATH_R@/share/rt50/plugins
- LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH_R@
- LOCAL_LIB_PATH		=	@LOCAL_LIB_PATH_R@
- LOCAL_LEXICON_PATH	=	@LOCAL_LEXICON_PATH_R@
-@@ -275,16 +275,13 @@ testdeps:
+@@ -279,16 +279,13 @@ fixdeps:
  depends: fixdeps
  
  fixdeps:
@@ -36,7 +27,7 @@
  
  
  	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
-@@ -306,12 +303,6 @@ fixperms:
+@@ -310,12 +307,6 @@ fixperms:
  	# Make the system binaries executable also
  	cd $(DESTDIR)$(RT_SBIN_PATH) && ( chmod 0755 $(SYSTEM_BINARIES) ; chown $(BIN_OWNER) $(SYSTEM_BINARIES);  chgrp $(RTGROUP) $(SYSTEM_BINARIES))
  
@@ -49,7 +40,7 @@
  	# Make the web ui readable by all. 
  	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)$(MASON_HTML_PATH) \
  					$(DESTDIR)$(MASON_LOCAL_HTML_PATH) \
-@@ -363,14 +354,14 @@ clean-mason-cache:
+@@ -367,14 +358,14 @@ clean-mason-cache:
  	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/etc/*
  	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/obj/*
  
@@ -64,11 +55,11 @@
 -@COMMENT_INPLACE_LAYOUT@	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 -o $(BIN_OWNER) -g $(RTGROUP) etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE) 
 +@COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -d $(DESTDIR)$(CONFIG_FILE_PATH)
 +@COMMENT_INPLACE_LAYOUT@	-$(INSTALL) -m 0440 etc/RT_Config.pm $(DESTDIR)$(CONFIG_FILE)
-+@COMMENT_INPLACE_LAYOUT@	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE) 
++@COMMENT_INPLACE_LAYOUT@	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE)
  @COMMENT_INPLACE_LAYOUT@	@echo "Installed configuration. About to install RT in  $(RT_PATH)"
  
  test: 
-@@ -462,19 +453,12 @@ etc-install:
+@@ -466,19 +457,12 @@ etc-install:
  @COMMENT_INPLACE_LAYOUT@	for file in $(ETC_FILES) ; do \
  @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
  @COMMENT_INPLACE_LAYOUT@	done
@@ -89,7 +80,7 @@
  @COMMENT_INPLACE_LAYOUT@	done
  
  
-@@ -482,7 +466,7 @@ sbin-install:
+@@ -486,7 +470,7 @@ bin-install:
  bin-install:
  @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_BIN_PATH)
  @COMMENT_INPLACE_LAYOUT@	for file in $(BINARIES) ; do \
diff --git a/www/rt50/pkg-plist b/www/rt50/pkg-plist
index 0726ef838b77..e2e9d5725a1e 100644
--- a/www/rt50/pkg-plist
+++ b/www/rt50/pkg-plist
@@ -2,6 +2,7 @@
 bin/rt
 bin/rt-crontool
 bin/rt-mailgate
+bin/rt-run-scheduled-processes
 @dir(root,rt,0750) %%RT_ETC_DIR%%
 @dir(root,rt,0750) %%RT_ETC_DIR%%/RT_SiteConfig.d
 @mode 0440
@@ -32,6 +33,7 @@ bin/rt-mailgate
 %%SITE_PERL%%/RT/Action/CreateTickets.pm
 %%SITE_PERL%%/RT/Action/EscalatePriority.pm
 %%SITE_PERL%%/RT/Action/ExtractSubjectTag.pm
+%%SITE_PERL%%/RT/Action/Forward.pm
 %%SITE_PERL%%/RT/Action/LinearEscalate.pm
 %%SITE_PERL%%/RT/Action/Notify.pm
 %%SITE_PERL%%/RT/Action/NotifyAsComment.pm
@@ -168,6 +170,7 @@ bin/rt-mailgate
 %%SITE_PERL%%/RT/Interface/Web/Request.pm
 %%SITE_PERL%%/RT/Interface/Web/Scrubber.pm
 %%SITE_PERL%%/RT/Interface/Web/Scrubber/Permissive.pm
+%%SITE_PERL%%/RT/Interface/Web/Scrubber/Restrictive.pm
 %%SITE_PERL%%/RT/Interface/Web/Session.pm
 %%SITE_PERL%%/RT/LDAPImport.pm
 %%SITE_PERL%%/RT/Lifecycle.pm
@@ -310,15 +313,19 @@ bin/rt-mailgate
 %%SITE_PERL%%/RT/Shredder/Exceptions.pm
 %%SITE_PERL%%/RT/Shredder/POD.pm
 %%SITE_PERL%%/RT/Shredder/Plugin.pm
+%%SITE_PERL%%/RT/Shredder/Plugin/Assets.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Attachments.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Base.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Base/Dump.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Base/Search.pm
+%%SITE_PERL%%/RT/Shredder/Plugin/ExternalStorageDump.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Objects.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/SQLDump.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Summary.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Tickets.pm
+%%SITE_PERL%%/RT/Shredder/Plugin/Transactions.pm
 %%SITE_PERL%%/RT/Shredder/Plugin/Users.pm
+%%SITE_PERL%%/RT/Shredder/RawRecord.pm
 %%SITE_PERL%%/RT/Squish.pm
 %%SITE_PERL%%/RT/Squish/CSS.pm
 %%SITE_PERL%%/RT/Squish/JS.pm
@@ -333,6 +340,7 @@ bin/rt-mailgate
 %%SITE_PERL%%/RT/Test/Crypt.pm
 %%SITE_PERL%%/RT/Test/Email.pm
 %%SITE_PERL%%/RT/Test/ExternalStorage.pm
+%%SITE_PERL%%/RT/Test/FTS.pm
 %%SITE_PERL%%/RT/Test/GnuPG.pm
 %%SITE_PERL%%/RT/Test/REST2.pm
 %%SITE_PERL%%/RT/Test/SMIME.pm
@@ -431,6 +439,7 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/images/action-decline.png
 %%PORTDOCS%%%%DOCSDIR%%/images/added-terms.png
 %%PORTDOCS%%%%DOCSDIR%%/images/advanced-search.png
+%%PORTDOCS%%%%DOCSDIR%%/images/approvals.png
 %%PORTDOCS%%%%DOCSDIR%%/images/asset-cfs.png
 %%PORTDOCS%%%%DOCSDIR%%/images/asset-date-details.png
 %%PORTDOCS%%%%DOCSDIR%%/images/asset-search.png
@@ -474,6 +483,9 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/images/quote-selection-highlighted.png
 %%PORTDOCS%%%%DOCSDIR%%/images/quote-selection-ticket-update.png
 %%PORTDOCS%%%%DOCSDIR%%/images/saved-dashboard.png
+%%PORTDOCS%%%%DOCSDIR%%/images/scheduled-process-create.png
+%%PORTDOCS%%%%DOCSDIR%%/images/scheduled-process-schedule.png
+%%PORTDOCS%%%%DOCSDIR%%/images/scheduled-processes.png
 %%PORTDOCS%%%%DOCSDIR%%/images/screenshot.png
 %%PORTDOCS%%%%DOCSDIR%%/images/search-arrows.png
 %%PORTDOCS%%%%DOCSDIR%%/images/search-criteria.png
@@ -483,6 +495,8 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/images/subscriptions.png
 %%PORTDOCS%%%%DOCSDIR%%/images/support-dashboard.png
 %%PORTDOCS%%%%DOCSDIR%%/images/theme_editor_defaults.png
+%%PORTDOCS%%%%DOCSDIR%%/images/unread-messages-column.png
+%%PORTDOCS%%%%DOCSDIR%%/images/unread-notification.png
 %%PORTDOCS%%%%DOCSDIR%%/images/user-time-worked-report.png
 %%PORTDOCS%%%%DOCSDIR%%/images/with-created-before.png
 %%PORTDOCS%%%%DOCSDIR%%/images/with-newline.png
@@ -503,6 +517,7 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/system_administration/database.pod
 %%PORTDOCS%%%%DOCSDIR%%/ticket_metadata.pod
 %%PORTDOCS%%%%DOCSDIR%%/tracking-rt-configuration.pod
+%%PORTDOCS%%%%DOCSDIR%%/unread_messages.pod
 %%DOCSDIR%%/upgrade/3.1.0/acl.Oracle
 %%DOCSDIR%%/upgrade/3.1.0/acl.Pg
 %%DOCSDIR%%/upgrade/3.1.0/acl.SQLite
@@ -757,6 +772,10 @@ sbin/standalone_httpd
 %%DOCSDIR%%/upgrade/5.0.5/schema.SQLite
 %%DOCSDIR%%/upgrade/5.0.5/schema.mysql
 %%DOCSDIR%%/upgrade/5.0.6/indexes
+%%DOCSDIR%%/upgrade/5.0.8/indexes
+%%DOCSDIR%%/upgrade/5.0.8/schema.Oracle
+%%DOCSDIR%%/upgrade/5.0.8/schema.Pg
+%%DOCSDIR%%/upgrade/5.0.8/schema.mysql
 %%DOCSDIR%%/upgrade/generate-rtaddressregexp
 %%DOCSDIR%%/upgrade/reset-sequences
 %%DOCSDIR%%/upgrade/sanity-check-stylesheets
@@ -795,6 +814,7 @@ sbin/standalone_httpd
 %%DATADIR%%/html/Admin/Articles/index.html
 %%DATADIR%%/html/Admin/Assets/Catalogs/Create.html
 %%DATADIR%%/html/Admin/Assets/Catalogs/CustomFields.html
+%%DATADIR%%/html/Admin/Assets/Catalogs/CustomRoles.html
 %%DATADIR%%/html/Admin/Assets/Catalogs/DefaultValues.html
 %%DATADIR%%/html/Admin/Assets/Catalogs/Elements/EditBasics
 %%DATADIR%%/html/Admin/Assets/Catalogs/GroupRights.html
@@ -871,6 +891,7 @@ sbin/standalone_httpd
 %%DATADIR%%/html/Admin/Global/DashboardsInMenu.html
 %%DATADIR%%/html/Admin/Global/GroupRights.html
 %%DATADIR%%/html/Admin/Global/MyRT.html
+%%DATADIR%%/html/Admin/Global/RightsHistory.html
 %%DATADIR%%/html/Admin/Global/Scrips.html
 %%DATADIR%%/html/Admin/Global/SelfServiceHomePage.html
 %%DATADIR%%/html/Admin/Global/Template.html
@@ -927,6 +948,10 @@ sbin/standalone_httpd
 %%DATADIR%%/html/Admin/Tools/GnuPG.html
 %%DATADIR%%/html/Admin/Tools/Queries.html
 %%DATADIR%%/html/Admin/Tools/RightsInspector.html
+%%DATADIR%%/html/Admin/Tools/ScheduledProcesses/Create.html
+%%DATADIR%%/html/Admin/Tools/ScheduledProcesses/Elements/ScheduledProcess
+%%DATADIR%%/html/Admin/Tools/ScheduledProcesses/Modify.html
+%%DATADIR%%/html/Admin/Tools/ScheduledProcesses/index.html
 %%DATADIR%%/html/Admin/Tools/Shortener.html
 %%DATADIR%%/html/Admin/Tools/Shredder/Dumps/dhandler
 %%DATADIR%%/html/Admin/Tools/Shredder/Elements/DumpFileLink
@@ -980,7 +1005,6 @@ sbin/standalone_httpd
 %%DATADIR%%/html/Articles/Article/ExtractIntoClass.html
 %%DATADIR%%/html/Articles/Article/ExtractIntoTopic.html
 %%DATADIR%%/html/Articles/Article/History.html
-%%DATADIR%%/html/Articles/Article/PreCreate.html
 %%DATADIR%%/html/Articles/Article/Search.html
 %%DATADIR%%/html/Articles/Elements/BeforeMessageBox
 %%DATADIR%%/html/Articles/Elements/CheckSkipCreate
@@ -998,7 +1022,6 @@ sbin/standalone_httpd
 %%DATADIR%%/html/Articles/Elements/ShowTopicLink
 %%DATADIR%%/html/Articles/Elements/SubjectOverride
 %%DATADIR%%/html/Articles/Elements/UpdatedArticles
-%%DATADIR%%/html/Articles/Helpers/CreateInClass
 %%DATADIR%%/html/Articles/Topics.html
 %%DATADIR%%/html/Articles/index.html
 %%DATADIR%%/html/Asset/Create.html
@@ -1066,6 +1089,10 @@ sbin/standalone_httpd
 %%DATADIR%%/html/Elements/BulkCustomFields
 %%DATADIR%%/html/Elements/BulkLinks
 %%DATADIR%%/html/Elements/CSRF
+%%DATADIR%%/html/Elements/CatalogList
+%%DATADIR%%/html/Elements/CatalogListAllStatuses
+%%DATADIR%%/html/Elements/CatalogSummaryByLifecycle
+%%DATADIR%%/html/Elements/CatalogSummaryByStatus
 %%DATADIR%%/html/Elements/Checkbox
 %%DATADIR%%/html/Elements/CollectionAsTable/Header
 %%DATADIR%%/html/Elements/CollectionAsTable/ParseFormat
@@ -1327,6 +1354,7 @@ sbin/standalone_httpd
 %%DATADIR%%/html/NoAuth/rss/dhandler
 %%DATADIR%%/html/Prefs/AboutMe.html
 %%DATADIR%%/html/Prefs/AuthTokens.html
+%%DATADIR%%/html/Prefs/CatalogList.html
 %%DATADIR%%/html/Prefs/CustomDateRanges.html
 %%DATADIR%%/html/Prefs/DashboardsInMenu.html
 %%DATADIR%%/html/Prefs/Elements/EditAboutMe
@@ -1536,6 +1564,7 @@ sbin/standalone_httpd
 %%DATADIR%%/html/Widgets/Form/Integer
 %%DATADIR%%/html/Widgets/Form/JSON
 %%DATADIR%%/html/Widgets/Form/MultilineString
+%%DATADIR%%/html/Widgets/Form/SearchFormat
 %%DATADIR%%/html/Widgets/Form/Select
 %%DATADIR%%/html/Widgets/Form/String
 %%DATADIR%%/html/Widgets/SavedSearch
diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile
new file mode 100644
index 000000000000..d075ed081076
--- /dev/null
+++ b/www/shellinabox/Makefile
@@ -0,0 +1,55 @@
+PORTNAME=	shellinabox
+PORTVERSION=	2.20
+DISTVERSIONPREFIX=	v
+PORTREVISION=	6
+CATEGORIES=	www
+
+MAINTAINER=	olivier@FreeBSD.org
+COMMENT=	Publish command line shell through AJAX interface
+WWW=		https://github.com/shellinabox/shellinabox
+
+LICENSE=	GPLv2
+
+DEPRECATED=	Abandonware and outdated, last release in 2016. Use sysutils/ttyd instead
+EXPIRATION_DATE=	2025-12-31 # Expiration date has been extended because sysutils/ttyd doesn't work on some systems.
+
+USES=	autoreconf cpe libtool ssl
+CPE_VENDOR=	${PORTNAME}_project
+
+OPTIONS_DEFINE=	CORES NOLOGIN
+CORES_DESC=	Patch shellinaboxd to enable core dumps
+NOLOGIN_DESC=	Login through ssh (not through login)
+
+GNU_CONFIGURE=	yes
+USE_GITHUB=	yes
+
+USE_RC_SUBR=	shellinaboxd
+USERS?=		shellinabox
+GROUPS?=	shellinabox
+
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
+
+CONFIGURE_ARGS=	--disable-runtime-loading --disable-pam \
+		CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+
+NOLOGIN_CONFIGURE_ON=	--disable-login
+
+.include <bsd.port.options.mk>
+
+post-patch:
+.if ${PORT_OPTIONS:MCORES}
+	@${REINPLACE_CMD} \
+		-e 's|prctl(PR_SET_DUMPABLE,|// &|' \
+		-e 's|setrlimit(RLIMIT_CORE,|// &|' \
+			${WRKSRC}/shellinabox/shellinaboxd.c
+.endif
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+
+.include <bsd.port.mk>
diff --git a/www/shellinabox/distinfo b/www/shellinabox/distinfo
new file mode 100644
index 000000000000..1c5ea36a2115
--- /dev/null
+++ b/www/shellinabox/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1478938927
+SHA256 (shellinabox-shellinabox-v2.20_GH0.tar.gz) = 27a5ec6c3439f87aee238c47cc56e7357a6249e5ca9ed0f044f0057ef389d81e
+SIZE (shellinabox-shellinabox-v2.20_GH0.tar.gz) = 745920
diff --git a/www/shellinabox/files/patch-configure.ac b/www/shellinabox/files/patch-configure.ac
new file mode 100644
index 000000000000..f155c7fd06d3
--- /dev/null
+++ b/www/shellinabox/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2016-11-09 19:40:33 UTC
++++ configure.ac
+@@ -138,6 +138,17 @@ AC_ARG_ENABLE(runtime-loading,
+                             these libraries into the binary, thus making them a
+                             hard dependency, then disable runtime-loading.])
+ 
++dnl This changes the order of the top ciphersuites
++AC_ARG_ENABLE(prefer-chacha,
++              [  --enable-prefer-chacha    Prefer ChaCha20-Poly1305 ciphersuites over
++                            AES256-GCM.  For processors without AES-NI or
++			    similar capabilities, ChaCha20-Poly1305 is 3 times
++			    faster than AES, with an equivalent strength.])
++if test "x$enable_prefer_chacha" == xyes; then
++  AC_DEFINE(SHELLINABOX_USE_CHACHA_FIRST, 1,
++                                Set if you want to prefer Chacha20-Poly1305 over AES-GCM)
++fi
++
+ dnl This is feature is not suported in some standard C libs. So users can use
+ dnl this switch to avoid compile and runtime problems. Note that utmp must
+ dnl disabled on systems with musl libc.
diff --git a/www/shellinabox/files/patch-libhttp_ssl.c b/www/shellinabox/files/patch-libhttp_ssl.c
new file mode 100644
index 000000000000..10d20f6f0e93
--- /dev/null
+++ b/www/shellinabox/files/patch-libhttp_ssl.c
@@ -0,0 +1,200 @@
+--- libhttp/ssl.c.orig	2016-11-09 19:40:33 UTC
++++ libhttp/ssl.c
+@@ -117,6 +117,9 @@ SSL_CTX *     (*SSL_CTX_new)(SSL_METHOD *);
+ int           (*SSL_CTX_set_cipher_list)(SSL_CTX *, const char *);
+ void          (*SSL_CTX_set_info_callback)(SSL_CTX *,
+                                            void (*)(const SSL *, int, int));
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++unsigned long (*SSL_CTX_set_options)(SSL_CTX *, unsigned long);
++#endif
+ int           (*SSL_CTX_use_PrivateKey_file)(SSL_CTX *, const char *, int);
+ int           (*SSL_CTX_use_PrivateKey_ASN1)(int, SSL_CTX *,
+                                              const unsigned char *, long);
+@@ -130,7 +133,9 @@ void *        (*SSL_get_ex_data)(const SSL *, int);
+ BIO *         (*SSL_get_rbio)(const SSL *);
+ const char *  (*SSL_get_servername)(const SSL *, int);
+ BIO *         (*SSL_get_wbio)(const SSL *);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ int           (*SSL_library_init)(void);
++#endif
+ SSL *         (*SSL_new)(SSL_CTX *);
+ int           (*SSL_read)(SSL *, void *, int);
+ SSL_CTX *     (*SSL_set_SSL_CTX)(SSL *, SSL_CTX *);
+@@ -139,10 +144,16 @@ void          (*SSL_set_bio)(SSL *, BIO *, BIO *);
+ int           (*SSL_set_ex_data)(SSL *, int, void *);
+ int           (*SSL_shutdown)(SSL *);
+ int           (*SSL_write)(SSL *, const void *, int);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_METHOD *  (*SSLv23_server_method)(void);
++#else
++SSL_METHOD *  (*TLS_server_method)(void);
++#endif
+ X509 *        (*d2i_X509)(X509 **px, const unsigned char **in, int len);
+ void          (*X509_free)(X509 *a);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ void          (*x_sk_zero)(void *st);
++#endif
+ void *        (*x_SSL_COMP_get_compression_methods)(void);
+ #endif
+ 
+@@ -208,7 +219,7 @@ static int maybeLoadCrypto(void) {
+   // The feature is currently disabled.
+   const char* path_libcrypto = NULL; // getenv ("SHELLINABOX_LIBCRYPTO_SO");
+   if (path_libcrypto == NULL)
+-    path_libcrypto = "libcrypto.so";
++    path_libcrypto = DEFAULT_LIBCRYPTO_SO;
+ 
+   if (!crypto++) {
+ #ifdef RTLD_NOLOAD
+@@ -267,8 +278,8 @@ static void loadSSL(void) {
+   // The feature is currently disabled.
+   const char* path_libssl = NULL; // = getenv ("SHELLINABOX_LIBSSL_SO");
+   if (path_libssl == NULL)
+-    path_libssl = "libssl.so";
+-  check(!SSL_library_init);
++    path_libssl = DEFAULT_LIBSSL_SO;
++  check(!SSL_CTX_new);
+   struct {
+     union {
+       void *avoid_gcc_warning_about_type_punning;
+@@ -299,6 +310,9 @@ static void loadSSL(void) {
+     { { &SSL_CTX_new },                 "SSL_CTX_new" },
+     { { &SSL_CTX_set_cipher_list },     "SSL_CTX_set_cipher_list" },
+     { { &SSL_CTX_set_info_callback },   "SSL_CTX_set_info_callback" },
++#if OPENSSL_VERSION_NUMBER > 0x10100000L
++    { { &SSL_CTX_set_options },         "SSL_CTX_set_options" },
++#endif
+     { { &SSL_CTX_use_PrivateKey_file }, "SSL_CTX_use_PrivateKey_file" },
+     { { &SSL_CTX_use_PrivateKey_ASN1 }, "SSL_CTX_use_PrivateKey_ASN1" },
+     { { &SSL_CTX_use_certificate_file },"SSL_CTX_use_certificate_file"},
+@@ -312,7 +326,9 @@ static void loadSSL(void) {
+     { { &SSL_get_servername },          "SSL_get_servername" },
+ #endif
+     { { &SSL_get_wbio },                "SSL_get_wbio" },
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     { { &SSL_library_init },            "SSL_library_init" },
++#endif
+     { { &SSL_new },                     "SSL_new" },
+     { { &SSL_read },                    "SSL_read" },
+ #ifdef HAVE_TLSEXT
+@@ -323,10 +339,16 @@ static void loadSSL(void) {
+     { { &SSL_set_ex_data },             "SSL_set_ex_data" },
+     { { &SSL_shutdown },                "SSL_shutdown" },
+     { { &SSL_write },                   "SSL_write" },
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     { { &SSLv23_server_method },        "SSLv23_server_method" },
++#else
++    { { &TLS_server_method },           "TLS_server_method" },
++#endif
+     { { &d2i_X509 },                    "d2i_X509" },
+     { { &X509_free },                   "X509_free" },
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     { { &x_sk_zero },                   "sk_zero" }
++#endif
+   };
+   for (unsigned i = 0; i < sizeof(symbols)/sizeof(symbols[0]); i++) {
+     if (!(*symbols[i].var = loadSymbol(path_libssl, symbols[i].fn))) {
+@@ -343,7 +365,9 @@ static void loadSSL(void) {
+   // ends
+ 
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+   SSL_library_init();
++#endif
+   dcheck(!ERR_peek_error());
+   debug("[ssl] Loaded SSL suppport...");
+ }
+@@ -351,8 +375,12 @@ static void loadSSL(void) {
+ 
+ int serverSupportsSSL(void) {
+ #if defined(HAVE_OPENSSL) && !defined(HAVE_DLOPEN)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+   return SSL_library_init();
+ #else
++  return 1;
++#endif
++#else
+ #if defined(HAVE_OPENSSL)
+   // We want to call loadSSL() exactly once. For single-threaded applications,
+   // this is straight-forward. For threaded applications, we need to call
+@@ -372,8 +400,12 @@ int serverSupportsSSL(void) {
+       loadSSL();
+     }
+   }
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+   return !!SSL_library_init;
+ #else
++  return 1;
++#endif
++#else
+   return 0;
+ #endif
+ #endif
+@@ -623,7 +655,11 @@ static void sslInfoCallback(const SSL *sslHndl, int ty
+ static SSL_CTX *sslMakeContext(void) {
+ 
+   SSL_CTX *context;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+   check(context = SSL_CTX_new(SSLv23_server_method()));
++#else
++  check(context = SSL_CTX_new(TLS_server_method()));
++#endif
+ 
+   long options  = SSL_OP_ALL;
+   options      |= SSL_OP_NO_SSLv2;
+@@ -641,6 +677,7 @@ static SSL_CTX *sslMakeContext(void) {
+   // Set default SSL options.
+   SSL_CTX_set_options(context, options);
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+   // Workaround for SSL_OP_NO_COMPRESSION with older OpenSSL versions.
+ #ifdef HAVE_DLOPEN
+   if (SSL_COMP_get_compression_methods) {
+@@ -649,6 +686,7 @@ static SSL_CTX *sslMakeContext(void) {
+ #elif OPENSSL_VERSION_NUMBER >= 0x00908000L
+   sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
+ #endif
++#endif
+ 
+   // For Perfect Forward Secrecy (PFS) support we need to enable some additional
+   // SSL options, provide eliptic curve key object for handshake and add chipers
+@@ -657,21 +695,39 @@ static SSL_CTX *sslMakeContext(void) {
+   SSL_CTX_set_options(context, SSL_OP_SINGLE_ECDH_USE);
+   SSL_CTX_set_options(context, SSL_OP_CIPHER_SERVER_PREFERENCE);
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L /* openssl 1.1 does this automatically */
+   EC_KEY *ecKey;
+   check(ecKey   = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
+   SSL_CTX_set_tmp_ecdh(context, ecKey);
+   EC_KEY_free(ecKey);
++#endif
+ 
+   debug("[ssl] Support for PFS enabled...");
+ #endif
+ 
+   check(SSL_CTX_set_cipher_list(context,
++#ifdef SHELLINABOX_USE_CHACHA_FIRST
++    "ECDHE-ECDSA-CHACHA20-POLY1305:"
++    "ECDHE-RSA-CHACHA20-POLY1305:"
++    "ECDHE-ECDSA-AES256-GCM-SHA384:"
+     "ECDHE-RSA-AES256-GCM-SHA384:"
++#else
++    "ECDHE-ECDSA-AES256-GCM-SHA384:"
++    "ECDHE-RSA-AES256-GCM-SHA384:"
++    "ECDHE-ECDSA-CHACHA20-POLY1305:"
++    "ECDHE-RSA-CHACHA20-POLY1305:"
++#endif
++    "ECDHE-ECDSA-AES128-GCM-SHA256:"
+     "ECDHE-RSA-AES128-GCM-SHA256:"
++    "ECDHE-ECDSA-AES256-SHA384:"
+     "ECDHE-RSA-AES256-SHA384:"
++    "ECDHE-ECDSA-AES128-SHA256:"
+     "ECDHE-RSA-AES128-SHA256:"
++    "ECDHE-ECDSA-AES256-SHA:"
+     "ECDHE-RSA-AES256-SHA:"
++    "ECDHE-ECDSA-AES128-SHA:"
+     "ECDHE-RSA-AES128-SHA:"
++    "ECDHE-ECDSA-DES-CBC3-SHA:"
+     "ECDHE-RSA-DES-CBC3-SHA:"
+     "HIGH:MEDIUM:!RC4:!aNULL:!MD5"));
+ 
diff --git a/www/shellinabox/files/patch-libhttp_ssl.h b/www/shellinabox/files/patch-libhttp_ssl.h
new file mode 100644
index 000000000000..4166ee48c8ce
--- /dev/null
+++ b/www/shellinabox/files/patch-libhttp_ssl.h
@@ -0,0 +1,102 @@
+--- libhttp/ssl.h.orig	2016-11-09 19:40:33 UTC
++++ libhttp/ssl.h
+@@ -57,6 +57,7 @@
+ #include <openssl/bio.h>
+ #include <openssl/err.h>
+ #include <openssl/ssl.h>
++#include <openssl/safestack.h>
+ #else
+ #undef HAVE_OPENSSL
+ typedef struct BIO        BIO;
+@@ -77,6 +78,17 @@ typedef struct X509       X509;
+ #endif
+ 
+ #if defined(HAVE_DLOPEN)
++#if !defined(DEFAULT_LIBCRYPTO_SO) || !defined(DEFAULT_LIBSSL_SO)
++#undef DEFAULT_LIBCRYPTO_SO
++#undef DEFAULT_LIBSSL_SO
++#ifdef SHLIB_VERSION_NUMBER
++#define DEFAULT_LIBCRYPTO_SO "libcrypto.so." SHLIB_VERSION_NUMBER
++#define DEFAULT_LIBSSL_SO "libssl.so." SHLIB_VERSION_NUMBER
++#else
++#define DEFAULT_LIBCRYPTO_SO "libcrypto.so"
++#define DEFAULT_LIBSSL_SO "libssl.so"
++#endif
++#endif
+ extern long    (*x_BIO_ctrl)(BIO *, int, long, void *);
+ extern BIO_METHOD *(*x_BIO_f_buffer)(void);
+ extern void    (*x_BIO_free_all)(BIO *);
+@@ -99,6 +111,9 @@ extern SSL_CTX*(*x_SSL_CTX_new)(SSL_METHOD *);
+ extern int     (*x_SSL_CTX_set_cipher_list)(SSL_CTX *, const char *);
+ extern void    (*x_SSL_CTX_set_info_callback)(SSL_CTX *,
+                                               void (*)(const SSL *, int, int));
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++extern unsigned long (*x_SSL_CTX_set_options)(SSL_CTX *, unsigned long);
++#endif
+ extern int     (*x_SSL_CTX_use_PrivateKey_file)(SSL_CTX *, const char *, int);
+ extern int     (*x_SSL_CTX_use_PrivateKey_ASN1)(int, SSL_CTX *,
+                                                 const unsigned char *, long);
+@@ -112,7 +127,9 @@ extern void   *(*x_SSL_get_ex_data)(const SSL *, int);
+ extern BIO    *(*x_SSL_get_rbio)(const SSL *);
+ extern const char *(*x_SSL_get_servername)(const SSL *, int);
+ extern BIO    *(*x_SSL_get_wbio)(const SSL *);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ extern int     (*x_SSL_library_init)(void);
++#endif
+ extern SSL    *(*x_SSL_new)(SSL_CTX *);
+ extern int     (*x_SSL_read)(SSL *, void *, int);
+ extern SSL_CTX*(*x_SSL_set_SSL_CTX)(SSL *, SSL_CTX *);
+@@ -121,10 +138,16 @@ extern void    (*x_SSL_set_bio)(SSL *, BIO *, BIO *);
+ extern int     (*x_SSL_set_ex_data)(SSL *, int, void *);
+ extern int     (*x_SSL_shutdown)(SSL *);
+ extern int     (*x_SSL_write)(SSL *, const void *, int);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ extern SSL_METHOD *(*x_SSLv23_server_method)(void);
++#else
++extern SSL_METHOD *(*x_TLS_server_method)(void);
++#endif
+ extern X509 *  (*x_d2i_X509)(X509 **px, const unsigned char **in, int len);
+ extern void    (*x_X509_free)(X509 *a);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ extern void    (*x_sk_zero)(void *st);
++#endif
+ extern void   *(*x_SSL_COMP_get_compression_methods)(void);
+ 
+ #define BIO_ctrl                     x_BIO_ctrl
+@@ -146,6 +169,9 @@ extern void   *(*x_SSL_COMP_get_compression_methods)(v
+ #define SSL_CTX_new                  x_SSL_CTX_new
+ #define SSL_CTX_set_cipher_list      x_SSL_CTX_set_cipher_list
+ #define SSL_CTX_set_info_callback    x_SSL_CTX_set_info_callback
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#define SSL_CTX_set_options          x_SSL_CTX_set_options
++#endif
+ #define SSL_CTX_use_PrivateKey_file  x_SSL_CTX_use_PrivateKey_file
+ #define SSL_CTX_use_PrivateKey_ASN1  x_SSL_CTX_use_PrivateKey_ASN1
+ #define SSL_CTX_use_certificate_file x_SSL_CTX_use_certificate_file
+@@ -157,7 +183,9 @@ extern void   *(*x_SSL_COMP_get_compression_methods)(v
+ #define SSL_get_rbio                 x_SSL_get_rbio
+ #define SSL_get_servername           x_SSL_get_servername
+ #define SSL_get_wbio                 x_SSL_get_wbio
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define SSL_library_init             x_SSL_library_init
++#endif
+ #define SSL_new                      x_SSL_new
+ #define SSL_read                     x_SSL_read
+ #define SSL_set_SSL_CTX              x_SSL_set_SSL_CTX
+@@ -166,10 +194,16 @@ extern void   *(*x_SSL_COMP_get_compression_methods)(v
+ #define SSL_set_ex_data              x_SSL_set_ex_data
+ #define SSL_shutdown                 x_SSL_shutdown
+ #define SSL_write                    x_SSL_write
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define SSLv23_server_method         x_SSLv23_server_method
++#else
++#define TLS_server_method            x_TLS_server_method
++#endif
+ #define d2i_X509                     x_d2i_X509
+ #define X509_free                    x_X509_free
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define sk_zero                      x_sk_zero
++#endif
+ #define SSL_COMP_get_compression_methods    x_SSL_COMP_get_compression_methods
+ 
+ #undef  BIO_set_buffer_read_data
diff --git a/www/shellinabox/files/patch-libhttp_url.c b/www/shellinabox/files/patch-libhttp_url.c
new file mode 100644
index 000000000000..b9579a000fd6
--- /dev/null
+++ b/www/shellinabox/files/patch-libhttp_url.c
@@ -0,0 +1,12 @@
+--- libhttp/url.c.orig	2016-11-09 19:40:33 UTC
++++ libhttp/url.c
+@@ -312,6 +312,9 @@ static void urlParsePostBody(struct URL *url,
+               }
+             }
+           }
++        } else {
++           warn("[http] broken multipart/form-data!");
++           break;
+         }
+       }
+       if (lastPart) {
diff --git a/www/shellinabox/files/patch-shellinabox_launcher.c b/www/shellinabox/files/patch-shellinabox_launcher.c
new file mode 100644
index 000000000000..1bb89239e1dc
--- /dev/null
+++ b/www/shellinabox/files/patch-shellinabox_launcher.c
@@ -0,0 +1,13 @@
+--- shellinabox/launcher.c.orig	2016-11-09 19:40:33 UTC
++++ shellinabox/launcher.c
+@@ -993,8 +993,8 @@ static pam_handle_t *internalLogin(struct Service *ser
+   if (service->authUser == 2 /* SSH */) {
+     // If connecting to a remote host, include that hostname
+     hostname                   = strrchr(service->cmdline, '@');
+-    if (!hostname || !strcmp(++hostname, "localhost")) {
+-      hostname                 = NULL;
++    if (hostname) {
++      hostname++;
+     }
+   }
+   struct utsname uts;
diff --git a/www/shellinabox/files/patch-shellinabox_service.c b/www/shellinabox/files/patch-shellinabox_service.c
new file mode 100644
index 000000000000..fd708ab9df11
--- /dev/null
+++ b/www/shellinabox/files/patch-shellinabox_service.c
@@ -0,0 +1,20 @@
+--- shellinabox/service.c.orig	2016-11-09 19:40:33 UTC
++++ shellinabox/service.c
+@@ -169,14 +169,13 @@ void initService(struct Service *service, const char *
+     }
+ 
+     service->cmdline                        = stringPrintf(NULL,
+-      "ssh -a -e none -i /dev/null -x -oChallengeResponseAuthentication=no "
++      "ssh -a -e none -i /dev/null -x "
+           "-oCheckHostIP=no -oClearAllForwardings=yes -oCompression=no "
+-          "-oControlMaster=no -oGSSAPIAuthentication=no "
++          "-oControlMaster=no "
+           "-oHostbasedAuthentication=no -oIdentitiesOnly=yes "
+           "-oKbdInteractiveAuthentication=yes -oPasswordAuthentication=yes "
+           "-oPreferredAuthentications=keyboard-interactive,password "
+-          "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no "
+-          "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no "
++          "-oPubkeyAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no "
+           "-oUserKnownHostsFile=/dev/null -oVerifyHostKeyDNS=no "
+ // beewoolie-2012.03.30: while it would be nice to disable this
+ //          feature, we cannot be sure that it is available on the
diff --git a/www/shellinabox/files/patch-shellinabox_vt100.jspp b/www/shellinabox/files/patch-shellinabox_vt100.jspp
new file mode 100644
index 000000000000..cf416c16ab72
--- /dev/null
+++ b/www/shellinabox/files/patch-shellinabox_vt100.jspp
@@ -0,0 +1,22 @@
+--- shellinabox/vt100.jspp.orig	2018-11-13 14:31:22 UTC
++++ shellinabox/vt100.jspp
+@@ -118,7 +118,8 @@ function VT100(container) {
+     '(?::[1-9][0-9]*)?' +
+ 
+     // Path.
+-    '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' +
++    '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$)' +
++    '[-a-zA-Z0-9@:%_\+.~#?&//=])*)*|' +
+ 
+     (linkifyURLs <= 1 ? '' :
+     // Also support URLs without a protocol (assume "http").
+@@ -149,7 +150,8 @@ function VT100(container) {
+     '(?::[1-9][0-9]{0,4})?' +
+ 
+     // Path.
+-    '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') +
++    '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$)' +
++    '[-a-zA-Z0-9@:%_\+.~#?&//=])*)*|') +
+ 
+     // In addition, support e-mail address. Optionally, recognize "mailto:"
+     '(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') +
diff --git a/www/shellinabox/files/pkg-deinstall.in b/www/shellinabox/files/pkg-deinstall.in
new file mode 100644
index 000000000000..34bd114de51d
--- /dev/null
+++ b/www/shellinabox/files/pkg-deinstall.in
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
+if [ -d %%PREFIX%%/etc/shellinabox ]; then
+        echo "===> You may delete '%%PREFIX%%/etc/shellinabox' if you want to remove the SSL certificate left."
+fi
diff --git a/www/shellinabox/files/shellinaboxd.in b/www/shellinabox/files/shellinaboxd.in
new file mode 100644
index 000000000000..8ccdea164da8
--- /dev/null
+++ b/www/shellinabox/files/shellinaboxd.in
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Shell in a Box Daemon startup script
+#
+# PROVIDE: shellinaboxd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following to /etc/rc.conf[.local] to enable this service
+#
+# shellinaboxd_enable="YES"
+#
+# You can fine tune others variables too:
+# shellinaboxd_pidfile="/var/run/shellinabox.pid"
+# shellinaboxd_user="%%USERS%%"
+# shellinaboxd_group="%%GROUPS%%"
+# shellinaboxd_port="4200"
+# shellinaboxd_certdir="%%ETCDIR%%"
+# shellinaboxd_certfile=
+# 	Example: shellinaboxd_certfile="/your/cert.pem"
+# shellinaboxd_flags=
+
+shellinaboxd_precmd() {
+	if command -v check_namevarlist > /dev/null 2>&1; then
+		check_namevarlist fib && return 0
+	fi
+
+	${SYSCTL} net.fibs >/dev/null 2>&1 || return 0
+
+	shellinaboxd_fib=${shellinaboxd_fib:-"NONE"}
+	case "$shellinaboxd_fib" in
+	[Nn][Oo][Nn][Ee])
+		;;
+	*)
+		command="setfib -F ${shellinaboxd_fib} ${command}"
+		;;
+	esac
+} 
+
+. /etc/rc.subr
+
+name="shellinaboxd"
+rcvar=shellinaboxd_enable
+
+command="%%PREFIX%%/bin/${name}"
+start_precmd="shellinaboxd_precmd"
+
+load_rc_config $name
+
+shellinaboxd_enable=${shellinaboxd_enable:-"NO"}
+shellinaboxd_user=${shellinaboxd_user:-"%%USERS%%"}
+shellinaboxd_group=${shellinaboxd_group:-"%%GROUPS%%"}
+shellinaboxd_port=${shellinaboxd_port:-"4200"}
+shellinaboxd_certdir=${shellinaboxd_certdir:-"%%ETCDIR%%"}
+
+pidfile=${shellinaboxd_pidfile:-"/var/run/shellinaboxd.pid"}
+
+command_args="--user=${shellinaboxd_user} --group=${shellinaboxd_group} --port=${shellinaboxd_port} --background=${pidfile}"
+
+if [ "${shellinaboxd_certfile}" = "" ]; then
+	required_dirs="${shellinaboxd_certdir}"
+	command_args="$command_args --cert=${shellinaboxd_certdir}"
+else
+	command_args="$command_args --cert-fd=3 3< ${shellinaboxd_certfile}"
+fi
+
+# avoid unnecessary su(1) initiated by rc.subr
+unset shellinaboxd_user shellinaboxd_group
+
+run_rc_command "$1"
diff --git a/www/shellinabox/pkg-descr b/www/shellinabox/pkg-descr
new file mode 100644
index 000000000000..0dc088b71463
--- /dev/null
+++ b/www/shellinabox/pkg-descr
@@ -0,0 +1,2 @@
+Shell In A Box is a web server that can export arbitary command line tools
+to a web based terminal emulator.
diff --git a/www/shellinabox/pkg-plist b/www/shellinabox/pkg-plist
new file mode 100644
index 000000000000..37179f388f9d
--- /dev/null
+++ b/www/shellinabox/pkg-plist
@@ -0,0 +1,3 @@
+bin/shellinaboxd
+share/man/man1/shellinaboxd.1.gz
+@dir(shellinabox,shellinabox,700) etc/shellinabox
diff --git a/www/stagit/Makefile b/www/stagit/Makefile
index d826c3d14ef7..701bec8546c2 100644
--- a/www/stagit/Makefile
+++ b/www/stagit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	stagit
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	https://codemadness.org/releases/stagit/
 
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index d140d367a371..d643c6982b9d 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
diff --git a/www/tomcat-devel/files/tomcat_devel.in b/www/tomcat-devel/files/tomcat_devel.in
index 89df00dd6075..c4de5de2f969 100644
--- a/www/tomcat-devel/files/tomcat_devel.in
+++ b/www/tomcat-devel/files/tomcat_devel.in
@@ -108,16 +108,16 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 
 extra_commands="reload"
 
-_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
-
-export JAVA_TOOL_OPTIONS="\
+#_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_tomcat_java9_opts="\
 	--add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
 	--add-opens=java.base/java.io=ALL-UNNAMED \
 	--add-opens=java.base/java.util=ALL-UNNAMED \
 	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
-	--enable-native-access=ALL-UNNAMED"
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
+_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}"
 
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index 5f3401c6b053..755b7bd76299 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	10.1.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	101
diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in
index ac405c2fc815..a60d0f5f3a18 100644
--- a/www/tomcat101/files/tomcat101.in
+++ b/www/tomcat101/files/tomcat101.in
@@ -109,14 +109,23 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 extra_commands="reload"
 
 _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
-
-export JAVA_TOOL_OPTIONS="\
+_tomcat_java9_opts="\
 	--add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
 	--add-opens=java.base/java.io=ALL-UNNAMED \
 	--add-opens=java.base/java.util=ALL-UNNAMED \
 	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
 	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
+_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts}"
+
+case "${_tomcat_java_version}" in
+	1[7-9]* | [2-9][0-9]* )
+		_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java17_opts}"
+		;;
+	*)
+		;;
+esac
 
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index fd6db53a3cb3..a35009afb7e2 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	110
diff --git a/www/tomcat110/files/tomcat110.in b/www/tomcat110/files/tomcat110.in
index b375c9a2d0ff..20ddc6672db2 100644
--- a/www/tomcat110/files/tomcat110.in
+++ b/www/tomcat110/files/tomcat110.in
@@ -108,16 +108,16 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 
 extra_commands="reload"
 
-_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
-
-export JAVA_TOOL_OPTIONS="\
+#_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_tomcat_java9_opts="\
 	--add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
 	--add-opens=java.base/java.io=ALL-UNNAMED \
 	--add-opens=java.base/java.util=ALL-UNNAMED \
 	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
-	--enable-native-access=ALL-UNNAMED"
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
+_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}"
 
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 8b4efd75b3ea..6f5598aa5350 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	9.0.104
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9])(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	9
diff --git a/www/tomcat9/files/tomcat9.in b/www/tomcat9/files/tomcat9.in
index 21f4624e41e4..e807618d5c48 100644
--- a/www/tomcat9/files/tomcat9.in
+++ b/www/tomcat9/files/tomcat9.in
@@ -109,18 +109,24 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 extra_commands="reload"
 
 _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_tomcat_java9_opts="\
+	--add-opens=java.base/java.lang=ALL-UNNAMED \
+	--add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
+	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+	--add-opens=java.base/java.io=ALL-UNNAMED \
+	--add-opens=java.base/java.util=ALL-UNNAMED \
+	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
 
 case "${_tomcat_java_version}" in
-	9* | [1-2][0-9]* )
+	1[7-9]* | [2-9][0-9]* )
 		_tomcat_endorsed_dirs_option=
-		export JAVA_TOOL_OPTIONS="\
-			--add-opens=java.base/java.lang=ALL-UNNAMED \
-			--add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
-			--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
-			--add-opens=java.base/java.io=ALL-UNNAMED \
-			--add-opens=java.base/java.util=ALL-UNNAMED \
-			--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-			--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+		_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}"
+		;;
+	9* | 1[0-6]* )
+		_tomcat_endorsed_dirs_option=
+		_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts}"
 		;;
 	*)
 		_tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'"
diff --git a/www/tomee/Makefile b/www/tomee/Makefile
index a27633495d69..a5c906758dff 100644
--- a/www/tomee/Makefile
+++ b/www/tomee/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tomee
 DISTVERSION=	8.0.16
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${PORTNAME}-${DISTVERSION}/
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-webprofile
@@ -12,8 +13,12 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 
-USES=		cpe java
+USES=		cpe dos2unix java
 CPE_VENDOR=	apache
+DOS2UNIX_FILES=		${TOMEE_CONF_FILES} catalina.policy.original \
+			server.xml.original tomcat-users.xml.original \
+			tomcat-users.xsd
+DOS2UNIX_WRKSRC=	${WRKSRC}/conf
 USE_RC_SUBR=	${PKGBASE}
 
 EXTRACT_AFTER_ARGS=	--exclude *.bat \
diff --git a/www/tomee/files/tomee.in b/www/tomee/files/tomee.in
index ebc26f0476a1..2947d1acedc8 100644
--- a/www/tomee/files/tomee.in
+++ b/www/tomee/files/tomee.in
@@ -85,7 +85,7 @@ eval "${rcvar}=\${${rcvar}:-'NO'}"
 eval "_tomee_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}"
 eval "_tomee_catalina_user=\${${name}_catalina_user:-'%%TOMEE_USER%%'}"
 eval "_tomee_catalina_home=\${${name}_catalina_home:-'%%TOMEE_HOME%%'}"
-eval "_tomee_catalina_base=\${${name}_catalina_base:-'${_tomcat_catalina_home}'}"
+eval "_tomee_catalina_base=\${${name}_catalina_base:-'${_tomee_catalina_home}'}"
 eval "_tomee_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomee_catalina_base}/temp'}"
 eval "_tomee_stdout=\${${name}_stdout:-'${_tomee_catalina_base}/logs/catalina.out'}"
 eval "_tomee_stderr=\${${name}_stderr:-'&1'}"
@@ -104,10 +104,24 @@ required_dirs="${_tomee_catalina_tmpdir}"
 extra_commands="reload"
 
 _tomee_java_version=`${_tomee_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_tomee_java9_opts="\
+	--add-opens=java.base/java.io=ALL-UNNAMED \
+	--add-opens=java.base/java.lang=ALL-UNNAMED \
+	--add-opens=java.base/java.net=ALL-UNNAMED \
+	--add-opens=java.base/java.util=ALL-UNNAMED \
+	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+	--add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED \
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomee_java17_opts="--enable-native-access=ALL-UNNAMED"
 
 case "${_tomee_java_version}" in
-	9* | [1-2][0-9]* )
+	1[7-9]* | [2-9][0-9]* )
 		_tomee_endorsed_dirs_option=
+		_tomee_java_opts="${_tomee_java_opts} ${_tomee_java9_opts} ${_tomee_java17_opts}"
+		;;
+	9* | 1[0-6]* )
+		_tomee_endorsed_dirs_option=
+		_tomee_java_opts="${_tomee_java_opts} ${_tomee_java9_opts}"
 		;;
 	*)
 		_tomee_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomee_catalina_home}/endorsed'"
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index 45fcd0c3ca49..ffc9bec81862 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tor-browser
-DISTVERSION=	14.5
+DISTVERSION=	14.5.1
 CATEGORIES=	www net security wayland
 TAG_BASE=	86442427facf038d5706644221de7e2fb733550b
 TAG_TOR=	2c0b448503d52c3b512d1e7a55ccc78ac19db146
@@ -17,7 +17,7 @@ MASTER_SITES=	TOR \
 		LOCAL/vvd:source5
 MASTER_SITE_SUBDIR=	torbrowser/${DISTVERSION}/:DEFAULT \
 			download/releases/:source3
-DISTNAME=	src-firefox-tor-browser-128.9.0esr-14.5-1-build4
+DISTNAME=	src-firefox-tor-browser-128.10.0esr-14.5-1-build2
 MANUAL=		manual_215922.zip
 NOSCRIPT=	noscript-12.1.1.xpi
 DISTFILES=	${DISTNAME}.tar.xz \
diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo
index a1983e225dd2..26de690fd319 100644
--- a/www/tor-browser/distinfo
+++ b/www/tor-browser/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1746217866
-SHA256 (src-firefox-tor-browser-128.9.0esr-14.5-1-build4.tar.xz) = 67d3a6277d82b990752c82f2ee3357c938077210ec0d1dc5157acd94dd19daf2
-SIZE (src-firefox-tor-browser-128.9.0esr-14.5-1-build4.tar.xz) = 611007880
+TIMESTAMP = 1746299992
+SHA256 (src-firefox-tor-browser-128.10.0esr-14.5-1-build2.tar.xz) = 92ea6582bba3d6e6a4f65a3a16c3e22f5bdb3dd8ceb98570e39e3fdf8326edc0
+SIZE (src-firefox-tor-browser-128.10.0esr-14.5-1-build2.tar.xz) = 611152936
 SHA256 (manual_215922.zip) = b5ed703f54d52e9f197320f3698e936d585a3fed23cc4f9fbf59edce2869f885
 SIZE (manual_215922.zip) = 28305786
 SHA256 (fonts-3--4348e1.tar.zst) = 7fbbecece6de777f196982f6eb567970a6d8e7ac2bf5b1ad6b90e1ea36374032
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 895f67c9dfc1..616c569e77cd 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	135.0.7049.114
+PORTVERSION=	136.0.7103.92
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 UGVERSION=	${DISTVERSION}-1
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index 002207d5b589..ff9869865cd1 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1745557530
-SHA256 (chromium-135.0.7049.114.tar.xz) = aa85ce2bf36ed71261109fd7e700fac596a28b7be035a40a518c6a6fcf973c22
-SIZE (chromium-135.0.7049.114.tar.xz) = 7133024128
+TIMESTAMP = 1746691040
+SHA256 (chromium-136.0.7103.92.tar.xz) = 3fa7f88ef186566948367bf1e9a9f0612e753fc69285c1654728f6a015cd4cf2
+SIZE (chromium-136.0.7103.92.tar.xz) = 7188412240
 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (chromium-135.0.7049.114-testdata.tar.xz) = 587010be844abae797a57ddcab83ffa29dc441fcffeb9c66806d63eac6f9fe91
-SIZE (chromium-135.0.7049.114-testdata.tar.xz) = 646720320
-SHA256 (ungoogled-software-ungoogled-chromium-135.0.7049.114-135.0.7049.114-1_GH0.tar.gz) = bac5b844e936ec0340cdaa7e9a8d5b4cc3875d30828a1d6fa816f980d0f96e2e
-SIZE (ungoogled-software-ungoogled-chromium-135.0.7049.114-135.0.7049.114-1_GH0.tar.gz) = 631055
+SHA256 (chromium-136.0.7103.92-testdata.tar.xz) = 6e5bb3fba5b61ffc9e91b9d2fc9cc758bebe4d16806a68b1a32b189193c78256
+SIZE (chromium-136.0.7103.92-testdata.tar.xz) = 651393856
+SHA256 (ungoogled-software-ungoogled-chromium-136.0.7103.92-136.0.7103.92-1_GH0.tar.gz) = d256643a26d536a5079441e63fd4c8cda0e073702665605b40c5ce1d5b18bcbe
+SIZE (ungoogled-software-ungoogled-chromium-136.0.7103.92-136.0.7103.92-1_GH0.tar.gz) = 633266
diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn
index ebb9f69a85a7..dfb937661171 100644
--- a/www/ungoogled-chromium/files/patch-BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ BUILD.gn
 @@ -71,7 +71,7 @@ declare_args() {
    root_extra_deps = []
@@ -17,7 +17,7 @@
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -448,7 +447,7 @@ group("gn_all") {
+@@ -449,7 +448,7 @@ group("gn_all") {
        }
      }
  
@@ -26,7 +26,7 @@
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -630,6 +629,15 @@ group("gn_all") {
+@@ -628,6 +627,15 @@ group("gn_all") {
        }
      }
  
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
-@@ -678,7 +686,7 @@ group("gn_all") {
+@@ -676,7 +684,7 @@ group("gn_all") {
        }
      }
  
@@ -51,7 +51,7 @@
        # The official builders use this binary from the default toolchain's
        # output directory after building in order to upload the symbols of that
        # binary. They build the binary like `ninja symupload` which requires the
-@@ -713,7 +721,7 @@ group("gn_all") {
+@@ -711,7 +719,7 @@ group("gn_all") {
        ]
      }
  
@@ -60,16 +60,16 @@
        deps += [
          "//third_party/crashpad/crashpad:crashpad_tests",
          "//third_party/crashpad/crashpad/handler:crashpad_handler",
-@@ -1118,7 +1126,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1120,7 +1128,7 @@ if (use_blink && !is_cronet_build) {
+       "//third_party/blink/public:all_blink",
      ]
  
-     if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android &&
--        !is_castos) {
-+        !is_castos && !is_bsd) {
+-    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos) {
++    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
        deps += [
          ":chrome_wpt_tests",
          ":headless_shell_wpt",
-@@ -1265,7 +1273,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1267,7 +1275,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
  
@@ -78,7 +78,7 @@
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1279,7 +1287,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1281,7 +1289,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms" ]
      }
  
@@ -87,7 +87,7 @@
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1749,7 +1757,7 @@ group("chromium_builder_perf") {
+@@ -1752,7 +1760,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
  
diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn
index 86b846d1dee6..bc78e1ce31eb 100644
--- a/www/ungoogled-chromium/files/patch-base_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- base/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ base/BUILD.gn
-@@ -1094,11 +1094,26 @@ component("base") {
+@@ -1104,11 +1104,26 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -28,7 +28,7 @@
    if (use_allocator_shim) {
      if (is_apple) {
        sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1118,7 +1133,7 @@ component("base") {
+@@ -1128,7 +1143,7 @@ component("base") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -37,7 +37,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -2142,6 +2157,22 @@ component("base") {
+@@ -2152,6 +2167,22 @@ component("base") {
      ]
    }
  
@@ -60,7 +60,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2300,6 +2331,33 @@ component("base") {
+@@ -2312,6 +2343,33 @@ component("base") {
      }
    }
  
@@ -94,7 +94,7 @@
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2649,7 +2707,7 @@ buildflag_header("protected_memory_buildflags") {
+@@ -2690,7 +2748,7 @@ buildflag_header("protected_memory_buildflags") {
    header = "protected_memory_buildflags.h"
    header_dir = "base/memory"
  
@@ -103,7 +103,7 @@
                               (is_win || is_linux || is_android || is_mac)
  
    flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
-@@ -3122,7 +3180,7 @@ if (is_apple) {
+@@ -3163,7 +3221,7 @@ if (is_apple) {
    }
  }
  
@@ -112,7 +112,7 @@
    # This test must compile with -fstack-protector-all
    source_set("stack_canary_linux_unittests") {
      testonly = true
-@@ -3808,7 +3866,7 @@ test("base_unittests") {
+@@ -3851,7 +3909,7 @@ test("base_unittests") {
      ]
    }
  
@@ -121,7 +121,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3836,7 +3894,7 @@ test("base_unittests") {
+@@ -3879,7 +3937,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -130,7 +130,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3847,7 +3905,7 @@ test("base_unittests") {
+@@ -3890,7 +3948,7 @@ test("base_unittests") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -139,7 +139,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -4037,7 +4095,7 @@ test("base_unittests") {
+@@ -4080,7 +4138,7 @@ test("base_unittests") {
      deps += [ ":base_profiler_test_support_library" ]
    }
  
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index 08b8b36dfc42..0a026fd8dc36 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,15 +1,15 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-03-09 21:38:10 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-05-06 12:23:00 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
 @@ -89,7 +89,7 @@ if (is_nacl) {
+ # TODO(crbug.com/329199197): Clean this up when experiments are complete.
  use_large_empty_slot_span_ring = true
  
- has_memory_tagging =
--    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
-+    current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android)
+-has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan &&
++has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd &&
+                      !is_hwasan && (is_linux || is_android)
  
  declare_args() {
-   # Debug configuration.
-@@ -344,7 +344,7 @@ declare_args() {
+@@ -345,7 +345,7 @@ declare_args() {
  declare_args() {
    # Shadow metadata is still under development and only supports Linux
    # for now.
@@ -18,7 +18,7 @@
  }
  
  declare_args() {
-@@ -487,7 +487,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
+@@ -488,7 +488,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
  # dependencies that use partition_allocator are compiled in AOSP against a
  # version of glibc that does not include pkeys syscall numbers.
  is_pkeys_available =
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index c6d9ee6d9cf6..4115671624b8 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
+@@ -886,7 +886,7 @@ if (is_clang_or_gcc) {
          configs -= [ partition_alloc_enable_arc_config ]
        }
      }
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
index bf78804a53a8..9341892e0673 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-02-20 09:59:21 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
 @@ -18,7 +18,7 @@
  #include "partition_alloc/partition_alloc_base/logging.h"
@@ -7,5 +7,5 @@
 -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
 +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
  #include <sys/syscall.h>
- 
  #include <atomic>
+ #endif
diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc
index f9e68c8ca580..16ea957612c8 100644
--- a/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc
@@ -1,15 +1,14 @@
---- base/files/file_util_posix.cc.orig	2025-04-15 08:30:07 UTC
+--- base/files/file_util_posix.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/files/file_util_posix.cc
-@@ -902,6 +902,8 @@ bool CreateNewTempDirectory(const FilePath::StringType
+@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePath::StringType
  bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
    ScopedBlockingCall scoped_blocking_call(
        FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
 +  const FilePath kFileSystemRoot("/");
-+
+ 
    // Avoid checking subdirs if directory already exists.
    if (DirectoryExists(full_path)) {
-     return true;
-@@ -910,8 +912,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
    // Collect a list of all missing directories.
    std::vector<FilePath> missing_subpaths({full_path});
    FilePath last_path = full_path;
@@ -20,11 +19,11 @@
      if (DirectoryExists(path)) {
        break;
      }
-@@ -921,21 +923,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+     }
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
-   // Iterate through the missing directories and create.
-   for (const FilePath& subpath : base::Reversed(missing_subpaths)) {
--    if (mkdir(subpath.value().c_str(), 0700) == 0) {
+-    if (mkdir(subpath.value().c_str(), mode) == 0) {
 -      continue;
 -    }
 -    // Mkdir failed, but it might have failed with EEXIST, or some other error
@@ -34,7 +33,7 @@
 -    int saved_errno = errno;
 -    if (!DirectoryExists(subpath)) {
 -      if (error) {
-+    if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
++    if ((mkdir(subpath.value().c_str(), mode) == -1) &&
 +        ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
 +      int saved_errno = errno;
 +      if (error)
diff --git a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc
index 323f559d3155..30109a001a1f 100644
--- a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc
@@ -1,6 +1,6 @@
---- base/i18n/icu_util.cc.orig	2024-03-22 14:16:19 UTC
+--- base/i18n/icu_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/i18n/icu_util.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #endif
  
@@ -9,7 +9,7 @@
      BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  #endif
-@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() {
+@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() {
        FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/www/ungoogled-chromium/files/patch-base_logging__unittest.cc b/www/ungoogled-chromium/files/patch-base_logging__unittest.cc
index 4fe12aa3b5ca..63b70957600a 100644
--- a/www/ungoogled-chromium/files/patch-base_logging__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-base_logging__unittest.cc
@@ -1,4 +1,4 @@
---- base/logging_unittest.cc.orig	2025-04-15 08:30:07 UTC
+--- base/logging_unittest.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/logging_unittest.cc
 @@ -40,7 +40,7 @@
  #include "base/posix/eintr_wrapper.h"
@@ -9,7 +9,7 @@
  #include <ucontext.h>
  #endif
  
-@@ -588,14 +588,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -586,14 +586,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
    // need the arch-specific boilerplate below, which is inspired by breakpad.
    // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
    uintptr_t crash_addr = 0;
diff --git a/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc b/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc
index ada93bec92ae..6a2f332681e0 100644
--- a/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc
@@ -1,6 +1,6 @@
---- base/profiler/stack_base_address_posix.cc.orig	2025-04-15 08:30:07 UTC
+--- base/profiler/stack_base_address_posix.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/profiler/stack_base_address_posix.cc
-@@ -17,6 +17,10 @@
+@@ -18,6 +18,10 @@
  #include "base/files/scoped_file.h"
  #endif
  
@@ -11,7 +11,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
  extern "C" void* __libc_stack_end;
  #endif
-@@ -47,7 +51,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
+@@ -49,7 +53,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
  
  #if !BUILDFLAG(IS_LINUX)
  uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
@@ -33,7 +33,7 @@
    // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox
    // and pthread_id refers to a different thread, due to the use of
    // sched_getaffinity().
-@@ -60,12 +78,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr
+@@ -62,12 +80,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr
                        << logging::SystemErrorCodeToString(result);
    // See crbug.com/617730 for limitations of this approach on Linux-like
    // systems.
@@ -48,7 +48,7 @@
    const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
    return base_address;
  }
-@@ -82,7 +102,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
+@@ -84,7 +104,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
    // trying to work around the problem.
    return std::nullopt;
  #else
diff --git a/www/ungoogled-chromium/files/patch-base_rand__util.h b/www/ungoogled-chromium/files/patch-base_rand__util.h
index 4f4da58121be..3b1bd71ae65a 100644
--- a/www/ungoogled-chromium/files/patch-base_rand__util.h
+++ b/www/ungoogled-chromium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig	2025-03-09 21:38:10 UTC
+--- base/rand_util.h.orig	2025-05-06 12:23:00 UTC
 +++ base/rand_util.h
-@@ -209,7 +209,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -213,7 +213,7 @@ void RandomShuffle(Itr first, Itr last) {
    std::shuffle(first, last, RandomBitGenerator());
  }
  
diff --git a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc
index e4e56f2772b8..aae758c07404 100644
--- a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- base/rand_util_posix.cc.orig	2025-03-09 21:38:10 UTC
+--- base/rand_util_posix.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/rand_util_posix.cc
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  #include "base/time/time.h"
  #include "build/build_config.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/lss/linux_syscall_support.h"
  #elif BUILDFLAG(IS_MAC)
  // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK.
-@@ -44,6 +44,7 @@ namespace base {
+@@ -45,6 +45,7 @@ namespace base {
  
  namespace {
  
@@ -17,7 +17,7 @@
  #if BUILDFLAG(IS_AIX)
  // AIX has no 64-bit support for O_CLOEXEC.
  static constexpr int kOpenFlags = O_RDONLY;
-@@ -68,10 +69,11 @@ class URandomFd {
+@@ -69,10 +70,11 @@ class URandomFd {
   private:
    const int fd_;
  };
@@ -27,10 +27,10 @@
       BUILDFLAG(IS_ANDROID)) &&                        \
 -    !BUILDFLAG(IS_NACL)
 +    !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- // TODO(pasko): Unify reading kernel version numbers in:
- // mojo/core/channel_linux.cc
- // chrome/browser/android/seccomp_support_detector.cc
-@@ -156,6 +158,7 @@ bool UseBoringSSLForRandBytes() {
+ 
+ bool KernelSupportsGetRandom() {
+   return base::SysInfo::KernelVersionNumber::Current() >=
+@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() {
  namespace {
  
  void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
@@ -38,7 +38,7 @@
  #if !BUILDFLAG(IS_NACL)
    // The BoringSSL experiment takes priority over everything else.
    if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -190,6 +193,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
+@@ -163,6 +166,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
    const int urandom_fd = GetUrandomFD();
    const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
    CHECK(success);
@@ -48,7 +48,7 @@
  }
  
  }  // namespace
-@@ -209,9 +215,11 @@ void RandBytes(span<uint8_t> output) {
+@@ -182,9 +188,11 @@ void RandBytes(span<uint8_t> output) {
    RandBytesInternal(output, /*avoid_allocation=*/false);
  }
  
diff --git a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h
index 66e88b247d66..c9aea0b8d8e5 100644
--- a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig	2024-08-26 14:40:28 UTC
+--- base/synchronization/lock_impl.h.orig	2025-05-06 12:23:00 UTC
 +++ base/synchronization/lock_impl.h
-@@ -109,6 +109,10 @@ void LockImpl::Unlock() {
+@@ -110,6 +110,10 @@ void LockImpl::Unlock() {
  }
  
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -11,7 +11,7 @@
  
  #if DCHECK_IS_ON()
  BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -129,6 +133,9 @@ void LockImpl::Unlock() {
+@@ -130,6 +134,9 @@ void LockImpl::Unlock() {
    dcheck_unlock_result(rv);
  #endif
  }
diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.h b/www/ungoogled-chromium/files/patch-base_system_sys__info.h
index dcbe5ca72706..8fc08853b222 100644
--- a/www/ungoogled-chromium/files/patch-base_system_sys__info.h
+++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2025-03-09 21:38:10 UTC
+--- base/system/sys_info.h.orig	2025-05-06 12:23:00 UTC
 +++ base/system/sys_info.h
-@@ -332,6 +332,8 @@ class BASE_EXPORT SysInfo {
+@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo {
    static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
  
@@ -9,7 +9,7 @@
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -344,7 +346,7 @@ class BASE_EXPORT SysInfo {
+@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc
index d7398aef1ab1..608ee0cdabbf 100644
--- a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_posix.cc.orig	2025-03-09 21:38:10 UTC
+--- base/system/sys_info_posix.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/system/sys_info_posix.cc
-@@ -124,7 +124,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
+@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* major_version,
  
  namespace base {
  
@@ -9,7 +9,7 @@
  // static
  int SysInfo::NumberOfProcessors() {
  #if BUILDFLAG(IS_MAC)
-@@ -180,7 +180,7 @@ int SysInfo::NumberOfProcessors() {
+@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() {
  
    return cached_num_cpus;
  }
@@ -18,7 +18,7 @@
  
  // static
  uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -268,6 +268,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
index 1b2e7837ae52..b659e41a07c2 100644
--- a/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
@@ -1,15 +1,15 @@
---- base/task/thread_pool/environment_config_unittest.cc.orig	2025-03-09 21:38:10 UTC
+--- base/task/thread_pool/environment_config_unittest.cc.orig	2025-05-06 12:23:00 UTC
 +++ base/task/thread_pool/environment_config_unittest.cc
-@@ -14,7 +14,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
-   EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread());
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
+             base::FeatureList::IsEnabled(
+                 FeatureControllingBackgroundPriorityWorkerThreads()));
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
    EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread());
  #else
  #error Platform doesn't match any block
-@@ -23,7 +23,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
+@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
    EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread());
  #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
diff --git a/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn b/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn
index 7dff9f4f284c..1301100bc60a 100644
--- a/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,4 +1,4 @@
---- build/config/BUILDCONFIG.gn.orig	2025-01-25 09:34:31 UTC
+--- build/config/BUILDCONFIG.gn.orig	2025-05-06 12:23:00 UTC
 +++ build/config/BUILDCONFIG.gn
 @@ -136,7 +136,8 @@ declare_args() {
    is_official_build = false
@@ -10,7 +10,7 @@
               (current_cpu != "s390x" && current_cpu != "s390" &&
                current_cpu != "ppc64" && current_cpu != "ppc" &&
                current_cpu != "mips" && current_cpu != "mips64" &&
-@@ -234,6 +235,10 @@ if (host_toolchain == "") {
+@@ -235,6 +236,10 @@ if (host_toolchain == "") {
      host_toolchain = "//build/toolchain/aix:$host_cpu"
    } else if (host_os == "zos") {
      host_toolchain = "//build/toolchain/zos:$host_cpu"
@@ -21,7 +21,7 @@
    } else {
      assert(false, "Unsupported host_os: $host_os")
    }
-@@ -278,6 +283,8 @@ if (target_os == "android") {
+@@ -279,6 +284,8 @@ if (target_os == "android") {
    _default_toolchain = "//build/toolchain/aix:$target_cpu"
  } else if (target_os == "zos") {
    _default_toolchain = "//build/toolchain/zos:$target_cpu"
@@ -30,7 +30,7 @@
  } else {
    assert(false, "Unsupported target_os: $target_os")
  }
-@@ -312,7 +319,11 @@ is_android = current_os == "android"
+@@ -313,7 +320,11 @@ is_android = current_os == "android"
  is_chromeos = current_os == "chromeos"
  is_fuchsia = current_os == "fuchsia"
  is_ios = current_os == "ios"
@@ -42,4 +42,4 @@
 +is_bsd = current_os == "openbsd" || current_os == "freebsd"
  is_mac = current_os == "mac"
  is_nacl = current_os == "nacl"
- is_watchos = current_os == "watchos"
+ is_wasm = current_os == "emscripten"
diff --git a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn
index 2c4c4e0b3cfb..cba054032aec 100644
--- a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/clang/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- build/config/clang/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ build/config/clang/BUILD.gn
-@@ -251,7 +251,12 @@ template("clang_lib") {
+@@ -252,7 +252,12 @@ template("clang_lib") {
  
  # Adds a dependency on the Clang runtime library clang_rt.builtins.
  clang_lib("compiler_builtins") {
@@ -13,4 +13,4 @@
 +  } else if (is_mac) {
      libname = "osx"
    } else if (is_ios) {
-     if (target_environment == "simulator") {
+     if (target_platform == "iphoneos") {
diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
index ddbe826f5d08..3909947c4a96 100644
--- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- build/config/compiler/BUILD.gn.orig	2025-05-08 07:58:41 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -198,7 +198,7 @@ declare_args() {
+@@ -197,7 +197,7 @@ declare_args() {
    # This greatly reduces the size of debug builds, at the cost of
    # debugging information which is required by some specialized
    # debugging tools.
@@ -9,7 +9,7 @@
  }
  
  declare_args() {
-@@ -255,13 +255,16 @@ config("default_include_dirs") {
+@@ -254,13 +254,16 @@ config("default_include_dirs") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
  # the executable they are loaded into, so they are unresolved at link-time.
  config("no_unresolved_symbols") {
@@ -27,7 +27,7 @@
  }
  
  # compiler ---------------------------------------------------------------------
-@@ -519,6 +522,10 @@ config("compiler") {
+@@ -508,6 +511,10 @@ config("compiler") {
      }
    }
  
@@ -38,7 +38,7 @@
    # Linux-specific compiler flags setup.
    # ------------------------------------
    if (use_icf && (!is_apple || use_lld)) {
-@@ -578,7 +585,7 @@ config("compiler") {
+@@ -567,7 +574,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -47,7 +47,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
      if (save_reproducers_on_lld_crash && use_lld) {
        ldflags += [
-@@ -1223,7 +1230,7 @@ config("compiler_cpu_abi") {
+@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -56,7 +56,7 @@
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
        }
-@@ -1238,7 +1245,7 @@ config("compiler_cpu_abi") {
+@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
        if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
@@ -65,7 +65,7 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1572,7 +1579,7 @@ config("compiler_deterministic") {
+@@ -1561,7 +1568,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -74,7 +74,7 @@
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1630,7 +1637,7 @@ config("compiler_deterministic") {
+@@ -1619,7 +1626,7 @@ config("compiler_deterministic") {
  }
  
  config("clang_revision") {
@@ -83,32 +83,26 @@
        current_os != "zos") {
      update_args = [
        "--print-revision",
-@@ -1960,23 +1967,12 @@ config("default_warnings") {
-         ]
-       }
+@@ -1652,7 +1659,7 @@ config("clang_revision") {
+ # e.g. by setting in the the project's .gn file.
+ config("clang_warning_suppression") {
+   # Some build configs use older versions of clang that don't support WSMs
+-  if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
++  if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
+       !llvm_android_mainline && is_clang &&
+       clang_warning_suppression_file != "") {
+     from_build_root =
+@@ -1985,9 +1992,6 @@ config("default_warnings") {
  
--      cflags += [
--        # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
--        "-Wno-cast-function-type",
--
--        # TODO(crbug.com/40284799): Fix and re-enable.
--        "-Wno-thread-safety-reference-return",
+         # TODO(crbug.com/40284799): Fix and re-enable.
+         "-Wno-thread-safety-reference-return",
 -
 -        # TODO(crbug.com/376641662): Fix and re-enable.
 -        "-Wno-nontrivial-memcall",
--      ]
--
-       cflags_cc += [
-         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
-         "-Wenum-compare-conditional",
        ]
  
--      if (!is_nacl) {
-+      if (!is_nacl && !is_bsd) {
-         cflags_cc += [
-           # TODO(crbug.com/41486292): Fix and re-enable.
-           "-Wno-c++11-narrowing-const-reference",
-@@ -2742,7 +2738,7 @@ config("afdo_optimize_size") {
+       cflags_cc += [
+@@ -2776,7 +2780,7 @@ config("afdo_optimize_size") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -117,7 +111,7 @@
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2769,7 +2765,7 @@ config("afdo") {
+@@ -2803,7 +2807,7 @@ config("afdo") {
        cflags += [ "-Wno-backend-plugin" ]
        inputs = [ _clang_sample_profile ]
      }
@@ -126,7 +120,7 @@
      cflags = [ "-fauto-profile=${auto_profile_path}" ]
      inputs = [ auto_profile_path ]
    }
-@@ -2946,7 +2942,7 @@ config("symbols") {
+@@ -2980,7 +2984,7 @@ config("symbols") {
      cflags += [ "-gomit-unreferenced-methods" ]
    }
  
diff --git a/www/ungoogled-chromium/files/patch-build_config_ozone.gni b/www/ungoogled-chromium/files/patch-build_config_ozone.gni
index fcc90adb1ba5..c5a4c7f66283 100644
--- a/www/ungoogled-chromium/files/patch-build_config_ozone.gni
+++ b/www/ungoogled-chromium/files/patch-build_config_ozone.gni
@@ -1,6 +1,6 @@
---- build/config/ozone.gni.orig	2025-04-15 08:30:07 UTC
+--- build/config/ozone.gni.orig	2025-05-06 12:23:00 UTC
 +++ build/config/ozone.gni
-@@ -81,7 +81,15 @@ declare_args() {
+@@ -80,7 +80,15 @@ declare_args() {
        ozone_platform = "x11"
        ozone_platform_drm = true
        ozone_platform_x11 = true
diff --git a/www/ungoogled-chromium/files/patch-build_config_rust.gni b/www/ungoogled-chromium/files/patch-build_config_rust.gni
index 803ef95b68e8..6adac58e3c16 100644
--- a/www/ungoogled-chromium/files/patch-build_config_rust.gni
+++ b/www/ungoogled-chromium/files/patch-build_config_rust.gni
@@ -1,6 +1,6 @@
---- build/config/rust.gni.orig	2025-02-20 09:59:21 UTC
+--- build/config/rust.gni.orig	2025-05-06 12:23:00 UTC
 +++ build/config/rust.gni
-@@ -297,6 +297,10 @@ if (is_linux || is_chromeos) {
+@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) {
    }
  }
  
diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni
index 6776361443e6..647a75106c5e 100644
--- a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni
+++ b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni
@@ -1,6 +1,6 @@
---- build/toolchain/toolchain.gni.orig	2025-04-15 08:30:07 UTC
+--- build/toolchain/toolchain.gni.orig	2025-05-06 12:23:00 UTC
 +++ build/toolchain/toolchain.gni
-@@ -72,7 +72,7 @@ if (host_os == "mac") {
+@@ -75,7 +75,7 @@ if (host_os == "mac") {
    host_shlib_extension = ".dylib"
  } else if (host_os == "win") {
    host_shlib_extension = ".dll"
diff --git a/www/ungoogled-chromium/files/patch-cc_base_features.cc b/www/ungoogled-chromium/files/patch-cc_base_features.cc
index 69549b24374a..daa94569eb7a 100644
--- a/www/ungoogled-chromium/files/patch-cc_base_features.cc
+++ b/www/ungoogled-chromium/files/patch-cc_base_features.cc
@@ -1,6 +1,6 @@
---- cc/base/features.cc.orig	2025-02-20 09:59:21 UTC
+--- cc/base/features.cc.orig	2025-05-06 12:23:00 UTC
 +++ cc/base/features.cc
-@@ -43,7 +43,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
+@@ -48,7 +48,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
  // be using a separate flag to control the launch on GL.
  BASE_FEATURE(kUseDMSAAForTiles,
               "UseDMSAAForTiles",
diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
index f65cc56173a4..e19281f4647d 100644
--- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/app/chrome_main_delegate.cc
 @@ -147,7 +147,7 @@
  #include "components/webui/about/credit_utils.h"
@@ -129,7 +129,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess &&
        !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) {
-@@ -1532,13 +1532,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1532,13 +1532,13 @@ std::variant<int, content::MainFunctionParams> ChromeM
  #else
  
  #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn
index 03464de697fc..0147d1b2c8ef 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/BUILD.gn
-@@ -6788,6 +6788,13 @@ static_library("browser") {
+@@ -6836,6 +6836,13 @@ static_library("browser") {
            [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ]
      }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
index 42eea16ff98a..a0cfc7bbd707 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/about_flags.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/about_flags.cc
-@@ -259,7 +259,7 @@
+@@ -261,7 +261,7 @@
  #include "extensions/common/extension_features.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -345,7 +345,7 @@
+@@ -350,7 +350,7 @@
  #include "device/vr/public/cpp/switches.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "ui/ozone/public/ozone_switches.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -355,7 +355,7 @@
+@@ -360,7 +360,7 @@
  #include "chrome/browser/win/mica_titlebar.h"
  #endif
  
@@ -26,8 +26,8 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/contextual_cueing/contextual_cueing_features.h"  // nogncheck
  #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -366,7 +366,7 @@
+ #include "chrome/browser/enterprise/webstore/features.h"
+@@ -372,7 +372,7 @@
  #include "components/user_education/common/user_education_features.h"  // nogncheck
  #endif
  
@@ -36,7 +36,16 @@
  #include "chrome/browser/ui/ui_features.h"
  #include "ui/base/ui_base_features.h"
  #endif
-@@ -521,7 +521,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -424,7 +424,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = {
+ #endif  // USE_AURA
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ 
+ const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = {
+     {"LocalNetworkAccessChecksWarn", "false"}};
+@@ -540,7 +540,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
      {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
  #endif
  
@@ -45,7 +54,7 @@
  const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
      {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
      {flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -822,6 +822,26 @@ const FeatureEntry::FeatureVariation
+@@ -853,6 +853,26 @@ const FeatureEntry::FeatureVariation
           std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
           nullptr}};
  
@@ -72,8 +81,8 @@
  const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
      {"UIClipboardMaximumAge", "60"}};
  const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
-@@ -1185,7 +1205,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
- };
+@@ -1228,7 +1248,7 @@ constexpr FeatureEntry::FeatureVariation
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
@@ -81,7 +90,7 @@
  const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
      {"AtKeywordAcceleration", "true"},
  };
-@@ -1223,7 +1243,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
+@@ -1266,7 +1286,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
  };
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -89,8 +98,8 @@
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  
  // A limited number of combinations of the rich autocompletion params.
- const FeatureEntry::FeatureParam
-@@ -3583,7 +3603,7 @@ const FeatureEntry::FeatureVariation
+ const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = {
+@@ -3556,7 +3576,7 @@ const FeatureEntry::FeatureVariation
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -99,7 +108,7 @@
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
      {{"link_capturing_state", "on_by_default"}};
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
-@@ -4089,7 +4109,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
+@@ -4060,7 +4080,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
       std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
  };
  
@@ -108,7 +117,7 @@
  const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
      {"TranslationAPIAcceptLanguagesCheck", "false"},
      {"TranslationAPILimitLanguagePackCount", "false"}};
-@@ -4155,7 +4175,7 @@ const FeatureEntry::FeatureVariation
+@@ -4126,7 +4146,7 @@ const FeatureEntry::FeatureVariation
           1, nullptr},
  };
  
@@ -117,7 +126,7 @@
  const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
      {"BackoffTime", "0h"},
      {"BackoffMultiplierBase", "0.0"},
-@@ -5006,7 +5026,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5001,7 +5021,7 @@ const FeatureEntry kFeatureEntries[] = {
      },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -126,7 +135,7 @@
      {
          "fluent-overlay-scrollbars",
          flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5295,7 +5315,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5288,7 +5308,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableIsolatedWebAppDevModeName,
       flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
@@ -135,7 +144,7 @@
      {"enable-iwa-key-distribution-component",
       flag_descriptions::kEnableIwaKeyDistributionComponentName,
       flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
-@@ -5554,7 +5574,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5509,7 +5529,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kWebShare)},
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  
@@ -144,10 +153,10 @@
      {"pulseaudio-loopback-for-cast",
       flag_descriptions::kPulseaudioLoopbackForCastName,
       flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
-@@ -5590,6 +5610,16 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWaylandLinuxDrmSyncobjName,
-      flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)},
+@@ -5550,6 +5570,16 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWaylandSessionManagementName,
+      flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
+      FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
 +
 +#if BUILDFLAG(IS_BSD)
 +    {"audio-backend",
@@ -161,7 +170,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(ENABLE_VR)
-@@ -6470,7 +6500,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6436,7 +6466,7 @@ const FeatureEntry kFeatureEntries[] = {
                                      "MlUrlScoring")},
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -170,16 +179,16 @@
      {"omnibox-domain-suggestions",
       flag_descriptions::kOmniboxDomainSuggestionsName,
       flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
-@@ -6683,7 +6713,7 @@ const FeatureEntry kFeatureEntries[] = {
-                                     "OrganicRepeatableQueries")},
- 
+@@ -6706,7 +6736,7 @@ const FeatureEntry kFeatureEntries[] = {
+                                     kNumSrpZpsRelatedSearches,
+                                     "PowerTools")},
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
       flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
       FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
-@@ -7180,7 +7210,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7198,7 +7228,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -188,7 +197,7 @@
      {"cups-ipp-printing-backend",
       flag_descriptions::kCupsIppPrintingBackendName,
       flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
-@@ -7445,7 +7475,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7446,7 +7476,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)},
  
@@ -197,7 +206,7 @@
      {"wasm-tts-component-updater-enabled",
       flag_descriptions::kWasmTtsComponentUpdaterEnabledName,
       flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop,
-@@ -8101,7 +8131,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8118,7 +8148,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
  #endif  // !BUILDFLAG(IS_CHROMEOS)
  
@@ -206,7 +215,7 @@
      {"enable-network-service-sandbox",
       flag_descriptions::kEnableNetworkServiceSandboxName,
       flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8782,7 +8812,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8783,7 +8813,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -215,7 +224,7 @@
      {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
       flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
-@@ -8807,7 +8837,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8808,7 +8838,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
  
@@ -224,7 +233,7 @@
      {
          "ui-debug-tools",
          flag_descriptions::kUIDebugToolsName,
-@@ -9274,7 +9304,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9284,7 +9314,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -233,7 +242,7 @@
      {"media-session-enter-picture-in-picture",
       flag_descriptions::kMediaSessionEnterPictureInPictureName,
       flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -9912,7 +9942,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9933,7 +9963,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
  
@@ -242,7 +251,7 @@
      {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
       flag_descriptions::kCameraMicEffectsDescription,
       static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10036,7 +10066,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10057,7 +10087,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)},
  #endif
  
@@ -251,7 +260,7 @@
      {"third-party-profile-management",
       flag_descriptions::kThirdPartyProfileManagementName,
       flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10071,7 +10101,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10086,7 +10116,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -260,16 +269,16 @@
      {"enable-user-navigation-capturing-pwa",
       flag_descriptions::kPwaNavigationCapturingName,
       flag_descriptions::kPwaNavigationCapturingDescription,
-@@ -10832,7 +10862,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10826,7 +10856,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCanvasHibernationDescription, kOsAll,
       FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"sync-enable-bookmarks-in-transport-mode",
-      flag_descriptions::kSyncEnableBookmarksInTransportModeName,
-      flag_descriptions::kSyncEnableBookmarksInTransportModeDescription,
-@@ -10948,7 +10978,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-history-sync-optin",
+      flag_descriptions::kEnableHistorySyncOptinName,
+      flag_descriptions::kEnableHistorySyncOptinDescription,
+@@ -10929,7 +10959,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)},
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -278,7 +287,7 @@
      {"supervised-profile-safe-search",
       flag_descriptions::kSupervisedProfileSafeSearchName,
       flag_descriptions::kSupervisedProfileSafeSearchDescription,
-@@ -11195,7 +11225,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11176,7 +11206,7 @@ const FeatureEntry kFeatureEntries[] = {
           segmentation_platform::features::kSegmentationSurveyPage)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -287,7 +296,7 @@
      {"autofill-enable-buy-now-pay-later",
       flag_descriptions::kAutofillEnableBuyNowPayLaterName,
       flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
-@@ -11315,7 +11345,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11291,7 +11321,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
  
@@ -296,7 +305,7 @@
      {"translation-api", flag_descriptions::kTranslationAPIName,
       flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
       FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
-@@ -11352,7 +11382,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11328,7 +11358,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           password_manager::features::kPasswordFormClientsideClassifier)},
  
@@ -305,7 +314,7 @@
      {"contextual-cueing", flag_descriptions::kContextualCueingName,
       flag_descriptions::kContextualCueingDescription,
       kOsLinux | kOsMac | kOsWin,
-@@ -11671,7 +11701,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11662,7 +11692,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -314,7 +323,7 @@
      {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
       flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
       FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
-@@ -11721,7 +11751,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11712,7 +11742,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -323,7 +332,7 @@
      {"autofill-enable-amount-extraction-desktop",
       flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
       flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
-@@ -11741,7 +11771,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11732,7 +11762,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -332,3 +341,39 @@
      {"autofill-enable-amount-extraction-allowlist-desktop",
       flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
       flag_descriptions::
+@@ -11843,7 +11873,7 @@ const FeatureEntry kFeatureEntries[] = {
+          apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)},
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     {"chrome-web-store-navigation-throttle",
+      flag_descriptions::kChromeWebStoreNavigationThrottleName,
+      flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
+@@ -11878,7 +11908,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"autofill-enable-amount-extraction-desktop-logging",
+      flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName,
+      flag_descriptions::
+@@ -11908,7 +11938,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)},
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"root-scrollbar-follows-browser-theme",
+      flag_descriptions::kRootScrollbarFollowsTheme,
+      flag_descriptions::kRootScrollbarFollowsThemeDescription,
+@@ -11930,7 +11960,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"local-network-access-check",
+      flag_descriptions::kLocalNetworkAccessChecksName,
+      flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop,
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
index db9e3a2e1747..dfe1efa480db 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
@@ -1,6 +1,6 @@
---- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/background/glic/glic_status_icon.cc
-@@ -83,7 +83,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
+@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
    if (!status_icon_) {
      return;
    }
@@ -9,8 +9,8 @@
    //  Set a vector icon for proper themeing on Linux.
    status_icon_->SetIcon(
        GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON));
-@@ -113,7 +113,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
- GlicStatusIcon::~GlicStatusIcon() {
+@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() {
+ 
    context_menu_ = nullptr;
    if (status_icon_) {
 -#if !BUILDFLAG(IS_LINUX)
@@ -18,7 +18,16 @@
      status_icon_->RemoveObserver(this);
  #endif
      std::unique_ptr<StatusIcon> removed_icon =
-@@ -201,7 +201,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
+@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const ui::Accelerato
+ }
+ 
+ void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (context_menu_) {
+     context_menu_->SetCommandIdVisible(IDC_GLIC_STATUS_ICON_MENU_EXIT,
+                                        BrowserList::GetInstance()->empty());
+@@ -272,7 +272,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
    menu->AddItem(
        IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON,
        l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON));
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc
index f3e67b642295..3a7f59c641fd 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc
@@ -1,15 +1,15 @@
---- chrome/browser/browser_features.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/browser_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/browser_features.cc
-@@ -81,7 +81,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode,
-              "ContentUsesBrowserThemeColorMode",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDestruction,
+              "ClearUserDataUponProfileDestruction",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Enables usage of os_crypt_async::SecretPortalKeyProvider.  Once
  // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be
  // disabled without losing data.
-@@ -100,7 +100,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
+@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
  // the browser exits.
  BASE_FEATURE(kDestroyProfileOnBrowserClose,
               "DestroyProfileOnBrowserClose",
@@ -18,7 +18,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT);
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -233,7 +233,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
+@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
               "SandboxExternalProtocolBlockedWarning",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h
index ac6e2b158fa5..d58d0ac2c48a 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h
@@ -1,15 +1,15 @@
---- chrome/browser/browser_features.h.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/browser_features.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/browser_features.h
-@@ -39,7 +39,7 @@ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
- 
- BASE_DECLARE_FEATURE(kContentUsesBrowserThemeColorMode);
+@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore
+ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
+ BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kDbusSecretPortal);
  BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider);
  #endif
-@@ -101,7 +101,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
+@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked);
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning);
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc
index bb0ceeaab926..8fb41b787b00 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/browser_process_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/browser_process_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/browser_process_impl.cc
 @@ -261,7 +261,7 @@
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@@ -18,7 +18,7 @@
  // How often to check if the persistent instance of Chrome needs to restart
  // to install an update.
  static const int kUpdateCheckIntervalHours = 6;
-@@ -1147,7 +1147,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
+@@ -1159,7 +1159,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
                                  GoogleUpdateSettings::GetCollectStatsConsent());
    registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
  
@@ -27,7 +27,7 @@
    os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
  #endif
  }
-@@ -1412,7 +1412,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1424,7 +1424,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
            local_state())));
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -36,7 +36,7 @@
    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) !=
        "basic") {
-@@ -1681,7 +1681,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1693,7 +1693,7 @@ void BrowserProcessImpl::Unpin() {
  }
  
  // Mac is currently not supported.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
index 02d567d5edd0..d40de7409c4b 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/chrome_browser_interface_binders_webui.cc
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
  #include "content/public/browser/web_ui_controller_interface_binder.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
  #endif
  
@@ -17,8 +17,8 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
-@@ -440,7 +440,7 @@ void PopulateChromeWebUIFrameBinders(
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin.mojom.h"
+@@ -445,7 +445,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
    RegisterWebUIControllerInterfaceBinder<
        connectors_internals::mojom::PageHandler,
        enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -451,7 +451,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -456,7 +456,7 @@ void PopulateChromeWebUIFrameBinders(
                                           policy::DlpInternalsUI>(map);
  #endif
  
@@ -36,9 +36,9 @@
    RegisterWebUIControllerInterfaceBinder<
        app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
  
-@@ -544,14 +544,14 @@ void PopulateChromeWebUIFrameBinders(
-       page_image_service::mojom::PageImageServiceHandler, HistoryUI,
-       HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
+@@ -583,14 +583,14 @@ void PopulateChromeWebUIFrameBinders(
+         HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
+   }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
@@ -53,7 +53,7 @@
        WhatsNewUI,
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
        NewTabPageUI>(map);
-@@ -1084,7 +1084,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1123,7 +1123,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 8718db5d53b0..f2a228eccf41 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -503,7 +503,7 @@
+@@ -505,7 +505,7 @@
  #include "components/user_manager/user_manager.h"
  #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
  #include "storage/browser/file_system/external_mount_points.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #elif BUILDFLAG(IS_ANDROID)
-@@ -617,11 +617,11 @@
+@@ -621,11 +621,11 @@
  #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
  #endif  //  !BUILDFLAG(IS_ANDROID)
  
@@ -23,7 +23,7 @@
  #include "components/crash/core/app/crash_switches.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -632,7 +632,7 @@
+@@ -636,7 +636,7 @@
  #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
  #endif
  
@@ -32,7 +32,7 @@
  #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
  #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
  #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
-@@ -641,7 +641,7 @@
+@@ -645,7 +645,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -41,7 +41,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -650,7 +650,7 @@
+@@ -654,7 +654,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -50,7 +50,7 @@
  #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
  #elif BUILDFLAG(IS_OZONE)
  #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+@@ -1552,7 +1552,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
    registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache,
                                  false);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -59,7 +59,7 @@
    registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
                                  true);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1755,7 +1755,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1761,7 +1761,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  #elif BUILDFLAG(IS_CHROMEOS)
    main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>(
        is_integration_test, &startup_data_);
@@ -68,7 +68,7 @@
    main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
        is_integration_test, &startup_data_);
  #elif BUILDFLAG(IS_ANDROID)
-@@ -1784,7 +1784,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1790,7 +1790,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
      // Construct additional browser parts. Stages are called in the order in
      // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -77,7 +77,7 @@
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -1801,7 +1801,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1807,7 +1807,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>());
  #endif
  
@@ -86,7 +86,7 @@
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
  #elif BUILDFLAG(IS_OZONE)
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1820,7 +1820,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1826,7 +1826,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  
    chrome::AddMetricsExtraParts(main_parts.get());
  
@@ -95,7 +95,7 @@
    main_parts->AddParts(
        std::make_unique<
            enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2703,7 +2703,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
+@@ -2709,7 +2709,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
  void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
      base::CommandLine* command_line,
      int child_process_id) {
@@ -105,7 +105,7 @@
  #if BUILDFLAG(IS_MAC)
    std::unique_ptr<metrics::ClientInfo> client_info =
        GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -3054,7 +3056,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -3065,7 +3067,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      }
    }
  
@@ -114,7 +114,25 @@
    // Opt into a hardened stack canary mitigation if it hasn't already been
    // force-disabled.
    if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4896,7 +4898,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4015,7 +4017,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr
+   return old_preferred_color_scheme != web_prefs->preferred_color_scheme;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a
+ // custom colored frame for the UI.
+ void UpdateRootScrollbarThemeColor(Profile* profile,
+@@ -4642,7 +4644,7 @@ void ChromeContentBrowserClient::OverrideWebPreference
+ 
+   UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(),
+                              web_contents, GetWebTheme());
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs);
+ #endif  //  BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+ 
+@@ -4958,7 +4960,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -123,7 +141,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -5404,7 +5406,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5466,7 +5468,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
          &throttles);
    }
  
@@ -132,7 +150,7 @@
    MaybeAddThrottle(
        WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
        &throttles);
-@@ -5421,7 +5423,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5483,7 +5485,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -141,7 +159,7 @@
    MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -5462,7 +5464,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5524,7 +5526,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
    }
  #endif
  
@@ -150,7 +168,7 @@
    MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -7400,7 +7402,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -7477,7 +7479,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
  bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
  // This enterprise policy is supported on Android, but the feature will not be
  // launched there.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index 621c7a19d20d..581494964299 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -555,7 +555,7 @@ class ChromeContentBrowserClient : public content::Con
    bool IsPluginAllowedToUseDevChannelAPIs(
        content::BrowserContext* browser_context,
        const GURL& url) override;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
index c2e9d78ad7d9..e787171510d3 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc
-@@ -100,7 +100,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo
+@@ -102,7 +102,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo
    // This configuration object allows us to control platform specific behavior.
    MessagingBackendConfiguration configuration;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
index 1b508ae5b911..66894b11f934 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
@@ -1,6 +1,6 @@
---- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc
-@@ -56,7 +56,7 @@ void OnDemandUpdateCompleted(update_client::Error err)
+@@ -64,7 +64,7 @@ component_updater::OnDemandUpdater::Priority GetOnDema
  
  namespace component_updater {
  
@@ -9,7 +9,7 @@
  BASE_FEATURE(kIwaKeyDistributionComponent,
               "IwaKeyDistributionComponent",
  #if BUILDFLAG(IS_CHROMEOS)
-@@ -81,7 +81,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
+@@ -89,7 +89,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
    // the main IWA feature.
  #if BUILDFLAG(IS_WIN)
    return base::FeatureList::IsEnabled(features::kIsolatedWebApps);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc
new file mode 100644
index 000000000000..da39c0fe922f
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/features.cc.orig	2025-05-06 12:23:00 UTC
++++ chrome/browser/devtools/features.cc
+@@ -157,7 +157,7 @@ BASE_FEATURE(kDevToolsAiGeneratedTimelineLabels,
+              "DevToolsAiGeneratedTimelineLabels",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If enabled, DevTools does not accept remote debugging connections unless
+ // using a non-default user data dir via the --user-data-dir switch.
+ BASE_FEATURE(kDevToolsDebuggingRestrictions,
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h
new file mode 100644
index 000000000000..ecd58d9f0740
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/features.h.orig	2025-05-06 12:23:00 UTC
++++ chrome/browser/devtools/features.h
+@@ -89,7 +89,7 @@ BASE_DECLARE_FEATURE(kDevToolsCssValueTracing);
+ 
+ BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabels);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc
new file mode 100644
index 000000000000..60149d8304f2
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/remote_debugging_server.cc.orig	2025-05-06 12:23:00 UTC
++++ chrome/browser/devtools/remote_debugging_server.cc
+@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::optional<bool>& is
+         RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy);
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) &&
+       is_default_user_data_dir.value_or(true)) {
+     return base::unexpected(
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc
index f2f79e408020..457fabaf9bc6 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_item_model.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/download/download_item_model.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/download/download_item_model.cc
 @@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked(
               download_crx_util::IsExtensionDownload(*download_);
@@ -18,7 +18,7 @@
        if (download_commands->CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1215,7 +1215,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1206,7 +1206,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
      return;
    }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc
index 11db4ffa0d65..8913b28c9c82 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/common.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/enterprise/connectors/common.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/enterprise/connectors/common.cc
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  #include "components/user_manager/user.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/prefs/pref_service.h"
  #endif
-@@ -191,7 +191,7 @@ std::string GetProfileEmail(Profile* profile) {
+@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* profile) {
    std::string email =
        GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
index b4749bda167a..6069ad484ed2 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -469,7 +469,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope(
+@@ -475,7 +475,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope(
  bool ConnectorsService::ConnectorsEnabled() const {
    Profile* profile = Profile::FromBrowserContext(context_);
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
index 5d088d6a641d..c56243293c8f 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
-@@ -55,7 +55,7 @@
+@@ -53,7 +53,7 @@
  #include "base/strings/utf_string_conversions.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/device_signals/core/browser/signals_aggregator.h"
-@@ -160,7 +160,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
+@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
                                       /*include_profile_user_name=*/false);
  }
  
@@ -18,7 +18,7 @@
  
  void AddCrowdstrikeSignalsToEvent(
      base::Value::Dict& event,
-@@ -235,7 +235,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
+@@ -233,7 +233,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
    return client_id;
  }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
index 055bd798d6f2..ba5ad477c3ee 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
 @@ -19,7 +19,7 @@
  #include "components/keyed_service/core/keyed_service.h"
@@ -9,7 +9,7 @@
  #include "components/device_signals/core/browser/signals_types.h"
  #endif
  
-@@ -118,7 +118,7 @@ class RealtimeReportingClient : public RealtimeReporti
+@@ -113,7 +113,7 @@ class RealtimeReportingClient : public RealtimeReporti
        const std::string& dm_token) override;
  #endif
  
@@ -18,7 +18,7 @@
    // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...).
    void MaybeCollectDeviceSignalsAndReportEventDeprecated(
        base::Value::Dict event,
-@@ -168,7 +168,7 @@ class RealtimeReportingClient : public RealtimeReporti
+@@ -163,7 +163,7 @@ class RealtimeReportingClient : public RealtimeReporti
    base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
  };
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
new file mode 100644
index 000000000000..b809b34b43cb
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig	2025-05-06 12:23:00 UTC
++++ chrome/browser/enterprise/signals/context_info_fetcher.cc
+@@ -173,6 +173,8 @@ std::vector<std::string> ContextInfoFetcher::GetOnSecu
+ SettingValue ContextInfoFetcher::GetOSFirewall() {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+   return device_signals::GetOSFirewall();
++#elif BUILDFLAG(IS_OPENBSD)
++  return SettingValue::ENABLED;
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return GetChromeosFirewall();
+ #else
+@@ -192,7 +194,7 @@ ScopedUfwConfigPathForTesting::~ScopedUfwConfigPathFor
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+ std::vector<std::string> ContextInfoFetcher::GetDnsServers() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   return device_signals::GetSystemDnsServers();
+ #else
+   return std::vector<std::string>();
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
index 68cf65f1be75..21f131352378 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/enterprise/signals/device_info_fetcher.cc
 @@ -10,7 +10,7 @@
  #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
  #endif
  
-@@ -74,7 +74,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
+@@ -76,7 +76,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
    return CreateInstanceInternal();
  }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
index 7d15d08d5ab8..56867a07c9c0 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/enterprise/util/managed_browser_utils.cc
-@@ -224,7 +224,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
+@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
+       profile_manager->GetProfileAttributesStorage()
            .GetProfileAttributesWithPath(profile->GetPath());
    if (entry) {
-     entry->SetUserAcceptedAccountManagement(accepted);
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     entry->SetEnterpriseProfileLabel(GetEnterpriseLabel(profile));
+     SetEnterpriseProfileLabel(profile);
  #endif
-   }
+     entry->SetUserAcceptedAccountManagement(accepted);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn
index cff5d63b8f6b..61cff9624bd0 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1435,6 +1435,10 @@ source_set("extensions") {
+@@ -1463,6 +1463,10 @@ source_set("extensions") {
        deps += [ "//chrome/services/printing/public/mojom" ]
      }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index 934d2bb31006..9effb07552cc 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 @@ -40,7 +40,7 @@
  #include "components/reporting/util/statusor.h"
@@ -9,7 +9,7 @@
  #include <optional>
  
  #include "base/strings/string_util.h"
-@@ -115,7 +115,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+@@ -114,7 +114,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
  }
  
  bool AllowClientCertificateReportingForUsers() {
@@ -18,7 +18,7 @@
    return base::FeatureList::IsEnabled(
        enterprise_signals::features::kAllowClientCertificateReportingForUsers);
  #else
-@@ -128,7 +128,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin
+@@ -127,7 +127,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin
    return pref && pref->IsManaged();
  }
  
@@ -27,7 +27,7 @@
  
  device_signals::SignalsAggregationRequest CreateAggregationRequest(
      device_signals::SignalName signal_name) {
-@@ -190,7 +190,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -189,7 +189,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
  
  // getPersistentSecret
  
@@ -36,7 +36,7 @@
  
  EnterpriseReportingPrivateGetPersistentSecretFunction::
      EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -630,7 +630,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+@@ -629,7 +629,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
  }
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
index 3efb2a11c8d0..37518819899e 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -409,7 +409,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
+@@ -410,7 +410,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
    apps::LaunchContainer launch_container =
        GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
    Profile* profile = Profile::FromBrowserContext(context);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index 04daac619833..d99441ada90f 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -293,7 +293,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+@@ -292,7 +292,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PlatformOs::kLinux;
    } else if (strcmp(os, "openbsd") == 0) {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index 328ae08cde8f..9103d0b80a67 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,15 +1,15 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -189,7 +189,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] =
        settings_api::PrefType::kBoolean;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] =
-       settings_api::PrefType::kBoolean;
    (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] =
-@@ -209,7 +209,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+       settings_api::PrefType::kBoolean;
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+@@ -212,7 +212,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
        settings_api::PrefType::kBoolean;
  
@@ -18,7 +18,7 @@
    (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::kBoolean;
  #endif
-@@ -221,7 +221,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -224,7 +224,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
    (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
    (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
index 2bdadce6fa72..4be643f06c0f 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -931,7 +931,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
+@@ -932,7 +932,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
  // created as minimized.
  // TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
  // TODO(crbug.com/40254339): Find a fix for wayland as well.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index 320c677e9aa9..ef227a4761c8 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -795,7 +795,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
    if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
@@ -9,7 +9,7 @@
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
          base::MakeRefCounted<ExternalPrefLoader>(
-@@ -823,7 +823,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders(
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
index 1b130a5673a2..cbd91e709415 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
@@ -1,6 +1,6 @@
---- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
-@@ -38,7 +38,7 @@
+@@ -37,7 +37,7 @@
  #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
  #endif
  
-@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content
+@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content
    fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>());
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
index 321138c478f8..a48340647d8f 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
@@ -1,6 +1,6 @@
---- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc
-@@ -45,7 +45,7 @@
+@@ -44,7 +44,7 @@
  #include "services/network/public/cpp/shared_url_loader_factory.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
  #endif
  
-@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil
+@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil
    fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data));
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
index 9ffda1ce73dc..c5deb87cdff1 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -562,7 +562,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
+@@ -602,7 +602,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
      "Autofill suggestions on the allowlisted merchant websites.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kAutofillEnableAmountExtractionAllowlistDesktopName[] =
      "Enable loading and querying the checkout amount extraction allowlist on "
      "Chrome Desktop";
-@@ -580,7 +580,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr
+@@ -626,7 +626,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi
          // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  const char kAutofillEnableBuyNowPayLaterName[] =
      "Enable buy now pay later on Autofill";
  const char kAutofillEnableBuyNowPayLaterDescription[] =
-@@ -992,7 +992,7 @@ const char kDevicePostureDescription[] =
+@@ -1031,7 +1031,7 @@ const char kDevicePostureDescription[] =
      "Enables Device Posture API (foldable devices)";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -27,16 +27,16 @@
  const char kDocumentPictureInPictureAnimateResizeName[] =
      "Document Picture-in-Picture Animate Resize";
  const char kDocumentPictureInPictureAnimateResizeDescription[] =
-@@ -1077,7 +1077,7 @@ const char kCompressionDictionaryTransportRequireKnown
-     "when the connection is using a well known root cert or when the server is "
-     "a localhost.";
+@@ -1123,7 +1123,7 @@ const char kContextMenuEmptySpaceDescription[] =
+     "space, a context menu containing page-related items will be shown.";
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  const char kContextualCueingName[] = "Contextual cueing";
  const char kContextualCueingDescription[] =
-     "Enables the contextual cueing system to support showing actions";
-@@ -1496,7 +1496,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
+     "Enables the contextual cueing system to support showing actions.";
+@@ -1563,7 +1563,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
  const char kEnableIsolatedWebAppDevModeDescription[] =
      "Enables the installation of unverified Isolated Web Apps";
  
@@ -45,7 +45,16 @@
  const char kEnableIwaKeyDistributionComponentName[] =
      "Enable the Iwa Key Distribution component";
  const char kEnableIwaKeyDistributionComponentDescription[] =
-@@ -3498,7 +3498,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
+@@ -3434,7 +3434,7 @@ const char kRetainOmniboxOnFocusDescription[] =
+     "exhibit a change in behavior.";
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme";
+ const char kRootScrollbarFollowsThemeDescription[] =
+     "If enabled makes the root scrollbar follow the browser's theme color.";
+@@ -3652,7 +3652,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
      "SiteInstance.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,25 +63,25 @@
  const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing";
  const char kPwaNavigationCapturingDescription[] =
      "Enables opening links from Chrome in an installed PWA. Currently under "
-@@ -3733,7 +3733,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
+@@ -3867,7 +3867,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
      "Force the Translate Triggering on English pages experiment to be enabled "
      "with the selected language model active.";
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kTranslationAPIName[] = "Experimental translation API";
- const char kTranslationAPIDescription[] =
-     "Enables the on-device language translation API. "
-@@ -5356,7 +5356,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes
-     "Enables a mitigation during web app install on CrOS for syncing "
-     "user_display_mode: kStandalone to non-CrOS devices.";
+ const char kEnableHistorySyncOptinName[] = "History Sync Opt-in";
+ const char kEnableHistorySyncOptinDescription[] =
+     "Enables the History Sync Opt-in screen on Desktop platforms. The screen "
+@@ -5455,7 +5455,7 @@ const char kTranslateOpenSettingsDescription[] =
+     "Add an option to the translate bubble menu to open language settings.";
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  const char kWasmTtsComponentUpdaterEnabledName[] =
      "Enable Wasm TTS Extension Component";
  const char kWasmTtsComponentUpdaterEnabledDescription[] =
-@@ -7354,7 +7354,7 @@ const char kTetheringExperimentalFunctionalityDescript
+@@ -7463,7 +7463,7 @@ const char kTetheringExperimentalFunctionalityDescript
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -81,7 +90,7 @@
  const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
  const char kGetAllScreensMediaDescription[] =
      "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7584,7 +7584,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
+@@ -7692,7 +7692,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
  
  // Linux -----------------------------------------------------------------------
  
@@ -90,7 +99,7 @@
  const char kOzonePlatformHintChoiceDefault[] = "Default";
  const char kOzonePlatformHintChoiceAuto[] = "Auto";
  const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7630,6 +7630,18 @@ const char kWaylandUiScalingDescription[] =
+@@ -7742,6 +7742,18 @@ const char kWaylandUiScalingDescription[] =
      "Enable experimental support for text scaling in the Wayland backend "
      "backed by full UI scaling. Requires #wayland-per-window-scaling to be "
      "enabled too.";
@@ -109,7 +118,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -7642,7 +7654,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+@@ -7754,7 +7766,7 @@ const char kZeroCopyVideoCaptureDescription[] =
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -118,16 +127,16 @@
  const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
  const char kFollowingFeedSidepanelDescription[] =
      "Enables the following feed in the sidepanel.";
-@@ -7675,7 +7687,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
-     "Enables a refreshed design for the Task Manager on Desktop platforms.";
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -7797,7 +7809,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P
+ const char kGroupPromoPrototypeDescription[] =
+     "Enables prototype for group promo.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  const char kEnableNetworkServiceSandboxName[] =
      "Enable the network service sandbox.";
  const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7707,7 +7719,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7829,7 +7841,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
      "Bluetooth";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -136,7 +145,7 @@
  #if BUILDFLAG(ENABLE_PRINTING)
  const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend";
  const char kCupsIppPrintingBackendDescription[] =
-@@ -7852,7 +7864,7 @@ const char kElementCaptureDescription[] =
+@@ -7971,7 +7983,7 @@ const char kElementCaptureDescription[] =
      "media track into a track capturing just a specific DOM element.";
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -145,7 +154,7 @@
  const char kUIDebugToolsName[] = "Debugging tools for UI";
  const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
-@@ -7908,7 +7920,7 @@ const char kComposeUpfrontInputModesDescription[] =
+@@ -8022,7 +8034,7 @@ const char kComposeUpfrontInputModesDescription[] =
      "Enables upfront input modes in the Compose dialog";
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -154,9 +163,9 @@
  const char kThirdPartyProfileManagementName[] =
      "Third party profile management";
  const char kThirdPartyProfileManagementDescription[] =
-@@ -8052,7 +8064,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] =
-     "Enable the OS settings for overlay scrollbars on ChromeOS.";
- #endif  // BUILDFLAG(IS_CHROMEOS)
+@@ -8158,7 +8170,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] =
+ const char kSupervisedUserBlockInterstitialV3Description[] =
+     "Enables URL filter interstitial V3 for Family Link users.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
index ed1e614e231c..687d24240adb 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/flag_descriptions.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -356,7 +356,7 @@ extern const char
+@@ -373,7 +373,7 @@ extern const char
      kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[];
  extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[];
  extern const char kAutofillEnableAmountExtractionDesktopName[];
-@@ -365,7 +365,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
+@@ -384,7 +384,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
          // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,16 +18,16 @@
  extern const char kAutofillEnableBuyNowPayLaterName[];
  extern const char kAutofillEnableBuyNowPayLaterDescription[];
  
-@@ -581,7 +581,7 @@ extern const char kCrossTabRegionCaptureName[];
- extern const char kCrossTabRegionCaptureDescription[];
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -602,7 +602,7 @@ extern const char kContextMenuEmptySpaceName[];
+ extern const char kContextMenuEmptySpaceDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  extern const char kContextualCueingName[];
  extern const char kContextualCueingDescription[];
- #endif  // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -753,7 +753,7 @@ extern const char kDevicePostureName[];
+ extern const char kGlicZeroStateSuggestionsName[];
+@@ -786,7 +786,7 @@ extern const char kDevicePostureName[];
  extern const char kDevicePostureDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +36,7 @@
  extern const char kDocumentPictureInPictureAnimateResizeName[];
  extern const char kDocumentPictureInPictureAnimateResizeDescription[];
  
-@@ -915,7 +915,7 @@ extern const char kEnableIsolatedWebAppManagedGuestSes
+@@ -948,7 +948,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri
  extern const char kEnableIsolatedWebAppDevModeName[];
  extern const char kEnableIsolatedWebAppDevModeDescription[];
  
@@ -45,7 +45,16 @@
  extern const char kEnableIwaKeyDistributionComponentName[];
  extern const char kEnableIwaKeyDistributionComponentDescription[];
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -2020,7 +2020,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
+@@ -1967,7 +1967,7 @@ extern const char kRetainOmniboxOnFocusName[];
+ extern const char kRetainOmniboxOnFocusDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kRootScrollbarFollowsTheme[];
+ extern const char kRootScrollbarFollowsThemeDescription[];
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+@@ -2099,7 +2099,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
  extern const char kDefaultSiteInstanceGroupsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,25 +63,25 @@
  extern const char kPwaNavigationCapturingName[];
  extern const char kPwaNavigationCapturingDescription[];
  #endif
-@@ -2180,7 +2180,7 @@ extern const char kTouchTextEditingRedesignDescription
+@@ -2245,7 +2245,7 @@ extern const char kTouchTextEditingRedesignDescription
  extern const char kTranslateForceTriggerOnEnglishName[];
  extern const char kTranslateForceTriggerOnEnglishDescription[];
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kTranslationAPIName[];
- extern const char kTranslationAPIDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -3147,7 +3147,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio
- extern const char kUserDisplayModeSyncStandaloneMitigationName[];
- extern const char kUserDisplayModeSyncStandaloneMitigationDescription[];
+ extern const char kEnableHistorySyncOptinName[];
+ extern const char kEnableHistorySyncOptinDescription[];
+ 
+@@ -3200,7 +3200,7 @@ extern const char kTranslateOpenSettingsName[];
+ extern const char kTranslateOpenSettingsDescription[];
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  extern const char kWasmTtsComponentUpdaterEnabledName[];
  extern const char kWasmTtsComponentUpdaterEnabledDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -4328,7 +4328,7 @@ extern const char kTetheringExperimentalFunctionalityD
+@@ -4388,7 +4388,7 @@ extern const char kTetheringExperimentalFunctionalityD
  
  #endif  // #if BUILDFLAG(IS_CHROMEOS)
  
@@ -81,7 +90,7 @@
  extern const char kGetAllScreensMediaName[];
  extern const char kGetAllScreensMediaDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4463,7 +4463,7 @@ extern const char kEnableArmHwdrmDescription[];
+@@ -4523,7 +4523,7 @@ extern const char kEnableArmHwdrmDescription[];
  
  // Linux ---------------------------------------------------------------------
  
@@ -90,7 +99,7 @@
  extern const char kOzonePlatformHintChoiceDefault[];
  extern const char kOzonePlatformHintChoiceAuto[];
  extern const char kOzonePlatformHintChoiceX11[];
-@@ -4491,6 +4491,9 @@ extern const char kWaylandTextInputV3Description[];
+@@ -4554,6 +4554,9 @@ extern const char kWaylandTextInputV3Description[];
  
  extern const char kWaylandUiScalingName[];
  extern const char kWaylandUiScalingDescription[];
@@ -100,7 +109,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -4510,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -4573,7 +4576,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
  extern const char kWebBluetoothConfirmPairingSupportDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -109,7 +118,7 @@
  #if BUILDFLAG(ENABLE_PRINTING)
  extern const char kCupsIppPrintingBackendName[];
  extern const char kCupsIppPrintingBackendDescription[];
-@@ -4523,7 +4526,7 @@ extern const char kScreenlockReauthCardDescription[];
+@@ -4586,7 +4589,7 @@ extern const char kScreenlockReauthCardDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -117,8 +126,8 @@
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kFollowingFeedSidepanelName[];
  extern const char kFollowingFeedSidepanelDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4537,7 +4540,7 @@ extern const char kTaskManagerDesktopRefreshName[];
+ 
+@@ -4603,7 +4606,7 @@ extern const char kTaskManagerDesktopRefreshName[];
  extern const char kTaskManagerDesktopRefreshDescription[];
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -127,7 +136,7 @@
  extern const char kEnableNetworkServiceSandboxName[];
  extern const char kEnableNetworkServiceSandboxDescription[];
  
-@@ -4632,7 +4635,7 @@ extern const char kElementCaptureName[];
+@@ -4698,7 +4701,7 @@ extern const char kElementCaptureName[];
  extern const char kElementCaptureDescription[];
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -136,7 +145,7 @@
  extern const char kUIDebugToolsName[];
  extern const char kUIDebugToolsDescription[];
  #endif
-@@ -4674,7 +4677,7 @@ extern const char kComposeUpfrontInputModesName[];
+@@ -4737,7 +4740,7 @@ extern const char kComposeUpfrontInputModesName[];
  extern const char kComposeUpfrontInputModesDescription[];
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -145,9 +154,9 @@
  extern const char kThirdPartyProfileManagementName[];
  extern const char kThirdPartyProfileManagementDescription[];
  
-@@ -4759,7 +4762,7 @@ extern const char kEnablePolicyPromotionBannerName[];
- extern const char kEnablePolicyPromotionBannerDescription[];
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -4817,7 +4820,7 @@ extern const char kEnablePolicyPromotionBannerDescript
+ extern const char kSupervisedUserBlockInterstitialV3Name[];
+ extern const char kSupervisedUserBlockInterstitialV3Description[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc
index e9cc0f7ca963..b6319a9d5dfa 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc
@@ -1,7 +1,7 @@
---- chrome/browser/global_features.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/global_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/global_features.cc
-@@ -21,7 +21,7 @@
- #include "chrome/browser/glic/glic_profile_manager.h"  // nogncheck
+@@ -22,7 +22,7 @@
+ #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h"  // nogncheck
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
  // This causes a gn error on Android builds, because gn does not understand
  // buildflags, so we include it only on platforms where it is used.
  #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h"
-@@ -60,7 +60,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
+@@ -61,7 +61,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
  
  void GlobalFeatures::Init() {
    system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
@@ -18,7 +18,7 @@
    whats_new_registry_ = CreateWhatsNewRegistry();
  #endif
  
-@@ -88,7 +88,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
+@@ -93,7 +93,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
    return system_permission_settings::PlatformHandle::Create();
  }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h
index c7d6b1f3500d..2395787f10ec 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h
@@ -1,4 +1,4 @@
---- chrome/browser/global_features.h.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/global_features.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/global_features.h
 @@ -14,7 +14,7 @@
  namespace system_permission_settings {
@@ -9,7 +9,7 @@
  namespace whats_new {
  class WhatsNewRegistry;
  }  // namespace whats_new
-@@ -55,7 +55,7 @@ class GlobalFeatures {
+@@ -56,7 +56,7 @@ class GlobalFeatures {
    system_permissions_platform_handle() {
      return system_permissions_platform_handle_.get();
    }
@@ -18,7 +18,7 @@
    whats_new::WhatsNewRegistry* whats_new_registry() {
      return whats_new_registry_.get();
    }
-@@ -80,7 +80,7 @@ class GlobalFeatures {
+@@ -85,7 +85,7 @@ class GlobalFeatures {
  
    virtual std::unique_ptr<system_permission_settings::PlatformHandle>
    CreateSystemPermissionsPlatformHandle();
@@ -27,7 +27,7 @@
    virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry();
  #endif
  
-@@ -90,7 +90,7 @@ class GlobalFeatures {
+@@ -95,7 +95,7 @@ class GlobalFeatures {
  
    std::unique_ptr<system_permission_settings::PlatformHandle>
        system_permissions_platform_handle_;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
index 787dfa3c643d..4b30ff5f497b 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-01-25 09:34:31 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 3c7fe034a111..c5a0f5a9bd06 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -86,7 +86,7 @@
+@@ -85,7 +85,7 @@
  #include "chrome/browser/flags/android/chrome_session_state.h"
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -9,7 +9,7 @@
  #if defined(__GLIBC__)
  #include <gnu/libc-version.h>
  #endif  // defined(__GLIBC__)
-@@ -111,7 +111,7 @@
+@@ -110,7 +110,7 @@
  #include "chrome/installer/util/taskbar_util.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -18,7 +18,7 @@
  #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -120,7 +120,7 @@
+@@ -119,7 +119,7 @@
  #include "components/user_manager/user_manager.h"
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -27,7 +27,7 @@
  #include "components/power_metrics/system_power_monitor.h"
  #endif
  
-@@ -872,7 +872,7 @@ void RecordStartupMetrics() {
+@@ -873,7 +873,7 @@ void RecordStartupMetrics() {
  
    // Record whether Chrome is the default browser or not.
    // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -36,7 +36,7 @@
    shell_integration::DefaultWebClientState default_state =
        shell_integration::GetDefaultBrowser();
    base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1183,11 +1183,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -1181,11 +1181,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
        std::make_unique<web_app::SamplingMetricsProvider>();
  #endif  // !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index 56f3576638c1..9e5720f5cf6a 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -196,11 +196,11 @@
+@@ -197,11 +197,11 @@
  #include "chrome/browser/metrics/google_update_metrics_provider_mac.h"
  #endif
  
@@ -41,7 +41,7 @@
    // Register the environment with the crash reporter. Note that there is a
    // window from startup to this point during which crash reports will not have
    // an environment set.
-@@ -724,7 +724,7 @@ void ChromeMetricsServiceClient::Initialize() {
+@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::Initialize() {
          std::make_unique<metrics::dwa::DwaService>(this, local_state);
    }
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -50,7 +50,7 @@
    metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
        base::SequencedTaskRunner::GetCurrentDefault());
  #endif
-@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -781,7 +781,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::CPUMetricsProvider>());
  
@@ -59,7 +59,7 @@
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::MotherboardMetricsProvider>());
  #endif
-@@ -873,7 +873,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
        std::make_unique<GoogleUpdateMetricsProviderMac>());
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
index f26c88c7059f..405219a9ba03 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/metrics/perf/cpu_identity.cc
-@@ -145,7 +145,7 @@ CPUIdentity GetCPUIdentity() {
+@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() {
    result.release =
  #if BUILDFLAG(IS_CHROMEOS)
        base::SysInfo::KernelVersion();
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc
index 24ccd554f6e3..c9f0d6ec54f5 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc
@@ -1,15 +1,15 @@
---- chrome/browser/net/profile_network_context_service.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/net/profile_network_context_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/net/profile_network_context_service.cc
-@@ -133,7 +133,7 @@
+@@ -134,7 +134,7 @@
  #include "extensions/common/constants.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -260,7 +260,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+@@ -275,7 +275,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
        });
  }
  
@@ -18,7 +18,7 @@
  std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
      Profile* profile,
      std::unique_ptr<net::ClientCertStore> platform_store) {
-@@ -1201,7 +1201,7 @@ ProfileNetworkContextService::CreateClientCertStore() 
+@@ -1227,7 +1227,7 @@ ProfileNetworkContextService::CreateClientCertStore() 
        std::make_unique<net::ClientCertStoreNSS>(
            base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate,
                                kCryptoModulePasswordClientAuth));
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 3feab4e1303e..1b4230e430ae 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -134,7 +134,7 @@ SystemNetworkContextManager* g_system_network_context_
+@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_
  // received a failed launch for a sandboxed network service.
  bool g_previously_failed_to_launch_sandboxed_service = false;
  
@@ -9,7 +9,7 @@
  // Whether kerberos library loading will work in the network service due to the
  // sandbox.
  bool g_network_service_will_allow_gssapi_library_load = false;
-@@ -142,7 +142,7 @@ bool g_network_service_will_allow_gssapi_library_load 
+@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load 
  const char* kGssapiDesiredPref =
  #if BUILDFLAG(IS_CHROMEOS)
      prefs::kKerberosEnabled;
@@ -18,7 +18,7 @@
      prefs::kReceivedHttpAuthNegotiateHeader;
  #endif
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -188,7 +188,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
    auth_dynamic_params->basic_over_http_enabled =
        local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
  
@@ -27,7 +27,7 @@
    auth_dynamic_params->delegate_by_kdc_policy =
        local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -203,7 +203,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
        local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -36,7 +36,7 @@
    auth_dynamic_params->allow_gssapi_library_load =
        local_state->GetBoolean(kGssapiDesiredPref);
  #endif  // BUILDFLAG(IS_CHROMEOS)
-@@ -213,7 +213,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
  
  void OnNewHttpAuthDynamicParams(
      network::mojom::HttpAuthDynamicParamsPtr& params) {
@@ -45,7 +45,7 @@
    // The kerberos library is incompatible with the network service sandbox, so
    // if library loading is now enabled, the network service needs to be
    // restarted. It will be restarted unsandboxed because is
-@@ -255,11 +255,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    if (g_previously_failed_to_launch_sandboxed_service) {
      return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
    }
@@ -59,7 +59,7 @@
    // The network service sandbox and the kerberos library are incompatible.
    // If kerberos is enabled by policy, disable the network service sandbox.
    if (g_network_service_will_allow_gssapi_library_load ||
-@@ -275,7 +275,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -68,7 +68,7 @@
    if (local_state &&
        local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
      return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -519,7 +519,7 @@ void SystemNetworkContextManager::DeleteInstance() {
+@@ -522,7 +522,7 @@ void SystemNetworkContextManager::DeleteInstance() {
    g_system_network_context_manager = nullptr;
  }
  
@@ -77,7 +77,7 @@
  SystemNetworkContextManager::GssapiLibraryLoadObserver::
      GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
      : owner_(owner) {}
-@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
                               auth_pref_callback);
  
@@ -86,7 +86,7 @@
    pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -591,7 +591,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -95,7 +95,7 @@
    pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  
-@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -659,7 +659,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
                                 std::string());
  
@@ -104,7 +104,7 @@
    registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
                                  false);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -681,11 +681,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -684,11 +684,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
  
    registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
  
@@ -118,7 +118,7 @@
    registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -738,7 +738,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -741,7 +741,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
    network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
  
@@ -127,7 +127,7 @@
    gssapi_library_loader_observer_.Install(network_service);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
+@@ -960,7 +960,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
        break;
    }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index 3c7994bac7e1..d185143c3058 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -642,7 +642,7 @@ void ChromePasswordManagerClient::
+@@ -638,7 +638,7 @@ void ChromePasswordManagerClient::
  bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
      device_reauth::DeviceAuthenticator* authenticator) {
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
    if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
      return false;
    }
-@@ -920,7 +920,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
+@@ -916,7 +916,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
  }
  
  void ChromePasswordManagerClient::NotifyKeychainError() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index d56b9ffbfc05..7ef0d8aa51ba 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
 @@ -252,19 +252,19 @@
  #include "components/spellcheck/browser/pref_names.h"
@@ -39,7 +39,7 @@
  #include "components/search_engines/enterprise/search_aggregator_policy_handler.h"
  #include "components/search_engines/enterprise/site_search_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -577,7 +577,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -574,7 +574,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
    { key::kDefaultDirectSocketsSetting,
      prefs::kManagedDefaultDirectSocketsSetting,
      base::Value::Type::INTEGER },
@@ -48,7 +48,7 @@
    { key::kDeletingUndecryptablePasswordsEnabled,
      password_manager::prefs::kDeletingUndecryptablePasswordsEnabled,
      base::Value::Type::BOOLEAN },
-@@ -936,13 +936,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -927,13 +927,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kManagedDefaultGeolocationSetting,
      base::Value::Type::INTEGER },
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -64,7 +64,7 @@
    { key::kFullscreenAllowed,
      prefs::kFullscreenAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1788,7 +1788,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1809,7 +1809,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::INTEGER},
  #endif // BUILDFLAG(IS_CHROMEOS)
  
@@ -73,7 +73,7 @@
    { key::kGSSAPILibraryName,
      prefs::kGSSAPILibraryName,
      base::Value::Type::STRING },
-@@ -1847,7 +1847,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1868,7 +1868,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -82,7 +82,7 @@
    { key::kNetworkServiceSandboxEnabled,
      prefs::kNetworkServiceSandboxEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1867,12 +1867,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1888,12 +1888,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kTotalMemoryLimitMb,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -97,7 +97,7 @@
    { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
      device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1880,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kLiveTranslateEnabled,
      base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -106,7 +106,7 @@
    { key::kDefaultBrowserSettingEnabled,
      prefs::kDefaultBrowserSettingEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1892,7 +1892,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1913,7 +1913,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -115,7 +115,7 @@
    { key::kAutoplayAllowed,
      prefs::kAutoplayAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1990,7 +1990,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2011,7 +2011,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
  
@@ -124,8 +124,8 @@
    { key::kAlternativeBrowserPath,
      browser_switcher::prefs::kAlternativeBrowserPath,
      base::Value::Type::STRING },
-@@ -2092,7 +2092,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::LIST },
+@@ -2116,7 +2116,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -133,7 +133,7 @@
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
-@@ -2163,7 +2163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2187,7 +2187,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      ash::prefs::kUrlParameterToAutofillSAMLUsername,
      base::Value::Type::STRING },
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -142,7 +142,7 @@
    { key::kTabDiscardingExceptions,
      performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
      base::Value::Type::LIST },
-@@ -2192,7 +2192,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2216,7 +2216,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kUiAutomationProviderEnabled,
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
@@ -151,7 +151,7 @@
    { key::kOutOfProcessSystemDnsResolutionEnabled,
      prefs::kOutOfProcessSystemDnsResolutionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2229,7 +2229,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2256,7 +2256,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::INTEGER },
  #endif
  #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -160,7 +160,7 @@
    { key::kExtensionInstallTypeBlocklist,
      extensions::pref_names::kExtensionInstallTypeBlocklist,
      base::Value::Type::LIST},
-@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2282,7 +2282,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
    { key::kTabCompareSettings,
      optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
      base::Value::Type::INTEGER},
@@ -169,7 +169,7 @@
    { key::kChromeForTestingAllowed,
      prefs::kChromeForTestingAllowed,
      base::Value::Type::BOOLEAN },
-@@ -2439,7 +2439,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2469,7 +2469,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    // Policies for all platforms - End
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -178,7 +178,7 @@
    handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
        key::kMemorySaverModeSavings,
        performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
-@@ -2666,7 +2666,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2690,7 +2690,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -187,7 +187,7 @@
    handlers->AddHandler(
        std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
    handlers->AddHandler(
-@@ -2719,7 +2719,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2749,7 +2749,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
        key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
        chrome_schema));
  
@@ -196,7 +196,7 @@
    handlers->AddHandler(std::make_unique<GuestModePolicyHandler>());
    handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
    handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
-@@ -3145,7 +3145,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3186,7 +3186,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif
  
  #if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -205,7 +205,7 @@
    handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
    handlers->AddHandler(
        std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -3153,7 +3153,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3194,7 +3194,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -214,7 +214,7 @@
    handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
        key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
        base::Value::Type::BOOLEAN));
-@@ -3171,7 +3171,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3212,7 +3212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            first_party_sets::FirstPartySetsOverridesPolicyHandler>(
            key::kRelatedWebsiteSetsOverrides, chrome_schema)));
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -223,7 +223,7 @@
    handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-@@ -3194,7 +3194,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3235,7 +3235,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            base::Value::Type::BOOLEAN)));
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -232,7 +232,7 @@
    handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -3212,7 +3212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3253,7 +3253,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails>
        gen_ai_default_policies;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index 918f475c571a..cb2033b02427 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,15 +1,15 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -309,7 +309,7 @@
- #include "components/ntp_tiles/custom_links_manager_impl.h"
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -313,7 +313,7 @@
+ #include "chrome/browser/devtools/devtools_window.h"
+ #endif  // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -478,11 +478,11 @@
+@@ -484,11 +484,11 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -23,7 +23,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
-@@ -510,7 +510,7 @@
+@@ -516,7 +516,7 @@
  #include "chrome/browser/sessions/session_service_log.h"
  #endif
  
@@ -32,7 +32,7 @@
  #include "ui/color/system_theme.h"
  #endif
  
-@@ -1659,7 +1659,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+@@ -1660,7 +1660,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
    on_device_translation::RegisterLocalStatePrefs(registry);
  #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
  
@@ -41,7 +41,7 @@
    WhatsNewUI::RegisterLocalStatePrefs(registry);
  #endif
  
-@@ -1815,7 +1815,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+@@ -1814,7 +1814,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
  #endif  // BUILDFLAG(ENABLE_PDF)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -50,7 +50,7 @@
    registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
  #endif
  
-@@ -2167,12 +2167,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -2168,12 +2168,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc b/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc
index 6ee1b2033231..6bb55c955c82 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/printer_query.cc.orig	2024-02-03 15:42:55 UTC
+--- chrome/browser/printing/printer_query.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/printing/printer_query.cc
-@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
+@@ -342,7 +342,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
      crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
          printer_name, print_backend->GetPrinterDriverInfo(printer_name));
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index 4a51cf65a1c4..0edfe3fc5035 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -348,7 +348,7 @@
+@@ -356,7 +356,7 @@
  #endif
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/idle/idle_service_factory.h"
  #endif
  
-@@ -390,7 +390,7 @@
+@@ -398,7 +398,7 @@
  #endif
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
  #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
-@@ -398,7 +398,7 @@
+@@ -406,7 +406,7 @@
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
  #endif
  
@@ -27,7 +27,7 @@
  #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
  #endif
  
-@@ -406,7 +406,7 @@
+@@ -414,7 +414,7 @@
  #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h"
  #endif
  
@@ -36,7 +36,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
-@@ -720,7 +720,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -728,7 +728,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    DiceBoundSessionCookieServiceFactory::GetInstance();
  #endif
  #endif
@@ -45,7 +45,7 @@
    browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
  #endif
    browser_sync::UserEventServiceFactory::GetInstance();
-@@ -777,7 +777,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -785,7 +785,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    commerce::ShoppingServiceFactory::GetInstance();
    ConsentAuditorFactory::GetInstance();
    ContentIndexProviderFactory::GetInstance();
@@ -54,7 +54,7 @@
    contextual_cueing::ContextualCueingServiceFactory::GetInstance();
  #endif
    CookieControlsServiceFactory::GetInstance();
-@@ -832,31 +832,31 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -840,31 +840,31 @@ void ChromeBrowserMainExtraPartsProfiles::
  #endif
    enterprise_connectors::ConnectorsServiceFactory::GetInstance();
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -92,7 +92,7 @@
    enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
  #endif
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -983,7 +983,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -992,7 +992,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_ANDROID)
    MerchantViewerDataManagerFactory::GetInstance();
  #endif
@@ -101,7 +101,7 @@
    metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1095,7 +1095,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1104,7 +1104,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_CHROMEOS)
    policy::PolicyCertServiceFactory::GetInstance();
  #endif
@@ -110,7 +110,7 @@
    policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
-@@ -1134,7 +1134,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1143,7 +1143,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
    ProfileStatisticsFactory::GetInstance();
  #endif
@@ -119,7 +119,7 @@
    ProfileTokenWebSigninInterceptorFactory::GetInstance();
    OidcAuthenticationSigninInterceptorFactory::GetInstance();
  #endif
-@@ -1154,7 +1154,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1163,7 +1163,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    ReduceAcceptLanguageFactory::GetInstance();
    RendererUpdaterFactory::GetInstance();
    regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance();
@@ -128,7 +128,7 @@
    reporting::ManualTestHeartbeatEventFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1334,7 +1334,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1346,7 +1346,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    WebDataServiceFactory::GetInstance();
    webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
index dc60f38769c3..7cdc8cbf483e 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/profiles/profile_impl.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/profiles/profile_impl.cc
 @@ -269,6 +269,10 @@
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -20,7 +20,7 @@
      ProfileManager* profile_manager = g_browser_process->profile_manager();
      ProfileAttributesEntry* entry =
          profile_manager->GetProfileAttributesStorage()
-@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
+@@ -871,7 +875,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
  }
  
  base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
index 4aa6e9ee3ca4..c04de2596278 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
@@ -1,24 +1,6 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc
-@@ -8,7 +8,7 @@
- #include "base/strings/string_util.h"
- #include "components/country_codes/country_codes.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/variations/service/variations_service.h"
- #endif
- 
-@@ -20,7 +20,7 @@
- #endif
- 
- namespace regional_capabilities {
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- RegionalCapabilitiesServiceClient::RegionalCapabilitiesServiceClient(
-     variations::VariationsService* variations_service)
-@@ -56,7 +56,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId
+@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId
        base::android::AttachCurrentThread(),
        reinterpret_cast<intptr_t>(heap_callback.release()));
  }
@@ -26,4 +8,4 @@
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void RegionalCapabilitiesServiceClient::FetchCountryId(
      CountryIdCallback on_country_id_fetched) {
-   std::move(on_country_id_fetched).Run(variations_country_id_);
+   std::move(on_country_id_fetched).Run(variations_latest_country_id_);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h
deleted file mode 100644
index 50b5fb75075e..000000000000
--- a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_client.h.orig	2025-03-09 21:38:10 UTC
-+++ chrome/browser/regional_capabilities/regional_capabilities_service_client.h
-@@ -21,7 +21,7 @@ namespace regional_capabilities {
- class RegionalCapabilitiesServiceClient
-     : public RegionalCapabilitiesService::Client {
-  public:
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   explicit RegionalCapabilitiesServiceClient(
-       variations::VariationsService* variations_service);
- #else
-@@ -35,7 +35,7 @@ class RegionalCapabilitiesServiceClient
-   void FetchCountryId(CountryIdCallback country_id_fetched_callback) override;
- 
-  private:
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const int variations_country_id_;
- #endif
- };
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc
deleted file mode 100644
index fed04ed2a2e5..000000000000
--- a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc.orig	2025-03-09 21:38:10 UTC
-+++ chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc
-@@ -12,7 +12,7 @@
- #include "chrome/browser/regional_capabilities/regional_capabilities_service_client.h"
- #include "components/regional_capabilities/regional_capabilities_service.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/variations/service/variations_service.h"
- #endif
- 
-@@ -57,7 +57,7 @@ RegionalCapabilitiesServiceFactory::BuildServiceInstan
-   Profile* profile = Profile::FromBrowserContext(context);
-   auto regional_capabilities_service_client =
-       std::make_unique<RegionalCapabilitiesServiceClient>(
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-           g_browser_process->variations_service()
- #endif
-       );
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc
index 6882e77eee89..4ad8927e2a71 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
  #include "ui/views/controls/textfield/textfield.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/linux/linux_ui.h"
-@@ -181,7 +181,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -180,7 +180,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
    prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
  #endif
  
@@ -18,7 +18,7 @@
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    if (linux_ui_theme) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -204,7 +204,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -203,7 +203,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
index 38992e3c3b11..f1f56059701c 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-02-20 09:59:21 UTC
+--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
-@@ -1250,7 +1250,7 @@ std::string ChromePasswordProtectionService::GetOrgani
+@@ -1261,7 +1261,7 @@ std::string ChromePasswordProtectionService::GetOrgani
      ReusedPasswordAccountType password_type) const {
    if (base::FeatureList::IsEnabled(
            safe_browsing::kEnterprisePasswordReuseUiRefresh)) {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
index d0e21ef0681c..87b745588d11 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
@@ -1,8 +1,8 @@
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
 @@ -20,7 +20,7 @@
+ #include "components/safe_browsing/core/common/safebrowsing_switches.h"
  #include "net/base/url_util.h"
- #include "third_party/abseil-cpp/absl/types/variant.h"
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
index f85f837ec982..bcf0a3ffdb44 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
@@ -1,6 +1,6 @@
---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/screen_ai/screen_ai_service_router.cc
-@@ -316,7 +316,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -403,7 +403,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
    base::FilePath binary_path = state_instance->get_component_binary_path();
  #if BUILDFLAG(IS_WIN)
    std::vector<base::FilePath> preload_libraries = {binary_path};
@@ -9,7 +9,7 @@
    std::vector<std::string> extra_switches = {
        base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
                           binary_path.MaybeAsASCII().c_str())};
-@@ -330,7 +330,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -417,7 +417,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
            .WithPreloadedLibraries(
                preload_libraries,
                content::ServiceProcessHostPreloadLibraries::GetPassKey())
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
deleted file mode 100644
index 1c41fbc94a62..000000000000
--- a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2024-06-22 08:49:42 UTC
-+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
-@@ -15,7 +15,7 @@
- #include "components/send_tab_to_self/features.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
-@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController*
- ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
-     Profile* profile) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   for (const std::unique_ptr<ReceivingUiHandler>& handler :
-        applicable_handlers_) {
-     auto* button_controller =
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
deleted file mode 100644
index ce0f2343ed90..000000000000
--- a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig	2024-03-22 14:16:19 UTC
-+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
-@@ -16,7 +16,7 @@
- #include "components/send_tab_to_self/send_tab_to_self_model.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
- 
-@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
-     const std::vector<const SendTabToSelfEntry*>& new_entries) {
-   for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     // Only respond to notifications corresponding to this service's profile
-     // for these OSes; mobile does not have a Profile.
-     // Cast note: on desktop, handlers are guaranteed to be the derived class
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
index ade7492f9f66..085f3db57558 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-02-20 09:59:21 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
-@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
+@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
        return;
      }
    }
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
index 65611193f818..2f8725b0a6f2 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
-@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager::
+@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager::
      ActivateManagementPolicyAndUpdateRegistration() {
    SetActiveForSupervisedUsers();
    UpdateManagementPolicyRegistration();
@@ -9,7 +9,7 @@
    MaybeMarkExtensionsLocallyParentApproved();
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  }
-@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
+@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
    return false;
  }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
index acef88499f62..a4996e31a185 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
-@@ -34,12 +34,12 @@
+@@ -33,12 +33,12 @@
  #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "ui/android/view_android.h"
@@ -15,7 +15,7 @@
  namespace {
  bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) {
    if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) {
-@@ -161,7 +161,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
+@@ -160,7 +160,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
      return content::NavigationThrottle::DEFER;
    }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index c4bf85182724..faf1daa38076 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -227,7 +227,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc
index 43182bde880e..2bd6f55e6169 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/themes/theme_service.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/themes/theme_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/themes/theme_service.cc
-@@ -71,7 +71,7 @@
+@@ -72,7 +72,7 @@
  #include "extensions/browser/extension_registry_observer.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #include "ui/ozone/public/ozone_platform.h"  // nogncheck
  #endif
-@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
+@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
  }
  
  bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
index 3374df28fe1c..f6c94847ad21 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/actions/chrome_action_id.h
-@@ -495,7 +495,7 @@
+@@ -497,7 +497,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
  #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
    E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h
index 0f1604ea2288..a5ec284f388e 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser.h.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/browser.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/browser.h
-@@ -301,7 +301,7 @@ class Browser : public TabStripModelObserver,
+@@ -302,7 +302,7 @@ class Browser : public TabStripModelObserver,
      std::optional<int64_t> display_id;
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 8ecd1c9060b0..78a2566790ee 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,14 +1,14 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -126,7 +126,7 @@
+@@ -125,7 +125,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/base/ime/text_edit_commands.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
- #endif
 @@ -135,7 +135,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif
@@ -18,7 +18,7 @@
  #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h"
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  
-@@ -328,7 +328,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -331,7 +331,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  #endif
    }
  
@@ -27,7 +27,7 @@
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    auto* linux_ui = ui::LinuxUi::instance();
-@@ -580,7 +580,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -594,7 +594,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -36,7 +36,7 @@
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -800,7 +800,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -811,7 +811,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
      case IDC_CREATE_SHORTCUT:
        base::RecordAction(base::UserMetricsAction("CreateShortcut"));
@@ -45,7 +45,7 @@
        chrome::CreateDesktopShortcutForActiveWebContents(browser_);
  #else
        web_app::CreateWebAppFromCurrentWebContents(
-@@ -967,7 +967,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -978,7 +978,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
      case IDC_CHROME_WHATS_NEW:
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
@@ -54,7 +54,7 @@
        ShowChromeWhatsNew(browser_);
        break;
  #else
-@@ -1283,7 +1283,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1323,7 +1323,7 @@ void BrowserCommandController::InitCommandState() {
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
  #endif
@@ -63,7 +63,7 @@
    command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
-@@ -1640,7 +1640,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
+@@ -1682,7 +1682,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
    bool can_create_web_app = web_app::CanCreateWebApp(browser_);
    command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc
index a7b688927243..fec1b6f8cad6 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_commands.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/browser_commands.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/browser_commands.cc
-@@ -1985,7 +1985,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
+@@ -1974,7 +1974,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
    } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
      UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
    } else {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
index 35344fa4a319..29d2b4be728c 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/browser_ui_prefs.cc
-@@ -71,7 +71,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
+@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
    registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
    registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime,
                               base::Time());
@@ -9,7 +9,7 @@
    registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser,
                                 std::string());
    registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser,
-@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
+@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
    registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc
index d1874cb7b511..33a4b07dca6d 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/chrome_pages.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/chrome_pages.cc
-@@ -84,7 +84,7 @@
+@@ -83,7 +83,7 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/web_applications/web_app_utils.h"
  #endif
  
-@@ -378,7 +378,7 @@ void ShowChromeTips(Browser* browser) {
+@@ -380,7 +380,7 @@ void ShowChromeTips(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeTipsURL));
  }
  
@@ -18,7 +18,7 @@
  void ShowChromeWhatsNew(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL));
  }
-@@ -701,7 +701,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+@@ -698,7 +698,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
new file mode 100644
index 000000000000..b372ef74be9f
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig	2025-05-06 12:23:00 UTC
++++ chrome/browser/ui/prefs/prefs_tab_helper.cc
+@@ -66,7 +66,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If a font name in prefs default values starts with a comma, consider it's a
+ // comma-separated font list and resolve it to the first available font.
+ #define PREFS_FONT_LIST 1
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
index 32f5c64e8e9b..843f3d5bee0c 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/signin/signin_view_controller.cc
-@@ -418,7 +418,7 @@ void SigninViewController::ShowModalSyncConfirmationDi
+@@ -433,7 +433,7 @@ void SigninViewController::ShowModalSyncConfirmationDi
  void SigninViewController::ShowModalManagedUserNoticeDialog(
      std::unique_ptr<signin::EnterpriseProfileCreationDialogParams>
          create_param) {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 2a0a2653bc88..4aa02f013698 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-02-20 09:59:21 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -93,7 +93,7 @@ const char* const kBadFlags[] = {
+@@ -94,7 +94,7 @@ const char* const kBadFlags[] = {
      extensions::switches::kExtensionsOnChromeURLs,
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
index 8e4ca648d30d..407f7f1cd8d4 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
 @@ -76,7 +76,7 @@
  #include "components/app_restore/full_restore_utils.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -207,7 +207,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
      // at the state of the MessageLoop.
      Browser::CreateParams params = Browser::CreateParams(profile_, false);
      params.creation_source = Browser::CreationSource::kStartupCreator;
@@ -18,7 +18,7 @@
      params.startup_id =
          command_line_->GetSwitchValueASCII("desktop-startup-id");
  #endif
-@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
        continue;
      }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index b3262346e2c9..5dd2b6676b24 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -216,7 +216,7 @@
+@@ -218,7 +218,7 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -689,12 +689,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -699,12 +699,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
    webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents);
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc
index e2d47349a50d..472eb7547a22 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tabs/features.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/tabs/features.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/tabs/features.cc
-@@ -48,7 +48,7 @@ bool CanShowTabSearchPositionSetting() {
+@@ -47,7 +47,7 @@ bool CanShowTabSearchPositionSetting() {
    }
  // Mac and other platforms will always have the tab search position in the
  // correct location, cros/linux/win git the user the option to change.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index f17d7fefc78c..fa53ddbee7ee 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,15 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -530,7 +530,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
+@@ -419,7 +419,7 @@ TaskManagerTableModel::~TaskManagerTableModel() {
+   // Note: system_total_time_ is used for both since there is no functional
+   // difference between browser & system (they are essentially the same tab).
+   // Instead, the data is routed to the platform appropriate bucket.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser,
+                                      system_total_time_);
+ #elif BUILDFLAG(IS_CHROMEOS)
+@@ -560,7 +560,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
                   ? stringifier_->backgrounded_string()
                   : stringifier_->foregrounded_string();
  
@@ -9,7 +18,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
        return fd_count >= 0 ? base::FormatNumber(fd_count)
-@@ -693,7 +693,7 @@ int TaskManagerTableModel::CompareValues(size_t row1,
+@@ -723,7 +723,7 @@ int TaskManagerTableModel::CompareValues(size_t row1,
        return BooleanCompare(is_proc1_bg, is_proc2_bg);
      }
  
@@ -18,7 +27,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -935,7 +935,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -1030,7 +1030,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc
index c49776a877cb..0ca135e32836 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/ui_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/ui_features.cc
-@@ -67,7 +67,7 @@ bool IsExtensionMenuInRootAppMenu() {
+@@ -45,7 +45,7 @@ bool IsExtensionMenuInRootAppMenu() {
    return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu);
  }
  
@@ -9,7 +9,7 @@
  // Enables the feature to remove the last confirmation dialog when relaunching
  // to update Chrome.
  BASE_FEATURE(kFewerUpdateConfirmations,
-@@ -333,7 +333,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
+@@ -326,7 +326,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h
index 38c0f89a3f2f..03fbe993c7db 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/ui_features.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/ui_features.h
-@@ -47,7 +47,7 @@ extern const base::FeatureParam<int> kMaxPromptCount;
+@@ -31,7 +31,7 @@ BASE_DECLARE_FEATURE(kCloseOmniboxPopupOnInactiveAreaC
  BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu);
  bool IsExtensionMenuInRootAppMenu();
  
@@ -9,7 +9,7 @@
  BASE_DECLARE_FEATURE(kFewerUpdateConfirmations);
  #endif
  
-@@ -211,7 +211,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog);
+@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog);
  BASE_DECLARE_FEATURE(kViewsJSAppModalDialog);
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 4623677d2841..6248adcaf891 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/accelerator_table.cc
-@@ -67,11 +67,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -70,11 +70,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
      {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
      {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
@@ -14,7 +14,7 @@
      {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
      {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
       IDC_MOVE_TAB_PREVIOUS},
-@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -102,7 +102,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
      {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
      {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
@@ -23,7 +23,7 @@
      {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -151,7 +151,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
       IDC_SHOW_AVATAR_MENU},
  
  // Platform-specific key maps.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index e2787dd09660..e09062e0086b 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
 @@ -52,7 +52,7 @@
  #include "ui/aura/window.h"
@@ -18,7 +18,7 @@
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -182,7 +182,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() {
  
    Init(std::move(params));
  
@@ -27,7 +27,7 @@
    SelectNativeTheme();
  #else
    SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi());
-@@ -368,7 +368,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
    chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
    chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
                                             IsVisibleOnAllWorkspaces());
@@ -36,7 +36,7 @@
    // If the window was sent to a different workspace, prioritize it if
    // it was sent to the current workspace and deprioritize it
    // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()
-@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() {
+@@ -568,7 +568,7 @@ void BrowserFrame::OnMenuClosed() {
  }
  
  void BrowserFrame::SelectNativeTheme() {
@@ -45,7 +45,7 @@
    // Use the regular NativeTheme instance if running incognito mode, regardless
    // of system theme (gtk, qt etc).
    ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
-@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() {
+@@ -609,7 +609,7 @@ void BrowserFrame::OnTouchUiChanged() {
  bool BrowserFrame::RegenerateFrameOnThemeChange(
      BrowserThemeChangeType theme_change_type) {
    bool need_regenerate = false;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index b97f07ec1c8c..fff3a7bf21c9 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2523,7 +2523,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
+@@ -2585,7 +2585,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
  }
  
  void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
@@ -9,7 +9,7 @@
    GetContentsWebView()->SetFastResize(is_dragging);
    if (multi_contents_view_) {
      multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging);
-@@ -5563,7 +5563,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() {
+@@ -5830,7 +5830,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() {
  }
  
  void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index 76d0bb181d0e..8cdef7c3f47d 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
 @@ -62,7 +62,7 @@
  #include "ui/aura/window.h"
@@ -9,7 +9,16 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
-@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16;
+@@ -76,7 +76,7 @@
+ 
+ // Windows, Mac and CrOS do not clip child widgets to their parents, so we
+ // don't have to worry about resizing quite as much.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define PLATFORM_CLIPS_CHILD_WINDOWS
+ #endif
+ 
+@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 16;
  // The height of the controls bar at the top of the window.
  constexpr int kTopControlsHeight = 34;
  
@@ -18,7 +27,7 @@
  // Frame border when window shadow is not drawn.
  constexpr int kFrameBorderThickness = 4;
  #endif
-@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::EventObserver {
  
      gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
  
@@ -27,7 +36,7 @@
      // Calculate input bounds for Linux. This is needed because the input bounds
      // is not necessary the same as the local bounds on Linux.
      if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -618,7 +618,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -630,7 +630,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
          AddChildView(std::move(auto_pip_setting_overlay));
    }
  
@@ -36,7 +45,7 @@
    auto* profile = browser_view->browser()->profile();
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -843,7 +843,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -855,7 +855,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
      view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
    }
  
@@ -45,7 +54,7 @@
    // On Linux the top bar background will be drawn in OnPaint().
    top_bar_container_view_->SetBackground(views::CreateSolidBackground(
        color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -932,7 +932,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -944,7 +944,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
    BrowserNonClientFrameView::RemovedFromWidget();
  }
  
@@ -54,7 +63,7 @@
  gfx::Insets
  PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const {
    auto border = FrameBorderInsets();
-@@ -1223,7 +1223,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -1235,7 +1235,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
  // views::View implementations:
  
  void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +72,7 @@
    // Draw the PiP window frame borders and shadows, including the top bar
    // background.
    if (window_frame_provider_) {
-@@ -1378,7 +1378,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -1390,7 +1390,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,7 +81,7 @@
    if (window_frame_provider_) {
      const auto insets = window_frame_provider_->GetFrameThicknessDip();
      const bool tiled = frame()->tiled();
-@@ -1396,7 +1396,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+@@ -1408,7 +1408,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -81,7 +90,7 @@
    return FrameBorderInsets();
  #elif !BUILDFLAG(IS_CHROMEOS)
    return gfx::Insets(kResizeBorder);
-@@ -1417,7 +1417,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+@@ -1429,7 +1429,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
                     top_height + border_thickness.bottom());
  }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
index 9d428fa100f7..960011cf916c 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
 @@ -30,7 +30,7 @@
  #include "ui/views/layout/flex_layout_view.h"
@@ -9,7 +9,7 @@
  #include "ui/linux/window_frame_provider.h"
  #endif
  
-@@ -90,7 +90,7 @@ class PictureInPictureBrowserFrameView
+@@ -87,7 +87,7 @@ class PictureInPictureBrowserFrameView
    void Layout(PassKey) override;
    void AddedToWidget() override;
    void RemovedFromWidget() override;
@@ -18,7 +18,7 @@
    gfx::Insets RestoredMirroredFrameBorderInsets() const override;
    gfx::Insets GetInputInsets() const override;
    SkRRect GetRestoredClipRegion() const override;
-@@ -182,7 +182,7 @@ class PictureInPictureBrowserFrameView
+@@ -179,7 +179,7 @@ class PictureInPictureBrowserFrameView
    // Returns true if there's an overlay view that's currently shown.
    bool IsOverlayViewVisible() const;
  
@@ -27,7 +27,7 @@
    // Returns whether a client-side shadow should be drawn for the window.
    bool ShouldDrawFrameShadow() const;
  
-@@ -391,7 +391,7 @@ class PictureInPictureBrowserFrameView
+@@ -388,7 +388,7 @@ class PictureInPictureBrowserFrameView
    // `top_bar_color_animation_`.
    std::optional<SkColor> current_foreground_color_;
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index 7383c465ef8f..501c86f811d4 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-02-20 09:59:21 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -419,7 +419,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
+@@ -452,7 +452,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
index b07b18b45ff6..4b7c858115de 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc
-@@ -2064,7 +2064,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem(
+@@ -2089,7 +2089,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem(
  }
  
  void OmniboxViewViews::OnPopupOpened() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
index 93c0be38c612..b2bf838c6607 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
  #include "ui/strings/grit/ui_strings.h"
  #include "ui/views/accessibility/view_accessibility.h"
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
  
-@@ -549,7 +549,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() {
+@@ -550,7 +550,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() {
      case signin_util::SignedInState::kSignedOut:
      case signin_util::SignedInState::kWebOnlySignedIn: {
        std::string profile_user_display_name, profile_user_email;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
index 70debee602ea..78a920825e10 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
-@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
  
  void UpdateSystemDnDDragImage(TabDragContext* attached_context,
                                const gfx::ImageSkia& image) {
@@ -9,7 +9,7 @@
    VLOG(1) << __func__ << " image size=" << image.size().ToString();
    aura::Window* root_window =
        attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
-@@ -392,7 +392,7 @@ TabDragController::Liveness TabDragController::Init(
+@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragController::Init(
    //     synchronous on desktop Linux, so use that.
    // - ChromeOS Ash
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -18,7 +18,7 @@
    ref->can_release_capture_ = false;
  #endif
    ref->start_point_in_screen_ =
-@@ -954,7 +954,7 @@ TabDragController::Liveness TabDragController::DragBro
+@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragController::DragBro
        CHECK_EQ(SetCapture(target_context), Liveness::ALIVE);
      }
  
@@ -27,7 +27,7 @@
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() {
+@@ -1914,7 +1914,7 @@ void TabDragController::CompleteDrag() {
      }
  
      // If source window was maximized - maximize the new window as well.
@@ -36,7 +36,7 @@
      // Keeping maximized state breaks snap to Grid on Windows when dragging
      // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
      // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2527,7 +2527,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2331,7 +2331,7 @@ TabDragController::Liveness TabDragController::GetLoca
      }
    }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index d979fec9c712..312c40c4fc26 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -644,7 +644,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -643,7 +643,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
      return;
    }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
index cebfab21257b..0b32aee73a91 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -379,7 +379,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+@@ -380,7 +380,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
    // not become active. Setting this to false creates the need to explicitly
    // hide the hovercard on press, touch, and keyboard events.
    SetCanActivate(false);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
index ebe502ff31ef..d70bfd5b06b5 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc
-@@ -96,7 +96,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow
+@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow
        base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged,
                            base::Unretained(this))));
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
index 9ff5a9530999..fdd4e2d3f861 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/tabs/tab_style_views.cc
-@@ -511,7 +511,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con
+@@ -545,7 +545,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con
    if (!IsHoverAnimationActive()) {
      return base_opacity;
    }
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
index a84148d9b910..848ca5f61364 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -917,7 +917,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -930,7 +930,7 @@ void MaybeRegisterChromeFeaturePromos(
                  "Triggered when a shared tab becomes the active tab.")));
    }
  
@@ -9,7 +9,7 @@
    // kIPHSupervisedUserProfileSigninFeature
    registry.RegisterFeature(std::move(
        FeaturePromoSpecification::CreateForCustomAction(
-@@ -1171,7 +1171,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -1209,7 +1209,7 @@ void MaybeRegisterChromeFeaturePromos(
                         "Triggered to inform users of the availability of the "
                         "new translate screen feature on the Lens Overlay.")));
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
index 4b768ca988cf..ea87cd6465ce 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-02-20 09:59:21 UTC
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
-@@ -518,7 +518,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
+@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
      Browser* browser,
      Profile* profile,
      const std::string& app_id) {
@@ -9,7 +9,7 @@
    WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
    CHECK(provider);
  
-@@ -747,7 +747,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
+@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
    }
  }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index fc8576c124b9..94896ba51498 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2024-10-01 07:26:23 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -62,7 +62,7 @@
+@@ -61,7 +61,7 @@
  #include "ui/base/window_open_disposition_utils.h"
  #include "url/gurl.h"
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
index 6277e5619548..e528728e1016 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc
 @@ -54,7 +54,7 @@
  #include "net/ssl/client_cert_store_mac.h"
@@ -6,10 +6,10 @@
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -174,7 +174,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto
  };
  #endif
  
@@ -18,7 +18,7 @@
  std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader(
      Profile* profile) {
  #if BUILDFLAG(IS_WIN)
-@@ -189,7 +189,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC
+@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC
  }
  #endif
  
@@ -27,7 +27,7 @@
  // ClientCertStore implementation that always returns an empty list. The
  // CertificateProvisioningService implementation expects to wrap a platform
  // cert store, but here we only want to get results from the provisioning
-@@ -347,7 +347,7 @@ class ClientCertSource : public CertificateManagerPage
+@@ -368,7 +368,7 @@ class ClientCertSource : public CertificateManagerPage
    std::optional<net::CertificateList> certs_;
  };
  
@@ -36,7 +36,7 @@
  // ChromeOS currently can use either Kcer or NSS for listing client certs, and
  // Linux uses NSS only. This interface provides an abstraction to hide that
  // from WritableClientCertSource. Currently this class only handles reading
-@@ -1078,7 +1078,7 @@ CreatePlatformClientCertSource(
+@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource(
      mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>*
          remote_client,
      Profile* profile) {
@@ -45,7 +45,7 @@
    return std::make_unique<WritableClientCertSource>(remote_client, profile);
  #else
    return std::make_unique<ClientCertSource>(
-@@ -1086,7 +1086,7 @@ CreatePlatformClientCertSource(
+@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource(
  #endif
  }
  
@@ -54,7 +54,7 @@
  std::unique_ptr<CertificateManagerPageHandler::CertSource>
  CreateProvisionedClientCertSource(Profile* profile) {
    return std::make_unique<ClientCertSource>(
-@@ -1135,7 +1135,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow
+@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow
  
    return client_cert_policy_ == ClientCertificateManagementPermission::kAll;
  }
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
index 53a75d1aeda1..3db8fb48a6b4 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -137,26 +137,26 @@
+@@ -138,7 +138,7 @@
  #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -8,7 +8,8 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h"
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h"
+@@ -146,19 +146,19 @@
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -31,7 +32,7 @@
  #include "chrome/browser/ui/webui/discards/discards_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -184,7 +184,7 @@
+@@ -186,7 +186,7 @@
  #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
  #endif  //  !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
  
@@ -40,7 +41,7 @@
  #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -322,7 +322,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -325,7 +325,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>());
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -49,16 +50,16 @@
    map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
          // BUILDFLAG(IS_OPENBSD)
-@@ -347,7 +347,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -350,7 +350,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>());
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>());
-@@ -355,13 +355,13 @@ void RegisterChromeWebUIConfigs() {
+   map.AddWebUIConfig(std::make_unique<HistorySyncOptinUIConfig>());
+   map.AddWebUIConfig(std::make_unique<OnDeviceTranslationInternalsUIConfig>());
+@@ -359,13 +359,13 @@ void RegisterChromeWebUIConfigs() {
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 75b3d665dfe5..d804b2c12712 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-02-20 09:59:21 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -114,16 +114,16 @@
+@@ -118,16 +118,16 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -20,7 +20,7 @@
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -404,7 +404,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
+@@ -408,7 +408,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
      return NewTabPageUI::GetFaviconResourceBytes(scale_factor);
    }
  
@@ -29,7 +29,7 @@
    if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) {
      return WhatsNewUI::GetFaviconResourceBytes(scale_factor);
    }
-@@ -438,7 +438,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
+@@ -442,7 +442,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::
    }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
index d2026c6ee834..1887e891213d 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -74,7 +74,7 @@
+@@ -77,7 +77,7 @@
  #include "components/security_interstitials/content/captive_portal_blocking_page.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
-@@ -420,7 +420,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa
+@@ -424,7 +424,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa
  }
  #endif
  
@@ -18,7 +18,7 @@
  std::unique_ptr<SupervisedUserVerificationPageForYouTube>
  CreateSupervisedUserVerificationPageForYouTube(
      content::WebContents* web_contents,
-@@ -647,7 +647,7 @@ void InterstitialHTMLSource::StartDataRequest(
+@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRequest(
      interstitial_delegate = CreateInsecureFormPage(web_contents);
    } else if (path_without_query == "/https_only") {
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 4ea2b5adf418..6c4d6aabb3d8 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -137,7 +137,7 @@
+@@ -139,7 +139,7 @@
  #include "chrome/browser/ui/webui/settings/system_handler.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/display/screen.h"
  #endif
  
-@@ -156,7 +156,7 @@
+@@ -158,7 +158,7 @@
  #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
  #endif
  
@@ -18,16 +18,16 @@
  #include "ui/linux/linux_ui_factory.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -281,7 +281,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
-       {"focusHighlightLabel",
-        IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+@@ -287,7 +287,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
+       {"toastAlertLevelDescription",
+        IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION},
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
        {"overscrollHistoryNavigationTitle",
         IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
        {"overscrollHistoryNavigationSubtitle",
-@@ -570,7 +570,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -576,7 +576,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
        {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT},
        {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT},
        {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT},
@@ -36,7 +36,7 @@
        {"gtkTheme", IDS_SETTINGS_GTK_THEME},
        {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
        {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -578,7 +578,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
        {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
        {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME},
  #endif
@@ -45,7 +45,7 @@
        {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -600,7 +600,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -606,7 +606,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
    html_source->AddBoolean("tabSearchIsRightAlignedAtStartup",
                            tabs::GetTabSearchTrailingTabstrip(profile));
  
@@ -54,7 +54,7 @@
    bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
                                        ->GetPlatformRuntimeProperties()
                                        .supports_server_side_window_decorations;
-@@ -1478,7 +1478,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource*
+@@ -1469,7 +1469,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource*
            g_browser_process->GetApplicationLocale())
            .spec();
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
index d9d9c40b7bcd..22d4ed0b763f 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc
-@@ -164,7 +164,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr
+@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr
        IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name);
    if (AccountInfo::IsManaged(entry->GetHostedDomain())) {
      profile_entry.Set("avatarBadge", "cr:domain");
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
index bcd5d665d83d..611fe99193a9 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc
 @@ -50,7 +50,7 @@
  #include "ui/base/l10n/l10n_util.h"
@@ -18,7 +18,7 @@
    return g_browser_process->GetFeatures()->whats_new_registry();
  #else
    return nullptr;
-@@ -794,7 +794,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats
+@@ -828,7 +828,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats
  }
  
  void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
index d26cf46b6892..401ba747db20 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/upgrade_detector/version_history_client.cc
-@@ -50,7 +50,7 @@ GURL GetVersionReleasesUrl(base::Version version) {
+@@ -175,7 +175,7 @@ GURL GetVersionReleasesUrl(base::Version version) {
  #define CURRENT_PLATFORM "win"
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
index b73e98984ed2..ca7df842a71c 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2024-10-27 06:40:35 UTC
+--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  #include "components/visited_url_ranking/public/visited_url_ranking_service.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h"
  #elif BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h"
-@@ -118,7 +118,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF
+@@ -119,7 +119,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF
  
    std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
index 913b881978a2..702bd8f4effb 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2024-10-01 07:26:23 UTC
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/web_applications/extensions/extension_status_utils.cc
-@@ -25,7 +25,7 @@ namespace {
+@@ -26,7 +26,7 @@ namespace {
  
  const char* g_preinstalled_app_for_testing = nullptr;
  
@@ -9,7 +9,7 @@
  // TODO(b/268221237): Remove this allow-list.
  const char kDefaultAllowedExtensionIds[] =
      "alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -107,7 +107,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
+@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
    return prefs && prefs->IsExternalExtensionUninstalled(extension_id);
  }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
index e971b5f826a8..1ce23a5d7079 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc
-@@ -660,7 +660,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu
+@@ -662,7 +662,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu
      }
    }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
index d280b4f425bf..504976002256 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2023-09-17 07:59:53 UTC
+--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc
-@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT
+@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode ConvertWebAppRunOn
  // different from other platforms, see web_app_run_on_os_login_manager.h for
  // more info.
  bool DoesRunOnOsLoginRequireExecution() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
index a29b91e2cccd..59ba3193eea3 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-02-20 09:59:21 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
 @@ -22,7 +22,7 @@
  #include "ui/gfx/image/image_family.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -75,7 +75,7 @@ struct ShortcutInfo {
+@@ -77,7 +77,7 @@ struct ShortcutInfo {
    // the installed PWA experience and thus the icons are not designed to be
    // displayed on an OS dock.
    bool is_diy_app = false;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index c00447aea71d..31e61f8e9326 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -574,7 +574,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
+@@ -577,7 +577,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
      g_observer->ConfiguringCable(request_type);
    }
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
index 81c8f174a3b4..e8b15cd3e9c8 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
@@ -1,20 +1,20 @@
---- chrome/browser/webauthn/enclave_manager.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/webauthn/enclave_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/webauthn/enclave_manager.cc
-@@ -711,7 +711,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
+@@ -689,7 +689,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
  
  std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return label;
  #else
    return std::string("placeholder");
-@@ -721,7 +721,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
+@@ -699,7 +699,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
  std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString(
      std::string saved_label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return saved_label;
  #else
    return std::nullopt;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc
new file mode 100644
index 000000000000..9f86f648e356
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/webauthn/password_credential_controller.cc.orig	2025-05-06 12:23:00 UTC
++++ chrome/browser/webauthn/password_credential_controller.cc
+@@ -46,7 +46,7 @@ password_manager::PasswordManagerClient* GetPasswordMa
+ }
+ 
+ std::u16string GetAuthenticationMessage(std::string_view rp_id) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return u"";
+ #else
+   return l10n_util::GetStringFUTF16(IDS_PASSWORD_MANAGER_FILLING_REAUTH,
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
index 4c8958afc45a..04ca94782363 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc
@@ -1,11 +1,11 @@
---- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/browser/webauthn/unexportable_key_utils.cc
-@@ -34,7 +34,7 @@ GetWebAuthnUnexportableKeyProvider() {
+@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() {
    // If there is a scoped UnexportableKeyProvider configured, we always use
    // that so that tests can still override the key provider.
    const bool use_software_provider =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        !crypto::internal::HasScopedUnexportableKeyProvider();
  #else
        false;
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc
index 2716f1a091b0..2ab8ed24b6d7 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/chrome_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/chrome_features.cc
 @@ -80,7 +80,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims,
  #endif  // BUILDFLAG(IS_MAC)
@@ -36,7 +36,7 @@
  // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
  // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
  // Apps will not launch and will be marked in the UI as deprecated.
-@@ -834,7 +834,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+@@ -899,7 +899,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
               "KAnonymityServiceStorage",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -45,7 +45,7 @@
  BASE_FEATURE(kLinuxLowMemoryMonitor,
               "LinuxLowMemoryMonitor",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -847,7 +847,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -912,7 +912,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
      &kLinuxLowMemoryMonitor, "critical_level", 255};
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h
index ad55aa5943fe..bb92c6c13ecf 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/chrome_features.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/chrome_features.h
 @@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims);
  #endif  // BUILDFLAG(IS_MAC)
@@ -25,7 +25,7 @@
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kShortcutsNotApps);
-@@ -494,7 +494,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
+@@ -521,7 +521,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
  
@@ -34,7 +34,7 @@
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -502,7 +502,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -529,7 +529,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc
index d7d651300121..5514b73f57b9 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/chrome_paths.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/chrome_paths.cc
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
  #include "base/apple/foundation_util.h"
  #endif
  
@@ -9,9 +9,9 @@
  #include "components/policy/core/common/policy_paths.h"
  #endif
  
-@@ -44,14 +44,14 @@
+@@ -48,14 +48,14 @@ namespace {
  
- namespace {
+ std::optional<bool> g_override_using_default_data_directory_for_testing;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -27,7 +27,7 @@
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -208,7 +208,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePath* result) {
        }
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -36,7 +36,7 @@
        if (!GetUserDownloadsDirectorySafe(&cur)) {
          return false;
        }
-@@ -500,13 +500,13 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -52,7 +52,7 @@
      (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
-@@ -516,7 +516,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -61,7 +61,7 @@
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -554,7 +554,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
  
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
@@ -70,7 +70,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if BUILDFLAG(IS_MAC)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -568,9 +568,12 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -572,9 +572,12 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(
            FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h
index 13df0b208176..fea526827d3c 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths_internal.h.orig	2023-06-05 19:39:05 UTC
+--- chrome/common/chrome_paths_internal.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/chrome_paths_internal.h
-@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
+@@ -53,7 +53,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
  // Get the path to the user's documents directory.
  bool GetUserDocumentsDirectory(base::FilePath* result);
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc
index 241fc6dd06b7..7429150ca8bc 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/chrome_switches.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -874,7 +874,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -883,7 +883,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -9,8 +9,8 @@
  const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
  
  // Causes the browser to launch directly in guest mode.
-@@ -897,7 +897,7 @@ const char kGlicAllowedOrigins[] = "glic-webui-allowed
- const char kGlicDev[] = "glic-dev";
+@@ -911,7 +911,7 @@ const char kGlicDev[] = "glic-dev";
+ const char kGlicHostLogging[] = "glic-host-logging";
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h
index d6b22f9c3fa2..efde71a9c8e0 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/chrome_switches.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/chrome_switches.h
-@@ -271,7 +271,7 @@ extern const char kAllowNaClSocketAPI[];
+@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[];
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -9,8 +9,8 @@
  extern const char kEnableNewAppMenuIcon[];
  extern const char kGuest[];
  extern const char kForceNtpMobilePromo[];
-@@ -286,7 +286,7 @@ extern const char kGlicAllowedOrigins[];
- extern const char kGlicDev[];
+@@ -290,7 +290,7 @@ extern const char kGlicDev[];
+ extern const char kGlicHostLogging[];
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h
index bc65a2c65055..efda42c3327e 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h
@@ -1,4 +1,4 @@
---- chrome/common/pref_names.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/pref_names.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/pref_names.h
 @@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem
  inline constexpr char kAllowedDomainsForApps[] =
@@ -18,7 +18,7 @@
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -2120,7 +2120,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
+@@ -2129,7 +2129,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
  inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
  inline constexpr char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
  #endif
-@@ -2613,14 +2613,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
+@@ -2622,14 +2622,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
  inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -44,7 +44,7 @@
  // Records whether the user has seen an HTTP auth "negotiate" header.
  inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
      "net.received_http_auth_negotiate_headers";
-@@ -2712,7 +2712,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[
+@@ -2721,7 +2721,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[
  inline constexpr char kIsolatedWebAppPendingInitializationCount[] =
      "profile.isolated_web_app.install.pending_initialization_count";
  
@@ -53,7 +53,7 @@
  // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
  // along with kAuthNegotiateDelegateAllowlist.
  inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] 
+@@ -3240,7 +3240,7 @@ inline constexpr char kKioskChromeAppsForceAllowed[] =
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -62,7 +62,7 @@
  // Defines administrator-set availability of Chrome for Testing.
  inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed";
  #endif
-@@ -3764,7 +3764,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo
+@@ -3763,7 +3763,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo
  inline constexpr char kSandboxExternalProtocolBlocked[] =
      "profile.sandbox_external_protocol_blocked";
  
@@ -71,7 +71,7 @@
  // Boolean that indicates if system notifications are allowed to be used in
  // place of Chrome notifications.
  inline constexpr char kAllowSystemNotifications[] =
-@@ -3960,7 +3960,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] =
+@@ -3959,7 +3959,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] =
      "policy.lens_desktop_ntp_search_enabled";
  #endif
  
@@ -80,7 +80,7 @@
  // A dict mapping the edition name with the major version it was shown.
  inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used";
  // A list containing the features of each module in order of when they
-@@ -4057,7 +4057,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
+@@ -4056,7 +4056,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
      "printing.oauth2_authorization_servers";
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h
index e0dc0f0f735d..048c234ce754 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/url_constants.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/url_constants.h
-@@ -981,7 +981,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] =
+@@ -983,7 +983,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] =
  inline constexpr char kPhoneHubPermissionLearnMoreURL[] =
      "https://support.9oo91e.qjz9zk/chromebook?p=multidevice";
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h
index a46f2331ca38..612d3a726bee 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig	2025-04-15 08:30:07 UTC
+--- chrome/common/webui_url_constants.h.orig	2025-05-06 12:23:00 UTC
 +++ chrome/common/webui_url_constants.h
-@@ -509,18 +509,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome
+@@ -513,18 +513,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -22,7 +22,7 @@
  inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings";
  inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
  inline constexpr char kChromeUIWhatsNewHost[] = "whats-new";
-@@ -532,11 +532,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] 
+@@ -536,11 +536,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] 
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -36,8 +36,8 @@
  inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch";
  inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
  inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser";
-@@ -558,7 +558,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[
- inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/";
+@@ -565,7 +565,7 @@ inline constexpr char kChromeUIHistorySyncOptinURL[] =
+     "chrome://history-sync-optin/";
  #endif
  
 -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
diff --git a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc
index 9858a5607892..2c3c74c87254 100644
--- a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc
@@ -1,6 +1,6 @@
---- chrome/enterprise_companion/event_logger.cc.orig	2025-03-09 21:38:10 UTC
+--- chrome/enterprise_companion/event_logger.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/enterprise_companion/event_logger.cc
-@@ -124,7 +124,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() {
+@@ -126,7 +126,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() {
    metadata.set_application_arch(proto::ARM64);
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index 7c9af90c064a..314e0c795959 100644
--- a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig	2025-01-25 09:34:31 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/services/printing/print_backend_service_impl.cc
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
  #include "printing/backend/cups_connection_pool.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/no_destructor.h"
  #include "ui/linux/linux_ui.h"
  #include "ui/linux/linux_ui_delegate_stub.h"
-@@ -77,7 +77,7 @@ namespace printing {
+@@ -76,7 +76,7 @@ namespace printing {
  
  namespace {
  
@@ -18,7 +18,7 @@
  void InstantiateLinuxUiDelegate() {
    // TODO(crbug.com/40561724)  Until a real UI can be used in a utility process,
    // need to use the stub version.
-@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() {
+@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
  #endif
  
  scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() {
@@ -27,7 +27,7 @@
    // Use task runner associated with equivalent of UI thread.  Needed for calls
    // made through `PrintDialogLinuxInterface` to properly execute.
    CHECK(base::SequencedTaskRunner::HasCurrentDefault());
-@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init(
+@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init(
    // `InitCommon()`.
    InitializeProcessForPrinting();
    print_backend_ = PrintBackend::CreateInstance(locale);
@@ -36,7 +36,7 @@
    // Test framework already initializes the UI, so this should not go in
    // `InitCommon()`.  Additionally, low-level Linux UI is not needed when tests
    // are using `TestPrintingContext`.
-@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
    crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
        *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name));
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc
index d90eaa0770fe..cc6d15cb6153 100644
--- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc
@@ -1,6 +1,6 @@
---- chrome/utility/services.cc.orig	2025-04-15 08:30:07 UTC
+--- chrome/utility/services.cc.orig	2025-05-06 12:23:00 UTC
 +++ chrome/utility/services.cc
-@@ -49,7 +49,7 @@
+@@ -48,7 +48,7 @@
  #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -9,7 +9,7 @@
  #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -207,7 +207,7 @@ auto RunMacNotificationService(
+@@ -203,7 +203,7 @@ auto RunMacNotificationService(
  }
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -18,7 +18,7 @@
  auto RunSystemSignalsService(
      mojo::PendingReceiver<device_signals::mojom::SystemSignalsService>
          receiver) {
-@@ -476,7 +476,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -470,7 +470,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
    services.Add(RunWindowsIconReader);
  #endif  // BUILDFLAG(IS_WIN)
  
diff --git a/www/ungoogled-chromium/files/patch-components_BUILD.gn b/www/ungoogled-chromium/files/patch-components_BUILD.gn
index bb60ef7b091c..a841ce7604d4 100644
--- a/www/ungoogled-chromium/files/patch-components_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-components_BUILD.gn
@@ -1,4 +1,4 @@
---- components/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- components/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ components/BUILD.gn
 @@ -208,7 +208,6 @@ test("components_unittests") {
      "//components/content_settings/core/browser:unit_tests",
@@ -8,7 +8,7 @@
      "//components/cross_device/logging:unit_tests",
      "//components/crx_file:unit_tests",
      "//components/data_sharing:unit_tests",
-@@ -607,7 +606,7 @@ test("components_unittests") {
+@@ -610,7 +609,7 @@ test("components_unittests") {
        deps += [ "//components/cast:unit_tests" ]
      }
  
@@ -17,7 +17,7 @@
        deps += [
          "//components/crash/content/browser:unit_tests",
          "//components/crash/core/app:unit_tests",
-@@ -765,7 +764,7 @@ test("components_unittests") {
+@@ -771,7 +770,7 @@ test("components_unittests") {
      deps += [ "//components/constrained_window:unit_tests" ]
    }
  
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
index 2826767e2dd6..a7411beb7a04 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
@@ -1,6 +1,15 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-04-15 08:30:07 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
-@@ -1003,7 +1003,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
+@@ -950,7 +950,7 @@ void PaymentsDataManager::SetPrefService(PrefService* 
+           &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
+           base::Unretained(this)));
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   pref_registrar_.Add(
+       prefs::kAutofillBnplEnabled,
+       base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
+@@ -1026,7 +1026,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,21 +18,21 @@
  bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
    return prefs::HasSeenBnpl(pref_service_);
  }
-@@ -1172,7 +1172,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar
- bool PaymentsDataManager::ShouldShowCardsFromAccountOption() const {
- // The feature is only for Linux, Windows, Mac, and Fuchsia.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // This option should only be shown for users that have not enabled the Sync
-   // Feature and that have server credit cards available.
-   // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and
-@@ -2026,7 +2026,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
+@@ -2022,7 +2022,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
  
  bool PaymentsDataManager::AreBnplIssuersSupported() const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return app_locale_ == "en-US" &&
+   return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" &&
           base::FeatureList::IsEnabled(
               features::kAutofillEnableBuyNowPayLaterSyncing);
+@@ -2055,7 +2055,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void PaymentsDataManager::OnBnplEnabledPrefChange() {
+   // On pref change to `false`, clearing BNPL issuers is implicitly handled by
+   // `GetBnplIssuers()`, since it returns an empty vector when
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
index cd82b447e235..8f3feaf0092d 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
@@ -1,4 +1,4 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-04-15 08:30:07 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-05-06 12:23:00 UTC
 +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
 @@ -354,7 +354,7 @@ class PaymentsDataManager : public AutofillWebDataServ
    void SetAutofillHasSeenIban();
@@ -9,3 +9,12 @@
    // Returns the value of the kAutofillHasSeenBnpl pref.
    bool IsAutofillHasSeenBnplPrefEnabled() const;
  
+@@ -683,7 +683,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+   void ClearAllCreditCardBenefits();
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Monitors the `kAutofillBnplEnabled` preference for changes and controls the
+   // clearing/loading of payment instruments accordingly. Will also log the
+   // `Autofill.SettingsPage.BnplToggled` metric.
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
index 35ef522509ff..017c282093a2 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-04-15 08:30:07 UTC
+--- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/autofill/core/browser/payments/bnpl_manager.cc
-@@ -109,7 +109,7 @@ void BnplManager::OnAmountExtractionReturned(
+@@ -114,7 +114,7 @@ void BnplManager::OnAmountExtractionReturned(
  
  bool BnplManager::ShouldShowBnplSettings() const {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
    const PaymentsDataManager& payments_data_manager =
        payments_autofill_client().GetPaymentsDataManager();
  
-@@ -223,7 +223,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl(
+@@ -431,7 +431,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl(
        .Run(update_suggestions_result.suggestions, trigger_source);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index 92ac14a5d76d..bf3f6e09f37b 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig	2025-04-15 08:30:07 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -269,7 +269,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts,
+@@ -267,7 +267,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts,
  #endif  // BUILDFLAG(IS_ANDROID)
  
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc
index 652d9742ed54..4013fbef491c 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc
@@ -1,15 +1,15 @@
---- components/autofill/core/common/autofill_prefs.cc.orig	2025-04-15 08:30:07 UTC
+--- components/autofill/core/common/autofill_prefs.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/autofill/core/common/autofill_prefs.cc
-@@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -98,7 +98,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled,
-                                 false);
    registry->RegisterBooleanPref(
-@@ -297,7 +297,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer
+       kAutofillBnplEnabled, true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+@@ -277,7 +277,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  void SetAutofillBnplEnabled(PrefService* prefs, bool value) {
    prefs->SetBoolean(kAutofillBnplEnabled, value);
  }
-@@ -306,7 +306,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
+@@ -286,7 +286,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
  
  bool IsAutofillBnplEnabled(const PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
    return prefs->GetBoolean(kAutofillBnplEnabled);
  #else
    return false;
-@@ -315,7 +315,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) {
+@@ -295,7 +295,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) {
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h
index 7dd2765ac095..c54e41f01582 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h
@@ -1,24 +1,15 @@
---- components/autofill/core/common/autofill_prefs.h.orig	2025-04-15 08:30:07 UTC
+--- components/autofill/core/common/autofill_prefs.h.orig	2025-05-06 12:23:00 UTC
 +++ components/autofill/core/common/autofill_prefs.h
-@@ -26,7 +26,7 @@ namespace autofill::prefs {
- inline constexpr std::string_view kAutofillAblationSeedPref =
-     "autofill.ablation_seed";
+@@ -32,7 +32,7 @@ inline constexpr std::string_view kAutofillAblationSee
+ inline constexpr char kAutofillAiOptInStatus[] =
+     "autofill.autofill_ai.opt_in_status";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Boolean that is true if BNPL on Autofill is enabled.
  inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled";
  // Boolean that is true if the user has ever seen a BNPL suggestion.
-@@ -82,7 +82,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] =
- inline constexpr char kAutofillPaymentCardBenefits[] =
-     "autofill.payment_card_benefits";
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Boolean that controls improved autofill filling predictions. When enabled,
- // the autofill functionality is enhanced with adopting user data to
- // the form being filled in, which is triggered by the user via an extra
-@@ -237,7 +237,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs,
+@@ -208,7 +208,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs,
  bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +18,7 @@
  void SetAutofillBnplEnabled(PrefService* prefs, bool value);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -245,7 +245,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
+@@ -216,7 +216,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v
  bool IsAutofillBnplEnabled(const PrefService* prefs);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc
index 88d7a271dac3..0937797e84e4 100644
--- a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc
+++ b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc
@@ -1,24 +1,25 @@
---- components/commerce/core/commerce_feature_list.cc.orig	2025-04-15 08:30:07 UTC
+--- components/commerce/core/commerce_feature_list.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/commerce/core/commerce_feature_list.cc
-@@ -156,7 +156,7 @@ BASE_FEATURE(kPriceAnnotationsRegionLaunched,
- BASE_FEATURE(kPriceInsights,
+@@ -156,7 +156,8 @@ BASE_FEATURE(kPriceInsights,
               "PriceInsights",
               base::FEATURE_DISABLED_BY_DEFAULT);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \
++    BUILDFLAG(IS_BSD)
  BASE_FEATURE(kPriceInsightsRegionLaunched,
               "PriceInsightsRegionLaunched",
-@@ -222,7 +222,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
  const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  const base::FeatureParam<bool> kDiscountOnShoppyPage{
      &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true};
  #else
-@@ -231,7 +231,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{
+@@ -236,7 +237,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +28,7 @@
  BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched,
               "EnableDiscountInfoApiRegionLaunched",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -246,7 +246,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi
+@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi
  const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,13 +37,3 @@
  BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting,
               "DiscountDialogAutoPopupBehaviorSetting",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -287,7 +287,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl
- 
- BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || \
-+    BUILDFLAG(IS_BSD)
- BASE_FEATURE(kShoppingListRegionLaunched,
-              "ShoppingListRegionLaunched",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc
index c520f8f7a1a5..f03494e49f57 100644
--- a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc
+++ b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc
@@ -1,6 +1,6 @@
---- components/constrained_window/constrained_window_views.cc.orig	2025-03-09 21:38:10 UTC
+--- components/constrained_window/constrained_window_views.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/constrained_window/constrained_window_views.cc
-@@ -375,7 +375,7 @@ bool SupportsGlobalScreenCoordinates() {
+@@ -377,7 +377,7 @@ bool SupportsGlobalScreenCoordinates() {
  }
  
  bool PlatformClipsChildrenToViewport() {
diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn
index 6b0af9eed8c3..4020853e1566 100644
--- a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/app/BUILD.gn.orig	2025-02-20 09:59:21 UTC
+--- components/crash/core/app/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ components/crash/core/app/BUILD.gn
 @@ -70,6 +70,10 @@ static_library("app") {
      ]
@@ -20,7 +20,7 @@
      sources += [ "crashpad_linux.cc" ]
      data_deps = [ ":chrome_crashpad_handler" ]
    }
-@@ -103,7 +107,7 @@ static_library("app") {
+@@ -105,7 +109,7 @@ static_library("app") {
      libs = [ "log" ]
    }
  
@@ -29,7 +29,7 @@
      deps += [
        "//base:base_static",
        "//components/crash/core/common",
-@@ -235,11 +239,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -237,11 +241,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
    # define custom UserStreamDataSources.
    executable("chrome_crashpad_handler") {
      sources = [ "chrome_crashpad_handler.cc" ]
diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h
new file mode 100644
index 000000000000..1ff3c19f80b7
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h
@@ -0,0 +1,20 @@
+--- components/device_signals/core/browser/browser_utils.h.orig	2025-05-06 12:23:00 UTC
++++ components/device_signals/core/browser/browser_utils.h
+@@ -15,7 +15,7 @@ namespace device_signals {
+ // Returns the hostname of the current machine.
+ std::string GetHostName();
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the hostname of the current machine.
+ std::vector<std::string> GetSystemDnsServers();
+ 
+@@ -23,7 +23,7 @@ std::vector<std::string> GetSystemDnsServers();
+ SettingValue GetOSFirewall();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the path to the ufw configuration file.
+ const char** GetUfwConfigPath();
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
index e0ffaa6ceb46..20a681da37a2 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc
+++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
@@ -1,8 +1,8 @@
---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig	2025-03-09 21:38:10 UTC
-+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc
+--- components/device_signals/core/common/linux/platform_utils_linux.cc.orig	2025-05-06 12:23:00 UTC
++++ components/device_signals/core/common/linux/platform_utils_linux.cc
 @@ -4,12 +4,23 @@
  
- #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
+ #include "components/device_signals/core/common/platform_utils.h"
  
 +#include "build/build_config.h"
 +
@@ -22,17 +22,17 @@
 +#endif
 +
  #include <algorithm>
+ #include <optional>
  #include <string>
- 
-@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() {
+@@ -100,6 +111,7 @@ SettingValue GetScreenlockSecured() {
  // Implements the logic from the native host installation script. First find the
  // root device identifier, then locate its parent and get its type.
  SettingValue GetDiskEncrypted() {
 +#if !BUILDFLAG(IS_BSD)
    struct stat info;
    // First figure out the device identifier. Fail fast if this fails.
-   if (stat("/", &info) != 0)
-@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() {
+   if (stat("/", &info) != 0) {
+@@ -122,11 +134,35 @@ SettingValue GetDiskEncrypted() {
      }
      return SettingValue::UNKNOWN;
    }
@@ -66,9 +66,9 @@
 +  }
 +#else
    base::DirReaderPosix reader("/sys/class/net");
-   if (!reader.IsValid())
+   if (!reader.IsValid()) {
      return result;
-@@ -165,6 +201,7 @@ std::vector<std::string> GetMacAddresses() {
+@@ -151,6 +187,7 @@ std::vector<std::string> GetMacAddresses() {
                                &address);
      result.push_back(address);
    }
diff --git a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc
index f37b6c2c755b..6d17d1c67b33 100644
--- a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc
+++ b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc
@@ -1,12 +1,47 @@
---- components/embedder_support/user_agent_utils.cc.orig	2025-04-15 08:30:07 UTC
+--- components/embedder_support/user_agent_utils.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/embedder_support/user_agent_utils.cc
-@@ -439,6 +439,9 @@ std::string GetPlatformForUAMetadata() {
- # else
+@@ -322,7 +322,7 @@ std::string GetUserAgentPlatform() {
+   return "";
+ #elif BUILDFLAG(IS_MAC)
+   return "Macintosh; ";
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return "X11; ";  // strange, but that's what Firefox uses
+ #elif BUILDFLAG(IS_ANDROID)
+   return "Linux; ";
+@@ -348,7 +348,7 @@ std::string GetUnifiedPlatform() {
+   return "Windows NT 10.0; Win64; x64";
+ #elif BUILDFLAG(IS_FUCHSIA)
+   return "Fuchsia";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return "X11; Linux x86_64";
+ #elif BUILDFLAG(IS_IOS)
+   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
+@@ -605,6 +605,9 @@ std::string GetPlatformForUAMetadata() {
+ #else
    return "Chromium OS";
- # endif
+ #endif
 +#elif BUILDFLAG(IS_BSD)
 +  // The internet is weird...
 +  return "Linux";
  #else
    return std::string(version_info::GetOSType());
  #endif
+@@ -819,6 +822,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
+                       "Android %s", os_version.c_str()
+ #elif BUILDFLAG(IS_FUCHSIA)
+                       "Fuchsia"
++#elif BUILDFLAG(IS_BSD)
++#if defined(__x86_64__)
++                      "Linux x86_64; %s %s",
++#elif defined(__aarch64__)
++                      "Linux aarch64; %s %s",
++#else 
++                      "Linux i686; %s %s",
++#endif
++                      unixinfo.sysname,  // e.g. Linux
++                      cpu_type.c_str()   // e.g. i686
+ #elif BUILDFLAG(IS_IOS)
+                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
+                       os_version.c_str()
diff --git a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
index ec3584ad0dd4..0cd8e9eaf816 100644
--- a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
@@ -1,6 +1,6 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-04-15 08:30:07 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -151,7 +151,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
+@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
    ASSERT_EQ("CrOS", pieces[0]);
    ASSERT_EQ("x86_64", pieces[1]);
    ASSERT_EQ("14541.0.0", pieces[2]);
@@ -9,7 +9,7 @@
    // Post-UA Reduction there is a single <unifiedPlatform> value for Linux:
    // X11; Linux x86_64
    ASSERT_EQ(2u, pieces.size());
-@@ -339,7 +339,7 @@ class UserAgentUtilsTest : public testing::Test,
+@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testing::Test,
          "X11; CrOS x86_64 14541.0.0";
  #elif BUILDFLAG(IS_FUCHSIA)
          "Fuchsia";
@@ -18,7 +18,7 @@
          "X11; Linux x86_64";
  #elif BUILDFLAG(IS_MAC)
          "Macintosh; Intel Mac OS X 10_15_7";
-@@ -699,7 +699,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) {
+@@ -696,7 +696,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) {
  #endif
  #elif BUILDFLAG(IS_ANDROID)
    EXPECT_EQ(metadata.platform, "Android");
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 01610238afd1..58ed6f860341 100644
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig	2025-04-15 08:30:07 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/feature_engagement/public/feature_configurations.cc
 @@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro
  
@@ -18,7 +18,7 @@
    if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) {
      FeatureConfig config;
      config.valid = true;
-@@ -1722,7 +1722,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
+@@ -1740,7 +1740,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -27,4 +27,4 @@
 +    BUILDFLAG(IS_BSD)
  
    if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) {
-     // Credit card benefit IPH is shown:
+     // The credit card benefit IPH appears up to three times over 10 years and
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index 2f7a14c43b69..0f3b6f25dda2 100644
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig	2025-04-15 08:30:07 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/feature_engagement/public/feature_constants.cc
 @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU
  BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  BASE_FEATURE(kEsbDownloadRowPromoFeature,
               "EsbDownloadRowPromo",
-@@ -682,7 +682,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
+@@ -710,7 +710,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
  
  #endif  // BUILDFLAG(IS_IOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
- BASE_FEATURE(kIPHAutofillCardInfoRetrievalSuggestionFeature,
-              "IPH_AutofillCardInfoRetrievalSuggestion",
-@@ -823,7 +823,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
+ BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+              "IPH_AutofillBnplAffirmOrZipSuggestion",
+@@ -857,7 +857,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h
index aadb775060b4..dccc13e92060 100644
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig	2025-04-15 08:30:07 UTC
+--- components/feature_engagement/public/feature_constants.h.orig	2025-05-06 12:23:00 UTC
 +++ components/feature_engagement/public/feature_constants.h
 @@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode);
  FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature);
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature);
  #endif
-@@ -303,7 +303,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg
+@@ -316,7 +316,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg
  
  #endif  // BUILDFLAG(IS_IOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature);
  FEATURE_CONSTANTS_DECLARE_FEATURE(
-     kIPHAutofillCardInfoRetrievalSuggestionFeature);
-@@ -359,7 +359,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA
+@@ -374,7 +374,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA
  FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc
index 7df2bb1f757e..fbb4b64d7580 100644
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_list.cc.orig	2025-04-15 08:30:07 UTC
+--- components/feature_engagement/public/feature_list.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/feature_engagement/public/feature_list.cc
-@@ -170,7 +170,7 @@ const base::Feature* const kAllFeatures[] = {
-     &kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature,
+@@ -175,7 +175,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHiOSSettingsInOverflowMenuBubbleFeature,
  #endif  // BUILDFLAG(IS_IOS)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -9,16 +9,16 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
      &kEsbDownloadRowPromoFeature,
  #endif
-@@ -241,7 +241,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -247,7 +247,7 @@ const base::Feature* const kAllFeatures[] = {
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-     &kIPHAutofillCardInfoRetrievalSuggestionFeature,
-     &kIPHAutofillCreditCardBenefitFeature,
-@@ -294,7 +294,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHAutofillAiOptInFeature,
+     &kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+@@ -302,7 +302,7 @@ const base::Feature* const kAllFeatures[] = {
      &kIPHScalableIphGamingFeature,
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h
index ecadc91dd219..a7573528b42e 100644
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig	2025-04-15 08:30:07 UTC
+--- components/feature_engagement/public/feature_list.h.orig	2025-05-06 12:23:00 UTC
 +++ components/feature_engagement/public/feature_list.h
-@@ -302,7 +302,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDownloadAutoDeletionFeat
+@@ -312,7 +312,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSettingsInOverflowMenuBu
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,17 +9,17 @@
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo");
  #endif
-@@ -415,7 +415,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF
+@@ -427,7 +427,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
- DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature,
-                        "IPH_AutofillCreditCardBenefit");
- 
-@@ -509,7 +510,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
+ DEFINE_VARIATION_PARAM(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn");
+ DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+                        "IPH_AutofillBnplAffirmOrZipSuggestion");
+@@ -523,7 +524,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
  DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -28,7 +28,7 @@
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
                         "IPH_DesktopPWAsLinkCapturingLaunch");
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab,
-@@ -682,7 +683,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -697,7 +698,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
              kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature),
          VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature),
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -37,17 +37,17 @@
          VARIATION_ENTRY(kIPHBatterySaverModeFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
-@@ -743,7 +744,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -759,7 +760,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHAutofillAiOptInFeature),
          VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature),
          VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature),
-         VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature),
-@@ -795,7 +797,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
+@@ -812,7 +814,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat
          VARIATION_ENTRY(kIPHScalableIphGamingFeature),
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn b/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn
index f081b6ad7220..d30161072fd1 100644
--- a/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn
@@ -1,11 +1,11 @@
---- components/gwp_asan/BUILD.gn.orig	2022-12-02 17:56:32 UTC
+--- components/gwp_asan/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ components/gwp_asan/BUILD.gn
 @@ -15,7 +15,7 @@ test("gwp_asan_unittests") {
      "//testing/gtest",
      "//third_party/boringssl",
    ]
--  if (is_win || is_mac || is_linux || is_chromeos || is_android) {
-+  if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) {
+-  if (is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) {
++  if ((is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) && !is_bsd) {
      deps += [
        "//components/gwp_asan/client:unit_tests",
        "//components/gwp_asan/crash_handler:unit_tests",
diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni b/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni
index ece4723996c3..efe14ed420b8 100644
--- a/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni
+++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni
@@ -1,11 +1,11 @@
---- components/gwp_asan/buildflags/buildflags.gni.orig	2025-04-15 08:30:07 UTC
+--- components/gwp_asan/buildflags/buildflags.gni.orig	2025-05-06 12:23:00 UTC
 +++ components/gwp_asan/buildflags/buildflags.gni
 @@ -10,10 +10,7 @@ import("//build/config/compiler/compiler.gni")
  # Android component builds are disabled due to https://crbug.com/976399
  # Android requires frame pointers for unwinding, unwind tables aren't shipped in
  # official builds.
 -supported_platform =
--    is_linux || is_chromeos || is_mac ||
+-    is_linux || is_chromeos || is_mac || is_ios ||
 -    (is_win && (current_cpu == "x64" || current_cpu == "arm64")) ||
 -    (is_android && !is_component_build && enable_frame_pointers)
 +supported_platform = false
diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
index 38b8a1d9a432..2f99e0f47c9d 100644
--- a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
+++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
@@ -1,6 +1,6 @@
---- components/gwp_asan/client/gwp_asan.cc.orig	2024-06-22 08:49:42 UTC
+--- components/gwp_asan/client/gwp_asan.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/gwp_asan/client/gwp_asan.cc
-@@ -75,7 +75,7 @@ namespace {
+@@ -76,7 +76,7 @@ namespace {
  // ProcessSamplingBoost is the multiplier to increase the
  // ProcessSamplingProbability in scenarios where we want to perform additional
  // testing (e.g., on canary/dev builds).
diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
index 5c8c2dee2645..1bb0e3f5915e 100644
--- a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
+++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
@@ -1,4 +1,4 @@
---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2024-10-01 07:26:23 UTC
+--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/gwp_asan/crash_handler/crash_analyzer.cc
 @@ -35,7 +35,7 @@
  #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
@@ -9,7 +9,7 @@
  #include <signal.h>
  #elif BUILDFLAG(IS_APPLE)
  #include <mach/exception_types.h>
-@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo(
+@@ -113,7 +113,7 @@ bool CrashAnalyzer::GetExceptionInfo(
  
  crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
      const crashpad::ExceptionSnapshot& exception) {
diff --git a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc
index 6b979c5ca215..86be2f816fa4 100644
--- a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc
+++ b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc
@@ -1,9 +1,18 @@
---- components/metrics/drive_metrics_provider.cc.orig	2025-03-09 21:38:10 UTC
+--- components/metrics/drive_metrics_provider.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/metrics/drive_metrics_provider.cc
-@@ -113,7 +113,7 @@ void DriveMetricsProvider::FillDriveMetrics(
-                        response.has_seek_penalty);
-   RecordTriStateMetric("UMA.SeekPenaltyResult.Base",
-                        response.has_seek_penalty_base);
+@@ -21,7 +21,7 @@
+ namespace metrics {
+ 
+ namespace {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void RecordTriStateMetric(const char* name, std::optional<bool> sample) {
+   base::UmaHistogramEnumeration(
+       name, !sample.has_value()
+@@ -106,7 +106,7 @@ void DriveMetricsProvider::FillDriveMetrics(
+     drive->set_has_seek_penalty(*response.has_seek_penalty);
+   }
+ 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable);
diff --git a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
deleted file mode 100644
index cdcf556242e0..000000000000
--- a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- components/metrics/drive_metrics_provider_linux.cc.orig	2023-09-17 07:59:53 UTC
-+++ components/metrics/drive_metrics_provider_linux.cc
-@@ -4,7 +4,13 @@
- 
- #include "components/metrics/drive_metrics_provider.h"
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/types.h>
-+#define MAJOR(dev) major(dev)
-+#define MINOR(dev) minor(dev)
-+#else
- #include <linux/kdev_t.h>  // For MAJOR()/MINOR().
-+#endif
- #include <sys/stat.h>
- #include <string>
- 
diff --git a/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc
index 01c74febb710..a80e7d59fb38 100644
--- a/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc
+++ b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig	2025-04-15 08:30:07 UTC
+--- components/metrics/metrics_log.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/metrics/metrics_log.cc
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
  #include "base/win/current_module.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -157,7 +157,7 @@ void RecordCurrentTime(
+@@ -158,7 +158,7 @@ void RecordCurrentTime(
    }
  }
  
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
index fcde0596a03d..1564edf65d76 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_form_manager.cc.orig	2025-04-15 08:30:07 UTC
+--- components/password_manager/core/browser/password_form_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/browser/password_form_manager.cc
-@@ -63,7 +63,7 @@
+@@ -64,7 +64,7 @@
  #include "components/webauthn/android/webauthn_cred_man_delegate.h"
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -9,7 +9,7 @@
  #include "components/os_crypt/sync/os_crypt.h"
  #endif
  
-@@ -239,7 +239,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
+@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
    return false;
  }
  
@@ -18,7 +18,7 @@
  bool ShouldShowKeychainErrorBubble(
      std::optional<PasswordStoreBackendError> backend_error) {
    if (!backend_error.has_value()) {
-@@ -898,7 +898,7 @@ void PasswordFormManager::OnFetchCompleted() {
+@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchCompleted() {
          error.value().type);
    }
  
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc
index 3d4eb29b30ef..1fb8bf8c2820 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc
@@ -1,15 +1,15 @@
---- components/password_manager/core/browser/password_manager.cc.orig	2025-04-15 08:30:07 UTC
+--- components/password_manager/core/browser/password_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/browser/password_manager.cc
-@@ -492,7 +492,7 @@ void PasswordManager::RegisterProfilePrefs(
-                                 false);
- #endif
+@@ -511,7 +511,7 @@ void PasswordManager::RegisterProfilePrefs(
+       prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false);
+ #endif  // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
    registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter,
                                  0);
  #endif
-@@ -505,7 +505,7 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -524,7 +524,7 @@ void PasswordManager::RegisterProfilePrefs(
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
index 3a4f0c0f9f62..54b1f695d9a3 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_manager_client.h.orig	2025-04-15 08:30:07 UTC
+--- components/password_manager/core/browser/password_manager_client.h.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/browser/password_manager_client.h
 @@ -31,7 +31,7 @@
  #include "net/cert/cert_status_flags.h"
@@ -9,8 +9,8 @@
  #include "base/i18n/rtl.h"
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #include "ui/gfx/geometry/rect_f.h"
-@@ -550,7 +550,7 @@ class PasswordManagerClient {
-       CredentialsCallback callback);
+@@ -533,7 +533,7 @@ class PasswordManagerClient {
+   virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
index d8271baa9a54..d6433fd77dc5 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-03-09 21:38:10 UTC
+--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/browser/password_manual_fallback_flow.cc
-@@ -45,7 +45,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri
+@@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  // Returns the password form corresponding to the `payload` data. In most
  // cases there is only one such form stored, but having more than one or no
  // forms is also possible. If there is more than one form, showing any of them
-@@ -294,7 +294,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion(
+@@ -295,7 +295,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion(
      }
      case autofill::SuggestionType::kViewPasswordDetails: {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
        std::optional<password_manager::PasswordForm> credentials =
            GetCorrespondingPasswordForm(
                suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(),
-@@ -429,7 +429,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass
+@@ -425,7 +425,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass
      const Suggestion::PasswordSuggestionDetails& payload,
      base::OnceClosure on_allowed) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
index 5d130519829b..c0427ad5c7bc 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2024-10-27 06:40:35 UTC
+--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/browser/password_manual_fallback_flow.h
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@
  #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : public autofill::Au
+@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : public autofill::Au
    std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
index 51172f3f396e..9895885e9365 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_store/login_database.cc.orig	2024-10-27 06:40:35 UTC
+--- components/password_manager/core/browser/password_store/login_database.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/browser/password_store/login_database.cc
 @@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords(
      bool is_user_data_dir_policy_set,
@@ -6,10 +6,10 @@
      IsAccountStore is_account_store) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string user_data_dir_string;
    std::unique_ptr<base::Environment> environment(base::Environment::Create());
    // On Linux user data directory ca be specified using an env variable. If it
-@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords(
+   // exists, passwords shouldn't be deleted.
+@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords(
      return false;
    }
  
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
index 85739afd5ff0..2abdaf5d7bf1 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-04-15 08:30:07 UTC
+--- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/browser/stub_password_manager_client.cc
-@@ -201,7 +201,7 @@ version_info::Channel StubPasswordManagerClient::GetCh
+@@ -206,7 +206,7 @@ version_info::Channel StubPasswordManagerClient::GetCh
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
index 83460e7f493f..059b6717620a 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-04-15 08:30:07 UTC
+--- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-05-06 12:23:00 UTC
 +++ components/password_manager/core/common/password_manager_pref_names.h
 @@ -59,7 +59,7 @@ inline constexpr char kCredentialProviderEnabledOnStar
  #endif
@@ -9,7 +9,7 @@
  // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy.
  // If set to false it blocks deleting undecryptable passwords, otherwise the
  // deletion can happen.
-@@ -357,7 +357,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme
+@@ -356,7 +356,7 @@ inline constexpr char kAutofillableCredentialsAccountS
  inline constexpr char kPasswordSharingEnabled[] =
      "password_manager.password_sharing_enabled";
  
diff --git a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h
index b6dc484647de..7bdcbf5730b0 100644
--- a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h
+++ b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h
@@ -1,6 +1,6 @@
---- components/performance_manager/public/features.h.orig	2025-03-09 21:38:10 UTC
+--- components/performance_manager/public/features.h.orig	2025-05-06 12:23:00 UTC
 +++ components/performance_manager/public/features.h
-@@ -17,7 +17,7 @@ namespace performance_manager::features {
+@@ -19,7 +19,7 @@ namespace performance_manager::features {
  
  #if !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
index 826c86ecac53..32fa08dca343 100644
--- a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ b/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
@@ -1,7 +1,7 @@
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-04-15 08:30:07 UTC
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -413,7 +413,7 @@ class PolicyTestCase {
-     const std::string os("chromeos_ash");
+@@ -432,7 +432,7 @@ class PolicyTestCase {
+     const std::string os("chromeos");
  #elif BUILDFLAG(IS_IOS)
      const std::string os("ios");
 -#elif BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index 225fa85225f4..fd18814e9aed 100644
--- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-04-15 08:30:07 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -741,7 +741,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
+@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
          fetch_request->set_invalidation_payload(invalidation_payload_);
        }
      }
diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index 863e660c95de..c0c11d553a66 100644
--- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-02-20 09:59:21 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include "base/win/wincred_shim.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <pwd.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -35,10 +35,15 @@
+@@ -36,10 +36,15 @@
  #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
  #endif
  
@@ -26,7 +26,7 @@
  #include <algorithm>
  #include <utility>
  
-@@ -83,7 +88,7 @@ namespace policy {
+@@ -84,7 +89,7 @@ namespace policy {
  namespace em = enterprise_management;
  
  std::string GetMachineName() {
@@ -35,7 +35,7 @@
    char hostname[HOST_NAME_MAX];
    if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
      return hostname;
-@@ -139,7 +144,7 @@ std::string GetMachineName() {
+@@ -140,7 +145,7 @@ std::string GetMachineName() {
  
  std::string GetOSVersion() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -44,7 +44,7 @@
    return base::SysInfo::OperatingSystemVersion();
  #elif BUILDFLAG(IS_WIN)
    base::win::OSInfo::VersionNumber version_number =
-@@ -161,7 +166,7 @@ std::string GetOSArchitecture() {
+@@ -162,7 +167,7 @@ std::string GetOSArchitecture() {
  }
  
  std::string GetOSUsername() {
diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
index 5282e2b964ff..239252ea0fa9 100644
--- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
+++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc
@@ -1,11 +1,11 @@
---- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-03-09 21:38:10 UTC
+--- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/regional_capabilities/regional_capabilities_service.cc
-@@ -85,7 +85,7 @@ void RegionalCapabilitiesService::InitializeCountryIdC
-       base::UmaHistogramEnumeration(kUnknownCountryIdStored,
-                                     UnknownCountryIdStored::kValidCountryId);
-     } else {
+@@ -216,7 +216,7 @@ std::optional<CountryId> RegionalCapabilitiesService::
+     return persisted_country_id;
+   }
+ 
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
-         profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
-         country_id.reset();
+   if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
+     profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
+     base::UmaHistogramEnumeration(kUnknownCountryIdStored,
diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
index 998300ab25e6..35c2c92bd5d8 100644
--- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
+++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc
@@ -1,4 +1,4 @@
---- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-03-09 21:38:10 UTC
+--- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/regional_capabilities/regional_capabilities_switches.cc
 @@ -6,7 +6,7 @@
  
@@ -8,4 +8,4 @@
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_FEATURE(kClearPrefForUnknownCountry,
               "ClearCountryPrefForStoredUnknownCountry",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
index 0135f9a646c8..f86426bd5762 100644
--- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
+++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h
@@ -1,4 +1,4 @@
---- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-03-09 21:38:10 UTC
+--- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-05-06 12:23:00 UTC
 +++ components/regional_capabilities/regional_capabilities_switches.h
 @@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoiceCountry[] =
  inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA";
@@ -6,6 +6,6 @@
  
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // When the `country_codes::kCountryIDUnknown` is stored in prefs and this
+ // When an invalid `country_codes::CountryId` is stored in prefs and this
  // feature is enabled the pref will be cleared allowing a valid country to be
  // set again.
diff --git a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc
index 2e99678dc7d1..ef9c4e18bf26 100644
--- a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc
+++ b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc
@@ -1,6 +1,6 @@
---- components/search_engines/template_url_service.cc.orig	2025-04-15 08:30:07 UTC
+--- components/search_engines/template_url_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/search_engines/template_url_service.cc
-@@ -3426,7 +3426,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
+@@ -3450,7 +3450,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
  std::unique_ptr<EnterpriseSearchManager>
  TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc
new file mode 100644
index 000000000000..2f669895ae38
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.cc.orig	2025-05-06 12:23:00 UTC
++++ components/signin/public/base/signin_switches.cc
+@@ -54,7 +54,7 @@ BASE_FEATURE(kUseHostedDomainForManagementCheckOnSigni
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables the History Sync Opt-in on Desktop.
+ BASE_FEATURE(kEnableHistorySyncOptin,
+              "EnableHistorySyncOptin",
diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h
new file mode 100644
index 000000000000..78d3cd76fe97
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.h.orig	2025-05-06 12:23:00 UTC
++++ components/signin/public/base/signin_switches.h
+@@ -52,7 +52,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kEnableHistorySyncOptin);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc b/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc
index 9e1052a1394e..ea58b63942d2 100644
--- a/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc
+++ b/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc
@@ -1,6 +1,6 @@
---- components/soda/soda_util.cc.orig	2025-02-20 09:59:21 UTC
+--- components/soda/soda_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/soda/soda_util.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  #include "base/win/windows_version.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/cpu.h"
  #endif
  
-@@ -38,7 +38,7 @@ bool IsSupportedChromeOS() {
+@@ -39,7 +39,7 @@ bool IsSupportedChromeOS() {
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -18,7 +18,7 @@
  bool IsSupportedLinux() {
  #if defined(ARCH_CPU_X86_FAMILY)
    // Check if the CPU has the required instruction set to run the Speech
-@@ -69,7 +69,7 @@ bool IsSupportedWin() {
+@@ -70,7 +70,7 @@ bool IsSupportedWin() {
  bool IsOnDeviceSpeechRecognitionSupported() {
  #if BUILDFLAG(IS_CHROMEOS)
    return IsSupportedChromeOS();
diff --git a/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn
index 6890d043898b..4de9dcd13638 100644
--- a/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn
@@ -1,6 +1,6 @@
---- components/storage_monitor/BUILD.gn.orig	2025-02-20 09:59:21 UTC
+--- components/storage_monitor/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ components/storage_monitor/BUILD.gn
-@@ -71,7 +71,7 @@ static_library("storage_monitor") {
+@@ -73,7 +73,7 @@ component("storage_monitor") {
        deps += [ "//services/device/public/mojom" ]
      }
    } else if (is_linux) {
@@ -9,7 +9,7 @@
        sources += [
          "mtab_watcher_linux.cc",
          "mtab_watcher_linux.h",
-@@ -177,7 +177,7 @@ source_set("unit_tests") {
+@@ -182,7 +182,7 @@ source_set("unit_tests") {
          "storage_monitor_chromeos_unittest.cc",
        ]
      }
diff --git a/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h
index 4cc5ace87c78..6e658d4e353d 100644
--- a/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h
+++ b/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h
@@ -1,11 +1,11 @@
---- components/storage_monitor/removable_device_constants.h.orig	2022-10-01 07:40:07 UTC
+--- components/storage_monitor/removable_device_constants.h.orig	2025-05-06 12:23:00 UTC
 +++ components/storage_monitor/removable_device_constants.h
-@@ -14,7 +14,7 @@ namespace storage_monitor {
- extern const char kFSUniqueIdPrefix[];
- extern const char kVendorModelSerialPrefix[];
+@@ -15,7 +15,7 @@ namespace storage_monitor {
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kFSUniqueIdPrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kVendorModelSerialPrefix[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kVendorModelVolumeStoragePrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const
+     char kVendorModelVolumeStoragePrefix[];
  #endif
- 
diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
index e9c388963fb2..1be04444c84d 100644
--- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
+++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
@@ -1,6 +1,6 @@
---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-02-20 09:59:21 UTC
+--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/supervised_user/core/browser/supervised_user_preferences.cc
-@@ -144,7 +144,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
+@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
    registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false);
    registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string());
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc
index 740dfb6cfa24..c0d092909a95 100644
--- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc
+++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc
@@ -1,4 +1,4 @@
---- components/supervised_user/core/common/features.cc.orig	2025-04-15 08:30:07 UTC
+--- components/supervised_user/core/common/features.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/supervised_user/core/common/features.cc
 @@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
  #endif
@@ -9,7 +9,16 @@
  const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
  
  const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{
-@@ -83,7 +83,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt
+@@ -45,7 +45,7 @@ const base::FeatureParam<int> kLocalWebApprovalBottomS
+ #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kEnableLocalWebApprovalErrorDialog,
+              "EnableLocalWebApprovalErrorDialog",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -97,7 +97,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt
               "UpdatedSupervisedUserExtensionApprovalStrings",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -18,7 +27,7 @@
  BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
               "EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -98,7 +98,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+@@ -112,7 +112,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
  #if BUILDFLAG(IS_CHROMEOS)
    return base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
@@ -27,7 +36,7 @@
    bool skipParentApprovalEnabled = base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
    bool permissionExtensionsForSupervisedUsersEnabled =
-@@ -115,7 +115,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+@@ -129,7 +129,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
  }
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -36,7 +45,7 @@
  BASE_FEATURE(kCustomProfileStringsForSupervisedUsers,
               "CustomProfileStringsForSupervisedUsers",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -127,13 +127,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers,
+@@ -141,13 +141,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers,
  
  BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers,
               "ForceSafeSearchForUnauthenticatedSupervisedUsers",
@@ -52,7 +61,7 @@
  BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog,
               "EnableSupervisedUserVersionSignOutDialog",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -155,7 +155,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking,
+@@ -169,7 +169,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking,
  // platform #defines.
  BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers,
               "UncredentialedFilteringFallbackForSupervisedUsers",
diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h
index e7cebb7bd825..200e825a00d7 100644
--- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h
+++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h
@@ -1,6 +1,6 @@
---- components/supervised_user/core/common/features.h.orig	2025-04-15 08:30:07 UTC
+--- components/supervised_user/core/common/features.h.orig	2025-05-06 12:23:00 UTC
 +++ components/supervised_user/core/common/features.h
-@@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
+@@ -19,12 +19,12 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
  BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals);
  
  #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,13 @@
  extern const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs;
  #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_WIN)
-@@ -36,7 +36,7 @@ BASE_DECLARE_FEATURE(
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Whether we show an error screen in case of failure of a local web approval.
+ BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog);
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(
  // Applies new informative strings during the parental extension approval flow.
  BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings);
  
@@ -18,7 +24,7 @@
  BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
  #endif
  
-@@ -54,7 +54,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE
+@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE
  bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled();
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -27,7 +33,7 @@
  // Enable different web sign in interception behaviour for supervised users:
  //
  // 1. Supervised user signs in to existing signed out Profile: show modal
-@@ -72,7 +72,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers);
+@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers);
  // unauthenticated (e.g. signed out of the content area) account.
  BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers);
  
diff --git a/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc b/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
index 6b4433b74202..ac3d66914a6b 100644
--- a/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
+++ b/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc
@@ -1,6 +1,6 @@
---- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-04-15 08:30:07 UTC
+--- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/sync_preferences/common_syncable_prefs_database.cc
-@@ -319,7 +319,7 @@ constexpr auto kCommonSyncablePrefsAllowlist =
+@@ -321,7 +321,7 @@ constexpr auto kCommonSyncablePrefsAllowlist =
            PrefSensitivity::kNone, MergeBehavior::kNone}},
  #endif  // BUILDFLAG(IS_ANDROID)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
index f8324e3f515c..b015ae9bedee 100644
--- a/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
+++ b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc
@@ -1,6 +1,6 @@
---- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2024-10-27 06:40:35 UTC
+--- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/trusted_vault/trusted_vault_connection_impl.cc
-@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() {
+@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() {
    // currently used or even built on all platforms.
  #if BUILDFLAG(IS_CHROMEOS)
    return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS;
diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc
index 4ec2e6084eef..d1b739f4933a 100644
--- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc
+++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc
@@ -1,6 +1,6 @@
---- components/user_education/views/help_bubble_view.cc.orig	2025-04-15 08:30:07 UTC
+--- components/user_education/views/help_bubble_view.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/user_education/views/help_bubble_view.cc
-@@ -299,7 +299,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, 
+@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, 
  // TODO(https://crbug.com/382611284): Temporarily handle the case when the
  // primary window is minimized by closing the help bubble. Remove this code when
  // the issue is solved at the Views framework level.
@@ -9,7 +9,7 @@
  class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver {
   public:
    explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble)
-@@ -774,7 +774,7 @@ HelpBubbleView::HelpBubbleView(
+@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView(
      event_relay_->Init(this);
    }
  
@@ -18,7 +18,7 @@
    primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this);
  #endif
  
-@@ -886,7 +886,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
+@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
  void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
                                                views::Widget* widget) const {
    BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h
index b024e9468d99..cbbfe388ee4b 100644
--- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h
+++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h
@@ -1,6 +1,6 @@
---- components/user_education/views/help_bubble_view.h.orig	2025-02-20 09:59:21 UTC
+--- components/user_education/views/help_bubble_view.h.orig	2025-05-06 12:23:00 UTC
 +++ components/user_education/views/help_bubble_view.h
-@@ -162,7 +162,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg
+@@ -160,7 +160,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg
  // work around this problem by closing the bubble if the widget is minimized.
  // When the underlying issue is fixed at the framework level, this can be
  // removed.
diff --git a/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
index 50bc3fede639..365f16d1ef6b 100644
--- a/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
+++ b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc
@@ -1,6 +1,6 @@
---- components/visited_url_ranking/public/url_visit_util.cc.orig	2024-10-27 06:40:35 UTC
+--- components/visited_url_ranking/public/url_visit_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/visited_url_ranking/public/url_visit_util.cc
-@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() {
+@@ -67,7 +67,7 @@ PlatformType GetPlatformInput() {
    return PlatformType::kWindows;
  #elif BUILDFLAG(IS_MAC)
    return PlatformType::kMac;
diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index 56192c662443..9661e9e0103f 100644
--- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-03-09 21:38:10 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1505,7 +1505,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1510,7 +1510,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
                                              ->GetVulkanPhysicalDevice(),
                                          VK_IMAGE_TILING_OPTIMAL, vk_format,
                                          si_format, yuv_color_space, ycbcr_info);
diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc
index fcff9d467d4d..4196c8d4ffda 100644
--- a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc
+++ b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display/skia_renderer.cc.orig	2025-04-15 08:30:07 UTC
+--- components/viz/service/display/skia_renderer.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/viz/service/display/skia_renderer.cc
-@@ -1383,7 +1383,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1391,7 +1391,7 @@ void SkiaRenderer::ClearFramebuffer() {
    if (current_frame()->current_render_pass->has_transparent_background) {
      ClearCanvas(SkColors::kTransparent);
    } else {
diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index d49f4b3322aa..c71c189874c7 100644
--- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -123,7 +123,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -126,7 +126,7 @@ RootCompositorFrameSinkImpl::Create(
    output_surface->SetNeedsSwapSizeNotifications(
        params->send_swap_size_notifications);
  
@@ -9,7 +9,7 @@
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -858,7 +858,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -884,7 +884,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
    if (display_client_ && enable_swap_completion_callback_) {
      display_client_->DidCompleteSwapWithSize(pixel_size);
    }
diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 436d126ae865..bc568204facf 100644
--- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,8 +1,8 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-03-09 21:38:10 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-05-06 12:23:00 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -228,7 +228,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
-   // See comments on `EvictionHandler`.
-   EvictionHandler eviction_handler_;
+@@ -229,7 +229,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+   base::TimeDelta preferred_frame_interval_ =
+       FrameRateDecider::UnspecifiedFrameInterval();
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
diff --git a/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc b/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc
index 5c4f3c3b75d4..369e49e751b3 100644
--- a/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc
+++ b/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc
@@ -1,6 +1,6 @@
---- components/webui/flags/flags_state.cc.orig	2025-04-15 08:30:07 UTC
+--- components/webui/flags/flags_state.cc.orig	2025-05-06 12:23:00 UTC
 +++ components/webui/flags/flags_state.cc
-@@ -787,7 +787,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -792,7 +792,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
    return kOsWin;
  #elif BUILDFLAG(IS_CHROMEOS)
    return kOsCrOS;
diff --git a/www/ungoogled-chromium/files/patch-content_app_BUILD.gn b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn
index a976cbb603a1..fd1566ad8463 100644
--- a/www/ungoogled-chromium/files/patch-content_app_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn
@@ -1,6 +1,6 @@
---- content/app/BUILD.gn.orig	2025-02-20 09:59:21 UTC
+--- content/app/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ content/app/BUILD.gn
-@@ -89,9 +89,9 @@ source_set("content_main_runner_app") {
+@@ -90,9 +90,9 @@ source_set("content_main_runner_app") {
             "//third_party/tflite:buildflags",
             "//tools/v8_context_snapshot:buildflags",
           ]
diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
index f4cfef4e90d3..06cd20a4d204 100644
--- a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- content/app/content_main_runner_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/app/content_main_runner_impl.cc
-@@ -144,18 +144,20 @@
+@@ -146,18 +146,20 @@
  #include "content/browser/posix_file_descriptor_info_impl.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -23,7 +23,7 @@
  #include "third_party/boringssl/src/include/openssl/crypto.h"
  #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
  
-@@ -184,6 +186,10 @@
+@@ -186,6 +188,10 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -34,7 +34,7 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "content/browser/android/battery_metrics.h"
-@@ -382,7 +388,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE)
  
@@ -43,7 +43,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -420,7 +426,10 @@ void PreloadLibraryCdms() {
+@@ -422,7 +428,10 @@ void PreloadLibraryCdms() {
  
  void PreSandboxInit() {
    // Ensure the /dev/urandom is opened.
@@ -54,7 +54,7 @@
  
    // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
    // files.
-@@ -432,9 +441,16 @@ void PreSandboxInit() {
+@@ -434,9 +443,16 @@ void PreSandboxInit() {
    // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md
    CRYPTO_pre_sandbox_init();
  
@@ -71,7 +71,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
    // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -748,7 +764,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain(
+@@ -750,7 +766,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain(
      unregister_thread_closure = base::HangWatcher::RegisterThread(
          base::HangWatcher::ThreadType::kMainThread);
      bool start_hang_watcher_now;
@@ -80,7 +80,7 @@
      // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is
      // initialized, because the sandbox can't be started with multiple threads.
      // TODO(mpdenton): start the HangWatcher after the sandbox is initialized.
-@@ -861,11 +877,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -863,11 +879,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
                   base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -94,7 +94,7 @@
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -1046,10 +1061,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1048,10 +1063,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
        process_type == switches::kZygoteProcess) {
      PreSandboxInit();
    }
@@ -117,7 +117,7 @@
    delegate_->SandboxInitialized(process_type);
  
  #if BUILDFLAG(USE_ZYGOTE)
-@@ -1146,6 +1173,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() {
+@@ -1148,6 +1175,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() {
    content_main_params_.reset();
  
    RegisterMainThreadFactories();
diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
index 0af3aa1f1e01..07cb2927f0c2 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- content/browser/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/BUILD.gn
-@@ -2543,6 +2543,14 @@ source_set("browser") {
+@@ -2561,6 +2561,14 @@ source_set("browser") {
      ]
    }
  
@@ -15,10 +15,10 @@
    if (is_linux || is_chromeos) {
      sources -=
          [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
-@@ -2588,6 +2596,15 @@ source_set("browser") {
+@@ -2606,6 +2614,15 @@ source_set("browser") {
    if (allow_oop_video_decoder) {
-     sources += [ "media/stable_video_decoder_factory.cc" ]
-     deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
+     sources += [ "media/oop_video_decoder_factory.cc" ]
+     deps += [ "//media/mojo/mojom" ]
 +  }
 +
 +  if (is_bsd) {
diff --git a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
index 35a04d276f0c..d1cc5798e9ed 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/accessibility/browser_accessibility_state_impl.cc
-@@ -192,7 +192,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta
+@@ -180,7 +180,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta
  
  // On Android, Mac, Windows and Linux there are platform-specific subclasses.
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \
diff --git a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
index 0f0945fde500..a5648d07b660 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
@@ -1,6 +1,6 @@
---- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-04-15 08:30:07 UTC
+--- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc
-@@ -31,7 +31,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
+@@ -32,7 +32,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
    std::string cmdline;
    std::stringstream ss(cmdline_all);
    while (std::getline(ss, cmdline, '\0')) {
@@ -12,22 +12,22 @@
      if (re2::RE2::PartialMatch(cmdline, orca_regex)) {
        return true;  // Orca was found
      }
-@@ -57,7 +61,9 @@ class BrowserAccessibilityStateImplAuralinux
+@@ -42,6 +46,10 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al
  
- void BrowserAccessibilityStateImplAuralinux::UpdateHistogramsOnOtherThread() {
-   BrowserAccessibilityStateImpl::UpdateHistogramsOnOtherThread();
--
+ // Returns true if Orca is active.
+ bool DiscoverOrca() {
 +#if BUILDFLAG(IS_BSD)
 +  NOTIMPLEMENTED();
++  return false;
 +#else
    // NOTE: this method is run from another thread to reduce jank, since
-   // there's no guarantee these system calls will return quickly. Code that
-   // needs to run in the UI thread can be run in
-@@ -105,6 +111,7 @@ void BrowserAccessibilityStateImplAuralinux::UpdateHis
-   } else {
-     base::debug::ClearCrashKeyString(ax_orca_crash_key);
+   // there's no guarantee these system calls will return quickly.
+   std::unique_ptr<DIR, decltype(&CloseDir)> proc_dir(opendir("/proc"),
+@@ -79,6 +87,7 @@ bool DiscoverOrca() {
    }
+ 
+   return is_orca_active;
 +#endif
  }
  
- void BrowserAccessibilityStateImplAuralinux::UpdateUniqueUserHistograms() {
+ }  // namespace
diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc
index fbdbacb253bd..aad063681942 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig	2025-02-20 09:59:21 UTC
+--- content/browser/browser_main_loop.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/browser_main_loop.cc
-@@ -247,6 +247,12 @@
+@@ -249,6 +249,12 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
  #endif
  
@@ -13,7 +13,7 @@
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -541,6 +547,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() {
    // by now since a thread to start the ServiceManager has been created
    // before the browser main loop starts.
    DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,7 +26,7 @@
  #endif
  
    // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() {
        base::ThreadType::kDisplayCritical);
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
index c5fca68899cf..06172f1f158a 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
@@ -1,6 +1,6 @@
---- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-03-09 21:38:10 UTC
+--- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien
+@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien
    HostDisplayClient& operator=(const HostDisplayClient&) = delete;
  
    // viz::HostDisplayClient:
diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc
index 12aa03618c88..5a93489ed499 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/compositor_util.cc.orig	2025-04-15 08:30:07 UTC
+--- content/browser/gpu/compositor_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/gpu/compositor_util.cc
-@@ -147,7 +147,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+@@ -142,7 +142,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
        "video_decode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
@@ -9,7 +9,7 @@
            !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) ||
  #endif  // BUILDFLAG(IS_LINUX)
                command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)),
-@@ -159,7 +159,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
+@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData(
        "video_encode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE,
diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
index 5da1a9643438..ee1d9ee35e51 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.cc.orig	2024-08-26 14:40:28 UTC
+--- content/browser/gpu/gpu_data_manager_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.cc
-@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
+@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
    private_->OnDisplayMetricsChanged(display, changed_metrics);
  }
  
diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
index e7ffbeb7b39e..93de1465289c 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
+++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.h.orig	2024-08-26 14:40:28 UTC
+--- content/browser/gpu/gpu_data_manager_impl.h.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.h
-@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
+@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics) override;
  
diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index 3dedba683db4..2d2b66457453 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-04-15 08:30:07 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1667,7 +1667,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
    UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
  }
  
diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
index f963975cf5e5..f3db2ccc056d 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
+++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2024-11-16 12:20:41 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics);
  
@@ -9,7 +9,7 @@
    bool IsGpuMemoryBufferNV12Supported();
    void SetGpuMemoryBufferNV12Supported(bool supported);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    bool application_is_visible_ = true;
  
    bool disable_gpu_compositing_ = false;
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool is_gpu_memory_buffer_NV12_supported_ = false;
  #endif  // BUILDFLAG(IS_LINUX)
- };
+ 
diff --git a/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
index 3ee2b481f1fd..354e5a627139 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
+++ b/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
@@ -1,4 +1,4 @@
---- content/browser/media/frameless_media_interface_proxy.h.orig	2024-05-23 20:04:36 UTC
+--- content/browser/media/frameless_media_interface_proxy.h.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/media/frameless_media_interface_proxy.h
 @@ -19,7 +19,7 @@
  #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -6,15 +6,15 @@
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
+ #include "media/mojo/mojom/video_decoder.mojom.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final
+@@ -104,7 +104,7 @@ class FramelessMediaInterfaceProxy final
    // Connections to the renderer.
    mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Connection to the StableVideoDecoderFactory that lives in a utility
-   // process. This is only used for out-of-process video decoding and only when
-   // the FramelessMediaInterfaceProxy is created without a RenderProcessHost
+   // Connection to the InterfaceFactory that lives in a utility process.
+   // This is only used for out-of-process video decoding and only when the
+   // FramelessMediaInterfaceProxy is created without a RenderProcessHost
diff --git a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc
index 9796b1b8afa8..218369f4d676 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/network_service_instance_impl.cc.orig	2025-02-20 09:59:21 UTC
+--- content/browser/network_service_instance_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/network_service_instance_impl.cc
-@@ -84,7 +84,7 @@
+@@ -83,7 +83,7 @@
  #include "content/browser/network/network_service_process_tracker_win.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/browser/system_dns_resolution/system_dns_resolver.h"
  #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
  #endif
-@@ -367,7 +367,7 @@ void CreateInProcessNetworkService(
+@@ -341,7 +341,7 @@ void CreateInProcessNetworkService(
                                  std::move(receiver)));
  }
  
@@ -18,7 +18,7 @@
  // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
  // high-priority thread pool.
  void RunSystemDnsResolverOnThreadPool(
-@@ -436,7 +436,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -410,7 +410,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
    }
  #endif  // BUILDFLAG(IS_POSIX)
  
diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
index f4f694e350d6..cdf547f3c0a4 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-03-09 21:38:10 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -334,7 +334,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface(
  
    if (!primary_surface_id ||
        primary_surface_id->local_surface_id() != local_surface_id_) {
diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index fb0d4b229e59..e5cbef061005 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -225,7 +225,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
@@ -9,7 +9,7 @@
  #include <sys/resource.h>
  
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -1090,7 +1090,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1123,7 +1123,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1258,7 +1258,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost
+@@ -1318,7 +1318,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost
  
  void RenderProcessHostImpl::IOThreadHostImpl::SetPid(
      base::ProcessId child_pid) {
@@ -27,7 +27,7 @@
    child_thread_type_switcher_.SetPid(child_pid);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -3329,7 +3329,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3411,7 +3411,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
              base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
    }
  
@@ -36,7 +36,7 @@
    // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
    // for NV12 GPU memory buffer.
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3385,6 +3385,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3466,6 +3466,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
        switches::kDisableSpeechAPI,
        switches::kDisableThreadedCompositing,
        switches::kDisableTouchDragDrop,
@@ -44,7 +44,7 @@
        switches::kDisableV8IdleTasks,
        switches::kDisableVideoCaptureUseGpuMemoryBuffer,
        switches::kDisableWebGLImageChromium,
-@@ -5224,7 +5225,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr
+@@ -5314,7 +5315,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr
    // - Win: https://crbug.com/707022 .
    uint64_t total_size = 0;
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index 4cd9a115ca2f..ed3c764feef5 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig	2025-04-15 08:30:07 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/renderer_host/render_process_host_impl.h
 @@ -102,7 +102,7 @@
  #include "media/fuchsia_media_codec_provider_impl.h"
@@ -9,7 +9,7 @@
  #include "content/browser/child_thread_type_switcher_linux.h"
  #include "media/mojo/mojom/video_encode_accelerator.mojom.h"
  #endif
-@@ -988,7 +988,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -986,7 +986,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
      std::unique_ptr<service_manager::BinderRegistry> binders_;
      mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
  
@@ -18,7 +18,7 @@
      mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
          video_encode_accelerator_factory_remote_;
      ChildThreadTypeSwitcher child_thread_type_switcher_;
-@@ -1237,7 +1237,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -1235,7 +1235,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // if the request isn't handled on the IO thread.
    void OnBindHostReceiver(mojo::GenericPendingReceiver receiver);
  
diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index b8fec059f51c..e4ac9a5f760e 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-03-09 21:38:10 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -121,7 +121,7 @@
  #include "ui/gfx/gdi_util.h"
@@ -18,7 +18,7 @@
    ui::BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1867,7 +1867,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
    return host() && host()->delegate() && host()->delegate()->ShouldDoLearning();
  }
  
@@ -27,7 +27,7 @@
  bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
      const gfx::Range& range,
      const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2843,7 +2843,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,12 +36,12 @@
    return NeedsInputGrab();
  #else
    return false;
-@@ -3027,7 +3027,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!event.skip_if_unhandled && linux_ui && event.os_event &&
+   if (!event.skip_if_unhandled && linux_ui && event.os_event) {
+     const auto command = linux_ui->GetTextEditCommandForEvent(
diff --git a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc
index d4b09fc10209..f90fa1cf27cc 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/service_host/utility_process_host.cc.orig	2025-04-15 08:30:07 UTC
+--- content/browser/service_host/utility_process_host.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/service_host/utility_process_host.cc
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
  #include "content/browser/v8_snapshot_files.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/files/file_util.h"
  #include "base/files/scoped_file.h"
  #include "base/pickle.h"
-@@ -95,7 +95,7 @@ namespace content {
+@@ -96,7 +96,7 @@ namespace content {
  
  namespace {
  
@@ -18,7 +18,7 @@
  base::ScopedFD PassNetworkContextParentDirs(
      std::vector<base::FilePath> network_context_parent_dirs) {
    base::Pickle pickle;
-@@ -425,7 +425,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() {
      file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line));
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -27,7 +27,7 @@
      // The network service should have access to the parent directories
      // necessary for its usage.
      if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -442,7 +442,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() {
      if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
        bool pass_gpu_buffer_flag =
            switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
diff --git a/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc
index e17e5e5e100b..273da85f6b28 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc
@@ -1,9 +1,9 @@
---- content/browser/v8_snapshot_files.cc.orig	2024-06-22 08:49:42 UTC
+--- content/browser/v8_snapshot_files.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/browser/v8_snapshot_files.cc
-@@ -17,7 +17,7 @@ namespace content {
- std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>>
+@@ -19,7 +19,7 @@ namespace content {
+ std::map<std::string, std::variant<base::FilePath, base::ScopedFD>>
  GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) {
-   std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files;
+   std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> files;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT)
diff --git a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn
index fad0ed35e546..f301e9df9341 100644
--- a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig	2025-02-20 09:59:21 UTC
+--- content/common/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ content/common/BUILD.gn
-@@ -384,19 +384,28 @@ source_set("common") {
+@@ -382,19 +382,28 @@ source_set("common") {
    }
  
    if (is_linux || is_chromeos) {
diff --git a/www/ungoogled-chromium/files/patch-content_common_features.cc b/www/ungoogled-chromium/files/patch-content_common_features.cc
index 08bbde5d7d61..ae4a2c0d22a8 100644
--- a/www/ungoogled-chromium/files/patch-content_common_features.cc
+++ b/www/ungoogled-chromium/files/patch-content_common_features.cc
@@ -1,6 +1,6 @@
---- content/common/features.cc.orig	2025-03-09 21:38:10 UTC
+--- content/common/features.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/common/features.cc
-@@ -125,7 +125,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
+@@ -124,7 +124,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  // Enables error reporting for JS errors inside DevTools frontend host
diff --git a/www/ungoogled-chromium/files/patch-content_common_features.h b/www/ungoogled-chromium/files/patch-content_common_features.h
index d27068778482..98cbc35955f5 100644
--- a/www/ungoogled-chromium/files/patch-content_common_features.h
+++ b/www/ungoogled-chromium/files/patch-content_common_features.h
@@ -1,6 +1,6 @@
---- content/common/features.h.orig	2025-03-09 21:38:10 UTC
+--- content/common/features.h.orig	2025-05-06 12:23:00 UTC
 +++ content/common/features.h
-@@ -28,7 +28,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn
+@@ -27,7 +27,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation);
diff --git a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc b/www/ungoogled-chromium/files/patch-content_common_user__agent.cc
deleted file mode 100644
index c4cee4be8d64..000000000000
--- a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- content/common/user_agent.cc.orig	2025-04-15 08:30:07 UTC
-+++ content/common/user_agent.cc
-@@ -50,7 +50,7 @@ std::string GetUserAgentPlatform() {
-   return "";
- #elif BUILDFLAG(IS_MAC)
-   return "Macintosh; ";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return "X11; ";  // strange, but that's what Firefox uses
- #elif BUILDFLAG(IS_ANDROID)
-   return "Linux; ";
-@@ -76,7 +76,7 @@ std::string GetUnifiedPlatform() {
-   return "Windows NT 10.0; Win64; x64";
- #elif BUILDFLAG(IS_FUCHSIA)
-   return "Fuchsia";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "X11; Linux x86_64";
- #elif BUILDFLAG(IS_IOS)
-   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
-@@ -305,6 +305,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
-                       "Android %s", os_version.c_str()
- #elif BUILDFLAG(IS_FUCHSIA)
-                       "Fuchsia"
-+#elif BUILDFLAG(IS_BSD)
-+#if defined(__x86_64__)
-+                      "Linux x86_64; %s %s",
-+#elif defined(__aarch64__)
-+                      "Linux aarch64; %s %s",
-+#else
-+                      "Linux i686; %s %s",
-+#endif
-+                      unixinfo.sysname,  // e.g. Linux
-+                      cpu_type.c_str()   // e.g. i686
- #elif BUILDFLAG(IS_IOS)
-                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
-                       os_version.c_str()
diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc
index 79dbdf6e4c5d..4af5ac0fcc49 100644
--- a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc
+++ b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc
@@ -1,6 +1,6 @@
---- content/public/browser/content_browser_client.cc.orig	2025-04-15 08:30:07 UTC
+--- content/public/browser/content_browser_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/public/browser/content_browser_client.cc
-@@ -1376,7 +1376,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
+@@ -1395,7 +1395,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
  // that can be adequately sandboxed.
  // Currently Android's network service will not run out of process or sandboxed,
  // so OutOfProcessSystemDnsResolution is not currently enabled on Android.
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc
index dda59592dbda..55a571a8b193 100644
--- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc
+++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig	2025-04-15 08:30:07 UTC
+--- content/public/common/content_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/public/common/content_features.cc
 @@ -75,7 +75,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup,
  // Runs the audio service in a separate process.
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1274,9 +1274,9 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1271,9 +1271,9 @@ BASE_FEATURE(kWebAssemblyTiering,
  BASE_FEATURE(kWebAssemblyTrapHandler,
               "WebAssemblyTrapHandler",
  #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ||  \
@@ -21,7 +21,7 @@
       defined(ARCH_CPU_ARM64))
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
-@@ -1329,7 +1329,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended,
+@@ -1330,7 +1330,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended,
  
  // Controls whether the WebUSB API is enabled:
  // https://wicg.github.io/webusb
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc
index 286963208eb9..30bd1f4a5532 100644
--- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig	2025-04-15 08:30:07 UTC
+--- content/public/common/content_switches.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/public/common/content_switches.cc
-@@ -342,6 +342,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -339,6 +339,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
  // builds.
  const char kEnableLogging[]                 = "enable-logging";
  
@@ -9,7 +9,7 @@
  // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
  // triggering of change attribute of the NetInfo API when there is a change in
  // the connection type.
-@@ -949,7 +951,7 @@ const char kPreventResizingContentsForTesting[] =
+@@ -946,7 +948,7 @@ const char kPreventResizingContentsForTesting[] =
      "prevent-resizing-contents-for-testing";
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h
index 6fc2b1d1a865..0f5237f83d35 100644
--- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h
+++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig	2025-04-15 08:30:07 UTC
+--- content/public/common/content_switches.h.orig	2025-05-06 12:23:00 UTC
 +++ content/public/common/content_switches.h
-@@ -108,6 +108,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+@@ -107,6 +107,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
  CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
  CONTENT_EXPORT extern const char kEnableLCDText[];
  CONTENT_EXPORT extern const char kEnableLogging[];
@@ -8,7 +8,7 @@
  CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
  CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
  CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -259,7 +260,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -258,7 +259,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
  CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[];
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc
index e2c953494f32..dc2fdf143513 100644
--- a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- content/renderer/render_thread_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/renderer/render_thread_impl.cc
-@@ -212,6 +212,8 @@
+@@ -207,6 +207,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -9,7 +9,7 @@
  #else
  #include <malloc.h>
  #endif
-@@ -1050,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
                               kGpuStreamIdMedia, kGpuStreamPriorityMedia);
  
    const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
        base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) &&
  #endif  // BUILDFLAG(IS_LINUX)
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1059,7 +1061,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
         gpu::kGpuFeatureStatusEnabled);
  
    const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
        base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1855,7 +1857,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory(
+@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory(
      bool enable_video_encode_accelerator) {
    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
        vea_provider;
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index 98d7a34e32a9..d62bba2a0752 100644
--- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -129,7 +129,7 @@
+@@ -124,7 +124,7 @@
  
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
-@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -25,7 +25,7 @@
      mojo::PendingRemote<font_service::mojom::FontService> font_service;
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
-@@ -228,7 +228,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
    }
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -34,7 +34,7 @@
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -292,7 +292,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundledCodeCacheRes
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 8df00216e00a..3f72f3143c3d 100644
--- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2025-03-09 21:38:10 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2025-05-06 12:23:00 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
                                     const gpu::GPUInfo& gpu_info) const;
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn
index 8b16760558d8..f6f801eaf9e0 100644
--- a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- content/shell/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ content/shell/BUILD.gn
-@@ -1089,7 +1089,7 @@ group("content_shell_crash_test") {
+@@ -1095,7 +1095,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/ungoogled-chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc
new file mode 100644
index 000000000000..ef8c4b07db5d
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc
@@ -0,0 +1,11 @@
+--- content/shell/browser/shell_platform_delegate_views.cc.orig	2025-05-06 12:23:00 UTC
++++ content/shell/browser/shell_platform_delegate_views.cc
+@@ -373,7 +373,7 @@ void ShellPlatformDelegate::CreatePlatformWindow(
+       views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
+   params.bounds = gfx::Rect(initial_size);
+   params.delegate = delegate.release();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   params.wm_class_class = "chromium-content_shell";
+   params.wm_class_name = params.wm_class_class;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc
index 18482e6924a8..ebb0b933c815 100644
--- a/www/ungoogled-chromium/files/patch-content_utility_services.cc
+++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig	2025-02-20 09:59:21 UTC
+--- content/utility/services.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/utility/services.cc
 @@ -73,7 +73,7 @@
  extern sandbox::TargetServices* g_utility_target_services;
@@ -17,7 +17,7 @@
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  #include "content/common/features.h"
- #include "media/mojo/services/stable_video_decoder_factory_process_service.h"  // nogncheck
+ #include "media/mojo/services/oop_video_decoder_factory_process_service.h"  // nogncheck
 @@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
        << "task_policy_set TASK_QOS_POLICY";
  #endif
@@ -34,9 +34,9 @@
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- auto RunStableVideoDecoderFactoryProcessService(
-     mojo::PendingReceiver<
-@@ -392,7 +392,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+ auto RunOOPVideoDecoderFactoryProcessService(
+     mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) {
+@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessService(
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
@@ -45,16 +45,16 @@
  auto RunVideoEncodeAcceleratorProviderFactory(
      mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
          receiver) {
-@@ -415,7 +415,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
+@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
    // loop of type IO that can get notified when pipes have data.
    services.Add(RunNetworkService);
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
-   services.Add(RunStableVideoDecoderFactoryProcessService);
+   services.Add(RunOOPVideoDecoderFactoryProcessService);
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
-@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // BUILDFLAG(IS_CHROMEOS) && \
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
diff --git a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc
index d7e0ea775597..037cf07e4035 100644
--- a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc
+++ b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_main.cc.orig	2025-02-20 09:59:21 UTC
+--- content/utility/utility_main.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/utility/utility_main.cc
 @@ -36,18 +36,22 @@
  #include "services/tracing/public/cpp/trace_startup.h"
@@ -28,15 +28,15 @@
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
--#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_BSD)
 +#include "sandbox/policy/sandbox.h"
 +#include "content/common/gpu_pre_sandbox_hook_bsd.h"
 +#endif
 +
-+#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "services/video_effects/video_effects_sandbox_hook_linux.h"  // nogncheck
- #endif  // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
+ #endif  // BUILDFLAG(IS_LINUX)
  
 @@ -101,7 +110,7 @@
  sandbox::TargetServices* g_utility_target_services = nullptr;
diff --git a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc
index 11b7b1af047b..49281b99fe33 100644
--- a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig	2025-02-20 09:59:21 UTC
+--- content/zygote/zygote_linux.cc.orig	2025-05-06 12:23:00 UTC
 +++ content/zygote/zygote_linux.cc
 @@ -1,6 +1,7 @@
  // Copyright 2012 The Chromium Authors
@@ -6,9 +6,9 @@
  // found in the LICENSE file.
 +#if 0
  
- #ifdef UNSAFE_BUFFERS_BUILD
- // TODO(crbug.com/342213636): Remove this and spanify to fix the errors.
-@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
+ #include "content/zygote/zygote_linux.h"
+ 
+@@ -705,3 +706,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
  }
  
  }  // namespace content
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
index 4e906786053a..6999f1048eb8 100644
--- a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
@@ -1,8 +1,8 @@
---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-02-20 09:59:21 UTC
+--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-05-06 12:23:00 UTC
 +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
 @@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+   MediaPerceptionAPIManager::GetFactoryInstance();
  #endif
-   MessageService::GetFactoryInstance();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc
index c3e284d8c150..f2930183d454 100644
--- a/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/management/management_api.cc.orig	2024-08-26 14:40:28 UTC
+--- extensions/browser/api/management/management_api.cc.orig	2025-05-06 12:23:00 UTC
 +++ extensions/browser/api/management/management_api.cc
-@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
+@@ -286,7 +286,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
  #if BUILDFLAG(IS_CHROMEOS)
    // ChromeOS devices have this feature already shipped.
    return true;
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index ff235bc82fff..c8bb0e021cee 100644
--- a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/messaging/message_service.cc.orig	2025-04-15 08:30:07 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ extensions/browser/api/messaging/message_service.cc
-@@ -77,7 +77,7 @@ namespace {
+@@ -81,7 +81,7 @@ namespace {
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -667,7 +667,7 @@ void MessageService::OpenChannelToNativeAppImpl(
+@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNativeAppImpl(
      return;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
index df9c9c54dab9..6e657f86341e 100644
--- a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
@@ -1,4 +1,4 @@
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-01-25 09:34:31 UTC
+--- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-05-06 12:23:00 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.cc
 @@ -18,7 +18,7 @@
  #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
@@ -9,7 +9,7 @@
  #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
  #endif
  
-@@ -54,7 +54,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
+@@ -56,7 +56,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
    return std::make_unique<ShellDisplayInfoProvider>();
  }
  
diff --git a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
index 2288500e1e2e..d15bc7d6d4d4 100644
--- a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
+++ b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
@@ -1,6 +1,6 @@
---- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-01-25 09:34:31 UTC
+--- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-05-06 12:23:00 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.h
-@@ -34,14 +34,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
+@@ -36,14 +36,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
        content::BrowserContext* browser_context) const override;
    std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider()
        const override;
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
index ee70cbcde6d4..c000d07d50de 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-03-09 21:38:10 UTC
+--- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-05-06 12:23:00 UTC
 +++ gpu/command_buffer/service/dawn_context_provider.cc
-@@ -341,7 +341,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
+@@ -377,7 +377,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
    return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
               ? wgpu::BackendType::D3D12
               : wgpu::BackendType::D3D11;
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc
index e4d7b15855c0..8e0eb059002d 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_context_state.cc.orig	2025-04-15 08:30:07 UTC
+--- gpu/command_buffer/service/shared_context_state.cc.orig	2025-05-06 12:23:00 UTC
 +++ gpu/command_buffer/service/shared_context_state.cc
-@@ -65,7 +65,7 @@
+@@ -64,7 +64,7 @@
  #include "gpu/vulkan/vulkan_implementation.h"
  #include "gpu/vulkan/vulkan_util.h"
  
@@ -9,7 +9,7 @@
  #include "gpu/command_buffer/service/external_semaphore_pool.h"
  #endif
  
-@@ -334,7 +334,7 @@ SharedContextState::SharedContextState(
+@@ -322,7 +322,7 @@ SharedContextState::SharedContextState(
    if (gr_context_type_ == GrContextType::kVulkan) {
      if (vk_context_provider_) {
  #if BUILDFLAG(ENABLE_VULKAN) && \
@@ -18,7 +18,7 @@
        external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this);
  #endif
        use_virtualized_gl_contexts_ = false;
-@@ -371,7 +371,7 @@ SharedContextState::~SharedContextState() {
+@@ -359,7 +359,7 @@ SharedContextState::~SharedContextState() {
    }
  
  #if BUILDFLAG(ENABLE_VULKAN) && \
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index eba5e3a7e0e9..762e3899798f 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2024-08-26 14:40:28 UTC
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
 @@ -20,7 +20,7 @@ namespace {
  // TODO(penghuang): verify the scanout is the right usage for video playback.
@@ -9,3 +9,12 @@
      SHARED_IMAGE_USAGE_SCANOUT |
  #endif
      SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE |
+@@ -121,7 +121,7 @@ bool AngleVulkanImageBackingFactory::IsGMBSupported(
+   switch (gmb_type) {
+     case gfx::EMPTY_BUFFER:
+       return true;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP: {
+       auto* vulkan_implementation =
+           context_state_->vk_context_provider()->GetVulkanImplementation();
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
index e9163798d689..c34f3a755f7f 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-04-15 08:30:07 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
 @@ -48,7 +48,7 @@
  #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h"
@@ -9,7 +9,16 @@
  #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h"
  #endif
  
-@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
+@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t
+     case gfx::IO_SURFACE_BUFFER:
+       return "platform";
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
+       return "platform";
+ #endif
+@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
    return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
  #elif BUILDFLAG(IS_ANDROID)
    return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
@@ -18,7 +27,7 @@
    return gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
  #elif BUILDFLAG(IS_WIN)
    return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE;
-@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory(
+@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory(
          context_state_, workarounds_);
      factories_.push_back(std::move(ozone_factory));
    }
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index b48e74735aca..786cfe66a89f 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-03-09 21:38:10 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1752,7 +1752,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte
+@@ -1754,7 +1754,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte
        backend_types = {wgpu::BackendType::D3D12};
  #elif BUILDFLAG(IS_MAC)
        backend_types = {wgpu::BackendType::Metal};
@@ -9,7 +9,7 @@
        if (shared_context_state_->GrContextIsVulkan() ||
            shared_context_state_->IsGraphiteDawnVulkan()) {
          backend_types = {wgpu::BackendType::Vulkan};
-@@ -1994,7 +1994,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+@@ -1996,7 +1996,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
    }
  
  #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc
index b09f99361b61..d13d86681bae 100644
--- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_info_collector.cc.orig	2025-04-15 08:30:07 UTC
+--- gpu/config/gpu_info_collector.cc.orig	2025-05-06 12:23:00 UTC
 +++ gpu/config/gpu_info_collector.cc
-@@ -347,7 +347,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
+@@ -349,7 +349,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
  void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) {
    static BASE_FEATURE(kCollectWebGPUSupportMetrics,
                        "CollectWebGPUSupportMetrics",
diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 1dcd87c967dd..8fe45f715493 100644
--- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_init.cc.orig	2025-04-15 08:30:07 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2025-05-06 12:23:00 UTC
 +++ gpu/ipc/service/gpu_init.cc
 @@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
  
@@ -9,7 +9,7 @@
    if (gpu_info.gpu.vendor_id != 0x10de ||  // NVIDIA
        gpu_info.gpu.driver_vendor != "NVIDIA")
      return true;
-@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    enable_watchdog = false;
  #endif
  
@@ -18,7 +18,7 @@
    bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
  #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
    // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -431,7 +431,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -27,7 +27,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      gpu_preferences_.gr_context_type = GrContextType::kGL;
    }
  
@@ -36,7 +36,7 @@
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -590,7 +590,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -586,7 +586,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -45,7 +45,7 @@
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -758,7 +758,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -754,7 +754,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
                ->GetSupportedFormatsForGLNativePixmapImport();
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -54,7 +54,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -810,7 +810,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -806,7 +806,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        }
      }
    }
@@ -63,7 +63,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1014,7 +1014,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1008,7 +1008,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
    }
    bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
  
@@ -72,7 +72,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1069,7 +1069,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1063,7 +1063,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
      }
    }
  
diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
index 2098cf89a04b..f173831d49e9 100644
--- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig	2024-06-22 08:49:42 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2025-05-06 12:23:00 UTC
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -391,7 +391,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
    VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
    VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
  
@@ -9,7 +9,7 @@
    VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
        vkGetImageDrmFormatModifierPropertiesEXT;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1405,7 +1405,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
                                                               pPresentInfo);
  }
  
@@ -18,7 +18,7 @@
  ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
      VkDevice device,
      VkImage image,
-@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+@@ -1415,4 +1415,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/ungoogled-chromium/files/patch-headless_BUILD.gn b/www/ungoogled-chromium/files/patch-headless_BUILD.gn
index 322d21d524db..6a83631d2bc9 100644
--- a/www/ungoogled-chromium/files/patch-headless_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-headless_BUILD.gn
@@ -1,6 +1,6 @@
---- headless/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- headless/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ headless/BUILD.gn
-@@ -474,7 +474,7 @@ component("headless_non_renderer") {
+@@ -475,7 +475,7 @@ component("headless_non_renderer") {
      }
    }
  
diff --git a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc
index 51ee9b1d4e27..5209bf437b50 100644
--- a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- headless/lib/headless_content_main_delegate.cc.orig	2025-03-09 21:38:10 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig	2025-05-06 12:23:00 UTC
 +++ headless/lib/headless_content_main_delegate.cc
-@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
    if (process_type != ::switches::kZygoteProcess) {
      g_headless_crash_client.Pointer()->set_crash_dumps_dir(
          command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h
index 2fd3ab2f904c..b3cbea09ed4f 100644
--- a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h
+++ b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.h.orig	2025-03-09 21:38:10 UTC
+--- ipc/ipc_message_utils.h.orig	2025-05-06 12:23:00 UTC
 +++ ipc/ipc_message_utils.h
-@@ -215,7 +215,7 @@ struct ParamTraits<unsigned int> {
+@@ -216,7 +216,7 @@ struct ParamTraits<unsigned int> {
  // Since we want to support Android 32<>64 bit IPC, as long as we don't have
  // these traits for 32 bit ARM then that'll catch any errors.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-media_BUILD.gn b/www/ungoogled-chromium/files/patch-media_BUILD.gn
index bc71fcc0a801..0c367931c10d 100644
--- a/www/ungoogled-chromium/files/patch-media_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig	2025-03-09 21:38:10 UTC
+--- media/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ media/BUILD.gn
-@@ -100,6 +100,9 @@ config("media_config") {
+@@ -105,6 +105,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
      }
    }
diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn
index bffce70d8e9c..b9329b1da15d 100644
--- a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- media/audio/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ media/audio/BUILD.gn
-@@ -271,9 +271,23 @@ source_set("audio") {
+@@ -275,9 +275,23 @@ source_set("audio") {
      deps += [ "//media/base/android:media_jni_headers" ]
    }
  
diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
index 938b3b65e9d4..02b0221412f0 100644
--- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
+++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig	2025-04-15 08:30:07 UTC
+--- media/base/media_switches.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/base/media_switches.cc
 @@ -19,7 +19,7 @@
  #include "ui/gl/gl_features.h"
@@ -49,7 +49,7 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // When enabled, MediaCapabilities will check with GPU Video Accelerator
-@@ -611,7 +633,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture,
+@@ -636,7 +658,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture,
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
               "GlobalMediaControls",
@@ -58,7 +58,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -634,7 +656,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
+@@ -659,7 +681,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
               "MediaRemotingWithoutFullscreen",
@@ -67,7 +67,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -646,7 +668,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+@@ -671,7 +693,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -76,7 +76,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -675,7 +697,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -700,7 +722,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -85,7 +85,7 @@
  // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default
  // on chromeos, but needs an experiment on linux.
  BASE_FEATURE(kAcceleratedVideoDecodeLinux,
-@@ -775,7 +797,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
+@@ -800,7 +822,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
               "VSyncMjpegDecoding",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -94,8 +94,8 @@
  // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS.
  BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding,
               "V4L2H264TemporalLayerHWEncoding",
-@@ -1347,7 +1369,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1361,7 +1383,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
+ );
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -103,7 +103,7 @@
  // Spawn utility processes to perform hardware encode acceleration instead of
  // using the GPU process.
  BASE_FEATURE(kUseOutOfProcessVideoEncoding,
-@@ -1429,7 +1451,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
+@@ -1443,7 +1465,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
               "RecordWebAudioEngagement",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h
index 93ccd40ee936..ee1f3eae948d 100644
--- a/www/ungoogled-chromium/files/patch-media_base_media__switches.h
+++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,6 @@
---- media/base/media_switches.h.orig	2025-04-15 08:30:07 UTC
+--- media/base/media_switches.h.orig	2025-05-06 12:23:00 UTC
 +++ media/base/media_switches.h
-@@ -321,13 +321,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu
+@@ -329,13 +329,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
@@ -28,7 +28,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo);
-@@ -341,7 +353,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio);
+@@ -349,7 +361,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
@@ -37,7 +37,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux);
-@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
+@@ -371,7 +383,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -46,8 +46,8 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
-@@ -493,7 +505,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding);
+@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h
index 25e677decf6d..f5c60041b707 100644
--- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h
@@ -1,7 +1,7 @@
---- media/capture/video/linux/v4l2_capture_device.h.orig	2022-10-01 07:40:07 UTC
+--- media/capture/video/linux/v4l2_capture_device.h.orig	2025-05-06 12:23:00 UTC
 +++ media/capture/video/linux/v4l2_capture_device.h
-@@ -21,7 +21,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
-  public:
+@@ -23,7 +23,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
+ 
    virtual int open(const char* device_name, int flags) = 0;
    virtual int close(int fd) = 0;
 -  virtual int ioctl(int fd, int request, void* argp) = 0;
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_buffer__validation.cc b/www/ungoogled-chromium/files/patch-media_gpu_buffer__validation.cc
deleted file mode 100644
index 54798293a8cd..000000000000
--- a/www/ungoogled-chromium/files/patch-media_gpu_buffer__validation.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- media/gpu/buffer_validation.cc.orig	2024-11-16 12:20:41 UTC
-+++ media/gpu/buffer_validation.cc
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/gpu_memory_buffer.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <sys/types.h>
- #include <unistd.h>
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -23,7 +23,7 @@
- namespace media {
- 
- bool GetFileSize(const int fd, size_t* size) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (fd < 0) {
-     VLOG(1) << "Invalid file descriptor";
-     return false;
-@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle(
-     VLOG(1) << "Unsupported: " << pixel_format;
-     return false;
-   }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
-   if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
-       num_planes == 0) {
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
index 243bc9fdcd05..f77ead67c04a 100644
--- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2024-10-01 07:26:23 UTC
+--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/gpu/chromeos/mailbox_video_frame_converter.cc
-@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
+@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
                      << static_cast<int>(buffer_format);
        NOTREACHED();
    }
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index 52f906ef3ce2..bc2ca630cc8f 100644
--- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-04-15 08:30:07 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -1121,7 +1121,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1122,7 +1122,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    }
  #endif
  
@@ -9,7 +9,7 @@
    // Linux should always use a custom allocator (to allocate buffers using
    // libva) and a PlatformVideoFramePool.
    CHECK(allocator.has_value());
-@@ -1130,7 +1130,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1131,7 +1131,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
    main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
        *allocator, VideoFrame::STORAGE_DMABUFS);
@@ -18,7 +18,7 @@
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1304,7 +1304,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1305,7 +1305,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
index 6b017f5c4f57..7df6b27afa87 100644
--- a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
@@ -1,6 +1,6 @@
---- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-04-15 08:30:07 UTC
+--- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/gpu/gpu_video_decode_accelerator_factory.cc
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
  #include "media/gpu/media_gpu_export.h"
  #include "media/media_buildflags.h"
  
@@ -9,7 +9,7 @@
  #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h"
  #include "media/gpu/v4l2/v4l2_device.h"
  #endif
-@@ -28,7 +28,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA(
+@@ -29,7 +29,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA(
    if (gpu_preferences.disable_accelerated_video_decode)
      return nullptr;
  
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  
    std::unique_ptr<VideoDecodeAccelerator> vda;
-   vda.reset(new V4L2VideoDecodeAccelerator(new V4L2Device()));
+   vda.reset(new V4L2VideoDecodeAccelerator(base::MakeRefCounted<V4L2Device>()));
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
index 1dc87aad9a5e..3e61a33b6310 100644
--- a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
@@ -1,20 +1,20 @@
---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-04-15 08:30:07 UTC
+--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -150,7 +150,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
-     return vea_factory_functions;
+@@ -160,7 +160,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+   }
  
  #if BUILDFLAG(USE_VAAPI)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
    }
-@@ -158,7 +158,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
-   vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+@@ -168,7 +168,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+   vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
  #endif
  #elif BUILDFLAG(USE_V4L2_CODEC)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateV4L2VEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA));
    }
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
index ee76795c144a..b7d80eb60bdd 100644
--- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-04-15 08:30:07 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
    const gfx::Size decoder_natural_size =
        aspect_ratio_.GetNaturalSize(decoder_visible_rect);
  
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
index 400b3176bcc8..bafe72f0a8aa 100644
--- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-04-15 08:30:07 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -79,7 +79,7 @@
+@@ -81,7 +81,7 @@
  using media_gpu_vaapi::kModuleVa_prot;
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn
new file mode 100644
index 000000000000..6c9a87af95b3
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn
@@ -0,0 +1,11 @@
+--- media/mojo/mojom/BUILD.gn.orig	2025-05-06 12:23:00 UTC
++++ media/mojo/mojom/BUILD.gn
+@@ -959,7 +959,7 @@ source_set("test_support") {
+   sources = []
+   deps = []
+ 
+-  if (is_linux || is_chromeos) {
++  if (!is_bsd && (is_linux || is_chromeos)) {
+     sources += [
+       "buffer_handle_test_util.cc",
+       "buffer_handle_test_util.h",
diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_BUILD.gn b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_BUILD.gn
deleted file mode 100644
index 0cb7e98ca652..000000000000
--- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/mojo/mojom/stable/BUILD.gn.orig	2025-04-15 08:30:07 UTC
-+++ media/mojo/mojom/stable/BUILD.gn
-@@ -191,7 +191,7 @@ source_set("unit_tests") {
-   } else if (use_v4l2_codec) {
-     deps += [ "//media/gpu/v4l2:v4l2_status" ]
-   }
--  if (is_linux || is_chromeos) {
-+  if (!is_bsd && (is_linux || is_chromeos)) {
-     sources += [
-       "mojom_traits_test_util.cc",
-       "mojom_traits_test_util.h",
diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
deleted file mode 100644
index d2221e05065d..000000000000
--- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig	2025-03-09 21:38:10 UTC
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -861,7 +861,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
-   return input.id;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- gfx::NativePixmapHandle StructTraits<
-     media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -882,7 +882,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
- 
-   output->type = gfx::NATIVE_PIXMAP;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!data.ReadPlatformHandle(&output->native_pixmap_handle))
-     return false;
-   return true;
diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
deleted file mode 100644
index c408d761a5d2..000000000000
--- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2025-02-20 09:59:21 UTC
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -704,7 +704,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
-   static const gfx::GpuMemoryBufferId& id(
-       const gfx::GpuMemoryBufferHandle& input);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static gfx::NativePixmapHandle platform_handle(
-       gfx::GpuMemoryBufferHandle& input);
- #else
diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
index db711494f7db..c0cccf6c9d10 100644
--- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,4 +1,4 @@
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-04-15 08:30:07 UTC
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/mojo/mojom/video_frame_mojom_traits.cc
 @@ -24,7 +24,7 @@
  #include "ui/gfx/mojom/color_space_mojom_traits.h"
@@ -7,5 +7,32 @@
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/posix/eintr_wrapper.h"
+ #include "media/gpu/buffer_validation.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -166,7 +166,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+         media::mojom::OpaqueVideoFrameData::New());
+   }
  
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
+     // Duplicates the DMA buffer FDs to a new vector since this cannot take
+     // ownership of the FDs in |input| due to constness.
+@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+ 
+ }  // namespace
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // static
+ bool StructTraits<
+     media::mojom::ColorPlaneLayoutDataView,
+@@ -436,7 +436,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
+     frame = media::VideoFrame::WrapTrackingToken(
+         format, *metadata.tracking_token, coded_size, visible_rect,
+         natural_size, timestamp);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   } else if (data.is_dmabuf_data()) {
+     media::mojom::DmabufVideoFrameDataDataView dmabuf_data;
+     data.GetDmabufDataDataView(&dmabuf_data);
diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h
new file mode 100644
index 000000000000..8987e00a7730
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h
@@ -0,0 +1,11 @@
+--- media/mojo/mojom/video_frame_mojom_traits.h.orig	2025-05-06 12:23:00 UTC
++++ media/mojo/mojom/video_frame_mojom_traits.h
+@@ -21,7 +21,7 @@
+ 
+ namespace mojo {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ template <>
+ struct StructTraits<media::mojom::ColorPlaneLayoutDataView,
+                     media::ColorPlaneLayout> {
diff --git a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
index 726ea8e45117..a18102f8bb59 100644
--- a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
+++ b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
@@ -1,4 +1,4 @@
---- media/video/fake_gpu_memory_buffer.cc.orig	2025-04-15 08:30:07 UTC
+--- media/video/fake_gpu_memory_buffer.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/video/fake_gpu_memory_buffer.cc
 @@ -14,7 +14,7 @@
  #include "media/base/format_utils.h"
@@ -18,21 +18,12 @@
  base::ScopedFD GetDummyFD() {
    base::ScopedFD fd(open("/dev/zero", O_RDWR));
    DCHECK(fd.is_valid());
-@@ -84,7 +84,7 @@ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTestin
-   static base::AtomicSequenceNumber buffer_id_generator;
-   handle.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext());
+@@ -73,7 +73,7 @@ static base::AtomicSequenceNumber buffer_id_generator;
+ 
+ }  // namespace
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   for (size_t i = 0; i < VideoFrame::NumPlanes(*video_pixel_format); i++) {
-     const gfx::Size plane_size_in_bytes =
-         VideoFrame::PlaneSize(*video_pixel_format, i, size);
-@@ -187,7 +187,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH
-   gfx::GpuMemoryBufferHandle handle;
-   handle.type = gfx::NATIVE_PIXMAP;
-   handle.id = handle_.id;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   handle.native_pixmap_handle =
-       gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
- #endif
+ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting(
+     const gfx::Size& size,
+     gfx::BufferFormat format,
diff --git a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index 532021e6c64f..990f8ae0e232 100644
--- a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-03-09 21:38:10 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -644,7 +644,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
  
    bool is_software_backed_video_frame = !video_frame->HasSharedImage();
@@ -9,7 +9,7 @@
    is_software_backed_video_frame &= !video_frame->HasDmaBufs();
  #endif
  
-@@ -1054,7 +1054,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1057,7 +1057,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
        media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get());
  #endif
  
@@ -18,7 +18,7 @@
    is_webgpu_compatible =
        handle.native_pixmap_handle.supports_zero_copy_webgpu_import;
  #endif
-@@ -1225,7 +1225,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr
+@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr
        si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
      }
  
diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
index 6eae74307e6e..397534a78801 100644
--- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter.cc.orig	2025-03-09 21:38:10 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/video/video_encode_accelerator_adapter.cc
-@@ -463,7 +463,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele
+@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele
  
    auto format = PIXEL_FORMAT_I420;
    auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem;
diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc
index 0c5a1249586f..5f731bb4f9d8 100644
--- a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc
+++ b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc
@@ -1,6 +1,6 @@
---- media/webrtc/audio_processor.cc.orig	2025-04-15 08:30:07 UTC
+--- media/webrtc/audio_processor.cc.orig	2025-05-06 12:23:00 UTC
 +++ media/webrtc/audio_processor.cc
-@@ -507,7 +507,7 @@ std::optional<double> AudioProcessor::ProcessData(
+@@ -509,7 +509,7 @@ std::optional<double> AudioProcessor::ProcessData(
    // controller.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    DCHECK_LE(volume, 1.0);
diff --git a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni
index 0fc591191cb0..2c4c084993d9 100644
--- a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- mojo/public/tools/bindings/mojom.gni.orig	2025-04-15 08:30:07 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig	2025-05-06 12:23:00 UTC
 +++ mojo/public/tools/bindings/mojom.gni
-@@ -782,6 +782,16 @@ template("mojom") {
+@@ -774,6 +774,16 @@ template("mojom") {
        enabled_features += [ "is_apple" ]
      }
  
diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn
index bcb5a0d9716b..f128d26a2b5e 100644
--- a/www/ungoogled-chromium/files/patch-net_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- net/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ net/BUILD.gn
 @@ -125,7 +125,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1314,6 +1314,19 @@ component("net") {
+@@ -1322,6 +1322,19 @@ component("net") {
      ]
    }
  
@@ -29,7 +29,7 @@
    if (is_mac) {
      sources += [
        "base/network_notification_thread_mac.cc",
-@@ -1477,7 +1490,7 @@ component("net") {
+@@ -1485,7 +1498,7 @@ component("net") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
@@ -38,7 +38,7 @@
      sources += [
        "base/network_interfaces_getifaddrs.cc",
        "base/network_interfaces_getifaddrs.h",
-@@ -2176,7 +2189,7 @@ static_library("test_support") {
+@@ -2184,7 +2197,7 @@ static_library("test_support") {
      ]
    }
  
@@ -47,7 +47,7 @@
      sources += [
        "base/address_tracker_linux_test_util.cc",
        "base/address_tracker_linux_test_util.h",
-@@ -2987,14 +3000,14 @@ target(_test_target_type, "net_unittests") {
+@@ -3003,14 +3016,14 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -64,7 +64,7 @@
      sources += [
        "base/address_tracker_linux_unittest.cc",
        "base/network_interfaces_linux_unittest.cc",
-@@ -3088,6 +3101,10 @@ target(_test_target_type, "net_unittests") {
+@@ -3106,6 +3119,10 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -75,7 +75,7 @@
    if (enable_websockets) {
      sources += [
        "server/http_connection_unittest.cc",
-@@ -3154,7 +3171,7 @@ target(_test_target_type, "net_unittests") {
+@@ -3172,7 +3189,7 @@ target(_test_target_type, "net_unittests") {
      ]
    }
  
@@ -84,7 +84,7 @@
      sources += [ "tools/quic/quic_simple_server_test.cc" ]
    }
  
-@@ -3293,7 +3310,7 @@ target(_test_target_type, "net_unittests") {
+@@ -3311,7 +3328,7 @@ target(_test_target_type, "net_unittests") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/ungoogled-chromium/files/patch-net_base_features.cc b/www/ungoogled-chromium/files/patch-net_base_features.cc
index 51d4ab9fa2f2..c598aa2e501c 100644
--- a/www/ungoogled-chromium/files/patch-net_base_features.cc
+++ b/www/ungoogled-chromium/files/patch-net_base_features.cc
@@ -1,4 +1,4 @@
---- net/base/features.cc.orig	2025-03-09 21:38:10 UTC
+--- net/base/features.cc.orig	2025-05-06 12:23:00 UTC
 +++ net/base/features.cc
 @@ -28,7 +28,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin,
  BASE_FEATURE(kAsyncDns,
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -551,7 +551,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
+@@ -550,7 +550,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
               "SpdyHeadersToHttpResponseUseBuilder",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
diff --git a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h
index b73c2bec35b9..297caa7de152 100644
--- a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.h.orig	2024-11-16 12:20:41 UTC
+--- net/cert/cert_verify_proc.h.orig	2025-05-06 12:23:00 UTC
 +++ net/cert/cert_verify_proc.h
-@@ -186,7 +186,7 @@ class NET_EXPORT CertVerifyProc
+@@ -182,7 +182,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
    };
  
diff --git a/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc
index 8ff8dfce2d27..15de3b82659e 100644
--- a/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,14 +1,13 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2024-07-31 14:19:23 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig	2025-05-06 12:23:00 UTC
 +++ net/http/http_auth_gssapi_posix.cc
-@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
-     static const char* const kDefaultLibraryNames[] = {
+@@ -366,7 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+   } else {
  #if BUILDFLAG(IS_APPLE)
-       "/System/Library/Frameworks/GSS.framework/GSS"
+     library_names.emplace_back("/System/Library/Frameworks/GSS.framework/GSS");
 -#elif BUILDFLAG(IS_OPENBSD)
--      "libgssapi.so"  // Heimdal - OpenBSD
 +#elif BUILDFLAG(IS_BSD)
-+      "libgssapi_krb5.so.2",  // MIT Kerberos - FreeBSD
-+      "libgssapi.so"          // Heimdal - OpenBSD, FreeBSD
++    // MIT Kerberos - FreeBSD
++    library_names.emplace_back("libgssapi_krb5.so.2");
+     // Heimdal - OpenBSD
+     library_names.emplace_back("libgssapi.so");
  #else
-       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
-       "libgssapi.so.4",       // Heimdal - Suse10, MDK
diff --git a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 94c8fad9de8a..67d186cc13eb 100644
--- a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2024-07-31 14:19:23 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2025-05-06 12:23:00 UTC
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -11,7 +11,9 @@
  
@@ -18,7 +18,7 @@
  // Converts |value| from a decimal string to an int. If there was a failure
  // parsing, returns |default_value|.
  int StringToIntOrDefault(std::string_view value, int default_value) {
-@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1048,6 +1051,7 @@ class SettingGetterImplKDE : public ProxyConfigService
    // events on.
    scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
  };
@@ -26,7 +26,7 @@
  
  }  // namespace
  
-@@ -1256,9 +1260,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1266,9 +1270,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
      case base::nix::DESKTOP_ENVIRONMENT_KDE6:
diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc
index 49e3cbc54705..218f9cf32323 100644
--- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc
@@ -1,4 +1,4 @@
---- net/socket/udp_socket_unittest.cc.orig	2025-04-15 08:30:07 UTC
+--- net/socket/udp_socket_unittest.cc.orig	2025-05-06 12:23:00 UTC
 +++ net/socket/udp_socket_unittest.cc
 @@ -371,7 +371,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
    EXPECT_EQ(second_packet, received);
@@ -27,7 +27,7 @@
      // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #else
-@@ -763,7 +763,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
+@@ -770,7 +770,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
  
  // TODO(crbug.com/40620614): failing on device on iOS 12.2.
  // TODO(crbug.com/40189274): flaky on Mac 11.
@@ -36,7 +36,7 @@
  #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
  #else
  #define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -817,7 +817,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
+@@ -824,7 +824,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
                                  NetLogSource());
    ASSERT_THAT(client_socket.Connect(send_address), IsOk());
  
diff --git a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index b205cb3c4d48..e03981235b11 100644
--- a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,4 +1,4 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2024-10-27 06:40:35 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2025-05-06 12:23:00 UTC
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
 @@ -35,7 +35,7 @@
  #include "third_party/boringssl/src/pki/trust_store.h"
@@ -18,7 +18,7 @@
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -580,7 +580,7 @@ int main(int argc, char** argv) {
+@@ -582,7 +582,7 @@ int main(int argc, char** argv) {
    std::string impls_str = command_line.GetSwitchValueASCII("impls");
    if (impls_str.empty()) {
      // Default value.
diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc
index 6ad47778f738..841af72f19a3 100644
--- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig	2025-04-15 08:30:07 UTC
+--- net/url_request/url_request_context_builder.cc.orig	2025-05-06 12:23:00 UTC
 +++ net/url_request/url_request_context_builder.cc
-@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -442,7 +442,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
diff --git a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index 00a25f5e45a4..04d6bffc2482 100644
--- a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2025-04-15 08:30:07 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2025-05-06 12:23:00 UTC
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -109,7 +109,7 @@
+@@ -111,7 +111,7 @@
  #include "ui/accessibility/ax_features.mojom-features.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -565,7 +565,7 @@ void InitializeSDK(bool enable_v8,
+@@ -567,7 +567,7 @@ void InitializeSDK(bool enable_v8,
  
    FPDF_InitLibraryWithConfig(&config);
  
diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.cc b/www/ungoogled-chromium/files/patch-printing_printing__features.cc
index 1669ad7ff136..e1061b42f81c 100644
--- a/www/ungoogled-chromium/files/patch-printing_printing__features.cc
+++ b/www/ungoogled-chromium/files/patch-printing_printing__features.cc
@@ -1,7 +1,7 @@
---- printing/printing_features.cc.orig	2025-02-20 09:59:21 UTC
+--- printing/printing_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ printing/printing_features.cc
-@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr,
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -15,7 +15,7 @@
               base::FEATURE_DISABLED_BY_DEFAULT
  #else
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -69,7 +69,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
+@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
  // out-of-process.
  BASE_FEATURE(kEnableOopPrintDrivers,
               "EnableOopPrintDrivers",
diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.h b/www/ungoogled-chromium/files/patch-printing_printing__features.h
index 0f57dcee81c5..d122be42d31b 100644
--- a/www/ungoogled-chromium/files/patch-printing_printing__features.h
+++ b/www/ungoogled-chromium/files/patch-printing_printing__features.h
@@ -1,7 +1,7 @@
---- printing/printing_features.h.orig	2024-07-31 14:19:23 UTC
+--- printing/printing_features.h.orig	2025-05-06 12:23:00 UTC
 +++ printing/printing_features.h
-@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
- BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr);
+@@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
+ BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc
index baecf4dd070c..807ba1115578 100644
--- a/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc
@@ -1,6 +1,6 @@
---- remoting/host/base/desktop_environment_options.cc.orig	2024-10-27 06:40:35 UTC
+--- remoting/host/base/desktop_environment_options.cc.orig	2025-05-06 12:23:00 UTC
 +++ remoting/host/base/desktop_environment_options.cc
-@@ -99,7 +99,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
+@@ -109,7 +109,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic
    // TODO(joedow): Determine whether we can migrate additional platforms to
    // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then
    // clean up DesktopCapturerProxy::Core::CreateCapturer().
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc
index 854354173b8f..c3fe87c18e71 100644
--- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc
@@ -1,6 +1,6 @@
---- remoting/host/chromoting_host.cc.orig	2025-01-25 09:34:31 UTC
+--- remoting/host/chromoting_host.cc.orig	2025-05-06 12:23:00 UTC
 +++ remoting/host/chromoting_host.cc
-@@ -135,7 +135,7 @@ void ChromotingHost::Start(const std::string& host_own
+@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::string& host_own
        &ChromotingHost::OnIncomingSession, base::Unretained(this)));
  }
  
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h
index fd5b7354a505..14aaa2b4e26d 100644
--- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h
+++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h
@@ -1,4 +1,4 @@
---- remoting/host/chromoting_host.h.orig	2025-01-25 09:34:31 UTC
+--- remoting/host/chromoting_host.h.orig	2025-05-06 12:23:00 UTC
 +++ remoting/host/chromoting_host.h
 @@ -36,7 +36,7 @@
  #include "remoting/protocol/session_manager.h"
@@ -18,7 +18,7 @@
    // Starts running the ChromotingHostServices server and listening for incoming
    // IPC binding requests.
    // Currently only Linux runs the ChromotingHostServices server on the host
-@@ -220,7 +220,7 @@ class ChromotingHost : public ClientSession::EventHand
+@@ -222,7 +222,7 @@ class ChromotingHost : public ClientSession::EventHand
    // List of host extensions.
    std::vector<std::unique_ptr<HostExtension>> extensions_;
  
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc b/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc
index 25d25b22d1db..fd4a1c23036a 100644
--- a/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc
@@ -1,6 +1,6 @@
---- remoting/host/client_session.cc.orig	2025-04-15 08:30:07 UTC
+--- remoting/host/client_session.cc.orig	2025-05-06 12:23:00 UTC
 +++ remoting/host/client_session.cc
-@@ -187,7 +187,7 @@ void ClientSession::NotifyClientResolution(
+@@ -188,7 +188,7 @@ void ClientSession::NotifyClientResolution(
    if (effective_policies_.curtain_required.value_or(false)) {
      dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
    }
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc b/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc
index 400aa104d65c..381e77a6eace 100644
--- a/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc
@@ -1,6 +1,6 @@
---- remoting/host/host_attributes.cc.orig	2024-06-22 08:49:42 UTC
+--- remoting/host/host_attributes.cc.orig	2025-05-06 12:23:00 UTC
 +++ remoting/host/host_attributes.cc
-@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
+@@ -103,7 +103,7 @@ std::string GetHostAttributes() {
    if (media::InitializeMediaFoundation()) {
      result.push_back("HWEncoder");
    }
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc
index 835e5d878401..64cd181b44e2 100644
--- a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,4 +1,4 @@
---- remoting/host/remoting_me2me_host.cc.orig	2025-04-15 08:30:07 UTC
+--- remoting/host/remoting_me2me_host.cc.orig	2025-05-06 12:23:00 UTC
 +++ remoting/host/remoting_me2me_host.cc
 @@ -138,7 +138,7 @@
  #include "remoting/host/mac/permission_utils.h"
@@ -36,7 +36,7 @@
  // The command line switch used to pass name of the pipe to capture audio on
  // linux.
  const char kAudioPipeSwitchName[] = "audio-pipe-name";
-@@ -440,7 +440,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -441,7 +441,7 @@ class HostProcess : public ConfigWatcher::Delegate,
    std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_;
  #endif
  
@@ -45,7 +45,7 @@
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -505,7 +505,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -506,7 +506,7 @@ class HostProcess : public ConfigWatcher::Delegate,
    std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_;
  
    std::unique_ptr<HostEventLogger> host_event_logger_;
@@ -54,7 +54,7 @@
    std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
  #endif
    std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -824,7 +824,7 @@ void HostProcess::StartOnNetworkThread() {
+@@ -825,7 +825,7 @@ void HostProcess::StartOnNetworkThread() {
  void HostProcess::ShutdownOnNetworkThread() {
    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
    config_watcher_.reset();
@@ -63,7 +63,7 @@
    cert_watcher_.reset();
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -901,7 +901,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -902,7 +902,7 @@ void HostProcess::CreateAuthenticatorFactory() {
              context_->create_client_cert_store_callback(),
              service_account_email_, oauth_refresh_token_));
  
@@ -72,7 +72,7 @@
      if (!cert_watcher_) {
        cert_watcher_ = std::make_unique<CertificateWatcher>(
            base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -1043,7 +1043,7 @@ void HostProcess::StartOnUiThread() {
+@@ -1044,7 +1044,7 @@ void HostProcess::StartOnUiThread() {
        base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
  
@@ -81,7 +81,7 @@
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name =
-@@ -1122,7 +1122,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1123,7 +1123,7 @@ void HostProcess::ShutdownOnUiThread() {
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -90,7 +90,7 @@
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1131,7 +1131,7 @@ void HostProcess::ShutdownOnUiThread() {
    AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -99,16 +99,16 @@
    context_->input_task_runner()->PostTask(
        FROM_HERE,
        base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
-@@ -1864,7 +1864,7 @@ void HostProcess::StartHost() {
+@@ -1873,7 +1873,7 @@ void HostProcess::StartHost() {
      corp_host_status_logger_->StartObserving(*session_manager);
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_);
+   desktop_environment_options_.set_enable_remote_webauthn(true);
  #endif
  #if BUILDFLAG(IS_WIN)
-@@ -1891,7 +1891,7 @@ void HostProcess::StartHost() {
+@@ -1900,7 +1900,7 @@ void HostProcess::StartHost() {
  
    host_->AddExtension(std::make_unique<TestEchoExtension>());
  
@@ -117,7 +117,7 @@
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->HasSwitch(kEnableUtempter)) {
      host_utmp_logger_ =
-@@ -1927,7 +1927,7 @@ void HostProcess::StartHost() {
+@@ -1936,7 +1936,7 @@ void HostProcess::StartHost() {
    // addresses.
    host_->Start(*host_owner_emails_.begin());
  
@@ -126,7 +126,7 @@
    // For Windows, ChromotingHostServices connections are handled by the daemon
    // process, then the message pipe is forwarded to the network process.
    host_->StartChromotingHostServices();
-@@ -2072,7 +2072,7 @@ int HostProcessMain() {
+@@ -2081,7 +2081,7 @@ int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
  
@@ -135,7 +135,7 @@
  #if defined(REMOTING_USE_X11)
    // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
    // use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -2135,7 +2135,7 @@ int HostProcessMain() {
+@@ -2144,7 +2144,7 @@ int HostProcessMain() {
    std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
        net::NetworkChangeNotifier::CreateIfNeeded());
  
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc b/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc
index 71c8fa9116d8..fa382ccebca4 100644
--- a/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc
@@ -1,11 +1,11 @@
---- remoting/host/session_policies_from_dict.cc.orig	2025-01-25 09:34:31 UTC
+--- remoting/host/session_policies_from_dict.cc.orig	2025-05-06 12:23:00 UTC
 +++ remoting/host/session_policies_from_dict.cc
-@@ -76,7 +76,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict
-       .curtain_required =
-           dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain),
+@@ -75,7 +75,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict
+   session_policies.curtain_required =
+       dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain);
  #endif
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       .host_username_match_required =
-           dict.FindBool(policy::key::kRemoteAccessHostMatchUsername),
+   session_policies.host_username_match_required =
+       dict.FindBool(policy::key::kRemoteAccessHostMatchUsername);
  #endif
diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn
index 5191f3b3a910..9a3cd197d85b 100644
--- a/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/linux/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- sandbox/linux/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ sandbox/linux/BUILD.gn
 @@ -12,11 +12,11 @@ if (is_android) {
  }
@@ -15,7 +15,7 @@
  
    # On Android, use plain GTest.
    use_base_test_suite = is_linux || is_chromeos
-@@ -384,6 +384,17 @@ component("sandbox_services") {
+@@ -377,6 +377,17 @@ component("sandbox_services") {
        "services/libc_interceptor.h",
      ]
    }
diff --git a/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc
index 3bb45e0a7b79..cf8a2311b5e2 100644
--- a/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc
+++ b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc
@@ -1,8 +1,8 @@
---- services/device/geolocation/location_provider_manager.cc.orig	2025-02-20 09:59:21 UTC
+--- services/device/geolocation/location_provider_manager.cc.orig	2025-05-06 12:23:00 UTC
 +++ services/device/geolocation/location_provider_manager.cc
 @@ -91,7 +91,7 @@ LocationProviderManager::LocationProviderManager(
- #if BUILDFLAG(IS_ANDROID)
-   // On Android, default to using the platform location provider.
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+   // On Android and iOS, default to using the platform location provider.
    provider_manager_mode_ = kPlatformOnly;
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc b/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc
index 7550313ddcfc..0fa5fa323ae3 100644
--- a/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc
+++ b/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc
@@ -1,6 +1,6 @@
---- services/device/public/cpp/device_features.cc.orig	2025-04-15 08:30:07 UTC
+--- services/device/public/cpp/device_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ services/device/public/cpp/device_features.cc
-@@ -120,7 +120,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
+@@ -135,7 +135,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
  
  // Controls whether Chrome will try to automatically detach kernel drivers when
  // a USB interface is busy.
diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc
new file mode 100644
index 000000000000..c9dd3f901b57
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc
@@ -0,0 +1,38 @@
+--- services/device/usb/usb_device_handle_usbfs.cc.orig	2025-05-06 12:23:00 UTC
++++ services/device/usb/usb_device_handle_usbfs.cc
+@@ -39,7 +39,7 @@
+ #include "chromeos/dbus/permission_broker/permission_broker_client.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/device/public/cpp/device_features.h"
+ #include "services/device/usb/usb_interface_detach_allowlist.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::R
+   return true;
+ }
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface(
+     int interface_number,
+     const CombinedInterfaceInfo& interface_info) {
+@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterface(int interfac
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     const mojom::UsbConfigurationInfo* config =
+         device_->GetActiveConfiguration();
+@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     helper_.AsyncCall(&BlockingTaskRunnerHelper::ReattachInterface)
+         .WithArgs(interface_number)
diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h
new file mode 100644
index 000000000000..1d6b1f96603f
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h
@@ -0,0 +1,38 @@
+--- services/device/usb/usb_device_handle_usbfs.h.orig	2025-05-06 12:23:00 UTC
++++ services/device/usb/usb_device_handle_usbfs.h
+@@ -19,7 +19,7 @@
+ #include "base/threading/sequence_bound.h"
+ #include "services/device/usb/usb_device_handle.h"
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/containers/flat_set.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+ 
+@@ -215,7 +215,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   bool ClearHalt(uint8_t endpoint_address);
+   void DiscardUrb(Transfer* transfer);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Detach the interface from a kernel driver before ClaimInterface
+   virtual bool DetachInterface(int interface_number,
+                                const CombinedInterfaceInfo& interfaceInfo);
+@@ -228,7 +228,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   // Called when |fd_| is writable without blocking.
+   void OnFileCanWriteWithoutBlocking();
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Called from |DetachInterface|.
+   std::string GetKernelDriver(int interface_number) const;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -240,7 +240,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper {
+   std::unique_ptr<base::FileDescriptorWatcher::Controller> watch_controller_;
+   SEQUENCE_CHECKER(sequence_checker_);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // All interfaces that have been detached from kernel drivers
+   base::flat_set<int> detached_interfaces_;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn
index bf3918999620..128b47682158 100644
--- a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- services/network/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ services/network/BUILD.gn
-@@ -397,7 +397,6 @@ if (is_linux || is_chromeos) {
+@@ -400,7 +400,6 @@ if (is_linux || is_chromeos) {
      ]
      deps = [
        "//base:base",
diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.cc b/www/ungoogled-chromium/files/patch-services_network_network__context.cc
index 61ae73cbeea2..43f4a96277be 100644
--- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc
+++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc
@@ -1,6 +1,6 @@
---- services/network/network_context.cc.orig	2025-04-15 08:30:07 UTC
+--- services/network/network_context.cc.orig	2025-05-06 12:23:00 UTC
 +++ services/network/network_context.cc
-@@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
+@@ -607,7 +607,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
  NetworkContext::NetworkContextHttpAuthPreferences::
      ~NetworkContextHttpAuthPreferences() = default;
  
@@ -9,7 +9,7 @@
  bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
      const {
    if (network_service_) {
-@@ -2552,7 +2552,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
+@@ -2557,7 +2557,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
        http_auth_dynamic_network_service_params->android_negotiate_account_type);
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.h b/www/ungoogled-chromium/files/patch-services_network_network__context.h
index 0f20619fe638..d031a49b0f45 100644
--- a/www/ungoogled-chromium/files/patch-services_network_network__context.h
+++ b/www/ungoogled-chromium/files/patch-services_network_network__context.h
@@ -1,6 +1,6 @@
---- services/network/network_context.h.orig	2025-04-15 08:30:07 UTC
+--- services/network/network_context.h.orig	2025-05-06 12:23:00 UTC
 +++ services/network/network_context.h
-@@ -709,7 +709,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -715,7 +715,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
     public:
      explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
      ~NetworkContextHttpAuthPreferences() override;
diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.cc b/www/ungoogled-chromium/files/patch-services_network_network__service.cc
index 0219fb2ad8e2..4ae2ed81fac9 100644
--- a/www/ungoogled-chromium/files/patch-services_network_network__service.cc
+++ b/www/ungoogled-chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig	2025-04-15 08:30:07 UTC
+--- services/network/network_service.cc.orig	2025-05-06 12:23:00 UTC
 +++ services/network/network_service.cc
-@@ -102,11 +102,11 @@
+@@ -103,11 +103,11 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
@@ -14,7 +14,7 @@
  #include "services/network/network_change_notifier_passive_factory.h"
  #endif
  
-@@ -999,7 +999,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
+@@ -1016,7 +1016,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
    net::SetExplicitlyAllowedPorts(ports);
  }
  
@@ -23,7 +23,7 @@
  void NetworkService::SetGssapiLibraryLoadObserver(
      mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
          gssapi_library_load_observer) {
-@@ -1081,7 +1081,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
+@@ -1116,7 +1116,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
    );
  }
  
diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.h b/www/ungoogled-chromium/files/patch-services_network_network__service.h
index 2c6fe41a7536..2d6504c8c915 100644
--- a/www/ungoogled-chromium/files/patch-services_network_network__service.h
+++ b/www/ungoogled-chromium/files/patch-services_network_network__service.h
@@ -1,6 +1,6 @@
---- services/network/network_service.h.orig	2025-04-15 08:30:07 UTC
+--- services/network/network_service.h.orig	2025-05-06 12:23:00 UTC
 +++ services/network/network_service.h
-@@ -249,7 +249,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -250,7 +250,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
        const std::vector<ContentSettingPatternSource>& settings) override;
  
    void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
@@ -9,7 +9,7 @@
    void SetGssapiLibraryLoadObserver(
        mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
            gssapi_library_load_observer) override;
-@@ -275,7 +275,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -291,7 +291,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
        NetworkContext* network_context);
  
@@ -18,7 +18,7 @@
    // This is called just before a GSSAPI library may be loaded.
    void OnBeforeGssapiLibraryLoad();
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -531,7 +531,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -547,7 +547,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    // leaking stale listeners between tests.
    std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
  
diff --git a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn
index 92a4c5cec80c..01c61002c1dc 100644
--- a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/cpp/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- services/network/public/cpp/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ services/network/public/cpp/BUILD.gn
-@@ -572,7 +572,7 @@ component("cpp_base") {
+@@ -623,7 +623,7 @@ component("cpp_base") {
      sources += [ "transferable_directory_fuchsia.cc" ]
    }
  
diff --git a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn
index 7888baf8c686..1b8ad96aa628 100644
--- a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/mojom/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- services/network/public/mojom/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ services/network/public/mojom/BUILD.gn
-@@ -600,11 +600,11 @@ mojom("url_loader_base") {
+@@ -674,11 +674,11 @@ mojom("url_loader_base") {
    }
  
    enabled_features = []
@@ -14,7 +14,7 @@
      # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
      # not include lacros.
      enabled_features += [ "use_network_interface_change_listener" ]
-@@ -1672,7 +1672,7 @@ mojom("mojom") {
+@@ -1765,7 +1765,7 @@ mojom("mojom") {
      }
    }
  
diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
index e0ab844c9d3f..f61f7228a323 100644
--- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
@@ -1,4 +1,4 @@
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-03-09 21:38:10 UTC
+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-05-06 12:23:00 UTC
 +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
 @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
                                       uint32_t shared_resident_kb) {
@@ -18,7 +18,7 @@
    os_dump->private_footprint_swap_kb =
        internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
    os_dump->mappings_count = internal_os_dump.mappings_count;
-@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // On most platforms each process can dump data about their own process
  // so ask each process to do so Linux is special see below.
@@ -27,7 +27,7 @@
      request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
      client->RequestOSMemoryDump(request->memory_map_option(),
                                  {base::kNullProcessId},
-@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // In some cases, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -36,7 +36,7 @@
    std::vector<base::ProcessId> pids;
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
+@@ -283,7 +283,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
      const OsCallback& os_callback) {
  // On Linux, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -45,7 +45,7 @@
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = 0;
    for (const auto& client_info : clients) {
-@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
+@@ -333,7 +333,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
      // each client process provides 1 OS dump, % the case where the client is
      // disconnected mid dump.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
@@ -54,7 +54,7 @@
      for (auto& kv : extra_os_dumps) {
        auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
        DCHECK(results.find(pid) == results.end());
-@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
+@@ -394,7 +394,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
      // crash). In the latter case (OS_LINUX) we expect the full map to come
      // from the browser process response.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
diff --git a/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc b/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc
index 61bb212fccf0..add310d05a4b 100644
--- a/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc
+++ b/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc
@@ -1,6 +1,6 @@
---- skia/ext/font_utils.cc.orig	2025-04-15 08:30:07 UTC
+--- skia/ext/font_utils.cc.orig	2025-05-06 12:23:00 UTC
 +++ skia/ext/font_utils.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h"
  #endif
  
@@ -9,8 +9,8 @@
  #include "third_party/skia/include/ports/SkFontConfigInterface.h"
  #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
  #include "third_party/skia/include/ports/SkFontScanner_Fontations.h"
-@@ -62,7 +62,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() {
-   return SkFontMgr_New_Android(nullptr);
+@@ -67,7 +67,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() {
+   }
  #elif BUILDFLAG(IS_APPLE)
    return SkFontMgr_New_CoreText(nullptr);
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
index f3190efef5a6..164a76ae85c0 100644
--- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
+++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
@@ -1,6 +1,6 @@
---- third_party/abseil-cpp/absl/base/config.h.orig	2025-04-15 08:30:07 UTC
+--- third_party/abseil-cpp/absl/base/config.h.orig	2025-05-06 12:23:00 UTC
 +++ third_party/abseil-cpp/absl/base/config.h
-@@ -411,7 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -409,7 +409,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  #ifdef ABSL_HAVE_SCHED_YIELD
  #error ABSL_HAVE_SCHED_YIELD cannot be directly set
  #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
@@ -9,7 +9,7 @@
  #define ABSL_HAVE_SCHED_YIELD 1
  #endif
  
-@@ -426,7 +426,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -424,7 +424,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  // platforms.
  #ifdef ABSL_HAVE_SEMAPHORE_H
  #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h b/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h
index 7d15d876227c..6a0e9a3d62ae 100644
--- a/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h
+++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/common/platform.h.orig	2022-10-01 07:40:07 UTC
+--- third_party/angle/src/common/platform.h.orig	2025-05-06 12:23:00 UTC
 +++ third_party/angle/src/common/platform.h
-@@ -26,7 +26,15 @@
+@@ -23,7 +23,15 @@
  #elif defined(__linux__) || defined(EMSCRIPTEN)
  #    define ANGLE_PLATFORM_LINUX 1
  #    define ANGLE_PLATFORM_POSIX 1
diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index bec88fc81b38..a1b62d63157e 100644
--- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig	2025-03-09 21:38:10 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2025-05-06 12:23:00 UTC
 +++ third_party/angle/src/libANGLE/Display.cpp
 @@ -58,7 +58,7 @@
  #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -36,7 +36,7 @@
  #        if defined(ANGLE_USE_GBM)
              if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
              {
-@@ -2139,7 +2139,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2133,7 +2133,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.platformWaylandEXT = true;
  #endif
  
@@ -45,7 +45,7 @@
      extensions.platformSurfacelessMESA = true;
  #endif
  
-@@ -2186,7 +2186,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2180,7 +2180,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.x11Visual = true;
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 000000000000..53da5d93f0b8
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-05-05 18:35:31 UTC
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args
+         # https://savannah.gnu.org/bugs/index.php?53028
+         gperf_output = re.sub(r'\bregister ', '', gperf_output)
+         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
++        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++        if re.search(
++                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
++                gperf_output):
++            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
++                                                '  [[fallthrough]];')
+         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+         # Replace {(int)(long)&(foo), bar} with
+         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index bfc59b23709b..8011f772902c 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-04-15 08:30:07 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/controller/blink_initializer.cc
 @@ -82,12 +82,12 @@
  #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
@@ -24,8 +24,8 @@
    binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
        ConvertToBaseRepeatingCallback(
            CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -305,7 +305,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
- #endif
+@@ -304,7 +304,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
+   MemorySaverController::Initialize();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
 -    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index 87b0b2290830..2e246ddea21e 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-04-15 08:30:07 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -427,7 +427,7 @@ void RecordPrerenderActivationSignalDelay(const String
+@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String
  #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN)
  SkFontHinting RendererPreferencesToSkiaHinting(
      const blink::RendererPreferences& prefs) {
@@ -9,7 +9,7 @@
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3426,7 +3426,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
        gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
    WebFontRenderStyle::SetSubpixelPositioning(
        renderer_preferences_.use_subpixel_positioning);
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index a971301a28e8..6e696e7932a9 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-04-15 08:30:07 UTC
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
  
  /* The value is based on user statistics on Nov 2017. */
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index 658ed237cc68..8ff4088d1d29 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-02-20 09:59:21 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/core/layout/layout_view.cc
 @@ -74,7 +74,7 @@
  #include "ui/display/screen_info.h"
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -784,7 +784,7 @@ void LayoutView::LayoutRoot() {
+@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() {
      intrinsic_logical_widths_ = LogicalWidth();
    }
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
index e63f285c29e9..1f8eba516592 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-03-09 21:38:10 UTC
+--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/core/loader/mixed_content_checker.cc
-@@ -484,7 +484,7 @@ bool MixedContentChecker::ShouldBlockFetch(
+@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFetch(
    switch (context_type) {
      case mojom::blink::MixedContentContextType::kOptionallyBlockable:
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
new file mode 100644
index 000000000000..af5817f40876
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/page/context_menu_controller.cc.orig	2025-05-06 12:23:00 UTC
++++ third_party/blink/renderer/core/page/context_menu_controller.cc
+@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame
+     if (potential_image_node != nullptr &&
+         IsA<HTMLCanvasElement>(potential_image_node)) {
+       data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // TODO(crbug.com/40902474): Support reading from the WebGPU front buffer
+       // on Linux and remove the below code, which results in "Copy Image" and
+       // "Save Image To" being grayed out in the context menu.
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
index 545e82b24aca..cc4cc1c5db56 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-02-20 09:59:21 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -123,7 +123,7 @@ namespace blink {
+@@ -124,7 +124,7 @@ namespace blink {
  
  namespace {
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
index 2d06ae0484fb..89c95969c8c7 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-01-25 09:34:31 UTC
+--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
-@@ -873,7 +873,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
+@@ -857,7 +857,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
              mixer->get_output_params_for_testing().sample_rate());
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index 5e0adb35543d..d50c0d6dc709 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-04-17 14:09:48 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6347,7 +6347,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6342,7 +6342,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
    constexpr bool kAllowZeroCopyImages = true;
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
new file mode 100644
index 000000000000..6280e42ac65a
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig	2025-05-06 12:23:00 UTC
++++ third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc
+@@ -207,7 +207,7 @@ bool GPUCanvasContext::PaintRenderingResultsToCanvas(
+ 
+   scoped_refptr<WebGPUMailboxTexture> front_buffer_texture;
+   if (source_buffer == kFrontBuffer) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // By returning false here the canvas will show up as black in the scenarios
+     // that copy the front buffer, such as printing.
+     // TODO(crbug.com/40902474): Support concurrent SharedImage reads via Dawn
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index 514ff654b65c..499d94e67f44 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-03-09 21:38:10 UTC
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -815,7 +815,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+@@ -812,7 +812,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
  // on linux platform.
  // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
  // backend is failing for unknown reasons.
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 2f480ca53b68..3232f72412c1 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -2037,7 +2037,7 @@ static_library("test_support") {
+@@ -2049,7 +2049,7 @@ static_library("test_support") {
    ]
  
    # fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index 917cb6aa6876..31852a8cc873 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-04-15 08:30:07 UTC
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/platform/fonts/font_description.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
  #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -279,7 +279,7 @@ FontCacheKey FontDescription::CacheKey(
+@@ -280,7 +280,7 @@ FontCacheKey FontDescription::CacheKey(
        static_cast<unsigned>(fields_.orientation_) << 1 |            // bit 2-3
        static_cast<unsigned>(fields_.subpixel_text_position_);       // bit 1
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
index 280a600e1e2d..bcfb45318a8f 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-02-20 09:59:21 UTC
+--- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-@@ -48,7 +48,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated(
+@@ -47,7 +47,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated(
  
    const auto paint_image = source->PaintImageForCurrentFrame();
    const auto image_info = paint_image.GetSkImageInfo();
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
index ed7f7b80a934..fd0ef7f23d36 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-04-15 08:30:07 UTC
+--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -329,12 +329,12 @@ SupportedFormats GetSupportedFormatsInternal(
+@@ -324,12 +324,12 @@ SupportedFormats GetSupportedFormatsInternal(
        supported_formats.profiles.push_back(profile.profile);
        supported_formats.sdp_formats.push_back(std::move(*format));
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index 683bf416a01d..9a37800799e6 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-04-15 08:30:07 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-05-06 12:23:00 UTC
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -424,7 +424,7 @@
+@@ -434,7 +434,7 @@
        name: "AppTitle",
        status: "experimental",
        origin_trial_feature_name: "AppTitle",
@@ -9,7 +9,7 @@
        base_feature: "WebAppEnableAppTitle",
      },
      {
-@@ -1683,7 +1683,7 @@
+@@ -1698,7 +1698,7 @@
        name: "DocumentIsolationPolicy",
        status: "experimental",
        origin_trial_feature_name: "DocumentIsolationPolicy",
@@ -18,7 +18,7 @@
        base_feature: "none",
      },
      {
-@@ -1932,7 +1932,7 @@
+@@ -1943,7 +1943,7 @@
        base_feature: "none",
        public: true,
        origin_trial_feature_name: "FedCmMultipleIdentityProviders",
@@ -27,7 +27,7 @@
        origin_trial_allows_third_party: true,
      },
      {
-@@ -3344,7 +3344,7 @@
+@@ -3340,7 +3340,7 @@
        // Tracking bug for the implementation: https://crbug.com/1462930
        name: "PermissionElement",
        origin_trial_feature_name: "PermissionElement",
@@ -36,7 +36,7 @@
        status: "experimental",
        public: true,
        base_feature_status: "enabled",
-@@ -3468,7 +3468,7 @@
+@@ -3484,7 +3484,7 @@
      {
        name: "PrivateNetworkAccessPermissionPrompt",
        origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
@@ -45,7 +45,7 @@
        status: "stable",
        public: true,
        base_feature: "none",
-@@ -4589,7 +4589,7 @@
+@@ -4645,7 +4645,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -54,7 +54,7 @@
      },
      // Enables using policy-controlled feature "usb-unrestricted" to allow
      // isolated context to access protected USB interface classes and to
-@@ -4762,7 +4762,7 @@
+@@ -4820,7 +4820,7 @@
      {
        name: "WebAppScopeExtensions",
        origin_trial_feature_name: "WebAppScopeExtensions",
@@ -63,7 +63,7 @@
        status: "experimental",
        base_feature: "none",
      },
-@@ -5030,7 +5030,7 @@
+@@ -5095,7 +5095,7 @@
      {
        name: "WebIdentityDigitalCredentials",
        origin_trial_feature_name: "WebIdentityDigitalCredentials",
diff --git a/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c b/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c
index 308d12606a64..ac5c3d17a074 100644
--- a/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c
+++ b/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c
@@ -1,11 +1,11 @@
---- third_party/lzma_sdk/C/CpuArch.c.orig	2025-02-20 09:59:21 UTC
+--- third_party/lzma_sdk/C/CpuArch.c.orig	2025-05-06 12:23:00 UTC
 +++ third_party/lzma_sdk/C/CpuArch.c
-@@ -854,7 +854,35 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP
+@@ -854,6 +854,34 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP
  BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  
 +#elif defined(__OpenBSD__)
- 
++
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <machine/cpu.h>
@@ -32,20 +32,6 @@
 +MY_HWCAP_CHECK_FUNC (SHA1)
 +MY_HWCAP_CHECK_FUNC (SHA2)
 +MY_HWCAP_CHECK_FUNC (AES)
-+
- #else // __APPLE__
- 
- #if defined(__GLIBC__) && (__GLIBC__ * 100 + __GLIBC_MINOR__ >= 216)
-@@ -869,10 +897,12 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
-   #endif
- #endif
  
-+#if !defined(__FreeBSD__)
- #ifdef Z7_GETAUXV_AVAILABLE
- // #pragma message("=== Z7_GETAUXV_AVAILABLE === ")
- #include <sys/auxv.h>
- #define USE_HWCAP
-+#endif
- #endif
+ #else // __APPLE__
  
- #ifdef USE_HWCAP
diff --git a/www/ungoogled-chromium/files/patch-third__party_node_node.gni b/www/ungoogled-chromium/files/patch-third__party_node_node.gni
index d5338b0d33da..75af050680b9 100644
--- a/www/ungoogled-chromium/files/patch-third__party_node_node.gni
+++ b/www/ungoogled-chromium/files/patch-third__party_node_node.gni
@@ -1,4 +1,4 @@
---- third_party/node/node.gni.orig	2024-08-26 14:40:28 UTC
+--- third_party/node/node.gni.orig	2025-05-06 12:23:00 UTC
 +++ third_party/node/node.gni
 @@ -22,7 +22,7 @@ template("node") {
  
@@ -9,3 +9,21 @@
        inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ]
      }
      if (is_win && host_os == "win") {
+@@ -34,17 +34,6 @@ template("node") {
+       } else {
+         inputs += [ "//third_party/node/mac/node-darwin-x64/bin/node" ]
+       }
+-    }
+-
+-    # Automatically add a dependency to ":check_version" to ensure NodeJS is
+-    # always running the expected version, except when the ':check_version'
+-    # target itself is running in which case it shouldn't depend on itself.
+-    if (get_label_info(":" + target_name, "label_no_toolchain") !=
+-        "//third_party/node:check_version") {
+-      if (!defined(deps)) {
+-        deps = []
+-      }
+-      deps += [ "//third_party/node:check_version" ]
+     }
+   }
+ }
diff --git a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h
index e49548bbb117..2ee311925128 100644
--- a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h
+++ b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h
@@ -1,4 +1,4 @@
---- third_party/speech-dispatcher/libspeechd_version.h.orig	2025-04-15 08:30:07 UTC
+--- third_party/speech-dispatcher/libspeechd_version.h.orig	2025-05-06 12:23:00 UTC
 +++ third_party/speech-dispatcher/libspeechd_version.h
 @@ -0,0 +1,29 @@
 +/*
@@ -19,7 +19,7 @@
 + * You should have received a copy of the GNU Lesser General Public License
 + * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 + *
-+ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.16 2025/04/15 06:38:26 robert Exp $
++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.17 2025/05/06 11:56:40 robert Exp $
 + */
 +
 +#ifndef _LIBSPEECHD_VERSION_H
diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
index 7f786ddc4fe0..1bedf1f20c97 100644
--- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
+++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-02-20 09:59:21 UTC
+--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-05-08 07:58:41 UTC
 +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
index 9954be611b55..b3a019404b16 100644
--- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-10-27 06:40:35 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2025-05-08 07:58:41 UTC
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
@@ -9,7 +9,7 @@
  #  define _XOPEN_SOURCE 600
  #endif
  
-@@ -45183,7 +45183,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45387,7 +45387,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -22,7 +22,7 @@
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
      if( fd<0 ){
-@@ -45198,6 +45203,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45402,6 +45407,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
        robust_close(0, fd, __LINE__);
      }
    }
diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
index 3606a669f405..4fd12d3b8ee5 100644
--- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
@@ -1,18 +1,12 @@
---- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2023-08-23 11:41:11 UTC
+--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
-@@ -10,11 +10,15 @@
- 
+@@ -11,7 +11,9 @@
  #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
  
+ #include <EGL/eglext.h>
 +#if !defined(WEBRTC_BSD)
  #include <asm/ioctl.h>
 +#endif
  #include <dlfcn.h>
  #include <fcntl.h>
  #include <libdrm/drm_fourcc.h>
-+#if !defined(WEBRTC_BSD)
- #include <linux/types.h>
-+#endif
- #include <spa/param/video/format-utils.h>
- #include <unistd.h>
- #include <xf86drm.h>
diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc
deleted file mode 100644
index 33afacfc84c5..000000000000
--- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig	2025-03-24 05:49:20 UTC
-+++ third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-       .param = OnNodeParam,
-   };
- 
--  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
- }
- 
- // static
-@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod
-       uint32_t id = info->params[i].id;
-       if (id == SPA_PARAM_EnumFormat &&
-           info->params[i].flags & SPA_PARAM_INFO_READ) {
--        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-         break;
-       }
-     }
diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc
index d2a77619930e..a8cd64475161 100644
--- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,14 +1,14 @@
---- third_party/webrtc/rtc_base/network.cc.orig	2024-06-22 08:49:42 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/webrtc/rtc_base/network.cc
-@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
+@@ -314,7 +314,12 @@ webrtc::AdapterType GetAdapterTypeFromName(absl::strin
    }
  #endif
  
 +#if defined(WEBRTC_BSD)
 +  // Treat all other network interface names as ethernet on BSD
-+  return ADAPTER_TYPE_ETHERNET;
++  return webrtc::ADAPTER_TYPE_ETHERNET;
 +#else
-   return ADAPTER_TYPE_UNKNOWN;
+   return webrtc::ADAPTER_TYPE_UNKNOWN;
 +#endif
  }
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index ec23a37b64aa..22dcbd409ef4 100644
--- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-01-25 09:34:31 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-05-06 12:23:00 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
 @@ -55,7 +55,7 @@
  #include "rtc_base/time_utils.h"
@@ -18,7 +18,7 @@
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -330,7 +330,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
+@@ -331,7 +331,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
      return -1;
    }
    if (opt == OPT_DONTFRAGMENT) {
@@ -27,7 +27,7 @@
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -359,7 +359,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -360,7 +360,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -36,7 +36,7 @@
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -390,7 +390,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -391,7 +391,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
  int PhysicalSocket::Send(const void* pv, size_t cb) {
    int sent = DoSend(
        s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -45,7 +45,7 @@
        // Suppress SIGPIPE. Without this, attempting to send on a socket whose
        // other end is closed will result in a SIGPIPE signal being raised to
        // our process, which by default will terminate the process, which we
-@@ -419,7 +419,7 @@ int PhysicalSocket::SendTo(const void* buffer,
+@@ -420,7 +420,7 @@ int PhysicalSocket::SendTo(const void* buffer,
    size_t len = addr.ToSockAddrStorage(&saddr);
    int sent =
        DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -54,7 +54,7 @@
                 // Suppress SIGPIPE. See above for explanation.
                 MSG_NOSIGNAL,
  #else
-@@ -699,7 +699,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -698,7 +698,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
@@ -63,7 +63,7 @@
        RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
        return -1;
  #elif defined(WEBRTC_POSIX)
-@@ -748,7 +748,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -747,7 +747,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        return -1;
  #endif
      case OPT_RECV_ECN:
@@ -72,7 +72,7 @@
        if (family_ == AF_INET6) {
          *slevel = IPPROTO_IPV6;
          *sopt = IPV6_RECVTCLASS;
-@@ -768,10 +768,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -767,10 +767,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = SO_KEEPALIVE;
        break;
      case OPT_TCP_KEEPCNT:
@@ -92,7 +92,7 @@
        *slevel = IPPROTO_TCP;
  #if !defined(WEBRTC_MAC)
        *sopt = TCP_KEEPIDLE;
-@@ -779,12 +788,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -778,12 +787,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = TCP_KEEPALIVE;
  #endif
        break;
diff --git a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py
index 745b6c775530..575d2f1714e5 100644
--- a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py
+++ b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py
@@ -1,4 +1,4 @@
---- tools/gn/build/gen.py.orig	2024-04-23 07:42:17 UTC
+--- tools/gn/build/gen.py.orig	2025-05-06 12:23:00 UTC
 +++ tools/gn/build/gen.py
 @@ -94,6 +94,12 @@ class Platform(object):
    def is_solaris(self):
@@ -22,7 +22,7 @@
        'haiku': 'build_haiku.ninja.template',
        'solaris': 'build_linux.ninja.template',
        'netbsd': 'build_linux.ninja.template',
-@@ -539,6 +545,9 @@ def WriteGNNinja(path, platform, host, options, args_l
+@@ -542,6 +548,9 @@ def WriteGNNinja(path, platform, host, options, args_l
  
      if platform.is_posix() and not platform.is_haiku():
        ldflags.append('-pthread')
diff --git a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index d865475d5a7a..8b01af8af257 100644
--- a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -61,7 +61,7 @@ group("telemetry_chrome_test") {
+@@ -56,7 +56,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
@@ -9,7 +9,7 @@
      data_deps += [ "//third_party/breakpad:dump_syms" ]
  
      # CrOS currently has issues with the locally compiled version of
-@@ -215,7 +215,7 @@ group("telemetry_chrome_test_without_chrome") {
+@@ -210,7 +210,7 @@ group("telemetry_chrome_test_without_chrome") {
    ]
  
    # Cr-Fuchsia doesn't support breakpad.
diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc
index 6def30e4a5ff..b8dde720e1dc 100644
--- a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc
+++ b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc
@@ -1,6 +1,6 @@
---- ui/accessibility/accessibility_features.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/accessibility/accessibility_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/accessibility/accessibility_features.cc
-@@ -440,7 +440,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled
+@@ -472,7 +472,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled
  }
  #endif  // BUILDFLAG(IS_MAC)
  
diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h
index dd799847960b..5eeb6023ed88 100644
--- a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h
+++ b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h
@@ -1,6 +1,6 @@
---- ui/accessibility/accessibility_features.h.orig	2025-04-15 08:30:07 UTC
+--- ui/accessibility/accessibility_features.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/accessibility/accessibility_features.h
-@@ -306,7 +306,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc
+@@ -324,7 +324,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc
  AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled();
  #endif  // BUILDFLAG(IS_MAC)
  
diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc
new file mode 100644
index 000000000000..6fc6b44444d6
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc
@@ -0,0 +1,20 @@
+--- ui/accessibility/ax_node.cc.orig	2025-05-06 12:23:00 UTC
++++ ui/accessibility/ax_node.cc
+@@ -1553,7 +1553,7 @@ AXNode::GetExtraMacNodes() const {
+   return &table_info->extra_mac_nodes;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ AXNode* AXNode::GetExtraAnnouncementNode(
+     ax::mojom::AriaNotificationPriority priority_property) const {
+   if (!tree_->extra_announcement_nodes()) {
+@@ -1581,7 +1581,7 @@ bool AXNode::IsGenerated() const {
+       GetRole() == ax::mojom::Role::kColumn ||
+       GetRole() == ax::mojom::Role::kTableHeaderContainer;
+   DCHECK_EQ(is_generated_node, is_extra_mac_node_role);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   //  On Linux, generated nodes are always children of the root.
+   if (GetParent() && GetParent()->GetManager()) {
+     DCHECK(GetParent()->GetManager()->IsRoot());
diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h
new file mode 100644
index 000000000000..f157577df320
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h
@@ -0,0 +1,11 @@
+--- ui/accessibility/ax_node.h.orig	2025-05-06 12:23:00 UTC
++++ ui/accessibility/ax_node.h
+@@ -587,7 +587,7 @@ class AX_EXPORT AXNode final {
+   const std::vector<raw_ptr<AXNode, VectorExperimental>>* GetExtraMacNodes()
+       const;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   AXNode* GetExtraAnnouncementNode(
+       ax::mojom::AriaNotificationPriority priority_property) const;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc
new file mode 100644
index 000000000000..7147412400e2
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc
@@ -0,0 +1,38 @@
+--- ui/accessibility/ax_tree.cc.orig	2025-05-06 12:23:00 UTC
++++ ui/accessibility/ax_tree.cc
+@@ -824,7 +824,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged(
+   return old_node_is_ignored != new_node_is_ignored;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) {
+   assertive_node_ = CreateNode("assertive", root);
+   polite_node_ = CreateNode("polite", root);
+@@ -917,7 +917,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) const {
+ 
+ void AXTree::Destroy() {
+   base::ElapsedThreadTimer timer;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   ClearExtraAnnouncementNodes();
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -2104,7 +2104,7 @@ void AXTree::NotifyNodeAttributesWillChange(
+                     new_data);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void AXTree::ClearExtraAnnouncementNodes() {
+   if (!extra_announcement_nodes_) {
+     return;
+@@ -2493,7 +2493,7 @@ bool AXTree::CreateNewChildVector(
+     AXTreeUpdateState* update_state) {
+   DCHECK(GetTreeUpdateInProgressState());
+   bool success = true;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // If the root node has children added, clear the extra announcement nodes,
+   // which should always have their indices as the last two children of the root
+   // node. They will be recreated if needed, and given the correct indices.
diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h
new file mode 100644
index 000000000000..5d0219f9f423
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h
@@ -0,0 +1,29 @@
+--- ui/accessibility/ax_tree.h.orig	2025-05-06 12:23:00 UTC
++++ ui/accessibility/ax_tree.h
+@@ -62,7 +62,7 @@ enum class AXTreeUnserializeError {
+ };
+ // LINT.ThenChange(/tools/metrics/histograms/metadata/accessibility/enums.xml:AccessibilityTreeUnserializeError)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // To support AriaNotify on older versions of ATK, we need to use the ATK
+ // signal "Text::text-insert". This signal requires a node that is a
+ // text type, and it needs to have aria-live properties set in order for
+@@ -287,7 +287,7 @@ class AX_EXPORT AXTree {
+ 
+   void NotifyChildTreeConnectionChanged(AXNode* node, AXTree* child_tree);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void ClearExtraAnnouncementNodes();
+   void CreateExtraAnnouncementNodes();
+   ExtraAnnouncementNodes* extra_announcement_nodes() const {
+@@ -544,7 +544,7 @@ class AX_EXPORT AXTree {
+ 
+   std::unique_ptr<AXEvent> event_data_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<ExtraAnnouncementNodes> extra_announcement_nodes_ = nullptr;
+ #endif  // BUILDFLAG(IS_LINUX)
+ };
diff --git a/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
index b157bfb90fba..b6229d8fedd9 100644
--- a/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
+++ b/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
@@ -1,6 +1,6 @@
---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
-@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
+@@ -101,7 +101,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
  
  std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString()
      const {
diff --git a/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc
index 7bb896c6d1bd..7dd8cbf0c5c4 100644
--- a/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/base/resource/resource_bundle.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/base/resource/resource_bundle.cc
-@@ -930,7 +930,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -929,7 +929,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
diff --git a/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h b/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h
index e7376699d683..ff58757d2927 100644
--- a/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h
+++ b/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h
@@ -1,6 +1,6 @@
---- ui/base/test/ui_controls.h.orig	2025-01-25 09:34:31 UTC
+--- ui/base/test/ui_controls.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/base/test/ui_controls.h
-@@ -184,7 +184,7 @@ bool SendTouchEventsNotifyWhenDone(int action,
+@@ -191,7 +191,7 @@ bool SendTouchEventsNotifyWhenDone(int action,
                                     base::OnceClosure task);
  #endif
  
diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc
index 8dabb0898783..3b7a66edae2a 100644
--- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,4 +1,4 @@
---- ui/base/ui_base_features.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/base/ui_base_features.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/base/ui_base_features.cc
 @@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj,
  // Controls whether support for Wayland's per-surface scaling is enabled.
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -138,7 +138,7 @@ BASE_FEATURE(kWaylandUiScale,
+@@ -143,7 +143,7 @@ BASE_FEATURE(kWaylandSessionManagement,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -18,7 +18,7 @@
  // If this feature is enabled, users not specify --ozone-platform-hint switch
  // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220.
  COMPONENT_EXPORT(UI_BASE_FEATURES)
-@@ -220,7 +220,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists,
+@@ -225,7 +225,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists,
  // native apps on Windows.
  BASE_FEATURE(kExperimentalFlingAnimation,
               "ExperimentalFlingAnimation",
@@ -27,7 +27,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -296,7 +296,7 @@ bool IsForcedColorsEnabled() {
+@@ -301,7 +301,7 @@ bool IsForcedColorsEnabled() {
  BASE_FEATURE(kEyeDropper,
               "EyeDropper",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h
index a3aee56d3792..ac7fc8c6edb3 100644
--- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h
+++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h
@@ -1,7 +1,7 @@
---- ui/base/ui_base_features.h.orig	2025-02-20 09:59:21 UTC
+--- ui/base/ui_base_features.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/base/ui_base_features.h
-@@ -124,7 +124,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kWaylandUiScale);
+@@ -126,7 +126,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ BASE_DECLARE_FEATURE(kWaylandSessionManagement);
  #endif  // BUILDFLAG(IS_OZONE)
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc
index 367e6e0944fc..781c7c53085b 100644
--- a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc
+++ b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,6 +1,6 @@
---- ui/base/webui/web_ui_util.cc.orig	2025-01-25 09:34:31 UTC
+--- ui/base/webui/web_ui_util.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/base/webui/web_ui_util.cc
-@@ -43,7 +43,7 @@ namespace {
+@@ -46,7 +46,7 @@ namespace {
  constexpr float kMaxScaleFactor = 1000.0f;
  
  std::string GetFontFamilyMd() {
@@ -9,7 +9,7 @@
    return "Roboto, " + GetFontFamily();
  #else
    return GetFontFamily();
-@@ -218,7 +218,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
+@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
  std::string GetFontFamily() {
    std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY);
  
diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__id.h b/www/ungoogled-chromium/files/patch-ui_color_color__id.h
index 7a73ecff6f4d..ec94bc8d08e1 100644
--- a/www/ungoogled-chromium/files/patch-ui_color_color__id.h
+++ b/www/ungoogled-chromium/files/patch-ui_color_color__id.h
@@ -1,6 +1,6 @@
---- ui/color/color_id.h.orig	2025-04-15 08:30:07 UTC
+--- ui/color/color_id.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/color/color_id.h
-@@ -622,7 +622,7 @@
+@@ -624,7 +624,7 @@
    E_CPONLY(kColorCrosSysPositive) \
    E_CPONLY(kColorCrosSysComplementVariant) \
    E_CPONLY(kColorCrosSysInputFieldOnBase)
diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc
index 69cff86ed26d..5fbb4a53d29d 100644
--- a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc
+++ b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc
@@ -1,6 +1,6 @@
---- ui/color/color_provider_utils.cc.orig	2025-01-25 09:34:31 UTC
+--- ui/color/color_provider_utils.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/color/color_provider_utils.cc
-@@ -189,7 +189,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste
+@@ -191,7 +191,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste
    switch (system_theme) {
      case ui::SystemTheme::kDefault:
        return "kDefault";
diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc
index a0714c622634..69f10a5e5e56 100644
--- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc
+++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/compositor/compositor.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/compositor/compositor.cc
-@@ -940,7 +940,7 @@ void Compositor::OnResume() {
+@@ -952,7 +952,7 @@ void Compositor::OnResume() {
      obs.ResetIfActive();
  }
  
diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h
index 8361cc8af4c3..503f764c46ca 100644
--- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h
+++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig	2025-04-15 08:30:07 UTC
+--- ui/compositor/compositor.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/compositor/compositor.h
-@@ -467,7 +467,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -463,7 +463,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
    // base::PowerSuspendObserver:
    void OnResume() override;
  
diff --git a/www/ungoogled-chromium/files/patch-ui_display_screen.h b/www/ungoogled-chromium/files/patch-ui_display_screen.h
index 3d2ba0be6c6a..e14ef6bd1447 100644
--- a/www/ungoogled-chromium/files/patch-ui_display_screen.h
+++ b/www/ungoogled-chromium/files/patch-ui_display_screen.h
@@ -1,4 +1,4 @@
---- ui/display/screen.h.orig	2025-01-25 09:34:31 UTC
+--- ui/display/screen.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/display/screen.h
 @@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen {
    // (both of which may or may not be `nearest_id`).
@@ -9,7 +9,7 @@
    // Object which suspends the platform-specific screensaver for the duration of
    // its existence.
    class ScreenSaverSuspender {
-@@ -243,7 +243,7 @@ class DISPLAY_EXPORT Screen {
+@@ -246,7 +246,7 @@ class DISPLAY_EXPORT Screen {
    int64_t display_id_for_new_windows_;
    int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
  
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn
index dd668bc501e6..03836cc61d82 100644
--- a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- ui/gfx/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ ui/gfx/BUILD.gn
-@@ -658,7 +658,7 @@ source_set("memory_buffer_sources") {
+@@ -661,7 +661,7 @@ source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h
index 1397136e942b..d9b41a8663d9 100644
--- a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.h.orig	2025-03-09 21:38:10 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/gfx/gpu_memory_buffer.h
 @@ -17,7 +17,7 @@
  #include "ui/gfx/generic_shared_memory_id.h"
@@ -9,7 +9,16 @@
  #include "ui/gfx/native_pixmap_handle.h"
  #elif BUILDFLAG(IS_APPLE)
  #include "ui/gfx/mac/io_surface.h"
-@@ -205,7 +205,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle {
+@@ -47,7 +47,7 @@ enum GpuMemoryBufferType {
+ #if BUILDFLAG(IS_APPLE)
+   IO_SURFACE_BUFFER,
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   NATIVE_PIXMAP,
+ #endif
+ #if BUILDFLAG(IS_WIN)
+@@ -212,7 +212,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle {
  
    uint32_t offset = 0;
    uint32_t stride = 0;
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
index 24f4c3f19460..b0dc1f04f9a7 100644
--- a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-03-09 21:38:10 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
 @@ -14,7 +14,7 @@
  #include "ui/gfx/mac/io_surface.h"
@@ -41,16 +41,16 @@
    out->modifier = data.modifier();
    out->supports_zero_copy_webgpu_import =
        data.supports_zero_copy_webgpu_import();
-@@ -190,7 +190,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag
-       NOTREACHED();
+@@ -187,7 +187,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag
+     case gfx::IO_SURFACE_BUFFER:
+       return Tag::kMachPort;
  #endif  // BUILDFLAG(IS_APPLE)
-     case gfx::NATIVE_PIXMAP:
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
        return Tag::kNativePixmapHandle;
- #else
-       NOTREACHED();
-@@ -259,7 +259,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
+@@ -251,7 +251,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa
        }
        return true;
  #endif  // BUILDFLAG(IS_APPLE)
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h
index 91ed425a5a69..67b9eb5433c0 100644
--- a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h
@@ -1,6 +1,6 @@
---- ui/gfx/native_widget_types.h.orig	2025-01-25 09:34:31 UTC
+--- ui/gfx/native_widget_types.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/gfx/native_widget_types.h
-@@ -101,7 +101,7 @@ class ViewAndroid;
+@@ -104,7 +104,7 @@ class ViewAndroid;
  #endif
  class SkBitmap;
  
@@ -9,7 +9,7 @@
  extern "C" {
  struct _AtkObject;
  using AtkObject = struct _AtkObject;
-@@ -214,7 +214,7 @@ using NativeViewAccessible = id;
+@@ -194,7 +194,7 @@ using NativeViewAccessible = id;
  #else
  using NativeViewAccessible = struct objc_object*;
  #endif
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc b/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc
index b4f192e5b8fb..68d72d364094 100644
--- a/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc
@@ -1,6 +1,6 @@
---- ui/gfx/x/atom_cache.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/gfx/x/atom_cache.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/gfx/x/atom_cache.cc
-@@ -156,6 +156,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
+@@ -157,6 +157,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
      "application/octet-stream",
      "application/vnd.chromium.test",
      "chromium/filename",
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn
index 155b7662c6f0..40c6a58c5579 100644
--- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gl/BUILD.gn.orig	2025-03-09 21:38:10 UTC
+--- ui/gl/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ ui/gl/BUILD.gn
-@@ -169,7 +169,6 @@ component("gl") {
+@@ -174,7 +174,6 @@ component("gl") {
    public_deps = [
      ":gl_enums",
      "//base",
@@ -8,7 +8,7 @@
      "//ui/events/platform",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -323,7 +322,6 @@ component("gl") {
+@@ -328,7 +327,6 @@ component("gl") {
      data_deps += [
        "//third_party/angle:libEGL",
        "//third_party/angle:libGLESv2",
@@ -16,7 +16,7 @@
      ]
      if (enable_swiftshader) {
        data_deps += [
-@@ -548,7 +546,6 @@ test("gl_unittests") {
+@@ -554,7 +552,6 @@ test("gl_unittests") {
  
    data_deps = [
      "//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc
index 3e3ac8577973..b4083842deb7 100644
--- a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc
@@ -1,6 +1,6 @@
---- ui/gl/gl_implementation.cc.orig	2025-01-25 09:34:31 UTC
+--- ui/gl/gl_implementation.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/gl/gl_implementation.cc
-@@ -252,7 +252,7 @@ GetRequestedGLImplementationFromCommandLine(
+@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandLine(
      const base::CommandLine* command_line) {
    bool overrideUseSoftwareGL =
        command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc
index 18c54ea00338..051bf77fd723 100644
--- a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_switches.cc.orig	2025-03-09 21:38:10 UTC
+--- ui/gl/gl_switches.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/gl/gl_switches.cc
 @@ -13,7 +13,7 @@
  #include "base/android/build_info.h"
@@ -9,7 +9,7 @@
  #include <vulkan/vulkan_core.h>
  #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
  #endif
-@@ -314,7 +314,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -319,7 +319,7 @@ bool IsDefaultANGLEVulkan() {
      return false;
    }
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -18,7 +18,7 @@
    angle::SystemInfo system_info;
    {
      GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan");
-@@ -367,7 +367,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -372,7 +372,7 @@ bool IsDefaultANGLEVulkan() {
    }
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc
index cf75423fda7f..27079dba2e62 100644
--- a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc
@@ -1,6 +1,6 @@
---- ui/gtk/gtk_compat.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/gtk/gtk_compat.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/gtk/gtk_compat.cc
-@@ -64,27 +64,47 @@ auto DlCast(void* symbol) {
+@@ -65,27 +65,47 @@ auto DlCast(void* symbol) {
  }
  
  void* GetLibGio() {
diff --git a/www/iridium/files/patch-ui_native__theme_native__theme__features.cc b/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc
index 11382ca9c250..a7c97f0b75ed 100644
--- a/www/iridium/files/patch-ui_native__theme_native__theme__features.cc
+++ b/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme_features.cc.orig	2025-03-18 16:46:04 UTC
-+++ ui/native_theme/native_theme_features.cc
-@@ -73,7 +73,7 @@ namespace ui {
+--- ui/native_theme/features/native_theme_features.cc.orig	2025-05-06 12:23:00 UTC
++++ ui/native_theme/features/native_theme_features.cc
+@@ -59,7 +59,7 @@ namespace ui {
  
  bool IsFluentOverlayScrollbarEnabled() {
  // Fluent scrollbars are only used for some OSes due to UI design guidelines.
@@ -9,7 +9,7 @@
    return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar);
  #else
    return false;
-@@ -82,7 +82,7 @@ bool IsFluentOverlayScrollbarEnabled() {
+@@ -68,7 +68,7 @@ bool IsFluentOverlayScrollbarEnabled() {
  
  bool IsFluentScrollbarEnabled() {
  // Fluent scrollbars are only used for some OSes due to UI design guidelines.
diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h
index 24aa14c5e0ef..25eb81ce12f7 100644
--- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h
+++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme.h.orig	2025-01-25 09:34:31 UTC
+--- ui/native_theme/native_theme.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/native_theme/native_theme.h
-@@ -61,7 +61,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -61,7 +61,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
    // The part to be painted / sized.
    enum Part {
      kCheckbox,
diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc
index c425565b6e5c..676224a4fd06 100644
--- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc
+++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc
@@ -1,11 +1,11 @@
---- ui/native_theme/native_theme_base.cc.orig	2025-03-09 21:38:10 UTC
+--- ui/native_theme/native_theme_base.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/native_theme/native_theme_base.cc
-@@ -239,7 +239,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
-                     absl::get<ButtonExtraParams>(extra), color_scheme,
+@@ -240,7 +240,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+                     std::get<ButtonExtraParams>(extra), color_scheme,
                      accent_color_opaque);
        break;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      case kFrameTopArea:
        PaintFrameTopArea(canvas, state, rect,
-                         absl::get<FrameTopAreaExtraParams>(extra),
+                         std::get<FrameTopAreaExtraParams>(extra), color_scheme);
diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
index 667090dc5194..1a6199674a9f 100644
--- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
+++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2024-04-04 19:16:34 UTC
+--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/ozone/platform/headless/ozone_platform_headless.cc
-@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform {
+@@ -108,7 +108,7 @@ class OzonePlatformHeadlessImpl : public OzonePlatform
    }
  
  // Desktop Linux, not CastOS.
diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
index 80425fe259c6..f59b32b50b5b 100644
--- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
+++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/x11/x11_window.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/ozone/platform/x11/x11_window.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/ozone/platform/x11/x11_window.cc
-@@ -1472,7 +1472,7 @@ void X11Window::OnXWindowStateChanged() {
+@@ -1459,7 +1459,7 @@ void X11Window::OnXWindowStateChanged() {
    WindowTiledEdges tiled_state = GetTiledState();
    if (tiled_state != tiled_state_) {
      tiled_state_ = tiled_state;
diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h
index 66f7d1855559..52fb13ff5381 100644
--- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h
+++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.h.orig	2025-04-15 08:30:07 UTC
+--- ui/platform_window/platform_window_delegate.h.orig	2025-05-08 07:58:41 UTC
 +++ ui/platform_window/platform_window_delegate.h
-@@ -140,7 +140,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  
diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h
index 3d659947b270..5eaa81e5a86d 100644
--- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h
+++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,4 +1,4 @@
---- ui/platform_window/platform_window_init_properties.h.orig	2024-06-22 08:49:42 UTC
+--- ui/platform_window/platform_window_init_properties.h.orig	2025-05-06 12:23:00 UTC
 +++ ui/platform_window/platform_window_init_properties.h
 @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate;
  class ScenicWindowDelegate;
@@ -9,7 +9,7 @@
  class X11ExtensionDelegate;
  #endif
  
-@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
+@@ -120,7 +120,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
  
    PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault;
  
diff --git a/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn
index 5c866c1e8ebf..186b6fd8f500 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/views/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- ui/views/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/BUILD.gn
-@@ -836,7 +836,6 @@ component("views") {
+@@ -839,7 +839,6 @@ component("views") {
        sources += [ "accessibility/widget_ax_tree_id_map.cc" ]
      }
      deps += [
diff --git a/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc b/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc
index 1fd5efc6f2ee..7a60bfd9bf1a 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc
@@ -1,6 +1,6 @@
---- ui/views/accessibility/view_accessibility.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/views/accessibility/view_accessibility.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/accessibility/view_accessibility.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
  #include "ui/views/accessibility/view_ax_platform_node_delegate_win.h"
  #elif BUILDFLAG(IS_MAC)
  #include "ui/views/accessibility/view_ax_platform_node_delegate_mac.h"
@@ -9,7 +9,7 @@
  #include "ui/views/accessibility/view_ax_platform_node_delegate_auralinux.h"
  #endif
  
-@@ -100,7 +100,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility::
+@@ -101,7 +101,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility::
    return ViewAXPlatformNodeDelegateWin::CreatePlatformSpecific(view);
  #elif BUILDFLAG(IS_MAC)
    return ViewAXPlatformNodeDelegateMac::CreatePlatformSpecific(view);
diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc
index 2e1f3839002a..accd6c4d10ce 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/controls/textfield/textfield.cc
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
  #include "base/win/win_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
-@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -184,7 +184,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -18,25 +18,25 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -790,7 +790,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -791,7 +791,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
      return handled;
    }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!handled && linux_ui &&
-@@ -975,7 +975,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+   if (!handled) {
+     if (auto* linux_ui = ui::LinuxUi::instance()) {
+       const auto command =
+@@ -976,7 +976,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Skip any accelerator handling that conflicts with custom keybindings.
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -2066,7 +2066,7 @@ bool Textfield::ShouldDoLearning() {
+   if (auto* linux_ui = ui::LinuxUi::instance()) {
+     if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent(
+@@ -2062,7 +2062,7 @@ bool Textfield::ShouldDoLearning() {
    return false;
  }
  
@@ -45,7 +45,7 @@
  // TODO(crbug.com/41452689): Implement this method to support Korean IME
  // reconversion feature on native text fields (e.g. find bar).
  bool Textfield::SetCompositionFromExistingText(
-@@ -2584,7 +2584,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2580,7 +2580,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
@@ -54,7 +54,7 @@
        // Only erase by line break on Linux and ChromeOS.
        if (shift) {
          return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
-@@ -2592,7 +2592,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2588,7 +2588,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
        return ui::TextEditCommand::DELETE_WORD_BACKWARD;
      case ui::VKEY_DELETE:
diff --git a/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc
index 3debb8b1ea81..c3eb92b1b7f7 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,6 +1,6 @@
---- ui/views/corewm/tooltip_aura.cc.orig	2025-01-25 09:34:31 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/corewm/tooltip_aura.cc
-@@ -38,7 +38,7 @@ static constexpr int kTooltipMaxWidth = 800;
+@@ -42,7 +42,7 @@ static constexpr int kTooltipMaxWidth = 800;
  
  // TODO(varkha): Update if native widget can be transparent on Linux.
  bool CanUseTranslucentTooltipWidget() {
diff --git a/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc b/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc
index da7d8d192b46..892ae9b31051 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc
@@ -1,6 +1,6 @@
---- ui/views/examples/widget_example.cc.orig	2024-10-01 07:26:23 UTC
+--- ui/views/examples/widget_example.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/examples/widget_example.cc
-@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container)
+@@ -51,7 +51,7 @@ void WidgetExample::CreateExampleView(View* container)
    modal_button->SetCallback(
        base::BindRepeating(&WidgetExample::CreateDialogWidget,
                            base::Unretained(this), modal_button, true));
diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index e18d9376ffb3..1dfd9fb6fb7d 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
 @@ -50,7 +50,7 @@
  #include "ui/wm/core/window_util.h"
@@ -9,7 +9,7 @@
  #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
  #endif
  
-@@ -347,7 +347,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -353,7 +353,7 @@ std::unique_ptr<aura::client::DragDropClient>
  DesktopWindowTreeHostPlatform::CreateDragDropClient() {
    ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
    std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -18,7 +18,7 @@
        std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
  #else
        std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1179,7 +1179,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
+@@ -1185,7 +1185,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc
index 83dc7d0b5004..fd5b9edd2f44 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/widget.cc.orig	2025-04-15 08:30:07 UTC
+--- ui/views/widget/widget.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/widget/widget.cc
 @@ -63,7 +63,7 @@
  #include "ui/views/window/custom_frame_view.h"
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -2452,7 +2452,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
+@@ -2453,7 +2453,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
      return parent_->GetNativeTheme();
    }
  
diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h
new file mode 100644
index 000000000000..1865a479d173
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h
@@ -0,0 +1,11 @@
+--- ui/views/widget/widget.h.orig	2025-05-06 12:23:00 UTC
++++ ui/views/widget/widget.h
+@@ -487,7 +487,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
+     bool force_system_menu_for_frameless = false;
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Only used by X11, for root level windows. Specifies the res_name and
+     // res_class fields, respectively, of the WM_CLASS window property. Controls
+     // window grouping and desktop file matching in Linux window managers.
diff --git a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc
index 4dedbb551c39..f38cdd7a49ef 100644
--- a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig	2025-03-09 21:38:10 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2025-05-06 12:23:00 UTC
 +++ ui/views/window/dialog_delegate.cc
-@@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -106,7 +106,7 @@ Widget* DialogDelegate::CreateDialogWidget(
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn
index 59723a44d331..2a744f10b331 100644
--- a/www/ungoogled-chromium/files/patch-v8_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig	2025-04-15 08:30:07 UTC
+--- v8/BUILD.gn.orig	2025-05-06 12:23:00 UTC
 +++ v8/BUILD.gn
-@@ -974,6 +974,8 @@ external_v8_defines = [
+@@ -1000,6 +1000,8 @@ external_v8_defines = [
    "V8_TARGET_OS_MACOS",
    "V8_TARGET_OS_WIN",
    "V8_TARGET_OS_CHROMEOS",
@@ -9,7 +9,7 @@
  ]
  
  enabled_external_v8_defines = [
-@@ -1053,6 +1055,12 @@ if (target_os == "android") {
+@@ -1079,6 +1081,12 @@ if (target_os == "android") {
  } else if (target_os == "chromeos") {
    enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
    enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ]
@@ -22,7 +22,7 @@
  }
  
  disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines
-@@ -2479,6 +2487,12 @@ template("run_mksnapshot") {
+@@ -2537,6 +2545,12 @@ template("run_mksnapshot") {
        if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
          args += [ "--reorder-builtins" ]
        }
@@ -35,7 +35,7 @@
      }
  
      if (v8_enable_turboshaft_csa) {
-@@ -6565,7 +6579,7 @@ v8_component("v8_libbase") {
+@@ -6631,7 +6645,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -44,7 +44,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -6576,6 +6590,18 @@ v8_component("v8_libbase") {
+@@ -6642,6 +6656,18 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8config.h b/www/ungoogled-chromium/files/patch-v8_include_v8config.h
index 9442fff39a70..ea1a9ae03cd1 100644
--- a/www/ungoogled-chromium/files/patch-v8_include_v8config.h
+++ b/www/ungoogled-chromium/files/patch-v8_include_v8config.h
@@ -1,4 +1,4 @@
---- v8/include/v8config.h.orig	2025-01-25 09:34:31 UTC
+--- v8/include/v8config.h.orig	2025-05-06 12:23:00 UTC
 +++ v8/include/v8config.h
 @@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line
    && !defined(V8_TARGET_OS_FUCHSIA) \
@@ -35,7 +35,7 @@
  #ifdef V8_OS_MACOS
  # define V8_TARGET_OS_MACOS
  #endif
-@@ -382,6 +396,7 @@ path. Add it with -I<path> to the command line
+@@ -383,6 +397,7 @@ path. Add it with -I<path> to the command line
  #if (defined(_M_X64) || defined(__x86_64__)            /* x64 (everywhere) */  \
       || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */    \
           && !defined(_WIN32)))                         /* not on windows */    \
diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc
index 6826cc3a20bd..2e78c30d3a6a 100644
--- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc
+++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
---- v8/src/api/api.cc.orig	2025-04-15 08:30:07 UTC
+--- v8/src/api/api.cc.orig	2025-05-06 12:23:00 UTC
 +++ v8/src/api/api.cc
 @@ -153,7 +153,7 @@
  #include "src/wasm/wasm-serialization.h"
@@ -9,7 +9,7 @@
  #include <signal.h>
  #include <unistd.h>
  
-@@ -6476,7 +6476,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6483,7 +6483,7 @@ bool v8::V8::Initialize(const int build_config) {
    return true;
  }
  
diff --git a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc
index a92bea7568fd..bcf3a35d1000 100644
--- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc
+++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc
@@ -1,6 +1,6 @@
---- v8/src/execution/isolate.cc.orig	2025-04-15 08:30:07 UTC
+--- v8/src/execution/isolate.cc.orig	2025-05-06 12:23:00 UTC
 +++ v8/src/execution/isolate.cc
-@@ -172,6 +172,10 @@
+@@ -173,6 +173,10 @@
  #include "src/execution/simulator-base.h"
  #endif
  
@@ -11,7 +11,7 @@
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -5062,6 +5066,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -5114,6 +5118,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
index a400ad9e7ae2..7c5b8d93db06 100644
--- a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
+++ b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
@@ -1,6 +1,6 @@
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-04-15 08:30:07 UTC
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-05-06 12:23:00 UTC
 +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
-@@ -575,7 +575,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
  }
  
  void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -9,7 +9,7 @@
                              LoadType type, uint32_t* protected_load_pc,
                              bool /* is_load_mem */, bool /* i64_offset */,
                              bool needs_shift) {
-@@ -655,7 +655,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
  }
  
  void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -18,7 +18,7 @@
                               StoreType type, LiftoffRegList pinned,
                               uint32_t* protected_store_pc,
                               bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -734,7 +734,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
  }
  
  void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
@@ -27,7 +27,7 @@
                                    LoadType type, LiftoffRegList /* pinned */,
                                    bool /* i64_offset */) {
    if (type.value() != LoadType::kI64Load) {
-@@ -752,7 +752,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
  }
  
  void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
@@ -36,7 +36,7 @@
                                     StoreType type, LiftoffRegList pinned,
                                     bool /* i64_offset */) {
    DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
-@@ -822,7 +822,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
  
  inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
                                         Register dst_addr, Register offset_reg,
@@ -45,7 +45,7 @@
                                         LiftoffRegister value,
                                         LiftoffRegister result, StoreType type) {
    DCHECK_EQ(value, result);
-@@ -890,7 +890,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
  }
  
  inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -54,7 +54,7 @@
                            LiftoffRegister value, LiftoffRegister result,
                            StoreType type) {
    DCHECK_EQ(value, result);
-@@ -1005,7 +1005,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
  }
  
  inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -63,7 +63,7 @@
                            LiftoffRegister value, LiftoffRegister result) {
    // We need {ebx} here, which is the root register. As the root register it
    // needs special treatment. As we use {ebx} directly in the code below, we
-@@ -1101,7 +1101,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
  }  // namespace liftoff
  
  void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
@@ -72,7 +72,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1115,7 +1115,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
@@ -81,7 +81,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1128,7 +1128,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
@@ -90,7 +90,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1142,7 +1142,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
@@ -99,7 +99,7 @@
                                  LiftoffRegister result, StoreType type,
                                  bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1156,7 +1156,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
  }
  
  void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
@@ -108,7 +108,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1170,7 +1170,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
@@ -117,7 +117,7 @@
                                        LiftoffRegister value,
                                        LiftoffRegister result, StoreType type,
                                        bool /* i64_offset */) {
-@@ -1185,7 +1185,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
  }
  
  void LiftoffAssembler::AtomicCompareExchange(
diff --git a/www/webkit2-gtk/files/patch-Source_JavaScriptCore_runtime_MathCommon.cpp b/www/webkit2-gtk/files/patch-Source_JavaScriptCore_runtime_MathCommon.cpp
new file mode 100644
index 000000000000..331be93267d8
--- /dev/null
+++ b/www/webkit2-gtk/files/patch-Source_JavaScriptCore_runtime_MathCommon.cpp
@@ -0,0 +1,11 @@
+--- Source/JavaScriptCore/runtime/MathCommon.cpp.orig	2024-10-21 09:00:02 UTC
++++ Source/JavaScriptCore/runtime/MathCommon.cpp
+@@ -635,7 +635,7 @@ JSC_DEFINE_NOEXCEPT_JIT_OPERATION(f64_nearest, double,
+     return std::nearbyint(operand);
+ }
+ 
+-#if OS(LINUX) && !defined(__GLIBC__)
++#if OS(UNIX) && !defined(__GLIBC__)
+ static inline float roundevenf(float operand)
+ {
+     float rounded = roundf(operand);
diff --git a/www/zola/Makefile b/www/zola/Makefile
index be384d6c24d7..1db2e574d8d7 100644
--- a/www/zola/Makefile
+++ b/www/zola/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.20.0
 PORTREVISION=	1
 CATEGORIES=	www
 
-MAINTAINER=	mikael@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Fast static site generator
 WWW=		https://www.getzola.org/
 
diff --git a/x11-fonts/material-icons-ttf/Makefile b/x11-fonts/material-icons-ttf/Makefile
index 51aba3227416..c74bb0097fe2 100644
--- a/x11-fonts/material-icons-ttf/Makefile
+++ b/x11-fonts/material-icons-ttf/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	material-icons
-DISTVERSION=	5.0.1
+DISTVERSION=	6.7.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fonts
 PKGNAMESUFFIX=	-ttf
 
diff --git a/x11-fonts/material-icons-ttf/distinfo b/x11-fonts/material-icons-ttf/distinfo
index d2d02afe4dae..ab39e8230512 100644
--- a/x11-fonts/material-icons-ttf/distinfo
+++ b/x11-fonts/material-icons-ttf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558708729
-SHA256 (jossef-material-design-icons-iconfont-5.0.1_GH0.tar.gz) = 623811b1863dc9b04036d4b67a9803e6f2f8cdfc9efbae3e0e823e34b2284679
-SIZE (jossef-material-design-icons-iconfont-5.0.1_GH0.tar.gz) = 339220
+TIMESTAMP = 1745212119
+SHA256 (jossef-material-design-icons-iconfont-v6.7.0_GH0.tar.gz) = 48419986a82d18e6fa7dd9dc0208dcddf4a54feed77762f15d9d9bb229afc5dc
+SIZE (jossef-material-design-icons-iconfont-v6.7.0_GH0.tar.gz) = 1604735
diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile
index ea3afef748cd..e5cf56379067 100644
--- a/x11-fonts/urwfonts/Makefile
+++ b/x11-fonts/urwfonts/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	urwfonts
 PORTVERSION=	1.0
 PORTREVISION=	8
 CATEGORIES=	x11-fonts
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
+MASTER_SITES=	https://download.gimp.org/gimp/fonts/
 DISTNAME=	urw-fonts
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/x11-themes/papirus-icon-theme/Makefile b/x11-themes/papirus-icon-theme/Makefile
index d553f53fb794..85a3881f4735 100644
--- a/x11-themes/papirus-icon-theme/Makefile
+++ b/x11-themes/papirus-icon-theme/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	papirus-icon-theme
-PORTVERSION=	20250201
+PORTVERSION=	20250501
 CATEGORIES=	x11-themes
 
 MAINTAINER=	tagattie@FreeBSD.org
@@ -17,7 +17,7 @@ GH_ACCOUNT=	PapirusDevelopmentTeam
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-PORTDOCS=	AUTHORS README.md
+PORTDOCS=	AUTHORS CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/x11-themes/papirus-icon-theme/distinfo b/x11-themes/papirus-icon-theme/distinfo
index cabd6e5b31f8..15f4a40285d4 100644
--- a/x11-themes/papirus-icon-theme/distinfo
+++ b/x11-themes/papirus-icon-theme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738834130
-SHA256 (PapirusDevelopmentTeam-papirus-icon-theme-20250201_GH0.tar.gz) = 01a7a07293db9e22437b96fae9d7fd8dad74c33c5460af8c86227973cb3a9846
-SIZE (PapirusDevelopmentTeam-papirus-icon-theme-20250201_GH0.tar.gz) = 33743355
+TIMESTAMP = 1746543377
+SHA256 (PapirusDevelopmentTeam-papirus-icon-theme-20250501_GH0.tar.gz) = 3831a487f813479ad3224fdbfb0c7023f23056899bc78c93737f341aa655558e
+SIZE (PapirusDevelopmentTeam-papirus-icon-theme-20250501_GH0.tar.gz) = 32512075
diff --git a/x11-toolkits/kddockwidgets/Makefile b/x11-toolkits/kddockwidgets/Makefile
index 04dcddb79c9c..f0cdf899e63c 100644
--- a/x11-toolkits/kddockwidgets/Makefile
+++ b/x11-toolkits/kddockwidgets/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kddockwidgets
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2.3
+DISTVERSION=	2.2.4
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/x11-toolkits/kddockwidgets/distinfo b/x11-toolkits/kddockwidgets/distinfo
index 87e7adc34f50..d6e9934c1d7b 100644
--- a/x11-toolkits/kddockwidgets/distinfo
+++ b/x11-toolkits/kddockwidgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743699853
-SHA256 (KDAB-KDDockWidgets-v2.2.3_GH0.tar.gz) = b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec
-SIZE (KDAB-KDDockWidgets-v2.2.3_GH0.tar.gz) = 5651845
+TIMESTAMP = 1746348564
+SHA256 (KDAB-KDDockWidgets-v2.2.4_GH0.tar.gz) = a1cf55a3cf267108ee495de8df9038c67f61da5ca324059cb32543d69877524e
+SIZE (KDAB-KDDockWidgets-v2.2.4_GH0.tar.gz) = 5651823
diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile
index 072f5e0d1924..3bdb49070916 100644
--- a/x11/hyprpaper/Makefile
+++ b/x11/hyprpaper/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	hyprpaper
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.4
-PORTREVISION=	4
+DISTVERSION=	0.7.5
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/hyprpaper/distinfo b/x11/hyprpaper/distinfo
index 7674d75ecc87..702a0afb2a78 100644
--- a/x11/hyprpaper/distinfo
+++ b/x11/hyprpaper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737645174
-SHA256 (hyprwm-hyprpaper-v0.7.4_GH0.tar.gz) = a2375dae58d29293b942a60cd465771b2c3c85cfcac628ec4897f11e7008666f
-SIZE (hyprwm-hyprpaper-v0.7.4_GH0.tar.gz) = 27407
+TIMESTAMP = 1746559093
+SHA256 (hyprwm-hyprpaper-v0.7.5_GH0.tar.gz) = 93efc089c7051e6727ac5eac402ebd254199e93ac3efd6fe7dd37a52ddc1cc33
+SIZE (hyprwm-hyprpaper-v0.7.5_GH0.tar.gz) = 27567
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index b1fa65b4d5f6..3026cde4cfe9 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -1,12 +1,10 @@
 PORTNAME=	idesk
-PORTVERSION=	0.7.5
-PORTREVISION=	15
+PORTVERSION=	0.7.9
 CATEGORIES=	x11
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
-WWW=		https://idesk.sourceforge.net
+WWW=		https://github.com/neagix/idesk
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -14,7 +12,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
 		libXft.so:x11-fonts/libXft
 
-USES=		gmake pkgconfig tar:bzip2 xorg
+USE_GITHUB=	yes
+GH_ACCOUNT=	neagix
+GH_TAGNAME=	15f0b51dc7c7adbdf191481423793d7726fa8fab
+
+USES=		autoreconf gmake localbase:ldflags pkgconfig \
+		tar:bzip2 xorg
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
@@ -37,6 +40,9 @@ SHAPE_CONFIGURE_ENABLE=	shape
 SN_LIB_DEPENDS=		libstartup-notification-1.so:x11/startup-notification
 SN_CONFIGURE_ON=	--enable-libsn
 
+post-patch:
+	${REINPLACE_CMD} -e 's|0.7.8|${PORTVERSION}|g' ${WRKSRC}/configure.ac
+
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${STAGEDIR}${PREFIX}/bin
 		${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/x11/idesk/distinfo b/x11/idesk/distinfo
index eb1bdf278bdf..0607a9eeaf70 100644
--- a/x11/idesk/distinfo
+++ b/x11/idesk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (idesk-0.7.5.tar.bz2) = d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
-SIZE (idesk-0.7.5.tar.bz2) = 185858
+TIMESTAMP = 1745876492
+SHA256 (neagix-idesk-0.7.9-15f0b51dc7c7adbdf191481423793d7726fa8fab_GH0.tar.gz) = a3e41968c358e115fece2a1df8e5efb4bf86e4e49b1dce3bd9a99f8920974d5e
+SIZE (neagix-idesk-0.7.9-15f0b51dc7c7adbdf191481423793d7726fa8fab_GH0.tar.gz) = 139044
diff --git a/x11/idesk/files/patch-configure b/x11/idesk/files/patch-configure
deleted file mode 100644
index ec9459eb870d..000000000000
--- a/x11/idesk/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
-work around removed imlib2-config
-
-Index: configure
---- configure.orig	2005-11-10 23:31:38 UTC
-+++ configure
-@@ -7030,13 +7030,8 @@ echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
-   echo "$as_me:$LINENO: checking for imlib2" >&5
- echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
-   no_imlib2=""
--  if test "$IMLIB2_CONFIG" = "no" ; then
--     no_imlib2=yes
--  else
--     IMLIB2_CFLAGS="`$IMLIB2_CONFIG $imlib2_config_args --cflags`"
--     IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
--
--  fi
-+     IMLIB2_CFLAGS="`pkg-config --cflags imlib2`"
-+     IMLIB2_LIBS="`pkg-config --libs imlib2`"
-   if test "x$no_imlib2" = x ; then
-      echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -7067,8 +7062,8 @@ echo "$as_me: error: Cannot find imlib2: Is imlib2-con
- 
- 
- 
--IMLIB_LIBS=`imlib2-config --libs`
--IMLIB_CFLAGS=`imlib2-config --cflags`
-+IMLIB_LIBS=`pkg-config --libs imlib2`
-+IMLIB_CFLAGS=`pkg-config --cflags imlib2`
- 
- 
- 
diff --git a/x11/idesk/files/patch-src_Database.cpp b/x11/idesk/files/patch-src_Database.cpp
new file mode 100644
index 000000000000..bfef5be3d60c
--- /dev/null
+++ b/x11/idesk/files/patch-src_Database.cpp
@@ -0,0 +1,18 @@
+--- src/Database.cpp.orig	2025-04-06 14:11:58 UTC
++++ src/Database.cpp
+@@ -33,13 +33,13 @@ static inline std::string &ltrim(std::string &s) {
+
+ // trim from start
+ static inline std::string &ltrim(std::string &s) {
+-        s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
++        s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](const unsigned char ch) {return !std::isspace(ch); }));
+         return s;
+ }
+
+ // trim from end
+ static inline std::string &rtrim(std::string &s) {
+-        s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
++        s.erase(std::find_if(s.rbegin(), s.rend(), [](const unsigned char ch) {return !std::isspace(ch); }).base(), s.end());
+         return s;
+ }
+
diff --git a/x11/idesk/files/patch-src_DesktopConfig.cpp b/x11/idesk/files/patch-src_DesktopConfig.cpp
deleted file mode 100644
index c87db678e7e3..000000000000
--- a/x11/idesk/files/patch-src_DesktopConfig.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DesktopConfig.cpp.orig	2005-11-10 23:07:58 UTC
-+++ src/DesktopConfig.cpp
-@@ -24,6 +24,7 @@
- 
- #include "DesktopConfig.h"
- #include "Util.h"
-+#include "sys/stat.h"
- 
- //the initilizer list just sets the program defaults for non-necessary options
- DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
diff --git a/x11/idesk/files/patch-src_Timer.cpp b/x11/idesk/files/patch-src_Timer.cpp
index f7b8f5bde910..899d0742ec8a 100644
--- a/x11/idesk/files/patch-src_Timer.cpp
+++ b/x11/idesk/files/patch-src_Timer.cpp
@@ -1,5 +1,5 @@
---- src/Timer.cpp.orig	2005-08-15 05:26:39 UTC
-+++ src/Timer.cpp
+--- src/Timer.cpp	2025-04-28 14:46:12.228799000 -0700
++++ src/Timer.cpp	2025-04-28 14:46:20.177517000 -0700
 @@ -26,6 +26,7 @@
  #include "Database.h"
  #include <X11/Xlib.h>
diff --git a/x11/idesk/files/patch-src_XImlib2Background.cpp b/x11/idesk/files/patch-src_XImlib2Background.cpp
index d7dd9162b9af..c99bce26fc98 100644
--- a/x11/idesk/files/patch-src_XImlib2Background.cpp
+++ b/x11/idesk/files/patch-src_XImlib2Background.cpp
@@ -1,5 +1,5 @@
---- src/XImlib2Background.cpp.orig	2005-11-10 23:08:55 UTC
-+++ src/XImlib2Background.cpp
+--- src/XImlib2Background.cpp	2025-04-28 14:47:32.419474000 -0700
++++ src/XImlib2Background.cpp	2025-04-28 14:48:10.152608000 -0700
 @@ -26,6 +26,7 @@
  #include "Database.h"
  #include "XImlib2Background.h"
diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index c98573c2222a..3d0cba6ba83d 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -136,79 +136,36 @@ LINUX_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 .endif
 
-.if ${NVVERSION} >= 570.12400 # 570.124
-LINUX_LIBS+=    libnvidia-egl-wayland.so.1.1.18
-LINUX_LINKS+=   libnvidia-egl-wayland.so.1.1.18 libnvidia-egl-wayland.so.1
-LINUX32_LIBS+=	libnvidia-egl-wayland.so.1.1.18
-LINUX32_LINKS+=	libnvidia-egl-wayland.so.1.1.18 libnvidia-egl-wayland.so.1
-PLIST_RE+=      '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.18/'
-.elif ${NVVERSION} >= 565.00000 # 565.00
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.17
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.17 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.17/'
-.elif ${NVVERSION} >= 550.00000 # 550.00
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.13
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/'
-.elif ${NVVERSION} >= 545.00000 # 545.00
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.12
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.12 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.12/'
-.elif ${NVVERSION} >= 535.05403 # 535.54.03
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.11
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.11 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.11/'
-.elif ${NVVERSION} >= 495.02905 # 495.29.05
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.9
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'
+
+## graphics/egl-wayland supports
+## Estimated to be upgraded often.
+.if ${NVVERSION} >= 570.14400 # 570.144
+NV_EGL_W_VERSION=	1.1.19
 .elif ${NVVERSION} >= 470.04201 # 470.42.01
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.7
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.7 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.7/'
-.elif ${NVVERSION} >= 460.02704 # 460.27.04
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.5
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.5 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.5/'
-.elif ${NVVERSION} >= 440.026
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.4
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.4 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.4/'
-.elif ${NVVERSION} >= 435.017
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.3
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.3 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.3/'
-.elif ${NVVERSION} >= 418.030
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.2
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.2 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.2/'
-.elif ${NVVERSION} >= 410.057
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.0
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.0 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.0/'
-.elif ${NVVERSION} >= 396.018
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.3
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.3 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.3/'
+NV_EGL_W_VERSION=	1.1.7
 .elif ${NVVERSION} >= 387.012
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.2
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'
-.elif ${NVVERSION} >= 378.013
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.1
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.1 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.1/'
-.elif ${NVVERSION} >= 378.009
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.0
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.0 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.0/'
-.elif ${NVVERSION} >= 364.012
-LINUX_LIBS+=	libnvidia-egl-wayland.so.${PORTVERSION}
-LINUX_LINKS+=	libnvidia-egl-wayland.so.${PORTVERSION} libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/'
+NV_EGL_W_VERSION=	1.0.2
+.elif ${NVVERSION} >= 364.012	# Intentionally kept to indicate from which version
+				# this library is introduced.
+NV_EGL_W_VERSION=	${PORTVERSION}
+.else # Fool proof (Poka-yoke)
+NV_EGL_W_VERSION=	""
+.endif
+
+.if ${NVVERSION} >= 364.012 # Start graphics/egl-wayland support
+LINUX_LIBS+=    libnvidia-egl-wayland.so.${NV_EGL_W_VERSION}
+LINUX_LINKS+=   libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayland.so.1
+.  if ${NVVERSION} >= 570.12400 # 570.124 added 32bit version supports
+LINUX32_LIBS+=	libnvidia-egl-wayland.so.${NV_EGL_W_VERSION}
+LINUX32_LINKS+=	libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayland.so.1
+.  endif # 570.124
+PLIST_RE+=      '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${NV_EGL_W_VERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
-.endif
+.endif # 364.012
+# End of graphics/egl-wayland supports
+
+
 .if ${NVVERSION} >= 331.013 && ${NVVERSION} < 495.02905
 LINUX_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
@@ -308,50 +265,65 @@ LINUX32_LIBS+=  libnvidia-gpucomp.so.${PORTVERSION}
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'
 .endif # 545.00
 
-.if ${NVVERSION} >= 570.00000 #570.00
-LINUX_LIBS+=	libnvidia-egl-xcb.so.1.0.0 \
-		libnvidia-egl-xlib.so.1.0.0
-LINUX_LINKS+=	libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so.1 \
-		libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so \
-		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so.1 \
-		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so
-LINUX32_LIBS+=  libnvidia-egl-xcb.so.1.0.0 \
-		libnvidia-egl-xlib.so.1.0.0
-LINUX32_LINKS+=	libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so.1 \
-		libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so \
-		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so.1 \
-		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-(egl-xcb|egl-xlib)\.so)\.X/\1.1.0.0/'
+
+# nvidia-egl-X11 supports (not in x11/nvidia-driver nor separate ports)
+# Estimated to be upgrated often.
+.if ${NVVERSION} >= 570.14400 # 570.144
+NV_EGL_X_VERSION=	1.0.1
+.elif ${NVVERSION} >= 570.00000	# 570.00, Intentionally kept to clarify
+				# the start of egl-x11 support.
+NV_EGL_X_VERSION=	1.0.0
+.else # Fool proof (Poka-yoke)
+NV_EGL_X_VERSION=	""
+.endif
+
+.if ${NVVERSION} >= 570.00000 # 570.00, start of egl-x11 support
+LINUX_LIBS+=	libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} \
+		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION}
+LINUX_LINKS+=	libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so.1 \
+		libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so \
+		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so.1 \
+		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so
+LINUX32_LIBS+=  libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} \
+		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION}
+LINUX32_LINKS+=	libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so.1 \
+		libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so \
+		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so.1 \
+		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-(egl-xcb|egl-xlib)\.so)\.X/\1.${NV_EGL_X_VERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(egl-xcb|egl-xlib),d'
 .endif
+# End nvidia-egl-X11 supports
+
 
-.if ${NVVERSION} >= 570.00000 # 570.00
-LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.2
-LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
-		libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
-LINUX32_LIBS+=	libnvidia-egl-gbm.so.1.1.2
-LINUX32_LINKS+=	libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
-		libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'
-.elif ${NVVERSION} >= 565.00000 # 565.00
-LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.2
-LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
-		libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'
+# nvidia-egl-gbm supports.
+.if ${NVVERSION} >= 565.00000 # 565.00
+NV_EGL_G_VERSION=	1.1.2
 .elif ${NVVERSION} >= 550.00000 # 550.00
-LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.1
-LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \
-		libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.1/'
-.elif ${NVVERSION} >= 525.08902 # 525.89.02
-LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.0
-LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \
-		libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/'
+NV_EGL_G_VERSION=	1.1.1
+.elif ${NVVERSION} >= 525.08902	# 525.89.02, Intentionally kept to clarify
+				# the start of nvidia-egl-gbm support
+NV_EGL_G_VERSION=	1.1.0
+.else # Fool proof (Poka-yoke)
+NV_EGL_G_VERSION=	""
 .endif # 565.00
 
 .if ${NVVERSION} >= 525.08902 # 525.89.02
+LINUX_LIBS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION}
+LINUX_LINKS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so.1 \
+		libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so
+.  if ${NVVERSION} >= 570.00000 # 570.00, first LINUX32 support
+LINUX32_LIBS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION}
+LINUX32_LINKS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so.1 \
+		libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so
+.  endif # 570.00
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.${NV_EGL_G_VERSION}/'
+.endif # 525.89.02
+# End of nvidia-egl-gbm supports
+
+
+.if ${NVVERSION} >= 525.08902 # 525.89.02
 LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \
 		libnvidia-nvvm.so.${PORTVERSION} \
 		libnvidia-ngx.so.${PORTVERSION} \
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index 17ce5e3fe053..64d1e1b7c892 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1743665760
-SHA256 (NVIDIA-Linux-x86_64-570.124.04.run) = 1b786a4b7122d7c4216c58ae4007688a4f778c196c148d919163815ee10d53c4
-SIZE (NVIDIA-Linux-x86_64-570.124.04.run) = 375582187
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-570.144.run) = c0b8d7ecf2e20b83767674bab8fee4d1323dc55580274d8e934635e8955f3be6
+SIZE (NVIDIA-Linux-x86_64-570.144.run) = 375742470
 SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
 SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014
 SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 8e0f04596be8..629e1a69a5ac 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,7 +14,7 @@
 PORTNAME?=	nvidia-driver
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -83,12 +83,12 @@ SUB_PATCHES+=	extra-patch-src-nvidia_subr.c
 # Temporarily disable GSP firmware as it is known to cause
 # issues with suspend/resume
 .if ${NVVERSION} >= 565.00000
-SUB_PATCHES+=	extra-gsp-patch-src-nvidia_subr.c
+SUB_PATCHES+=	extra-gsp-patch-src-common-inc-nv_firmware_registry.h
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
-EXTENSIONSDIR?=	${MODULESDIR}/extensions/.nvidia
+EXTENSIONSDIR=	${MODULESDIR}/extensions/.nvidia
 PORTDOCS=	*
 
 .if ${NVVERSION} >= 331.013
@@ -147,11 +147,6 @@ PLIST_SUB+=	EXTENSIONSDIR=${EXTENSIONSDIR}
 .else
 PLIST_SUB+=	EXTENSIONSDIR="@comment "
 .endif
-.if defined(LIBGLDIR)
-PLIST_SUB+=	LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
-.else
-PLIST_SUB+=	LIBGLDIR="@comment " LIBGLMAP=""
-.endif
 
 # Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB
 .if ${NVVERSION} >= 515.04304
@@ -410,31 +405,9 @@ post-install: .SILENT
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
 .  endif
-# Configuration of Nvidia as secondary GPU requires preserving libglvnd or mesa
-# libraries as default implementation; a libmap must not override in this case.
-.  if !defined(LIBGLDIR)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/
-.  else
-# libgl proxies require a library path containing unrenamed lib*GL*.so
-	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBGLDIR}
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 \
-		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGL.so.1
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 \
-		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libEGL.so.1
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 \
-		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGLESv2.so.2
-.  endif
-# Configuration of Nvidia as secondary GPU requires preserving xorg-server's
-# libglx.so and moving Nvidia's glx to where it can be found by a secondary
-# Xorg instance.
-# Not needed since 410.057: Nvidia driver finds libglxserver_nvidia.so instead.
-.  if ${EXTENSIONSDIR} != ${MODULESDIR}/extensions/.nvidia
-	${MKDIR} ${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}
-	${MV} ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions/.nvidia/* \
-		${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}/
-.  endif
 .else
 	${REINPLACE_CMD} -E '/-NVIDIA/d ; \
 		/lib(Open)?E?GLX?(ESv[12](_CM)?|dispatch)?\.so/d' \
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index 19c00c4c29b6..7582499314be 100644
--- a/x11/nvidia-driver/Makefile.version
+++ b/x11/nvidia-driver/Makefile.version
@@ -1,4 +1,4 @@
 # NVIDIA Distversion
 #
 # This will be included from x11/nvidia-driver and the nvidia-drm port
-NVIDIA_DISTVERSION = 570.124.04
+NVIDIA_DISTVERSION?= 570.144
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index c0b9220779d2..1e22644b8440 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1743664922
-SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
-SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
+SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
 SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c
 SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020
 SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0
diff --git a/x11/nvidia-driver/files/extra-gsp-patch-src-common-inc-nv_firmware_registry.h.in b/x11/nvidia-driver/files/extra-gsp-patch-src-common-inc-nv_firmware_registry.h.in
new file mode 100644
index 000000000000..923d326df49a
--- /dev/null
+++ b/x11/nvidia-driver/files/extra-gsp-patch-src-common-inc-nv_firmware_registry.h.in
@@ -0,0 +1,11 @@
+--- src/common/inc/nv-firmware-registry.h.orig
++++ src/common/inc/nv-firmware-registry.h
+@@ -62,7 +62,7 @@
+ #define NV_REG_ENABLE_GPU_FIRMWARE_POLICY_MASK            0x000000F0
+ #define NV_REG_ENABLE_GPU_FIRMWARE_POLICY_ALLOW_FALLBACK  0x00000010
+ 
+-#define NV_REG_ENABLE_GPU_FIRMWARE_DEFAULT_VALUE          0x00000012
++#define NV_REG_ENABLE_GPU_FIRMWARE_DEFAULT_VALUE          0x00000000
+ 
+ //
+ // Registry key that when enabled,  will send GPU firmware logs
diff --git a/x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in b/x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in
deleted file mode 100644
index 1f09b6c683a3..000000000000
--- a/x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nvidia/nvidia_subr.c.orig	2025-04-14 16:14:13 UTC
-+++ src/nvidia/nvidia_subr.c
-@@ -32,7 +32,7 @@ nv_cap_t *nvidia_caps_root = NULL;
- nv_state_t nvidia_ctl_state;
- nv_cap_t *nvidia_caps_root = NULL;
- 
--const NvBool nv_is_rm_firmware_supported_os = NV_TRUE;
-+const NvBool nv_is_rm_firmware_supported_os = NV_FALSE;
- 
- static struct callout snapshot_timer;
- static struct mtx snapshot_timer_mutex;
diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in
index d73c5f09d6a9..ae2810196b97 100644
--- a/x11/nvidia-driver/files/pkg-message.in
+++ b/x11/nvidia-driver/files/pkg-message.in
@@ -32,9 +32,12 @@ If X.org cannot start and reports
 in /var/log/Xorg.0.log while actually you have ``options SYSVSHM''
 enabled in kernel, the sysctl ``kern.ipc.shmall'' should be increased.
 
-In certain 570 versions GSP firmware is known to cause issues with
-suspend/resume. To disable GSP firmware add
-hw.nvidia.registry.EnableGpuFirmware=0 to your loader.conf.
+Because in certain 570 versions GSP firmware is known to cause issues
+with suspend/resume, thus, disabled by default for now.
+On the other hand, some GPUs are known NOT to work without GSP
+firmware support.
+To enable GSP firmware add hw.nvidia.registry.EnableGpuFirmware=1
+to your loader.conf.
 
 https://download.nvidia.com/XFree86/FreeBSD-x86_64/560.31.02/README/gsp.html
 
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 3c61dc2818ce..4c244c172570 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,10 +1,7 @@
 bin/nvidia-bug-report.sh
 bin/nvidia-debugdump
 bin/nvidia-smi
-%%LIBGLMAP%%etc/libmap.d/nvidia.conf
-%%LIBGLDIR%%/libGL.so.1
-%%LIBGLDIR%%/libEGL.so.1
-%%LIBGLDIR%%/libGLESv2.so.2
+etc/libmap.d/nvidia.conf
 lib/libEGL-NVIDIA.so
 lib/libEGL-NVIDIA.so.1
 lib/libEGL_nvidia.so
@@ -17,8 +14,6 @@ lib/libGLESv2-NVIDIA.so
 lib/libGLESv2-NVIDIA.so.2
 lib/libGLESv2_nvidia.so
 lib/libGLESv2_nvidia.so.2
-%%LIBGLDIR%%/libGLX.so
-%%LIBGLDIR%%/libGLX.so.0
 @comment lib/libGLX_indirect.so.0
 lib/libGLX_nvidia.so
 lib/libGLX_nvidia.so.0
diff --git a/x11/qterminal/Makefile b/x11/qterminal/Makefile
index b5291cdedb42..2c52be5be274 100644
--- a/x11/qterminal/Makefile
+++ b/x11/qterminal/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qterminal
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	x11
 MASTER_SITES=	LXQT
 
diff --git a/x11/qterminal/distinfo b/x11/qterminal/distinfo
index 720d1315a35d..27d1aa461a15 100644
--- a/x11/qterminal/distinfo
+++ b/x11/qterminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744931557
-SHA256 (lxqt/qterminal-2.2.0.tar.xz) = 8a61d43ad43b4790c161aa1f9f6eb569c229e4b84b1836852d92593733196644
-SIZE (lxqt/qterminal-2.2.0.tar.xz) = 241148
+TIMESTAMP = 1746670533
+SHA256 (lxqt/qterminal-2.2.1.tar.xz) = 0cd38c3408bbaf4737a0276cf3d64b4c987716f0ef1f1eb8e9c1485e0c08f5d2
+SIZE (lxqt/qterminal-2.2.1.tar.xz) = 241276
diff --git a/x11/zutty/Makefile b/x11/zutty/Makefile
index e095935d5842..c44a3cd4f8e1 100644
--- a/x11/zutty/Makefile
+++ b/x11/zutty/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zutty
-DISTVERSION=	0.15
+DISTVERSION=	0.16
 CATEGORIES=	x11
-MASTER_SITES=	https://git.hq.sig7.se/zutty.git/snapshot/7e481c04507e9b5cacfe67fe2b96bdb449b08726?dummy=/
+MASTER_SITES=	https://git.hq.sig7.se/zutty.git/snapshot/${ZUTTY_COMMIT}?dummy=/
 
 MAINTAINER=	flo@purplekraken.com
 COMMENT=	High-end terminal for low-end systems
@@ -16,7 +16,8 @@ USES=		gl pkgconfig waf xorg
 USE_GL=		egl glesv2
 USE_XORG=	x11 xmu xt
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-7e481c0
+WRKSRC=		${WRKDIR}/${PORTNAME}-70150aa
+ZUTTY_COMMIT=	70150aa6d5eb93d0e9c5696f5ab101a523354298
 
 PLIST_FILES=	bin/zutty
 
diff --git a/x11/zutty/distinfo b/x11/zutty/distinfo
index 004769b355fd..5e1103e956aa 100644
--- a/x11/zutty/distinfo
+++ b/x11/zutty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706732320
-SHA256 (zutty-0.15.tar.gz) = 2d1ad3396de596682fcdb672cd979c254c6ce4d8fb5628705041addab979f034
-SIZE (zutty-0.15.tar.gz) = 378147
+TIMESTAMP = 1742112790
+SHA256 (zutty-0.16.tar.gz) = ac23c318403b4ed6d163be46f76fc842f644e89682312fd58c44ef947e620da3
+SIZE (zutty-0.16.tar.gz) = 389587